mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/ppc: Fold ci_large_pages flag into PPCHash64Options

Browse Source 
The ci_large_pages boolean in CPUPPCState is only relevant to 64-bit hash
MMU machines, indicating whether it's possible to map large (> 4kiB) pages
as cache-inhibitied (i.e. for IO, rather than memory).  Fold it as another
flag into the PPCHash64Options structure.

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 2018-03-23 14:32:48 +11:00
parent 58969eeece
commit 26cd35b861
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/ppc/spapr.c
View File

@ -263,7 +263,6 @@ static void spapr_populate_pa_features(sPAPRMachineState *spapr,
void *fdt, int offset, void *fdt, int offset,
bool legacy_guest) bool legacy_guest)
{ {
CPUPPCState *env = &cpu->env;
uint8_t pa_features_206[] = { 6, 0, uint8_t pa_features_206[] = { 6, 0,
0xf6, 0x1f, 0xc7, 0x00, 0x80, 0xc0 }; 0xf6, 0x1f, 0xc7, 0x00, 0x80, 0xc0 };
uint8_t pa_features_207[] = { 24, 0, uint8_t pa_features_207[] = { 24, 0,
@ -315,7 +314,7 @@ static void spapr_populate_pa_features(sPAPRMachineState *spapr,
return; return;
} }
if (env->ci_large_pages) { if (ppc_hash64_has(cpu, PPC_HASH64_CI_LARGEPAGE)) {
/* /*
* Note: we keep CI large pages off by default because a 64K capable * Note: we keep CI large pages off by default because a 64K capable
* guest provisioned with large pages might otherwise try to map a qemu * guest provisioned with large pages might otherwise try to map a qemu

1
target/ppc/cpu.h
View File

@ -1090,7 +1090,6 @@ struct CPUPPCState {
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
ppc_slb_t vrma_slb; ppc_slb_t vrma_slb;
target_ulong rmls; target_ulong rmls;
bool ci_large_pages;
#endif #endif
#if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) #if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY)

6
target/ppc/kvm.c
View File

@ -448,7 +448,11 @@ static void kvm_fixup_page_sizes(PowerPCCPU *cpu)
* host page size is smaller than 64K. * host page size is smaller than 64K.
*/ */
if (smmu_info.flags & KVM_PPC_PAGE_SIZES_REAL) { if (smmu_info.flags & KVM_PPC_PAGE_SIZES_REAL) {
env->ci_large_pages = getpagesize() >= 0x10000; if (getpagesize() >= 0x10000) {
cpu->hash64_opts->flags |= PPC_HASH64_CI_LARGEPAGE;
} else {
cpu->hash64_opts->flags &= ~PPC_HASH64_CI_LARGEPAGE;
}
} }
/* /*

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

@ -1128,7 +1128,7 @@ const PPCHash64Options ppc_hash64_opts_basic = {
}; };
const PPCHash64Options ppc_hash64_opts_POWER7 = { const PPCHash64Options ppc_hash64_opts_POWER7 = {
.flags = PPC_HASH64_1TSEG | PPC_HASH64_AMR, .flags = PPC_HASH64_1TSEG | PPC_HASH64_AMR | PPC_HASH64_CI_LARGEPAGE,
.sps = { .sps = {
{ {
.page_shift = 12, /* 4K */ .page_shift = 12, /* 4K */

1
target/ppc/mmu-hash64.h
View File

@ -155,6 +155,7 @@ struct PPCHash64SegmentPageSizes {
struct PPCHash64Options { struct PPCHash64Options {
#define PPC_HASH64_1TSEG 0x00001 #define PPC_HASH64_1TSEG 0x00001
#define PPC_HASH64_AMR 0x00002 #define PPC_HASH64_AMR 0x00002
#define PPC_HASH64_CI_LARGEPAGE 0x00004
unsigned flags; unsigned flags;
PPCHash64SegmentPageSizes sps[PPC_PAGE_SIZES_MAX_SZ]; PPCHash64SegmentPageSizes sps[PPC_PAGE_SIZES_MAX_SZ];
}; };

3
target/ppc/translate_init.c
View File

@ -8392,7 +8392,6 @@ static void init_proc_POWER7(CPUPPCState *env)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->slb_nr = 32; env->slb_nr = 32;
#endif #endif
env->ci_large_pages = true;
env->dcache_line_size = 128; env->dcache_line_size = 128;
env->icache_line_size = 128; env->icache_line_size = 128;
@ -8547,7 +8546,6 @@ static void init_proc_POWER8(CPUPPCState *env)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->slb_nr = 32; env->slb_nr = 32;
#endif #endif
env->ci_large_pages = true;
env->dcache_line_size = 128; env->dcache_line_size = 128;
env->icache_line_size = 128; env->icache_line_size = 128;
@ -8748,7 +8746,6 @@ static void init_proc_POWER9(CPUPPCState *env)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
env->slb_nr = 32; env->slb_nr = 32;
#endif #endif
env->ci_large_pages = true;
env->dcache_line_size = 128; env->dcache_line_size = 128;
env->icache_line_size = 128; env->icache_line_size = 128;