From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHyKm-0000AO-LQ for qemu-devel@nongnu.org; Tue, 28 Jun 2016 15:06:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHyKj-00057E-Dp for qemu-devel@nongnu.org; Tue, 28 Jun 2016 15:06:08 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:59708 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHyKj-000575-7j for qemu-devel@nongnu.org; Tue, 28 Jun 2016 15:06:05 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u5SIwo7Q036832 for ; Tue, 28 Jun 2016 15:06:05 -0400 Received: from e23smtp04.au.ibm.com (e23smtp04.au.ibm.com [202.81.31.146]) by mx0b-001b2d01.pphosted.com with ESMTP id 23utc84f21-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 28 Jun 2016 15:06:04 -0400 Received: from localhost by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 29 Jun 2016 05:06:00 +1000 From: Nikunj A Dadhania Date: Wed, 29 Jun 2016 00:35:14 +0530 In-Reply-To: <1467140719-4701-1-git-send-email-nikunj@linux.vnet.ibm.com> References: <1467140719-4701-1-git-send-email-nikunj@linux.vnet.ibm.com> Message-Id: <1467140719-4701-4-git-send-email-nikunj@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 3/8] ppc/xics: Implement H_IPOLL using an accessor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Cc: qemu-devel@nongnu.org, clg@kaod.org, benh@kernel.crashing.org, nikunj@linux.vnet.ibm.com From: Benjamin Herrenschmidt None of the other presenter functions directly mucks with the internal state, so don't do it there either. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Nikunj A Dadhania Reviewed-by: David Gibson --- hw/intc/xics.c | 8 ++++++++ hw/intc/xics_spapr.c | 7 ++++--- include/hw/ppc/xics.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index f01af08..f43f98a 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -288,6 +288,14 @@ uint32_t icp_accept(ICPState *ss) return xirr; } +uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr) +{ + if (mfrr) { + *mfrr = ss->mfrr; + } + return ss->xirr; +} + void icp_eoi(XICSState *icp, int server, uint32_t xirr) { ICPState *ss = icp->ss + server; diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 89190ef..94571dd 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -99,10 +99,11 @@ static target_ulong h_ipoll(PowerPCCPU *cpu, sPAPRMachineState *spapr, target_ulong opcode, target_ulong *args) { CPUState *cs = CPU(cpu); - ICPState *ss = &spapr->icp->ss[cs->cpu_index]; + uint32_t mfrr; + uint32_t xirr = icp_ipoll(spapr->icp->ss + cs->cpu_index, &mfrr); - args[0] = ss->xirr; - args[1] = ss->mfrr; + args[0] = xirr; + args[1] = mfrr; return H_SUCCESS; } diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 3349006..7445a14 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -186,6 +186,7 @@ int xics_get_cpu_index_by_dt_id(int cpu_dt_id); void icp_set_cppr(XICSState *icp, int server, uint8_t cppr); void icp_set_mfrr(XICSState *icp, int server, uint8_t mfrr); uint32_t icp_accept(ICPState *ss); +uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr); void icp_eoi(XICSState *icp, int server, uint32_t xirr); void ics_write_xive(ICSState *ics, int nr, int server, -- 2.7.4