Commit c2cabb34 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Michael S. Tsirkin
Browse files

hw/virtio: fix error enabling flags in Device Control register 



When the virtio devices are PCI Express, make error-enabling flags
writable to respect the PCIe spec.

Signed-off-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent f03d8ea3

dtc @ 65cc4d27

Original line number Diff line number Diff line 
Subproject commit 558cd81bdd432769b59bff01240c44f82cfb1a9d
 
Subproject commit 65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf

hw/virtio/virtio-pci.c

+12 −0
Original line number Diff line number Diff line
@@ -1819,6 +1819,11 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) 
         */

        pci_set_word(pci_dev->config + pos + PCI_PM_PMC, 0x3);



        if (proxy->flags & VIRTIO_PCI_FLAG_INIT_DEVERR) {

            /* Init error enabling flags */

            pcie_cap_deverr_init(pci_dev);

        }



        if (proxy->flags & VIRTIO_PCI_FLAG_ATS) {

            pcie_ats_init(pci_dev, 256);

        }
@@ -1849,6 +1854,7 @@ static void virtio_pci_reset(DeviceState *qdev) 
{

    VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev);

    VirtioBusState *bus = VIRTIO_BUS(&proxy->bus);

    PCIDevice *dev = PCI_DEVICE(qdev);

    int i;



    virtio_pci_stop_ioeventfd(proxy);
@@ -1862,6 +1868,10 @@ static void virtio_pci_reset(DeviceState *qdev) 
        proxy->vqs[i].avail[0] = proxy->vqs[i].avail[1] = 0;

        proxy->vqs[i].used[0] = proxy->vqs[i].used[1] = 0;

    }



    if (pci_is_express(dev)) {

        pcie_cap_deverr_reset(dev);

    }

}



static Property virtio_pci_properties[] = {
@@ -1882,6 +1892,8 @@ static Property virtio_pci_properties[] = { 
                     ignore_backend_features, false),

    DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags,

                    VIRTIO_PCI_FLAG_ATS_BIT, false),

    DEFINE_PROP_BIT("x-pcie-deverr-init", VirtIOPCIProxy, flags,

                    VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, true),

    DEFINE_PROP_END_OF_LIST(),

};

hw/virtio/virtio-pci.h

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ enum { 
    VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT,

    VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT,

    VIRTIO_PCI_FLAG_ATS_BIT,

    VIRTIO_PCI_FLAG_INIT_DEVERR_BIT,

};



/* Need to activate work-arounds for buggy guests at vmstate load. */
@@ -100,6 +101,9 @@ enum { 
/* address space translation service */

#define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT)



/* Init error enabling flags */

#define VIRTIO_PCI_FLAG_INIT_DEVERR (1 << VIRTIO_PCI_FLAG_INIT_DEVERR_BIT)



typedef struct {

    MSIMessage msg;

    int virq;

include/hw/compat.h

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ 
        .driver   = TYPE_PCI_DEVICE,\

        .property = "x-pcie-extcap-init",\

        .value    = "off",\

    },{\

        .driver   = "virtio-pci",\

        .property = "x-pcie-deverr-init",\

        .value    = "off",\

    },



#define HW_COMPAT_2_7 \