Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-15 22:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target/ppc: Style fixes for mmu-hash64.[ch]

Browse Source 
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
This commit is contained in:
David Gibson 2019-03-21 22:32:53 +11:00
parent 596e3ca852
commit d75cbae853
1 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
target/ppc/mmu-hash64.c
View File

@ -30,7 +30,7 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "mmu-book3s-v3.h" #include "mmu-book3s-v3.h"
//#define DEBUG_SLB /* #define DEBUG_SLB */
#ifdef DEBUG_SLB #ifdef DEBUG_SLB
# define LOG_SLB(...) qemu_log_mask(CPU_LOG_MMU, __VA_ARGS__) # define LOG_SLB(...) qemu_log_mask(CPU_LOG_MMU, __VA_ARGS__)
@ -58,9 +58,11 @@ static ppc_slb_t *slb_lookup(PowerPCCPU *cpu, target_ulong eaddr)
LOG_SLB("%s: slot %d %016" PRIx64 " %016" LOG_SLB("%s: slot %d %016" PRIx64 " %016"
PRIx64 "\n", __func__, n, slb->esid, slb->vsid); PRIx64 "\n", __func__, n, slb->esid, slb->vsid);
/* We check for 1T matches on all MMUs here - if the MMU /*
* We check for 1T matches on all MMUs here - if the MMU
* doesn't have 1T segment support, we will have prevented 1T * doesn't have 1T segment support, we will have prevented 1T
* entries from being inserted in the slbmte code. */ * entries from being inserted in the slbmte code.
*/
if (((slb->esid == esid_256M) && if (((slb->esid == esid_256M) &&
((slb->vsid & SLB_VSID_B) == SLB_VSID_B_256M)) ((slb->vsid & SLB_VSID_B) == SLB_VSID_B_256M))
|| ((slb->esid == esid_1T) && || ((slb->esid == esid_1T) &&
@ -103,7 +105,8 @@ void helper_slbia(CPUPPCState *env)
if (slb->esid & SLB_ESID_V) { if (slb->esid & SLB_ESID_V) {
slb->esid &= ~SLB_ESID_V; slb->esid &= ~SLB_ESID_V;
/* XXX: given the fact that segment size is 256 MB or 1TB, /*
* XXX: given the fact that segment size is 256 MB or 1TB,
* and we still don't have a tlb_flush_mask(env, n, mask) * and we still don't have a tlb_flush_mask(env, n, mask)
* in QEMU, we just invalidate all TLBs * in QEMU, we just invalidate all TLBs
*/ */
@ -126,7 +129,8 @@ static void __helper_slbie(CPUPPCState *env, target_ulong addr,
if (slb->esid & SLB_ESID_V) { if (slb->esid & SLB_ESID_V) {
slb->esid &= ~SLB_ESID_V; slb->esid &= ~SLB_ESID_V;
/* XXX: given the fact that segment size is 256 MB or 1TB, /*
* XXX: given the fact that segment size is 256 MB or 1TB,
* and we still don't have a tlb_flush_mask(env, n, mask) * and we still don't have a tlb_flush_mask(env, n, mask)
* in QEMU, we just invalidate all TLBs * in QEMU, we just invalidate all TLBs
*/ */
@ -306,8 +310,10 @@ static int ppc_hash64_pte_prot(PowerPCCPU *cpu,
{ {
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
unsigned pp, key; unsigned pp, key;
/* Some pp bit combinations have undefined behaviour, so default /*
* to no access in those cases */ * Some pp bit combinations have undefined behaviour, so default
* to no access in those cases
*/
int prot = 0; int prot = 0;
key = !!(msr_pr ? (slb->vsid & SLB_VSID_KP) key = !!(msr_pr ? (slb->vsid & SLB_VSID_KP)
@ -376,7 +382,7 @@ static int ppc_hash64_amr_prot(PowerPCCPU *cpu, ppc_hash_pte64_t pte)
} }
key = HPTE64_R_KEY(pte.pte1); key = HPTE64_R_KEY(pte.pte1);
amrbits = (env->spr[SPR_AMR] >> 2*(31 - key)) & 0x3; amrbits = (env->spr[SPR_AMR] >> 2 * (31 - key)) & 0x3;
/* fprintf(stderr, "AMR protection: key=%d AMR=0x%" PRIx64 "\n", key, */ /* fprintf(stderr, "AMR protection: key=%d AMR=0x%" PRIx64 "\n", key, */
/* env->spr[SPR_AMR]); */ /* env->spr[SPR_AMR]); */
@ -547,8 +553,9 @@ static hwaddr ppc_hash64_pteg_search(PowerPCCPU *cpu, hwaddr hash,
if (*pshift == 0) { if (*pshift == 0) {
continue; continue;
} }
/* We don't do anything with pshift yet as qemu TLB only deals /*
* with 4K pages anyway * We don't do anything with pshift yet as qemu TLB only
* deals with 4K pages anyway
*/ */
pte->pte0 = pte0; pte->pte0 = pte0;
pte->pte1 = pte1; pte->pte1 = pte1;
@ -572,8 +579,10 @@ static hwaddr ppc_hash64_htab_lookup(PowerPCCPU *cpu,
uint64_t vsid, epnmask, epn, ptem; uint64_t vsid, epnmask, epn, ptem;
const PPCHash64SegmentPageSizes *sps = slb->sps; const PPCHash64SegmentPageSizes *sps = slb->sps;
/* The SLB store path should prevent any bad page size encodings /*
* getting in there, so: */ * The SLB store path should prevent any bad page size encodings
* getting in there, so:
*/
assert(sps); assert(sps);
/* If ISL is set in LPCR we need to clamp the page size to 4K */ /* If ISL is set in LPCR we need to clamp the page size to 4K */
@ -732,17 +741,20 @@ int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
assert((rwx == 0) || (rwx == 1) || (rwx == 2)); assert((rwx == 0) || (rwx == 1) || (rwx == 2));
/* Note on LPCR usage: 970 uses HID4, but our special variant /*
* of store_spr copies relevant fields into env->spr[SPR_LPCR]. * Note on LPCR usage: 970 uses HID4, but our special variant of
* Similarily we filter unimplemented bits when storing into * store_spr copies relevant fields into env->spr[SPR_LPCR].
* LPCR depending on the MMU version. This code can thus just * Similarily we filter unimplemented bits when storing into LPCR
* use the LPCR "as-is". * depending on the MMU version. This code can thus just use the
* LPCR "as-is".
*/ */
/* 1. Handle real mode accesses */ /* 1. Handle real mode accesses */
if (((rwx == 2) && (msr_ir == 0)) || ((rwx != 2) && (msr_dr == 0))) { if (((rwx == 2) && (msr_ir == 0)) || ((rwx != 2) && (msr_dr == 0))) {
/* Translation is supposedly "off" */ /*
/* In real mode the top 4 effective address bits are (mostly) ignored */ * Translation is supposedly "off", but in real mode the top 4
* effective address bits are (mostly) ignored
*/
raddr = eaddr & 0x0FFFFFFFFFFFFFFFULL; raddr = eaddr & 0x0FFFFFFFFFFFFFFFULL;
/* In HV mode, add HRMOR if top EA bit is clear */ /* In HV mode, add HRMOR if top EA bit is clear */
@ -875,8 +887,10 @@ skip_slb_search:
if (rwx == 1) { if (rwx == 1) {
new_pte1 |= HPTE64_R_C; /* set changed (dirty) bit */ new_pte1 |= HPTE64_R_C; /* set changed (dirty) bit */
} else { } else {
/* Treat the page as read-only for now, so that a later write /*
* will pass through this function again to set the C bit */ * Treat the page as read-only for now, so that a later write
* will pass through this function again to set the C bit
*/
prot &= ~PAGE_WRITE; prot &= ~PAGE_WRITE;
} }
@ -1023,8 +1037,9 @@ static void ppc_hash64_update_vrma(PowerPCCPU *cpu)
return; return;
} }
/* Make one up. Mostly ignore the ESID which will not be /*
* needed for translation * Make one up. Mostly ignore the ESID which will not be needed
* for translation
*/ */
vsid = SLB_VSID_VRMA; vsid = SLB_VSID_VRMA;
vrmasd = (lpcr & LPCR_VRMASD) >> LPCR_VRMASD_SHIFT; vrmasd = (lpcr & LPCR_VRMASD) >> LPCR_VRMASD_SHIFT;
@ -1080,11 +1095,12 @@ void ppc_store_lpcr(PowerPCCPU *cpu, target_ulong val)
} }
env->spr[SPR_RMOR] = ((lpcr >> 41) & 0xffffull) << 26; env->spr[SPR_RMOR] = ((lpcr >> 41) & 0xffffull) << 26;
/* XXX We could also write LPID from HID4 here /*
* XXX We could also write LPID from HID4 here
* but since we don't tag any translation on it * but since we don't tag any translation on it
* it doesn't actually matter * it doesn't actually matter
*/ *
/* XXX For proper emulation of 970 we also need * XXX For proper emulation of 970 we also need
* to dig HRMOR out of HID5 * to dig HRMOR out of HID5
*/ */
break; break;