From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGJY7-0004Tb-4h for qemu-devel@nongnu.org; Fri, 24 Jun 2016 01:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bGJXy-0006o8-Qr for qemu-devel@nongnu.org; Fri, 24 Jun 2016 01:21:02 -0400 Date: Fri, 24 Jun 2016 15:21:09 +1000 From: David Gibson Message-ID: <20160624052109.GJ15625@voom.fritz.box> References: <1466704050-15108-1-git-send-email-nikunj@linux.vnet.ibm.com> <1466704050-15108-4-git-send-email-nikunj@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8tZVdKiiYitVG083" Content-Disposition: inline In-Reply-To: <1466704050-15108-4-git-send-email-nikunj@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH v1 03/11] ppc/xics: Implement H_IPOLL using an accessor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Nikunj A Dadhania Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, clg@kaod.org, Benjamin Herrenschmidt --8tZVdKiiYitVG083 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 23, 2016 at 11:17:22PM +0530, Nikunj A Dadhania wrote: > From: Benjamin Herrenschmidt >=20 > None of the other presenter functions directly mucks with the > internal state, so don't do it there either. >=20 > Signed-off-by: Benjamin Herrenschmidt > Signed-off-by: Nikunj A Dadhania Reviewed-by: David Gibson Modulo changes that will be necessary to account for review comments on earlier patches. > --- > hw/intc/xics.c | 8 ++++++++ > hw/intc/xics_spapr.c | 7 ++++--- > include/hw/ppc/xics.h | 1 + > 3 files changed, 13 insertions(+), 3 deletions(-) >=20 > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index 6ca391f..40969ee 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c > @@ -288,6 +288,14 @@ uint32_t icp_accept(ICPState *ss) > return xirr; > } > =20 > +uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr) > +{ > + if (mfrr) { > + *mfrr =3D ss->mfrr; > + } > + return ss->xirr; > +} > + > void icp_eoi(XICSState *icp, int server, uint32_t xirr) > { > ICPState *ss =3D icp->ss + server; > diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c > index 48d458a..4d5adda 100644 > --- a/hw/intc/xics_spapr.c > +++ b/hw/intc/xics_spapr.c > @@ -99,10 +99,11 @@ static target_ulong h_ipoll(PowerPCCPU *cpu, sPAPRMac= hineState *spapr, > target_ulong opcode, target_ulong *args) > { > CPUState *cs =3D CPU(cpu); > - ICPState *ss =3D &spapr->icp->ss[cs->cpu_index]; > + uint32_t mfrr; > + uint32_t xirr =3D icp_ipoll(spapr->icp->ss + cs->cpu_index, &mfrr); > =20 > - args[0] =3D ss->xirr; > - args[1] =3D ss->mfrr; > + args[0] =3D xirr; > + args[1] =3D mfrr; > =20 > return H_SUCCESS; > } > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h > index 76b45ef..32ea706 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -186,6 +186,7 @@ int 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); > =20 > void ics_write_xive(ICSState *ics, int nr, int server, --=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 --8tZVdKiiYitVG083 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXbMNFAAoJEGw4ysog2bOSOzoP/1gxMButCoSUv1YHNwh0wJoa ULtxgs0ndKkGaa7MgVzhlaMkzlGA63MpzySU1pm32GtNPEtab5CwkTBMR9V02zXR uorCt+Fp6h7bPVuT4TiVo7rtYaAAFG7S+aWXBRXJd5mghh2BDoT6ev10OfXWcu8s /ZFnWM42Gs4XoSuoV2FqvJ26ius5saCDg4KSz98znspZKuoVHgevkJWBtBYGPFkN j01fNUG2sQ5B5YTSntgxMZA4m1eFj6/lMpk2OElnFtAiKdQjl7mXxmm8ULOkYsWK AQemMT86+PTiwfTgn9dSn6ZV3is3MdZcSXETvLIe5I0xz2q/UqDZJf58A6hrI9KN R8anaz7LutG7qgtKLQm9ktYuoYMBdSUc/G1EwFxSAmUi+0FOA9AS7L0iU3MjYeeA xQpmbcLtImvd9B609RLqjnL2Xbvy/j0GfYDX2nlIUZEj4Ce5RDm6gMojWbO8gfEi IwWgoiQ7rfR/dReSTvfDEIfXLpwrXgzRaeDVanLKPWv3t2+P4ctVKOroL2BIHVoB g/OkGlmUDTbtWtV+NZjaFugDSYkJM7KBuiQW2bwVwvhlOMdMGxy4A4QVgCSWaXiz F04bcg2jNH/TyoD1w2b+Y2eSz2JNmsg+fT4NEXH0jey+lkmQEWmyJ0D8v8dqhtz5 1D5qcEEzGe/vu6Tx48kW =NwQZ -----END PGP SIGNATURE----- --8tZVdKiiYitVG083--