From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAqw-0000Al-Tt for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:07:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMAqm-0003Ik-Gi for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:07:38 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:32843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAqm-0003Ie-Ab for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:07:28 -0400 Received: by mail-pa0-f51.google.com with SMTP id ey11so23149385pad.10 for ; Tue, 26 Aug 2014 00:07:27 -0700 (PDT) Message-ID: <53FC322B.1000703@ozlabs.ru> Date: Tue, 26 Aug 2014 17:07:23 +1000 From: Alexey Kardashevskiy MIME-Version: 1.0 References: <1407914453-9912-1-git-send-email-aik@ozlabs.ru> In-Reply-To: <1407914453-9912-1-git-send-email-aik@ozlabs.ru> Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] spapr_pci: Fix config space corruption List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alexander Graf 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 > --- > 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