From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOZuk-0007Dw-4A for qemu-devel@nongnu.org; Wed, 27 Jan 2016 18:54:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOZuj-0001HI-1S for qemu-devel@nongnu.org; Wed, 27 Jan 2016 18:54:18 -0500 Date: Thu, 28 Jan 2016 10:47:39 +1100 From: David Gibson Message-ID: <20160127234739.GB23015@voom.fritz.box> References: <1453889591-30968-1-git-send-email-david@gibson.dropbear.id.au> <1453889591-30968-7-git-send-email-david@gibson.dropbear.id.au> <56A90722.2060703@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="U+BazGySraz5kW0T" Content-Disposition: inline In-Reply-To: <56A90722.2060703@redhat.com> Subject: Re: [Qemu-devel] [PATCHv2 06/10] target-ppc: Remove unused mmu models 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 --U+BazGySraz5kW0T Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 27, 2016 at 07:06:26PM +0100, Laurent Vivier wrote: > On 27/01/2016 11:13, David Gibson wrote: > > ppc_tlb_invalidate_one() has a big switch handling many different MMU > > types. However, most of those branches can never be reached: > >=20 > > It is called from 3 places: from remove_hpte() and h_protect() in > > spapr_hcall.c (which always has a 64-bit hash MMU type), and from > > helper_tlbie() in mmu_helper.c. > >=20 > > Calls to helper_tlbie() are generated from gen_tlbiel, gen_tlbiel and > > gen_tlbiva. The first two are only used with the PPC_MEM_TLBIE flag, > > set only with 32-bit or 64-bit hash MMU models, and gen_tlbiva() is > > used only on 440 and 460 models with the BookE mmu model. > >=20 > > These means the exhaustive list of MMU types which may call > > ppc_tlb_invalidate_one() is: POWERPC_MMU_SOFT_6xx, POWERPC_MMU_601, > > POWERPC_MMU_32B, POWERPC_MMU_SOFT_74xx, POWERPC_MMU_64B, POWERPC_MMU_2_= 03, > > POWERPC_MMU_2_06, POWERPC_MMU_2_07 and POWERPC_MMU_BOOKE. > >=20 > > Clean up by removing logic for all other MMU types from > > ppc_tlb_invalidate_one(). > >=20 > > Signed-off-by: David Gibson > > --- > > target-ppc/mmu_helper.c | 20 ++------------------ > > 1 file changed, 2 insertions(+), 18 deletions(-) > >=20 > > diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c > > index c040b17..82ebe5d 100644 > > --- a/target-ppc/mmu_helper.c > > +++ b/target-ppc/mmu_helper.c > > @@ -1971,25 +1971,10 @@ void ppc_tlb_invalidate_one(CPUPPCState *env, t= arget_ulong addr) > > ppc6xx_tlb_invalidate_virt(env, addr, 1); > > } > > break; > > - case POWERPC_MMU_SOFT_4xx: > > - case POWERPC_MMU_SOFT_4xx_Z: > > - ppc4xx_tlb_invalidate_virt(env, addr, env->spr[SPR_40x_PID]); >=20 > This function is now called by no one. Ah, yes. Well, actually it was already called by no one, but now it's obvi= ous. > Perhaps it should move to the > next patch in helper_tlbiva() (according to your comments) ? Uh... I'm not exactly sure what you're suggesting. Moving it to the next patch doesn't really make sense - this is about the 4xx MMU type which is *not* the same as the BookE MMU type used on 44x and 46x (yes, that's confusing - one of the dangers of using an "xx" name). Hmm.. not sure what to do with this - ppc4xx_tlb_invalidate_virt() should be removed, but I don't know that it's worth respinning the whole series just for that. --=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 --U+BazGySraz5kW0T Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWqVcbAAoJEGw4ysog2bOSLQ4P/izb+YduSeo1P0qWsoqn5tHT 2+Mg1Nqg4U7cOAwLoJYalWTPbeK6/UIRTR4/j7biCQzBmZj5mYr/MA5305bczvjP Y5lZzv2UsTdHaJLhmt8TY+SGIIHYJPxs0SSkdOejb3imMqcH4LWlmauPn5no6nXc UjBy+YkhlcEkEcbkiKx7+WAu7j3GDs9KccB4krR79UTTj35jmo8WcsXLEiBmu1x0 /W87l3mD+3V8pjxgvTuY1NulY6tvC0vCWdk/OsuszHJspU3R+KneOtOu6xyHxi/H yq4LJjET6mmxvkTrt7uaecxf7ZHW6flvmC4U+EYjO1wA8gmuAivFf6rNhsKYeHwJ gSLJg9/Cv+6S3qzMmxLwVuWAeUiZpWnieQVEFRYNpDASBGhpRhvqy3ltMqVGz7wS b0oFQhv7UHSm8DKXEQ7soi9JQeNPHpJVLW5qMympwhUxp7YU+/LJ9zlQydHH3WO2 p/Q9zjRX0+w7L/EPg9g0Jc/GQ7SzGZw4uL6VjM/pRc1MepUkH8tWHScq14ZSGxFr wraiOPtBxzj0J+3TvmBZUUfjUFrBBSxkv9Vpxe13lDQ1ZywnwTrVmqgU6FuOaIz6 E2bppxZjsjcwgKV3E5a8kUNJEy/uGtDzrgYwX0pkzHlnCtmxmotUNauxAFmR6GYt QfVN8Pt18dn+RiJOOHfz =VKGr -----END PGP SIGNATURE----- --U+BazGySraz5kW0T--