From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaCs7-0004IN-1o for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:43:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaCs5-0003Ha-Ts for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:43:38 -0500 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:36300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaCs5-0003HO-NW for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:43:37 -0500 Received: by mail-pf0-x243.google.com with SMTP id q129so1888400pfb.3 for ; Sun, 28 Feb 2016 17:43:37 -0800 (PST) References: <1456486323-8047-1-git-send-email-david@gibson.dropbear.id.au> <1456486323-8047-5-git-send-email-david@gibson.dropbear.id.au> From: Alexey Kardashevskiy Message-ID: <56D3A243.8010805@ozlabs.ru> Date: Mon, 29 Feb 2016 12:43:31 +1100 MIME-Version: 1.0 In-Reply-To: <1456486323-8047-5-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 04/12] spapr_pci: Fold spapr_phb_vfio_eeh_configure() 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_eeh_configure() > into rtas_ibm_configure_pe(). > > Signed-off-by: David Gibson Reviewed-by: Alexey Kardashevskiy > --- > hw/ppc/spapr_pci.c | 11 +++++++++-- > hw/ppc/spapr_pci_vfio.c | 12 ------------ > include/hw/pci-host/spapr.h | 1 - > 3 files changed, 9 insertions(+), 15 deletions(-) > > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index d1e5222..fa633a9 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -42,6 +42,9 @@ > #include "hw/ppc/spapr_drc.h" > #include "sysemu/device_tree.h" > > +#include "hw/vfio/vfio.h" > +#include > + > /* Copied from the kernel arch/powerpc/platforms/pseries/msi.c */ > #define RTAS_QUERY_FN 0 > #define RTAS_CHANGE_FN 1 > @@ -628,8 +631,12 @@ static void rtas_ibm_configure_pe(PowerPCCPU *cpu, > goto param_error_exit; > } > > - ret = spapr_phb_vfio_eeh_configure(sphb); > - rtas_st(rets, 0, ret); > + ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_CONFIGURE); > + if (ret < 0) { > + goto param_error_exit; > + } > + > + rtas_st(rets, 0, RTAS_OUT_SUCCESS); > return; > > param_error_exit: > diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c > index 10fa88a..4ac5736 100644 > --- a/hw/ppc/spapr_pci_vfio.c > +++ b/hw/ppc/spapr_pci_vfio.c > @@ -221,18 +221,6 @@ int spapr_phb_vfio_eeh_reset(sPAPRPHBState *sphb, int option) > return RTAS_OUT_SUCCESS; > } > > -int spapr_phb_vfio_eeh_configure(sPAPRPHBState *sphb) > -{ > - int ret; > - > - ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_CONFIGURE); > - if (ret < 0) { > - return RTAS_OUT_PARAM_ERROR; > - } > - > - return RTAS_OUT_SUCCESS; > -} > - > static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h > index cc1b82c..f02ef51 100644 > --- a/include/hw/pci-host/spapr.h > +++ b/include/hw/pci-host/spapr.h > @@ -140,6 +140,5 @@ int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, > unsigned int addr, int option); > int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state); > int spapr_phb_vfio_eeh_reset(sPAPRPHBState *sphb, int option); > -int spapr_phb_vfio_eeh_configure(sPAPRPHBState *sphb); > > #endif /* __HW_SPAPR_PCI_H__ */ > -- Alexey