From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7vfG-0006oG-9N for qemu-devel@nongnu.org; Tue, 31 May 2016 22:13:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7vfB-0006MN-73 for qemu-devel@nongnu.org; Tue, 31 May 2016 22:13:45 -0400 Date: Wed, 1 Jun 2016 12:15:11 +1000 From: David Gibson Message-ID: <20160601021511.GA15455@voom.fritz.box> References: <1464655277-14748-1-git-send-email-david@gibson.dropbear.id.au> <1464655277-14748-5-git-send-email-david@gibson.dropbear.id.au> <574E1021.8040805@ilande.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="TB36FDmn/VVEgNH/" Content-Disposition: inline In-Reply-To: <574E1021.8040805@ilande.co.uk> Subject: Re: [Qemu-devel] [Qemu-ppc] [PULL 04/12] ppc: tlbie, tlbia and tlbisync are HV only List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark Cave-Ayland Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata.rao@gmail.com, pbonzini@redhat.com --TB36FDmn/VVEgNH/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, May 31, 2016 at 11:28:49PM +0100, Mark Cave-Ayland wrote: > On 31/05/16 01:41, David Gibson wrote: >=20 > > From: Benjamin Herrenschmidt > >=20 > > Not that anything remotely recent supports tlbia but ... > >=20 > > Signed-off-by: Benjamin Herrenschmidt > > Signed-off-by: David Gibson > > --- > > target-ppc/translate.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > >=20 > > diff --git a/target-ppc/translate.c b/target-ppc/translate.c > > index dfd3010..690ffd2 100644 > > --- a/target-ppc/translate.c > > +++ b/target-ppc/translate.c > > @@ -4858,7 +4858,7 @@ static void gen_tlbie(DisasContext *ctx) > > #if defined(CONFIG_USER_ONLY) > > gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); > > #else > > - if (unlikely(ctx->pr)) { > > + if (unlikely(ctx->pr || !ctx->hv)) { > > gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); > > return; > > } > > @@ -4879,7 +4879,7 @@ static void gen_tlbsync(DisasContext *ctx) > > #if defined(CONFIG_USER_ONLY) > > gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); > > #else > > - if (unlikely(ctx->pr)) { > > + if (unlikely(ctx->pr || !ctx->hv)) { > > gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); > > return; > > } > > @@ -4898,7 +4898,7 @@ static void gen_slbia(DisasContext *ctx) > > #if defined(CONFIG_USER_ONLY) > > gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); > > #else > > - if (unlikely(ctx->pr)) { > > + if (unlikely(ctx->pr || !ctx->hv)) { > > gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); > > return; > > } >=20 > Unfortunately this patch breaks qemu-system-ppc for both g3beige and > mac99 under TCG causing a freeze in OpenBIOS when starting > qemu-system-ppc with no parameters. Bother, sorry. I think this is because I applied this without the patch that treats machines with no hypervisor mode (e.g. Apples) as always being in hypervisor mode. > Note that there is also another regression that has recently landed in > git master so you'll also need to revert > e7c9136977cb99c6eb52c9139f7b8d8b5fa87db9 in order to get back to a > functioning OpenBIOS. I'd preter to see it fixed rather than just reverted.. --=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 --TB36FDmn/VVEgNH/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXTkUvAAoJEGw4ysog2bOSS8oQAJ6AHZ4xdMN2BT3pS4Cb4B8R JX/oOeKOFHRMe9bt6ovfTZp/zFc8LkCAVR0HbHr+cIFLrO/rJaMsMRn020fRCC4l DcEvIrXK+1k16fOKs0uvUsJYxO/LGWT9R04QxXT34IUir18pouF8b8G1gJN1Ufo0 quuZwVfukb0sqZzqbIf1s7UNFQ+l0fz2O/ZQwob356/NBN3FXWgOOHPkIwKB4wbI LG7ucXgiLWO5BgjRbMaw7b/FXDV8ZZn4aseqrFGmrDQBzTzj4GqrYMLCS+9zXjc/ IeZuD99lIGDxI6QeWYJ02c467RpUq3D64B2vuS6vUUvsyn0D+e3EWt/u9CvMcbre WZzCi9S9P9BtnsYPJl+lhqtCZDugMWLIpSEp8hI5m6vGwH2s7HD7njKObU37KDw4 RSr+EwrrzG4v2MD8uE7SiNZkmaIwMqK0ghE0bHssg2VFh769x/i9yklHMPfwucyH HpM/hILMiiyhjGYxt46O44FVfHAxvnUjLgYiGek/H+uyCREvWTgRyL8m2PhxTCI/ 91dUTmFhIoZkFU7cVwP+Q78/jN0IWxmMITAGYLDHIhG5oVgAhYYBaQoQLWpJH3ID Sqhti956XqiaeuG2b/UClhDg0fy4yztFd0k4QoqgoTdqhpuMnnsy4iOB2xHO7jWM QHHoz/KsF7hkROCEul/S =4RTd -----END PGP SIGNATURE----- --TB36FDmn/VVEgNH/--