Commit f55a585d authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pci, pc, virtio: fixes

intel-iommu fixes
virtio typo fixes
linker: a couple of asserts for consistency/security

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

# gpg: Signature made Tue 02 Apr 2019 16:51:19 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# 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

* remotes/mst/tags/for_upstream:
  intel_iommu: Drop extended root field
  intel_iommu: Fix root_scalable migration breakage
  virtio-net: Fix typo in comment
  intel_iommu: Correct caching-mode error message
  acpi: verify file entries in bios_linker_loader_add_pointer()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 90fb864a 81fb1e64

hw/acpi/bios-linker-loader.c

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ void bios_linker_loader_add_pointer(BIOSLinker *linker, 
    const BiosLinkerFileEntry *source_file =

        bios_linker_find_file(linker, src_file);



    assert(dst_file);

    assert(source_file);

    assert(dst_patched_offset < dst_file->blob->len);

    assert(dst_patched_offset + dst_patched_size <= dst_file->blob->len);

    assert(src_offset < source_file->blob->len);

hw/i386/intel_iommu.c

+23 −9
Original line number Diff line number Diff line
@@ -162,6 +162,15 @@ static inline void vtd_iommu_unlock(IntelIOMMUState *s) 
    qemu_mutex_unlock(&s->iommu_lock);

}



static void vtd_update_scalable_state(IntelIOMMUState *s)

{

    uint64_t val = vtd_get_quad_raw(s, DMAR_RTADDR_REG);



    if (s->scalable_mode) {

        s->root_scalable = val & VTD_RTADDR_SMT;

    }

}



/* Whether the address space needs to notify new mappings */

static inline gboolean vtd_as_has_map_notifier(VTDAddressSpace *as)

{
@@ -1709,13 +1718,11 @@ error: 
static void vtd_root_table_setup(IntelIOMMUState *s)

{

    s->root = vtd_get_quad_raw(s, DMAR_RTADDR_REG);

    s->root_extended = s->root & VTD_RTADDR_RTT;

    if (s->scalable_mode) {

        s->root_scalable = s->root & VTD_RTADDR_SMT;

    }

    s->root &= VTD_RTADDR_ADDR_MASK(s->aw_bits);



    trace_vtd_reg_dmar_root(s->root, s->root_extended);

    vtd_update_scalable_state(s);



    trace_vtd_reg_dmar_root(s->root, s->root_scalable);

}



static void vtd_iec_notify_all(IntelIOMMUState *s, bool global,
@@ -2919,7 +2926,7 @@ static void vtd_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu, 
    IntelIOMMUState *s = vtd_as->iommu_state;



    if (!s->caching_mode && new & IOMMU_NOTIFIER_MAP) {

        error_report("We need to set caching-mode=1 for intel-iommu to enable "

        error_report("We need to set caching-mode=on for intel-iommu to enable "

                     "device assignment with IOMMU protection.");

        exit(1);

    }
@@ -2945,6 +2952,15 @@ static int vtd_post_load(void *opaque, int version_id) 
     */

    vtd_switch_address_space_all(iommu);



    /*

     * We don't need to migrate the root_scalable because we can

     * simply do the calculation after the loading is complete.  We

     * can actually do similar things with root, dmar_enabled, etc.

     * however since we've had them already so we'd better keep them

     * for compatibility of migration.

     */

    vtd_update_scalable_state(iommu);



    return 0;

}
@@ -2965,8 +2981,7 @@ static const VMStateDescription vtd_vmstate = { 
        VMSTATE_UINT16(next_frcd_reg, IntelIOMMUState),

        VMSTATE_UINT8_ARRAY(csr, IntelIOMMUState, DMAR_REG_SIZE),

        VMSTATE_UINT8(iq_last_desc_type, IntelIOMMUState),

        VMSTATE_BOOL(root_extended, IntelIOMMUState),

        VMSTATE_BOOL(root_scalable, IntelIOMMUState),

        VMSTATE_UNUSED(1),      /* bool root_extended is obsolete by VT-d */

        VMSTATE_BOOL(dmar_enabled, IntelIOMMUState),

        VMSTATE_BOOL(qi_enabled, IntelIOMMUState),

        VMSTATE_BOOL(intr_enabled, IntelIOMMUState),
@@ -3487,7 +3502,6 @@ static void vtd_init(IntelIOMMUState *s) 
    memset(s->womask, 0, DMAR_REG_SIZE);



    s->root = 0;

    s->root_extended = false;

    s->root_scalable = false;

    s->dmar_enabled = false;

    s->intr_enabled = false;

hw/i386/intel_iommu_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ 
#define VTD_CCMD_FM(val)            (((val) >> 32) & 3ULL)



/* RTADDR_REG */

#define VTD_RTADDR_RTT              (1ULL << 11)

#define VTD_RTADDR_SMT              (1ULL << 10)

#define VTD_RTADDR_ADDR_MASK(aw)    (VTD_HAW_MASK(aw) ^ 0xfffULL)

hw/i386/trace-events

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d" 
vtd_irq_generate(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64

vtd_reg_read(uint64_t addr, uint64_t size) "addr 0x%"PRIx64" size 0x%"PRIx64

vtd_reg_write(uint64_t addr, uint64_t size, uint64_t val) "addr 0x%"PRIx64" size 0x%"PRIx64" value 0x%"PRIx64

vtd_reg_dmar_root(uint64_t addr, bool extended) "addr 0x%"PRIx64" extended %d"

vtd_reg_dmar_root(uint64_t addr, bool scalable) "addr 0x%"PRIx64" scalable %d"

vtd_reg_ir_root(uint64_t addr, uint32_t size) "addr 0x%"PRIx64" size 0x%"PRIx32

vtd_reg_write_gcmd(uint32_t status, uint32_t val) "status 0x%"PRIx32" value 0x%"PRIx32

vtd_reg_write_fectl(uint32_t value) "value 0x%"PRIx32

hw/net/virtio-net.c

+1 −1
Original line number Diff line number Diff line
@@ -2281,7 +2281,7 @@ static void virtio_net_change_num_queues(VirtIONet *n, int new_max_queues) 
    /*

     * We always need to remove and add ctrl vq if

     * old_num_queues != new_num_queues. Remove ctrl_vq first,

     * and then we only enter one of the following too loops.

     * and then we only enter one of the following two loops.

     */

    virtio_del_queue(vdev, old_num_queues - 1);