From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOZuj-0007Do-2v for qemu-devel@nongnu.org; Wed, 27 Jan 2016 18:54:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOZuh-0001Gs-Rr for qemu-devel@nongnu.org; Wed, 27 Jan 2016 18:54:17 -0500 Date: Thu, 28 Jan 2016 10:31:14 +1100 From: David Gibson Message-ID: <20160127233114.GA23015@voom.fritz.box> References: <1453889591-30968-1-git-send-email-david@gibson.dropbear.id.au> <1453889591-30968-8-git-send-email-david@gibson.dropbear.id.au> <56A90553.4000106@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="/9DWx/yDrRhgMJTb" Content-Disposition: inline In-Reply-To: <56A90553.4000106@redhat.com> Subject: Re: [Qemu-devel] [PATCHv2 07/10] target-ppc: Split 44x tlbiva from ppc_tlb_invalidate_one() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Laurent Vivier Cc: thuth@redhat.com, aik@ozlabs.ru, agraf@suse.de, qemu-devel@nongnu.org, qemu-ppc@nongnu.org --/9DWx/yDrRhgMJTb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 27, 2016 at 06:58:43PM +0100, Laurent Vivier wrote: > On 27/01/2016 11:13, David Gibson wrote: > > Currently both the tlbiva instruction (used on 44x chips) and the tlbie > > instruction (used on hash MMU chips) are both handled via > > ppc_tlb_invalidate_one(). This is silly, because they're invoked from > > different places, and do different things. > >=20 > > Clean this up by separating out the tlbiva instruction into its own > > handling. In fact the implementation is only a stub anyway. > >=20 > > Signed-off-by: David Gibson > > --- > > target-ppc/helper.h | 1 + > > target-ppc/mmu_helper.c | 14 ++++++++++---- > > target-ppc/translate.c | 2 +- > > 3 files changed, 12 insertions(+), 5 deletions(-) > >=20 > > diff --git a/target-ppc/helper.h b/target-ppc/helper.h > > index 869be15..e5a8f7b 100644 > > --- a/target-ppc/helper.h > > +++ b/target-ppc/helper.h > > @@ -544,6 +544,7 @@ DEF_HELPER_2(74xx_tlbd, void, env, tl) > > DEF_HELPER_2(74xx_tlbi, void, env, tl) > > DEF_HELPER_FLAGS_1(tlbia, TCG_CALL_NO_RWG, void, env) > > DEF_HELPER_FLAGS_2(tlbie, TCG_CALL_NO_RWG, void, env, tl) > > +DEF_HELPER_FLAGS_2(tlbiva, TCG_CALL_NO_RWG, void, env, tl) > > #if defined(TARGET_PPC64) > > DEF_HELPER_FLAGS_3(store_slb, TCG_CALL_NO_RWG, void, env, tl, tl) > > DEF_HELPER_2(load_slb_esid, tl, env, tl) > > diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c > > index 82ebe5d..e9e0edb 100644 > > --- a/target-ppc/mmu_helper.c > > +++ b/target-ppc/mmu_helper.c > > @@ -1971,10 +1971,6 @@ void ppc_tlb_invalidate_one(CPUPPCState *env, ta= rget_ulong addr) > > ppc6xx_tlb_invalidate_virt(env, addr, 1); > > } > > break; > > - case POWERPC_MMU_BOOKE: > > - /* XXX: TODO */ > > - cpu_abort(CPU(cpu), "BookE MMU model is not implemented\n"); > > - break; > > case POWERPC_MMU_32B: > > case POWERPC_MMU_601: > > /* tlbie invalidate TLBs for all segments */ > > @@ -2116,6 +2112,16 @@ void helper_tlbie(CPUPPCState *env, target_ulong= addr) > > ppc_tlb_invalidate_one(env, addr); > > } > > =20 > > +void helper_tlbiva(CPUPPCState *env, target_ulong addr) > > +{ > > + PowerPCCPU *cpu =3D ppc_env_get_cpu(env); > > + > > + /* tlbiva instruciton only exists on BookE */ >=20 > Typo here ^^ Corrected, thanks. --=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 --/9DWx/yDrRhgMJTb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWqVNCAAoJEGw4ysog2bOSafIQAJ0Q8IbDx/oZ98nwW6TqkVfC ujxlaK+tflhCZ+J/gvYZeYFIZ2aclIuWC2/wZPoJ6m+A/x6YWmof/26wGcXsHcGM eBqsH3BpM6LxqMqb+gmTwrmu5cXGYO3h+wYBf/35zvMte4JWCurZrecteRbBlW2T lSgfWyxz8ybDNRJCTF6GgqBj3WznfVXbccrsOXQYNrW17obME4BKndPD6uB7KnOA c2LSfpIiFLJtg8D3fqzTo2bk5giGbTsVtV4kS4jht+BRHw+NK72iB1HqHLSHBRSQ f/NgYZwTqY+iVpo+8kuZx75LmwpqQPNyC7IG4uanjoaFX1BRUtnXnind1+4PyLJV E6dm3XrIOoqLKOQr0g50ERrQ5gjWmAy+nfU4ySHdvrB6sKe+Xz5/gQ8KMneyoPQy obv9WBeiYexc7oLqQry1Xfl3QbBHAGO1vDSOn6z12EJrEMMTpNuBvu+xu73C3cRS l+9d2evQWkV4QPvltzj4sazUeGVOfv7IneECEAK3wXtrjhq53m4ao4pel5yD+Vno Afdy+7CIMreVJsNe5wjt9LDSdOpb9tAzqmqfY3N8iCNtBBNXKjoDjXBaGA0lK5wA hNLSyt8Krw7BUsScfhoxTbh2U4YMe7LL5UYs0ekNkmLUpnmwMehLzp9EwL65xZkF z7xk6NrovvZCh9ThYCrL =31Pc -----END PGP SIGNATURE----- --/9DWx/yDrRhgMJTb--