[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC QEMU PATCH v8 1/2] virtio-pci: only reset pm state during resetting
From: |
Jiqian Chen |
Subject: |
[RFC QEMU PATCH v8 1/2] virtio-pci: only reset pm state during resetting |
Date: |
Thu, 28 Mar 2024 18:39:02 +0800 |
Fix bug imported by 27ce0f3afc9dd25d21b43bbce505157afd93d111
(fix Power Management Control Register for PCI Express virtio devices)
Only state of PM_CTRL is writable.
Only when flag VIRTIO_PCI_FLAG_INIT_PM is set, need to reset state.
Signed-off-by: Jiqian Chen <Jiqian.Chen@amd.com>
---
hw/virtio/virtio-pci.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index eaaf86402cfa..05dd03758d9f 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -2448,10 +2448,16 @@ static void virtio_pci_bus_reset_hold(Object *obj)
virtio_pci_reset(qdev);
if (pci_is_express(dev)) {
+ VirtIOPCIProxy *proxy = VIRTIO_PCI(dev);
+
pcie_cap_deverr_reset(dev);
pcie_cap_lnkctl_reset(dev);
- pci_set_word(dev->config + dev->exp.pm_cap + PCI_PM_CTRL, 0);
+ if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) {
+ pci_word_test_and_clear_mask(
+ dev->config + dev->exp.pm_cap + PCI_PM_CTRL,
+ PCI_PM_CTRL_STATE_MASK);
+ }
}
}
--
2.34.1
- [RFC QEMU PATCH v8 0/1] S3 support, Jiqian Chen, 2024/03/28
- [RFC QEMU PATCH v8 1/2] virtio-pci: only reset pm state during resetting,
Jiqian Chen <=
- [RFC QEMU PATCH v8 2/2] virtio-pci: implement No_Soft_Reset bit, Jiqian Chen, 2024/03/28
- Re: [RFC QEMU PATCH v8 2/2] virtio-pci: implement No_Soft_Reset bit, Michael S. Tsirkin, 2024/03/28
- Re: [RFC QEMU PATCH v8 2/2] virtio-pci: implement No_Soft_Reset bit, Chen, Jiqian, 2024/03/28
- Re: [RFC QEMU PATCH v8 2/2] virtio-pci: implement No_Soft_Reset bit, Michael S. Tsirkin, 2024/03/28
- Re: [RFC QEMU PATCH v8 2/2] virtio-pci: implement No_Soft_Reset bit, Chen, Jiqian, 2024/03/29
- Re: [RFC QEMU PATCH v8 2/2] virtio-pci: implement No_Soft_Reset bit, Jason Wang, 2024/03/29
- Re: [RFC QEMU PATCH v8 2/2] virtio-pci: implement No_Soft_Reset bit, Chen, Jiqian, 2024/03/29
- Re: [RFC QEMU PATCH v8 2/2] virtio-pci: implement No_Soft_Reset bit, Jason Wang, 2024/03/29
- Re: [RFC QEMU PATCH v8 2/2] virtio-pci: implement No_Soft_Reset bit, Michael S. Tsirkin, 2024/03/29