ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppc: restrict the use of the rfi instruction 

Power ISA 2.x has deleted the rfi instruction and rfid shoud be used
instead on cpus following this instruction set or later.

This will raise an invalid exception when rfi is used on such
processors: Book3S 64-bit processors.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
[clg: the required fix in openbios, commit b747b6acc272 ('ppc: use
      rfid when running under a CPU from the 970 family.'), is now
      merged in qemu under commit 5cebd885d0 ('Update OpenBIOS
      images to b747b6a built from submodule.') ]
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Benjamin Herrenschmidt 2016-09-08 09:32:42 +02:00 committed by David Gibson
parent b5d5502047
commit 6ca038c292
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target-ppc/translate.c
View File

@ -3585,10 +3585,13 @@ static void gen_rfi(DisasContext *ctx)
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
GEN_PRIV; GEN_PRIV;
#else #else
/* FIXME: This instruction doesn't exist anymore on 64-bit server /* This instruction doesn't exist anymore on 64-bit server
* processors compliant with arch 2.x, we should remove it there, * processors compliant with arch 2.x
* but we need to fix OpenBIOS not to use it on 970 first
*/ */
if (ctx->insns_flags & PPC_SEGMENT_64B) {
gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL);
return;
}
/* Restore CPU state */ /* Restore CPU state */
CHK_SV; CHK_SV;
gen_update_cfar(ctx, ctx->nip - 4); gen_update_cfar(ctx, ctx->nip - 4);