[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATTCH v2 4/6] pci/aer: fix interrupt on config write
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATTCH v2 4/6] pci/aer: fix interrupt on config write |
Date: |
Wed, 8 Dec 2010 17:46:26 +0900 |
From: Michael S. Tsirkin <address@hidden>
config write handling for aer seems broken:
For example, it won't clear a level interrupt
when command register is set to 0.
Make it match the spec: level should equal
the logical or of enabled bits, msi only
be sent when the logical or changes.
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Isaku Yamahata <address@hidden>
---
- reorder
- abort() instead of assert(0)
---
hw/pcie_aer.c | 46 +++++++++++++++++-----------------------------
1 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c
index bc98da0..389e9d5 100644
--- a/hw/pcie_aer.c
+++ b/hw/pcie_aer.c
@@ -762,43 +762,31 @@ void pcie_aer_root_reset(PCIDevice *dev)
*/
}
-static bool pcie_aer_root_does_trigger(uint32_t cmd, uint32_t status)
-{
- return
- ((cmd & PCI_ERR_ROOT_CMD_COR_EN) && (status & PCI_ERR_ROOT_COR_RCV)) ||
- ((cmd & PCI_ERR_ROOT_CMD_NONFATAL_EN) &&
- (status & PCI_ERR_ROOT_NONFATAL_RCV)) ||
- ((cmd & PCI_ERR_ROOT_CMD_FATAL_EN) &&
- (status & PCI_ERR_ROOT_FATAL_RCV));
-}
-
void pcie_aer_root_write_config(PCIDevice *dev,
uint32_t addr, uint32_t val, int len,
uint32_t root_cmd_prev)
{
uint8_t *aer_cap = dev->config + dev->exp.aer_cap;
-
- /* root command register */
+ uint32_t root_status = pci_get_long(aer_cap + PCI_ERR_ROOT_STATUS);
+ uint32_t enabled_cmd = pcie_aer_status_to_cmd(root_status);
uint32_t root_cmd = pci_get_long(aer_cap + PCI_ERR_ROOT_COMMAND);
- if (root_cmd & PCI_ERR_ROOT_CMD_EN_MASK) {
- /* 6.2.4.1.2 Interrupt Generation */
+ /* 6.2.4.1.2 Interrupt Generation */
+ if (!msix_enabled(dev) && !msi_enabled(dev)) {
+ qemu_set_irq(dev->irq[dev->exp.aer_intx], !!(root_cmd & enabled_cmd));
+ return;
+ }
- /* 0 -> 1 */
- uint32_t root_cmd_set = ~root_cmd_prev & root_cmd;
- uint32_t root_status = pci_get_long(aer_cap + PCI_ERR_ROOT_STATUS);
- bool trigger = pcie_aer_root_does_trigger(root_cmd_set, root_status);
+ if ((root_cmd_prev & enabled_cmd) || !(root_cmd & enabled_cmd)) {
+ /* Send MSI on transition from false to true. */
+ return;
+ }
- if (msix_enabled(dev)) {
- if (trigger) {
- msix_notify(dev, pcie_aer_root_get_vector(dev));
- }
- } else if (msi_enabled(dev)) {
- if (trigger) {
- msi_notify(dev, pcie_aer_root_get_vector(dev));
- }
- } else {
- qemu_set_irq(dev->irq[dev->exp.aer_intx], trigger);
- }
+ if (msix_enabled(dev)) {
+ msix_notify(dev, pcie_aer_root_get_vector(dev));
+ } else if (msi_enabled(dev)) {
+ msi_notify(dev, pcie_aer_root_get_vector(dev));
+ } else {
+ abort();
}
}
--
1.7.1.1
- [Qemu-devel] [PATTCH v2 0/6] pcie aer fixes, Isaku Yamahata, 2010/12/08
- [Qemu-devel] [PATTCH v2 4/6] pci/aer: fix interrupt on config write,
Isaku Yamahata <=
- [Qemu-devel] [PATTCH v2 2/6] Makefile: make msix/msi depend on CONFIG_PCI, Isaku Yamahata, 2010/12/08
- [Qemu-devel] [PATTCH v2 5/6] pci/aer: remove dead code, Isaku Yamahata, 2010/12/08
- [Qemu-devel] [PATTCH v2 6/6] pci/aer: factor out common code, Isaku Yamahata, 2010/12/08
- [Qemu-devel] [PATTCH v2 3/6] pci/aer: fix error injection, Isaku Yamahata, 2010/12/08
- [Qemu-devel] [PATTCH v2 1/6] pci: untangle pci/msi dependency, Isaku Yamahata, 2010/12/08
- [Qemu-devel] Re: [PATTCH v2 0/6] pcie aer fixes, Michael S. Tsirkin, 2010/12/09