From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaCrg-0003Xy-Vh for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:43:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaCrf-0003Ci-QK for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:43:12 -0500 Received: from mail-pa0-x243.google.com ([2607:f8b0:400e:c03::243]:34985) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaCrf-0003CT-Fs for qemu-devel@nongnu.org; Sun, 28 Feb 2016 20:43:11 -0500 Received: by mail-pa0-x243.google.com with SMTP id fl4so7772344pad.2 for ; Sun, 28 Feb 2016 17:43:11 -0800 (PST) References: <1456486323-8047-1-git-send-email-david@gibson.dropbear.id.au> <1456486323-8047-3-git-send-email-david@gibson.dropbear.id.au> From: Alexey Kardashevskiy Message-ID: <56D3A229.6030402@ozlabs.ru> Date: Mon, 29 Feb 2016 12:43:05 +1100 MIME-Version: 1.0 In-Reply-To: <1456486323-8047-3-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 02/12] spapr_pci: Switch to vfio_eeh_as_op() interface 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: > 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 Where is that "mak" from? :) Reviewed-by: Alexey Kardashevskiy > --- > 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(sPAPRPHBState *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 = { > - .argsz = sizeof(op), > - .op = 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 = SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > - struct vfio_eeh_pe_op op = { .argsz = sizeof(op) }; > + uint32_t op; > int ret; > > switch (option) { > case RTAS_EEH_DISABLE: > - op.op = VFIO_EEH_PE_DISABLE; > + op = VFIO_EEH_PE_DISABLE; > break; > case RTAS_EEH_ENABLE: { > PCIHostState *phb; > @@ -122,21 +115,20 @@ static int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, > return RTAS_OUT_PARAM_ERROR; > } > > - op.op = VFIO_EEH_PE_ENABLE; > + op = VFIO_EEH_PE_ENABLE; > break; > } > case RTAS_EEH_THAW_IO: > - op.op = VFIO_EEH_PE_UNFREEZE_IO; > + op = VFIO_EEH_PE_UNFREEZE_IO; > break; > case RTAS_EEH_THAW_DMA: > - op.op = VFIO_EEH_PE_UNFREEZE_DMA; > + op = VFIO_EEH_PE_UNFREEZE_DMA; > break; > default: > return RTAS_OUT_PARAM_ERROR; > } > > - ret = vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugroupid, > - VFIO_EEH_PE_OP, &op); > + ret = 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(sPAPRPHBState *sphb, > > static int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state) > { > - sPAPRPHBVFIOState *svphb = SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > - struct vfio_eeh_pe_op op = { .argsz = sizeof(op) }; > int ret; > > - op.op = VFIO_EEH_PE_GET_STATE; > - ret = vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugroupid, > - VFIO_EEH_PE_OP, &op); > + ret = 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(sPAPRPHBState *sphb) > > static int spapr_phb_vfio_eeh_reset(sPAPRPHBState *sphb, int option) > { > - sPAPRPHBVFIOState *svphb = SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > - struct vfio_eeh_pe_op op = { .argsz = sizeof(op) }; > + uint32_t op; > int ret; > > switch (option) { > case RTAS_SLOT_RESET_DEACTIVATE: > - op.op = VFIO_EEH_PE_RESET_DEACTIVATE; > + op = VFIO_EEH_PE_RESET_DEACTIVATE; > break; > case RTAS_SLOT_RESET_HOT: > spapr_phb_vfio_eeh_pre_reset(sphb); > - op.op = VFIO_EEH_PE_RESET_HOT; > + op = VFIO_EEH_PE_RESET_HOT; > break; > case RTAS_SLOT_RESET_FUNDAMENTAL: > spapr_phb_vfio_eeh_pre_reset(sphb); > - op.op = VFIO_EEH_PE_RESET_FUNDAMENTAL; > + op = VFIO_EEH_PE_RESET_FUNDAMENTAL; > break; > default: > return RTAS_OUT_PARAM_ERROR; > } > > - ret = vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugroupid, > - VFIO_EEH_PE_OP, &op); > + ret = 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 = SPAPR_PCI_VFIO_HOST_BRIDGE(sphb); > - struct vfio_eeh_pe_op op = { .argsz = sizeof(op) }; > int ret; > > - op.op = VFIO_EEH_PE_CONFIGURE; > - ret = vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugroupid, > - VFIO_EEH_PE_OP, &op); > + ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_CONFIGURE); > if (ret < 0) { > return RTAS_OUT_PARAM_ERROR; > } > -- Alexey