From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaFyF-0004Wq-Dz for qemu-devel@nongnu.org; Mon, 29 Feb 2016 00:02:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaFyC-0000w1-KW for qemu-devel@nongnu.org; Mon, 29 Feb 2016 00:02:11 -0500 Date: Mon, 29 Feb 2016 14:00:45 +1100 From: David Gibson Message-ID: <20160229030045.GB5427@voom.redhat.com> References: <1456486323-8047-1-git-send-email-david@gibson.dropbear.id.au> <1456486323-8047-3-git-send-email-david@gibson.dropbear.id.au> <56D3A229.6030402@ozlabs.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Y7xTucakfITjPcLV" Content-Disposition: inline In-Reply-To: <56D3A229.6030402@ozlabs.ru> Subject: Re: [Qemu-devel] [PATCH 02/12] spapr_pci: Switch to vfio_eeh_as_op() interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, gwshan@au1.ibm.com, agraf@suse.de, alex.williamson@redhat.com, qemu-ppc@nongnu.org --Y7xTucakfITjPcLV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 29, 2016 at 12:43:05PM +1100, Alexey Kardashevskiy wrote: > On 02/26/2016 10:31 PM, David Gibson wrote: > >This switches all EEH on VFIO operations in spapr_pci_vfio.c from the > >broken vfio_container_ioctl() interface to the new vfio_as_eeh_op() > >interface. > > > >Signed-off-by: David Gibson mak >=20 > Where is that "mak" from? :) Oops, no idea. Fixed. > Reviewed-by: Alexey Kardashevskiy >=20 >=20 > >--- > > hw/ppc/spapr_pci_vfio.c | 50 ++++++++++++++++-------------------------= -------- > > 1 file changed, 16 insertions(+), 34 deletions(-) > > > >diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c > >index 2f3752e..b1e8e8e 100644 > >--- a/hw/ppc/spapr_pci_vfio.c > >+++ b/hw/ppc/spapr_pci_vfio.c > >@@ -73,15 +73,9 @@ static void spapr_phb_vfio_finish_realize(sPAPRPHBSta= te *sphb, Error **errp) > > spapr_tce_get_iommu(tcet)); > > } > > > >-static void spapr_phb_vfio_eeh_reenable(sPAPRPHBVFIOState *svphb) > >+static void spapr_phb_vfio_eeh_reenable(sPAPRPHBState *sphb) > > { > >- struct vfio_eeh_pe_op op =3D { > >- .argsz =3D sizeof(op), > >- .op =3D VFIO_EEH_PE_ENABLE > >- }; > >- > >- vfio_container_ioctl(&svphb->phb.iommu_as, > >- svphb->iommugroupid, VFIO_EEH_PE_OP, &op); > >+ vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_ENABLE); > > } > > > > static void spapr_phb_vfio_reset(DeviceState *qdev) > >@@ -92,19 +86,18 @@ static void spapr_phb_vfio_reset(DeviceState *qdev) > > * ensures that the contained PCI devices will work properly > > * after reboot. > > */ > >- spapr_phb_vfio_eeh_reenable(SPAPR_PCI_VFIO_HOST_BRIDGE(qdev)); > >+ spapr_phb_vfio_eeh_reenable(SPAPR_PCI_HOST_BRIDGE(qdev)); > > } > > > > static int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, > > unsigned int addr, int option) > > { > >- sPAPRPHBVFIOState *svphb =3D SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > >- struct vfio_eeh_pe_op op =3D { .argsz =3D sizeof(op) }; > >+ uint32_t op; > > int ret; > > > > switch (option) { > > case RTAS_EEH_DISABLE: > >- op.op =3D VFIO_EEH_PE_DISABLE; > >+ op =3D VFIO_EEH_PE_DISABLE; > > break; > > case RTAS_EEH_ENABLE: { > > PCIHostState *phb; > >@@ -122,21 +115,20 @@ static int spapr_phb_vfio_eeh_set_option(sPAPRPHBS= tate *sphb, > > return RTAS_OUT_PARAM_ERROR; > > } > > > >- op.op =3D VFIO_EEH_PE_ENABLE; > >+ op =3D VFIO_EEH_PE_ENABLE; > > break; > > } > > case RTAS_EEH_THAW_IO: > >- op.op =3D VFIO_EEH_PE_UNFREEZE_IO; > >+ op =3D VFIO_EEH_PE_UNFREEZE_IO; > > break; > > case RTAS_EEH_THAW_DMA: > >- op.op =3D VFIO_EEH_PE_UNFREEZE_DMA; > >+ op =3D VFIO_EEH_PE_UNFREEZE_DMA; > > break; > > default: > > return RTAS_OUT_PARAM_ERROR; > > } > > > >- ret =3D vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugrou= pid, > >- VFIO_EEH_PE_OP, &op); > >+ ret =3D vfio_eeh_as_op(&sphb->iommu_as, op); > > if (ret < 0) { > > return RTAS_OUT_HW_ERROR; > > } > >@@ -146,13 +138,9 @@ static int spapr_phb_vfio_eeh_set_option(sPAPRPHBSt= ate *sphb, > > > > static int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *stat= e) > > { > >- sPAPRPHBVFIOState *svphb =3D SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > >- struct vfio_eeh_pe_op op =3D { .argsz =3D sizeof(op) }; > > int ret; > > > >- op.op =3D VFIO_EEH_PE_GET_STATE; > >- ret =3D vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugrou= pid, > >- VFIO_EEH_PE_OP, &op); > >+ ret =3D vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_GET_STATE); > > if (ret < 0) { > > return RTAS_OUT_PARAM_ERROR; > > } > >@@ -206,28 +194,26 @@ static void spapr_phb_vfio_eeh_pre_reset(sPAPRPHBS= tate *sphb) > > > > static int spapr_phb_vfio_eeh_reset(sPAPRPHBState *sphb, int option) > > { > >- sPAPRPHBVFIOState *svphb =3D SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > >- struct vfio_eeh_pe_op op =3D { .argsz =3D sizeof(op) }; > >+ uint32_t op; > > int ret; > > > > switch (option) { > > case RTAS_SLOT_RESET_DEACTIVATE: > >- op.op =3D VFIO_EEH_PE_RESET_DEACTIVATE; > >+ op =3D VFIO_EEH_PE_RESET_DEACTIVATE; > > break; > > case RTAS_SLOT_RESET_HOT: > > spapr_phb_vfio_eeh_pre_reset(sphb); > >- op.op =3D VFIO_EEH_PE_RESET_HOT; > >+ op =3D VFIO_EEH_PE_RESET_HOT; > > break; > > case RTAS_SLOT_RESET_FUNDAMENTAL: > > spapr_phb_vfio_eeh_pre_reset(sphb); > >- op.op =3D VFIO_EEH_PE_RESET_FUNDAMENTAL; > >+ op =3D VFIO_EEH_PE_RESET_FUNDAMENTAL; > > break; > > default: > > return RTAS_OUT_PARAM_ERROR; > > } > > > >- ret =3D vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugrou= pid, > >- VFIO_EEH_PE_OP, &op); > >+ ret =3D vfio_eeh_as_op(&sphb->iommu_as, op); > > if (ret < 0) { > > return RTAS_OUT_HW_ERROR; > > } > >@@ -237,13 +223,9 @@ static int spapr_phb_vfio_eeh_reset(sPAPRPHBState *= sphb, int option) > > > > static int spapr_phb_vfio_eeh_configure(sPAPRPHBState *sphb) > > { > >- sPAPRPHBVFIOState *svphb =3D SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > >- struct vfio_eeh_pe_op op =3D { .argsz =3D sizeof(op) }; > > int ret; > > > >- op.op =3D VFIO_EEH_PE_CONFIGURE; > >- ret =3D vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugrou= pid, > >- VFIO_EEH_PE_OP, &op); > >+ ret =3D vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_CONFIGURE); > > if (ret < 0) { > > return RTAS_OUT_PARAM_ERROR; > > } > > >=20 >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --Y7xTucakfITjPcLV Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJW07RdAAoJEGw4ysog2bOSPrYP/iO5mfZQ4+L+xVGIlPfmmRnY P0E/s4Rcr7RWcSB7r6wG/DQnyYiVtt5z+vSpeBMmow3ubdqOaVmnn7O+M+HlN38x 0C8Ysk3CKkyZUunRBc7J8QHq22MljX3lM5/X9MWaWphc8m/TYyAPo6Xh7h9xsDzy dKw4br51H6buyfkWem6Gq7uDx2uWDk+Yw9tI5hiuH8VSMH1lYyS6w8B9rrwQsKkr Ao9qv27MDpVxYATPmi4Pgg/EuJkrAvMLXWcHEZEMyjVxL2Lpsasubnr3uFn4Wu+a rikF+cQnpVux4IXw3RXol1vjmYAsy28O1YiQwl4Lb4Rbg5ETKGQQteJF2k2o4byV IhuidJmGlM1sxMrzX18VLKqiMBmDqSqPRLYJWnNc1UjpmZENjj4w/cwLZSoODI/+ lyAh0QBVeZ/fsBJlk8ErY+YTTHg2GOWVxR8sa0ahnQvt5AFmo5QcUbSvZnb0GU7U AOiyaggjiiM85ESL8bbnaV/tU24C/0AHetZ0MyyNzhrsFPwuDQS8Qc7522Eq+NbI Y11djODKHzFU2Bs7G82EegGnE8ZsY5DRxI0yAd2Vxdh46gi8WtOSXR+GxwBinOgc Igq99fK7CbnsmyA1/BxmVLUOEz6XJCuRtEOymhENH2Okp7Hu+Zb3izlTHVgenfnU khUX7cZyxKwOS4ZLfOZB =TPZu -----END PGP SIGNATURE----- --Y7xTucakfITjPcLV--