From patchwork Fri Feb 26 11:31:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8436021 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 629A39F1D4 for ; Fri, 26 Feb 2016 11:33:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AEED820396 for ; Fri, 26 Feb 2016 11:33:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0BA992035E for ; Fri, 26 Feb 2016 11:33:49 +0000 (UTC) Received: from localhost ([::1]:49015 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZGea-00060j-F0 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Feb 2016 06:33:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZGc4-0001zt-At for qemu-devel@nongnu.org; Fri, 26 Feb 2016 06:31:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZGby-0006iH-DJ for qemu-devel@nongnu.org; Fri, 26 Feb 2016 06:31:12 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:46407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZGby-0006hK-2i; Fri, 26 Feb 2016 06:31:06 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 7E86B140327; Fri, 26 Feb 2016 22:31:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1456486262; bh=e1gW9kFozZFWtRvVPHWC1lWqR3A5s69Jb1lywxVw9Co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H/XsYFNoSRN+8junIoTnANa5Zy6wetEv/pA1BVd/+8Xsp3oe5jtYIUyOFN/ZW3wK+ vW0YfiqyXTmX5EfB6+GUvvMYOXKG0Nx/1o+tlbyINzAHmbdMhqsRsFJCf+fkdMlwYV xHpOemI91heYh85GPxqe8Roiu5wPd//iWorfwYBI= From: David Gibson To: aik@ozlabs.ru, benh@kernel.crashing.org Date: Fri, 26 Feb 2016 22:31:57 +1100 Message-Id: <1456486323-8047-7-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456486323-8047-1-git-send-email-david@gibson.dropbear.id.au> References: <1456486323-8047-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 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, David Gibson Subject: [Qemu-devel] [PATCH 06/12] spapr_pci: Fold spapr_phb_vfio_eeh_get_state() into spapr_pci code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Simplify the sPAPR PCI code by folding spapr_phb_vfio_eeh_get_state9) into rtas_ibm_read_slot_reset_state2(). Signed-off-by: David Gibson Reviewed-by: Alexey Kardashevskiy --- hw/ppc/spapr_pci.c | 12 ++++++------ hw/ppc/spapr_pci_vfio.c | 13 ------------- include/hw/pci-host/spapr.h | 1 - 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 96cdca2..eaae7e2 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -539,7 +539,7 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU *cpu, { sPAPRPHBState *sphb; uint64_t buid; - int state, ret; + int ret; if ((nargs != 3) || (nret != 4 && nret != 5)) { goto param_error_exit; @@ -555,13 +555,13 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU *cpu, goto param_error_exit; } - ret = spapr_phb_vfio_eeh_get_state(sphb, &state); - rtas_st(rets, 0, ret); - if (ret != RTAS_OUT_SUCCESS) { - return; + ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_GET_STATE); + if (ret < 0) { + goto param_error_exit; } - rtas_st(rets, 1, state); + rtas_st(rets, 0, RTAS_OUT_SUCCESS); + rtas_st(rets, 1, ret); rtas_st(rets, 2, RTAS_EEH_SUPPORT); rtas_st(rets, 3, RTAS_EEH_PE_UNAVAIL_INFO); if (nret >= 5) { diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index 54075e0..c87f2e4 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -136,19 +136,6 @@ int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, return RTAS_OUT_SUCCESS; } -int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state) -{ - int ret; - - ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_GET_STATE); - if (ret < 0) { - return RTAS_OUT_PARAM_ERROR; - } - - *state = ret; - 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 d31162b..55237fc 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -138,6 +138,5 @@ void spapr_phb_vfio_reset(DeviceState *qdev); /* VFIO EEH hooks */ 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); #endif /* __HW_SPAPR_PCI_H__ */