qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 5af2ae: pci: Fix pci_device_iommu_address_spa

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 5af2ae: pci: Fix pci_device_iommu_address_space() bus prop...
Date: Thu, 10 Sep 2015 06:00:06 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5af2ae2305143f1805a696f9554231e1fc246edc
      
https://github.com/qemu/qemu/commit/5af2ae2305143f1805a696f9554231e1fc246edc
  Author: Benjamin Herrenschmidt <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M hw/pci/pci.c

  Log Message:
  -----------
  pci: Fix pci_device_iommu_address_space() bus propagation

he current code walks up the bus tree for an iommu, however it passes
to the iommu_fn() callback the bus/devfn of the immediate child of
the level where the callback was found, rather than the original
bus/devfn where the search started from.

This prevents iommu's like POWER8 (and in fact also Q35) to properly
provide an address space for a subset of devices that aren't immediate
children of the iommu.

PCIe carries the originator bdfn acccross to the iommu on all DMA
transactions, so we must be able to properly identify devices at all
levels.

This changes the function pci_device_iommu_address_space() to pass
the original pointers to the iommu_fn() callback instead.

Signed-off-by: Benjamin Herrenschmidt <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 91176e310527fac8414c417c093659e42e4564ea
      
https://github.com/qemu/qemu/commit/91176e310527fac8414c417c093659e42e4564ea
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/xen/xen.h
    M xen-hvm-stub.c
    M xen-hvm.c

  Log Message:
  -----------
  pc: Remove redundant arguments from xen_hvm_init()

Remove arguments that can be found in PCMachineState.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 95129d6fc9ead97155627a4ca0cfd37282883658
      
https://github.com/qemu/qemu/commit/95129d6fc9ead97155627a4ca0cfd37282883658
  Author: Cornelia Huck <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M hw/block/virtio-blk.c
    M hw/char/virtio-serial-bus.c
    M hw/net/vhost_net.c
    M hw/net/virtio-net.c
    M hw/scsi/virtio-scsi.c
    M hw/virtio/dataplane/vring.c
    M hw/virtio/vhost.c
    M hw/virtio/virtio-balloon.c
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio-access.h
    M include/hw/virtio/virtio.h

  Log Message:
  -----------
  virtio: avoid leading underscores for helpers

Commit ef546f1275f6563e8934dd5e338d29d9f9909ca6 ("virtio: add
feature checking helpers") introduced a helper __virtio_has_feature.
We don't want to use reserved identifiers, though, so let's
rename __virtio_has_feature to virtio_has_feature and virtio_has_feature
to virtio_vdev_has_feature.

Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 9372e3f5678cdd86e1ddfb957d9da4b1889a0dd0
      
https://github.com/qemu/qemu/commit/9372e3f5678cdd86e1ddfb957d9da4b1889a0dd0
  Author: Richard W.M. Jones <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M include/hw/acpi/aml-build.h

  Log Message:
  -----------
  acpi: Remove unused definition.

Signed-off-by: Richard W.M. Jones <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 3385e8e2640e5c38582f6e8413042bd23d97c640
      
https://github.com/qemu/qemu/commit/3385e8e2640e5c38582f6e8413042bd23d97c640
  Author: Igor Mammedov <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M hw/i386/pc.c

  Log Message:
  -----------
  pc: memhotplug: fix incorrectly set reserved-memory-end

reserved-memory-end tells firmware address from which
it could start treating memory as PCI address space
and map PCI BARs after it to avoid collisions with
RAM.
Currently it is incorrectly pointing to address where
hotplugged memory range starts which could redirect
hotplugged RAM accesses to PCI BARs when firmware
maps them over RAM or viceverse.
Fix this by pointing reserved-memory-end to the end
of memory hotplug area.

Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>


  Commit: 2f8b50083b321e470ef8e2502910ade40cbfa020
      
https://github.com/qemu/qemu/commit/2f8b50083b321e470ef8e2502910ade40cbfa020
  Author: Igor Mammedov <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: memhotplug: keep reserved-memory-end broken on 2.4 and earlier machines

it will prevent guests on old machines from seeing
inconsistent memory mapping in firmware/ACPI views.

Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>


  Commit: 0f288f854b96f56247e38f4207f71647133f0184
      
https://github.com/qemu/qemu/commit/0f288f854b96f56247e38f4207f71647133f0184
  Author: Laszlo Ersek <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M hw/pci/pci.c
    M trace-events

  Log Message:
  -----------
  hw/pci: fix pci_update_mappings() trace events

The current trace prototypes and (matching) trace calls lead to
"unorthodox" PCI BDF notation in at least the stderr trace backend. For
example, the four BARs of a QXL video card at 00:01.0 (bus 0, slot 1,
function 0) are traced like this (PID and timestamps removed):

  pci_update_mappings_add d=0x7f14a73bf890 00:00.1 0,0x84000000+0x4000000
  pci_update_mappings_add d=0x7f14a73bf890 00:00.1 1,0x80000000+0x4000000
  pci_update_mappings_add d=0x7f14a73bf890 00:00.1 2,0x88200000+0x2000
  pci_update_mappings_add d=0x7f14a73bf890 00:00.1 3,0xd060+0x20

The slot and function values are in reverse order.

Stick with the conventional BDF notation.

Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Don Koch <address@hidden>
Cc: address@hidden
Fixes: 7828d75045
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: fbf054cb0a8ce2dc8f2d3012fb9204ef50d28d17
      
https://github.com/qemu/qemu/commit/fbf054cb0a8ce2dc8f2d3012fb9204ef50d28d17
  Author: Peter Maydell <address@hidden>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M hw/block/virtio-blk.c
    M hw/char/virtio-serial-bus.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/net/vhost_net.c
    M hw/net/virtio-net.c
    M hw/pci/pci.c
    M hw/scsi/virtio-scsi.c
    M hw/virtio/dataplane/vring.c
    M hw/virtio/vhost.c
    M hw/virtio/virtio-balloon.c
    M hw/virtio/virtio.c
    M include/hw/acpi/aml-build.h
    M include/hw/i386/pc.h
    M include/hw/virtio/virtio-access.h
    M include/hw/virtio/virtio.h
    M include/hw/xen/xen.h
    M trace-events
    M xen-hvm-stub.c
    M xen-hvm.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio,pc,acpi fixes, cleanups

Fixes all over the place.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Thu 10 Sep 2015 10:16:18 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"

* remotes/mst/tags/for_upstream:
  hw/pci: fix pci_update_mappings() trace events
  pc: memhotplug: keep reserved-memory-end broken on 2.4 and earlier machines
  pc: memhotplug: fix incorrectly set reserved-memory-end
  acpi: Remove unused definition.
  virtio: avoid leading underscores for helpers
  pc: Remove redundant arguments from xen_hvm_init()
  pci: Fix pci_device_iommu_address_space() bus propagation

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/fc04a730b7e6...fbf054cb0a8c
reply via email to
[Prev in Thread] Current Thread [Next in Thread]