mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/virtio: fix Power Management Control Register for PCI Express virtio devices

Browse Source 
Make Power Management State flag writable to conform
with the PCI Express spec.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2017-02-20 22:43:13 +02:00 committed by Michael S. Tsirkin
parent d584f1b9ca
commit 27ce0f3afc
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/virtio/virtio-pci.c
View File

@ -1812,6 +1812,7 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
pos = pci_add_capability(pci_dev, PCI_CAP_ID_PM, 0, PCI_PM_SIZEOF); pos = pci_add_capability(pci_dev, PCI_CAP_ID_PM, 0, PCI_PM_SIZEOF);
assert(pos > 0); assert(pos > 0);
pci_dev->exp.pm_cap = pos;
/* /*
* Indicates that this function complies with revision 1.2 of the * Indicates that this function complies with revision 1.2 of the
@ -1829,6 +1830,12 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
pcie_cap_lnkctl_init(pci_dev); pcie_cap_lnkctl_init(pci_dev);
} }
if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) {
/* Init Power Management Control Register */
pci_set_word(pci_dev->wmask + pos + PCI_PM_CTRL,
PCI_PM_CTRL_STATE_MASK);
}
if (proxy->flags & VIRTIO_PCI_FLAG_ATS) { if (proxy->flags & VIRTIO_PCI_FLAG_ATS) {
pcie_ats_init(pci_dev, 256); pcie_ats_init(pci_dev, 256);
} }
@ -1877,6 +1884,8 @@ static void virtio_pci_reset(DeviceState *qdev)
if (pci_is_express(dev)) { if (pci_is_express(dev)) {
pcie_cap_deverr_reset(dev); pcie_cap_deverr_reset(dev);
pcie_cap_lnkctl_reset(dev); pcie_cap_lnkctl_reset(dev);
pci_set_word(dev->config + dev->exp.pm_cap + PCI_PM_CTRL, 0);
} }
} }
@ -1902,6 +1911,8 @@ static Property virtio_pci_properties[] = {
VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, true), VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, true),
DEFINE_PROP_BIT("x-pcie-lnkctl-init", VirtIOPCIProxy, flags, DEFINE_PROP_BIT("x-pcie-lnkctl-init", VirtIOPCIProxy, flags,
VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, true), VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, true),
DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags,
VIRTIO_PCI_FLAG_INIT_PM_BIT, true),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

4
hw/virtio/virtio-pci.h
View File

@ -75,6 +75,7 @@ enum {
VIRTIO_PCI_FLAG_ATS_BIT, VIRTIO_PCI_FLAG_ATS_BIT,
VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, VIRTIO_PCI_FLAG_INIT_DEVERR_BIT,
VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT,
VIRTIO_PCI_FLAG_INIT_PM_BIT,
}; };
/* Need to activate work-arounds for buggy guests at vmstate load. */ /* Need to activate work-arounds for buggy guests at vmstate load. */
@ -108,6 +109,9 @@ enum {
/* Init Link Control register */ /* Init Link Control register */
#define VIRTIO_PCI_FLAG_INIT_LNKCTL (1 << VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT) #define VIRTIO_PCI_FLAG_INIT_LNKCTL (1 << VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT)
/* Init Power Management */
#define VIRTIO_PCI_FLAG_INIT_PM (1 << VIRTIO_PCI_FLAG_INIT_PM_BIT)
typedef struct { typedef struct {
MSIMessage msg; MSIMessage msg;
int virq; int virq;

4
include/hw/compat.h
View File

@ -30,6 +30,10 @@
.driver = "virtio-pci",\ .driver = "virtio-pci",\
.property = "x-pcie-lnkctl-init",\ .property = "x-pcie-lnkctl-init",\
.value = "off",\ .value = "off",\
},{\
.driver = "virtio-pci",\
.property = "x-pcie-pm-init",\
.value = "off",\
}, },
#define HW_COMPAT_2_7 \ #define HW_COMPAT_2_7 \

2
include/hw/pci/pcie.h
View File

@ -63,6 +63,8 @@ typedef enum {
struct PCIExpressDevice { struct PCIExpressDevice {
/* Offset of express capability in config space */ /* Offset of express capability in config space */
uint8_t exp_cap; uint8_t exp_cap;
/* Offset of Power Management capability in config space */
uint8_t pm_cap;
/* SLOT */ /* SLOT */
bool hpev_notified; /* Logical AND of conditions for hot plug event. bool hpev_notified; /* Logical AND of conditions for hot plug event.