[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH] spapr_pci: Fix config space corruption
From: |
Alexey Kardashevskiy |
Subject: |
Re: [Qemu-ppc] [PATCH] spapr_pci: Fix config space corruption |
Date: |
Tue, 26 Aug 2014 17:07:23 +1000 |
User-agent: |
Mozilla/5.0 (X11; Linux i686 on x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.0 |
On 08/13/2014 05:20 PM, Alexey Kardashevskiy wrote:
> When disabling MSI/MSIX via "ibm,change-msi" RTAS call, no check was made
> if MSI or MSIX is actually supported and the MSI message was reset
> unconditionally. If this happened on a device which does not support MSI
> (but does support MSIX, otherwise "ibm,change-msi" would not be called),
> this device would have PCIDevice::msi_cap field (MSI capability offset)
> set to zero and writing a vector would actually clear PCI status.
>
> This clears MSI message only if MSI or MSIX is present on a device.
Ping?
> Signed-off-by: Alexey Kardashevskiy <address@hidden>
> ---
> hw/ppc/spapr_pci.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index d1f4c86..c0e703f 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -263,7 +263,6 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu,
> sPAPREnvironment *spapr,
> unsigned int irq, max_irqs = 0, num = 0;
> sPAPRPHBState *phb = NULL;
> PCIDevice *pdev = NULL;
> - bool msix = false;
> spapr_pci_msi *msi;
> int *config_addr_key;
>
> @@ -301,7 +300,12 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu,
> sPAPREnvironment *spapr,
> }
>
> xics_free(spapr->icp, msi->first_irq, msi->num);
> - spapr_msi_setmsg(pdev, 0, msix, 0, num);
> + if (msi_present(pdev)) {
> + spapr_msi_setmsg(pdev, 0, false, 0, num);
> + }
> + if (msix_present(pdev)) {
> + spapr_msi_setmsg(pdev, 0, true, 0, num);
> + }
> g_hash_table_remove(phb->msi, &config_addr);
>
> trace_spapr_pci_msi("Released MSIs", config_addr);
>
--
Alexey