OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/ppc: Check privilege level based on PSR and LPCR[HR] in tlbie[l]

Browse Source 
PowerISA v3.0B made tlbie[l] hypervisor privileged when PSR=0 and HR=1.
To allow the check at translation time, we'll use the HR bit of LPCR to
check the MMU mode instead of the PATE.HR.

Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Message-Id: <20210917114751.206845-3-matheus.ferst@eldorado.org.br>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Matheus Ferst 2021-09-17 08:47:51 -03:00 committed by David Gibson
parent 1db3632a14
commit 92fb92d3e9
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
target/ppc/translate.c
View File

@ -5517,7 +5517,15 @@ static void gen_tlbiel(DisasContext *ctx)
#if defined(CONFIG_USER_ONLY)
GEN_PRIV;
#else
CHK_SV;
bool psr = (ctx->opcode >> 17) & 0x1;
if (ctx->pr || (!ctx->hv && !psr && ctx->hr)) {
/*
* tlbiel is privileged except when PSR=0 and HR=1, making it
* hypervisor privileged.
*/
GEN_PRIV;
}
gen_helper_tlbie(cpu_env, cpu_gpr[rB(ctx->opcode)]);
#endif /* defined(CONFIG_USER_ONLY) */
@ -5529,12 +5537,20 @@ static void gen_tlbie(DisasContext *ctx)
#if defined(CONFIG_USER_ONLY)
GEN_PRIV;
#else
bool psr = (ctx->opcode >> 17) & 0x1;
TCGv_i32 t1;
if (ctx->gtse) {
CHK_SV; /* If gtse is set then tlbie is supervisor privileged */
} else {
CHK_HV; /* Else hypervisor privileged */
if (ctx->pr) {
/* tlbie is privileged... */
GEN_PRIV;
} else if (!ctx->hv) {
if (!ctx->gtse || (!psr && ctx->hr)) {
/*
* ... except when GTSE=0 or when PSR=0 and HR=1, making it
* hypervisor privileged.
*/
GEN_PRIV;
}
}
if (NARROW_MODE(ctx)) {