Commit a3203e7d authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'mst/tags/for_upstream' into staging 



pci, virtio, vhost: fixes

A bunch of fixes all over the place. Most notably this fixes
the new MTU feature when using vhost.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Mon 29 May 2017 01:10:24 AM BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* mst/tags/for_upstream:
  acpi-test: update expected files
  pc: ACPI BIOS: use highest NUMA node for hotplug mem hole SRAT entry
  vhost-user: pass message as a pointer to process_message_reply()
  virtio_net: Bypass backends for MTU feature negotiation
  intel_iommu: turn off pt before 2.9
  intel_iommu: support passthrough (PT)
  intel_iommu: allow dev-iotlb context entry conditionally
  intel_iommu: use IOMMU_ACCESS_FLAG()
  intel_iommu: provide vtd_ce_get_type()
  intel_iommu: renaming context entry helpers
  x86-iommu: use DeviceClass properties
  memory: remove the last param in memory_region_iommu_replay()
  memory: tune last param of iommu_ops.translate()

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 08f44282 811bf151

exec.c

+2 −1
Original line number Diff line number Diff line
@@ -486,7 +486,8 @@ static MemoryRegionSection address_space_do_translate(AddressSpace *as, 
            break;

        }



        iotlb = mr->iommu_ops->translate(mr, addr, is_write);

        iotlb = mr->iommu_ops->translate(mr, addr, is_write ?

                                         IOMMU_WO : IOMMU_RO);

        addr = ((iotlb.translated_addr & ~iotlb.addr_mask)

                | (addr & iotlb.addr_mask));

        *plen = MIN(*plen, (addr | iotlb.addr_mask) - addr + 1);

hw/alpha/typhoon.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static bool window_translate(TyphoonWindow *win, hwaddr addr, 
/* TODO: A translation failure here ought to set PCI error codes on the

   Pchip and generate a machine check interrupt.  */

static IOMMUTLBEntry typhoon_translate_iommu(MemoryRegion *iommu, hwaddr addr,

                                             bool is_write)

                                             IOMMUAccessFlags flag)

{

    TyphoonPchip *pchip = container_of(iommu, TyphoonPchip, iommu);

    IOMMUTLBEntry ret;

hw/dma/rc4030.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static const MemoryRegionOps jazzio_ops = { 
};



static IOMMUTLBEntry rc4030_dma_translate(MemoryRegion *iommu, hwaddr addr,

                                          bool is_write)

                                          IOMMUAccessFlags flag)

{

    rc4030State *s = container_of(iommu, rc4030State, dma_mr);

    IOMMUTLBEntry ret = {

hw/i386/acpi-build.c

+5 −2
Original line number Diff line number Diff line
@@ -2404,14 +2404,17 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) 
    }



    /*

     * Entry is required for Windows to enable memory hotplug in OS.

     * Entry is required for Windows to enable memory hotplug in OS

     * and for Linux to enable SWIOTLB when booted with less than

     * 4G of RAM. Windows works better if the entry sets proximity

     * to the highest NUMA node in the machine.

     * Memory devices may override proximity set by this entry,

     * providing _PXM method if necessary.

     */

    if (hotplugabble_address_space_size) {

        numamem = acpi_data_push(table_data, sizeof *numamem);

        build_srat_memory(numamem, pcms->hotplug_memory.base,

                          hotplugabble_address_space_size, 0,

                          hotplugabble_address_space_size, pcms->numa_nodes - 1,

                          MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);

    }

hw/i386/amd_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ static inline bool amdvi_is_interrupt_addr(hwaddr addr) 
}



static IOMMUTLBEntry amdvi_translate(MemoryRegion *iommu, hwaddr addr,

                                     bool is_write)

                                     IOMMUAccessFlags flag)

{

    AMDVIAddressSpace *as = container_of(iommu, AMDVIAddressSpace, iommu);

    AMDVIState *s = as->iommu_state;
@@ -1017,7 +1017,7 @@ static IOMMUTLBEntry amdvi_translate(MemoryRegion *iommu, hwaddr addr, 
        return ret;

    }



    amdvi_do_translate(as, addr, is_write, &ret);

    amdvi_do_translate(as, addr, flag & IOMMU_WO, &ret);

    trace_amdvi_translation_result(as->bus_num, PCI_SLOT(as->devfn),

            PCI_FUNC(as->devfn), addr, ret.translated_addr);

    return ret;