[Qemu-devel] Re: [PATCH 5/6] pci/aer: fix interrupt on config write

[Isaku Yamahata <yamahata@valinux.co.jp>]

Looks good.

On Fri, Dec 03, 2010 at 12:54:43AM +0200, Michael S. Tsirkin wrote:
> 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 <mst@redhat.com>
> ---
>  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 0fc191f..1c513a7 100644
> --- a/hw/pcie_aer.c
> +++ b/hw/pcie_aer.c
> @@ -749,43 +749,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 assert = 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 (assert) {
> -                msix_notify(dev, pcie_aer_root_get_vector(dev));
> -            }
> -        } else if (msi_enabled(dev)) {
> -            if (assert) {
> -                msi_notify(dev, pcie_aer_root_get_vector(dev));
> -            }
> -        } else {
> -            qemu_set_irq(dev->irq[dev->exp.aer_intx], assert);
> -        }
> +    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 {
> +        assert(0);
>      }
>  }
>  
> -- 
> 1.7.3.2.91.g446ac
> 

-- 
yamahata