From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaCsl-0005Yk-7l for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:44:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaCsh-0003Va-F2 for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:44:19 -0500 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]:34453) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaCsh-0003VM-7O for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:44:15 -0500 Received: by mail-pa0-x241.google.com with SMTP id yy13so7770303pab.1 for ; Sun, 28 Feb 2016 17:44:15 -0800 (PST) References: <1456486323-8047-1-git-send-email-david@gibson.dropbear.id.au> <1456486323-8047-9-git-send-email-david@gibson.dropbear.id.au> From: Alexey Kardashevskiy Message-ID: <56D3A269.6030704@ozlabs.ru> Date: Mon, 29 Feb 2016 12:44:09 +1100 MIME-Version: 1.0 In-Reply-To: <1456486323-8047-9-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 08/12] spapr_pci: Fold spapr_phb_vfio_reset() into spapr_pci code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , benh@kernel.crashing.org Cc: agraf@suse.de, qemu-devel@nongnu.org, gwshan@au1.ibm.com, mdroth@linux.vnet.ibm.com, alex.williamson@redhat.com, qemu-ppc@nongnu.org On 02/26/2016 10:31 PM, David Gibson wrote: > Simplify the sPAPR PCI code by folding spapr_phb_vfio_reset() into > spapr_phb_reset(). > > Signed-off-by: David Gibson Reviewed-by: Alexey Kardashevskiy > --- > hw/ppc/spapr_pci.c | 13 ++++++++++++- > hw/ppc/spapr_pci_vfio.c | 16 ---------------- > 2 files changed, 12 insertions(+), 17 deletions(-) > > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index 26d08ad..be18bf6 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -1531,13 +1531,24 @@ static int spapr_phb_children_reset(Object *child, void *opaque) > return 0; > } > > +static void spapr_phb_eeh_reenable(sPAPRPHBState *sphb) > +{ > + vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_ENABLE); > +} > + > static void spapr_phb_reset(DeviceState *qdev) > { > /* Reset the IOMMU state */ > object_child_foreach(OBJECT(qdev), spapr_phb_children_reset, NULL); > > if (spapr_phb_eeh_available(SPAPR_PCI_HOST_BRIDGE(qdev))) { > - spapr_phb_vfio_reset(qdev); > + /* > + * The PE might be in frozen state. To reenable the EEH > + * functionality on it will clean the frozen state, which > + * ensures that the contained PCI devices will work properly > + * after reboot. > + */ > + spapr_phb_eeh_reenable(SPAPR_PCI_HOST_BRIDGE(qdev)); > } > } > > diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c > index cccd444..0a0f31a 100644 > --- a/hw/ppc/spapr_pci_vfio.c > +++ b/hw/ppc/spapr_pci_vfio.c > @@ -73,22 +73,6 @@ static void spapr_phb_vfio_finish_realize(sPAPRPHBState *sphb, Error **errp) > spapr_tce_get_iommu(tcet)); > } > > -static void spapr_phb_vfio_eeh_reenable(sPAPRPHBState *sphb) > -{ > - vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_ENABLE); > -} > - > -void spapr_phb_vfio_reset(DeviceState *qdev) > -{ > - /* > - * The PE might be in frozen state. To reenable the EEH > - * functionality on it will clean the frozen state, which > - * ensures that the contained PCI devices will work properly > - * after reboot. > - */ > - spapr_phb_vfio_eeh_reenable(SPAPR_PCI_HOST_BRIDGE(qdev)); > -} > - > static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > -- Alexey