target/ppc: MMU debug fixes
cover target/ppc: MMU debug fixes
Some fixes for the commented-out debug options in MMU code.
Since v2:
- added a fix for DEBUG_BATS
v1: https://lists.nongnu.org/archive/html/qemu-ppc/2021-07/msg00004.html
Fabiano Rosas (3):
target/ppc: Fix compilation with DUMP_PAGE_TABLES debug option target/ppc: Fix compilation with FLUSH_ALL_TLBS debug option target/ppc: Fix compilation with DEBUG_BATS debug option
target/ppc/mmu-hash32.c | 5 ++++- target/ppc/mmu-hash32.h | 2 ++ target/ppc/mmu_helper.c | 10 +--------- 3 files changed, 7 insertions(+), 10 deletions(-)
--
2.29.2
PATCH 1/3 target/ppc: Fix compilation with DUMP_PAGE_TABLES debug option
../target/ppc/mmu_helper.c: In function 'get_segment_6xx_tlb':../target/ppc/mmu_helper.c:514:46: error: passing argument 1 of 'ppc_hash32_hpt_mask' from incompatible pointer type [-Werror=incompatible-pointer-types]
514 | ppc_hash32_hpt_mask(env) + 0x80);
| ^~~
| |
| CPUPPCState *--- target/ppc/mmu_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/ppc/mmu_helper.c +1 -1
@@ -511,7 +511,7 @@ static int get_segment_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx,qemu_log ("Page table: " TARGET_FMT_plx" len " TARGET_FMT_plx"\n" ,ppc_hash32_hpt_base (cpu), -ppc_hash32_hpt_mask (env) +0x80 ); +ppc_hash32_hpt_mask (cpu) +0x80 ); for (curaddr = ppc_hash32_hpt_base(cpu); curaddr < (ppc_hash32_hpt_base(cpu) + ppc_hash32_hpt_mask(cpu) + 0x80);
Signature · 1 line
2.29.2
David Gibson
AppliedRe: [PATCH 1/3] target/ppc: Fix compilation with DUMP_PAGE_TABLES debug option
Quoted 11 lines · Fabiano Rosas
../target/ppc/mmu_helper.c: In function 'get_segment_6xx_tlb':../target/ppc/mmu_helper.c:514:46: error: passing argument 1 of 'ppc_hash32_hpt_mask' from incompatible pointer type [-Werror=incompatible-pointer-types]514 | ppc_hash32_hpt_mask(env) + 0x80); | ^~~ | | | CPUPPCState *Fixes 36778660d7 ("target/ppc: Eliminate htab_base and htab_mask variables")Signed-off-by Fabiano Rosas <[email protected]>
Applied to ppc-for-6.1, thanks.
Quoted 17 lines
--- target/ppc/mmu_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/ppc/mmu_helper.c +1
-1@@ -511,7 +511,7 @@ static int get_segment_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx,qemu_log ("Page table: " TARGET_FMT_plx" len " TARGET_FMT_plx"\n" ,ppc_hash32_hpt_base (cpu), -ppc_hash32_hpt_mask (env) +0x80 ); +ppc_hash32_hpt_mask (cpu) +0x80 ); for (curaddr = ppc_hash32_hpt_base(cpu); curaddr < (ppc_hash32_hpt_base(cpu) + ppc_hash32_hpt_mask(cpu) + 0x80);
Signature · 4 lines
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
PATCH 2/3 target/ppc: Fix compilation with FLUSH_ALL_TLBS debug option
In reply to Fabiano Rosas../target/ppc/mmu_helper.c: In function 'helper_store_ibatu':../target/ppc/mmu_helper.c:1802:17: error: unused variable 'cpu' [-Werror=unused-variable]
1802 | PowerPCCPU *cpu = env_archcpu(env);
| ^~~../target/ppc/mmu_helper.c: In function 'helper_store_dbatu':../target/ppc/mmu_helper.c:1838:17: error: unused variable 'cpu' [-Werror=unused-variable]
1838 | PowerPCCPU *cpu = env_archcpu(env);
| ^~~../target/ppc/mmu_helper.c: In function 'helper_store_601_batu':../target/ppc/mmu_helper.c:1874:17: error: unused variable 'cpu' [-Werror=unused-variable]
1874 | PowerPCCPU *cpu = env_archcpu(env);
| ^~~../target/ppc/mmu_helper.c: In function 'helper_store_601_batl':../target/ppc/mmu_helper.c:1919:17: error: unused variable 'cpu' [-Werror=unused-variable]
1919 | PowerPCCPU *cpu = env_archcpu(env);
--- target/ppc/mmu_helper.c | 8 -------- 1 file changed, 8 deletions(-)
target/ppc/mmu_helper.c +0 -8
@@ -1798,9 +1798,6 @@ static inline void dump_store_bat(CPUPPCState *env, char ID, int ul, int nr,void helper_store_ibatu (CPUPPCState *env,uint32_t nr,target_ulong value) {target_ulong mask; -#if defined(FLUSH_ALL_TLBS ) -PowerPCCPU *cpu =env_archcpu (env); -#endif dump_store_bat (env,'I' ,0 , nr, value);if (env->IBAT[0 ][nr] != value) {
@@ -1834,9 +1831,6 @@ void helper_store_ibatl(CPUPPCState *env, uint32_t nr, target_ulong value)void helper_store_dbatu (CPUPPCState *env,uint32_t nr,target_ulong value) {target_ulong mask; -#if defined(FLUSH_ALL_TLBS ) -PowerPCCPU *cpu =env_archcpu (env); -#endif dump_store_bat (env,'D' ,0 , nr, value);if (env->DBAT[0 ][nr] != value) {
@@ -1871,7 +1865,6 @@ void helper_store_601_batu(CPUPPCState *env, uint32_t nr, target_ulong value) {target_ulong mask;#if defined(FLUSH_ALL_TLBS ) -PowerPCCPU *cpu =env_archcpu (env);int do_inval;#endif
@@ -1916,7 +1909,6 @@ void helper_store_601_batl(CPUPPCState *env, uint32_t nr, target_ulong value)#if !defined(FLUSH_ALL_TLBS )target_ulong mask;#else -PowerPCCPU *cpu =env_archcpu (env);int do_inval;#endif
Signature · 1 line
2.29.2
David Gibson
AppliedRe: [PATCH 2/3] target/ppc: Fix compilation with FLUSH_ALL_TLBS debug option
Quoted 16 lines · Fabiano Rosas
../target/ppc/mmu_helper.c: In function 'helper_store_ibatu':../target/ppc/mmu_helper.c:1802:17: error: unused variable 'cpu' [-Werror=unused-variable]
1802 | PowerPCCPU *cpu =env_archcpu(env);
| ^~~../target/ppc/mmu_helper.c: In function 'helper_store_dbatu':../target/ppc/mmu_helper.c:1838:17: error: unused variable 'cpu' [-Werror=unused-variable]
1838 | PowerPCCPU *cpu =env_archcpu(env);
| ^~~../target/ppc/mmu_helper.c: In function 'helper_store_601_batu':../target/ppc/mmu_helper.c:1874:17: error: unused variable 'cpu' [-Werror=unused-variable]
1874 | PowerPCCPU *cpu =env_archcpu(env);
| ^~~../target/ppc/mmu_helper.c: In function 'helper_store_601_batl':../target/ppc/mmu_helper.c:1919:17: error: unused variable 'cpu' [-Werror=unused-variable]
1919 | PowerPCCPU *cpu =env_archcpu(env);
Quoted 2 lines
Fixes db70b31144 ("target/ppc: Use env_cpu, env_archcpu")Signed-off-by Fabiano Rosas <[email protected]>
Applied to ppc-for-6.1, thanks.
Quoted 44 lines
--- target/ppc/mmu_helper.c | 8 -------- 1 file changed, 8 deletions(-)target/ppc/mmu_helper.c +0
-8@@ -1798,9 +1798,6 @@ static inline void dump_store_bat(CPUPPCState *env, char ID, int ul, int nr,void helper_store_ibatu (CPUPPCState *env,uint32_t nr,target_ulong value) {target_ulong mask; -#if defined(FLUSH_ALL_TLBS ) -PowerPCCPU *cpu =env_archcpu (env); -#endif dump_store_bat (env,'I' ,0 , nr, value);if (env->IBAT[0 ][nr] != value) {@@ -1834,9 +1831,6 @@ void helper_store_ibatl(CPUPPCState *env, uint32_t nr, target_ulong value)void helper_store_dbatu (CPUPPCState *env,uint32_t nr,target_ulong value) {target_ulong mask; -#if defined(FLUSH_ALL_TLBS ) -PowerPCCPU *cpu =env_archcpu (env); -#endif dump_store_bat (env,'D' ,0 , nr, value);if (env->DBAT[0 ][nr] != value) {@@ -1871,7 +1865,6 @@ void helper_store_601_batu(CPUPPCState *env, uint32_t nr, target_ulong value) {target_ulong mask;#if defined(FLUSH_ALL_TLBS ) -PowerPCCPU *cpu =env_archcpu (env);int do_inval;#endif @@ -1916,7 +1909,6 @@ void helper_store_601_batl(CPUPPCState *env, uint32_t nr, target_ulong value)#if !defined(FLUSH_ALL_TLBS )target_ulong mask;#else -PowerPCCPU *cpu =env_archcpu (env);int do_inval;#endif
Signature · 4 lines
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
PATCH 3/3 target/ppc: Fix compilation with DEBUG_BATS debug option
In reply to Fabiano Rosas../target/ppc/mmu-hash32.c: In function 'ppc_hash32_bat_lookup':../target/ppc/mmu-hash32.c:204:13: error: 'BATu' undeclared (first use in this function);
204 | BATu = &BATut[i];
| ^~~~
| BATut
../target/ppc/mmu-hash32.c:205:13: error: 'BATl' undeclared (first use in this function);
205 | BATl = &BATlt[i];
| ^~~~
| BATlt
../target/ppc/mmu-hash32.c:206:13: error: 'BEPIu' undeclared (first use in this function)
206 | BEPIu = *BATu & BATU32_BEPIU;
| ^~~~~
../target/ppc/mmu-hash32.c:206:29: error: 'BATU32_BEPIU' undeclared (first use in this function);
206 | BEPIu = *BATu & BATU32_BEPIU;
| ^~~~~~~~~~~~
| BATU32_BEPI
../target/ppc/mmu-hash32.c:207:13: error: 'BEPIl' undeclared (first use in this function)
207 | BEPIl = *BATu & BATU32_BEPIL;
| ^~~~~
../target/ppc/mmu-hash32.c:207:29: error: 'BATU32_BEPIL' undeclared (first use in this function);
207 | BEPIl = *BATu & BATU32_BEPIL;
| ^~~~~~~~~~~~
| BATU32_BEPI
../target/ppc/mmu-hash32.c:208:13: error: 'bl' undeclared (first use in this function)
208 | bl = (*BATu & 0x00001FFC) << 15;
| ^~--- target/ppc/mmu-hash32.c | 5 ++++- target/ppc/mmu-hash32.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)
target/ppc/mmu-hash32.c +4 -1
@@ -27,7 +27,7 @@#include "mmu-hash32.h" #include "exec/log.h" -/* #define DEBUG_BAT */ +/* #define DEBUG_BATS */ #ifdef DEBUG_BATS # define LOG_BATS (...) qemu_log_mask(CPU_LOG_MMU, __VA_ARGS__)
@@ -199,6 +199,9 @@ static hwaddr ppc_hash32_bat_lookup(PowerPCCPU *cpu, target_ulong ea,/* No hit */ #if defined(DEBUG_BATS )if (qemu_log_enabled ()) { +target_ulong *BATu, *BATl; +target_ulong BEPIl, BEPIu, bl; +LOG_BATS ("no BAT match for " TARGET_FMT_lx":\n" , ea);for (i =0 ; i <4 ; i++) { BATu = &BATut[i];
target/ppc/mmu-hash32.h +2 -0
@@ -22,6 +22,8 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr address, int rw,* Block Address Translation (BAT) definitions */ +#define BATU32_BEPIU 0xf0000000 +#define BATU32_BEPIL 0x0ffe0000#define BATU32_BEPI 0xfffe0000#define BATU32_BL 0x00001ffc#define BATU32_VS 0x00000002
Signature · 1 line
2.29.2
David Gibson
AppliedRe: [PATCH 3/3] target/ppc: Fix compilation with DEBUG_BATS debug option
Quoted 27 lines · Fabiano Rosas
../target/ppc/mmu-hash32.c: In function 'ppc_hash32_bat_lookup':../target/ppc/mmu-hash32.c:204:13: error: 'BATu' undeclared (first use in this function);204 | BATu = &BATut[i]; | ^~~~ | BATut ../target/ppc/mmu-hash32.c:205:13: error: 'BATl' undeclared (first use in this function); 205 | BATl = &BATlt[i]; | ^~~~ | BATlt ../target/ppc/mmu-hash32.c:206:13: error: 'BEPIu' undeclared (first use in this function) 206 | BEPIu = *BATu & BATU32_BEPIU; | ^~~~~ ../target/ppc/mmu-hash32.c:206:29: error: 'BATU32_BEPIU' undeclared (first use in this function); 206 | BEPIu = *BATu & BATU32_BEPIU; | ^~~~~~~~~~~~ | BATU32_BEPI ../target/ppc/mmu-hash32.c:207:13: error: 'BEPIl' undeclared (first use in this function) 207 | BEPIl = *BATu & BATU32_BEPIL; | ^~~~~ ../target/ppc/mmu-hash32.c:207:29: error: 'BATU32_BEPIL' undeclared (first use in this function); 207 | BEPIl = *BATu & BATU32_BEPIL; | ^~~~~~~~~~~~ | BATU32_BEPI ../target/ppc/mmu-hash32.c:208:13: error: 'bl' undeclared (first use in this function) 208 | bl = (*BATu & 0x00001FFC) << 15; | ^~
Quoted 2 lines
Fixes 9813279664 ("target-ppc: Disentangle BAT code for 32-bit hash MMUs")Signed-off-by Fabiano Rosas <[email protected]>
Applied to ppc-for-6.1, thanks.
Quoted 41 lines
--- target/ppc/mmu-hash32.c | 5 ++++- target/ppc/mmu-hash32.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)target/ppc/mmu-hash32.c +4
-1@@ -27,7 +27,7 @@#include "mmu-hash32.h" #include "exec/log.h" -/* #define DEBUG_BAT */ +/* #define DEBUG_BATS */ #ifdef DEBUG_BATS # define LOG_BATS (...) qemu_log_mask(CPU_LOG_MMU, __VA_ARGS__)@@ -199,6 +199,9 @@ static hwaddr ppc_hash32_bat_lookup(PowerPCCPU *cpu, target_ulong ea,/* No hit */ #if defined(DEBUG_BATS )if (qemu_log_enabled ()) { +target_ulong *BATu, *BATl; +target_ulong BEPIl, BEPIu, bl; +LOG_BATS ("no BAT match for " TARGET_FMT_lx":\n" , ea);for (i =0 ; i <4 ; i++) { BATu = &BATut[i];target/ppc/mmu-hash32.h +2
-0@@ -22,6 +22,8 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr address, int rw,* Block Address Translation (BAT) definitions */ +#define BATU32_BEPIU 0xf0000000 +#define BATU32_BEPIL 0x0ffe0000#define BATU32_BEPI 0xfffe0000#define BATU32_BL 0x00001ffc#define BATU32_VS 0x00000002
Signature · 4 lines
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