From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZASPW-00029Z-VB for qemu-devel@nongnu.org; Wed, 01 Jul 2015 20:31:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZASPP-00037B-Fm for qemu-devel@nongnu.org; Wed, 01 Jul 2015 20:31:26 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:43336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZASPO-000356-Ms for qemu-devel@nongnu.org; Wed, 01 Jul 2015 20:31:19 -0400 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 2 Jul 2015 10:31:14 +1000 From: Gavin Shan Date: Thu, 2 Jul 2015 10:30:11 +1000 Message-Id: <1435797012-6069-3-git-send-email-gwshan@linux.vnet.ibm.com> In-Reply-To: <1435797012-6069-1-git-send-email-gwshan@linux.vnet.ibm.com> References: <1435797012-6069-1-git-send-email-gwshan@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v4 2/3] sPAPR: Reenable EEH functionality on reboot List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: alex.williamson@redhat.com, qemu-devel@nongnu.org, Gavin Shan , david@gibson.dropbear.id.au When rebooting the guest, some PEs might be in frozen state. The contained PCI devices won't work properly if their frozen states aren't cleared in time. One case running into this situation would be maximal EEH error times encountered in the guest. The patch reenables the EEH functinality on PEs on PHB's reset callback, which will clear their frozen states if needed. Signed-off-by: Gavin Shan Reviewed-by: David Gibson --- v4: Separate function to reenable EEH functionality --- hw/ppc/spapr_pci_vfio.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index 99a1be5..8104074 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -71,9 +71,26 @@ 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) +{ + 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); +} + static void spapr_phb_vfio_reset(DeviceState *qdev) { - /* Do nothing */ + /* + * 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_VFIO_HOST_BRIDGE(qdev)); } static int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, -- 2.1.0