Consolidate embedded PPC initial mappung functions
cover Consolidate embedded PPC initial mappung functions
Embedded PPC has always enabled MMU so it needs initial mappings to start. This code is duplicated within machines which this small series aims to consolidate into helper functions to reduce duplicated code and make the board code simpler.
Regards,
BALATON Zoltan
BALATON Zoltan (2):
hw/ppc: Consolidate e500 initial mapping creation functions hw/ppc: Consolidate ppc440 initial mapping creation functions
hw/ppc/e500.c | 41 ++++++++++++++++++-------------------- hw/ppc/e500.h | 2 -- hw/ppc/ppc440_bamboo.c | 28 +++----------------------- hw/ppc/ppc_booke.c | 10 ++++++++++ hw/ppc/ppce500_spin.c | 30 +++++++++------------------- hw/ppc/sam460ex.c | 45 ++++++++++-------------------------------- hw/ppc/virtex_ml507.c | 28 +++----------------------- include/hw/ppc/ppc.h | 7 +++++++ 8 files changed, 61 insertions(+), 130 deletions(-)
Signature · 1 line
2.30.9
PATCH 1/2 hw/ppc: Consolidate e500 initial mapping creation functions
Add booke206_set_tlb() utility function and use it to replace very similar create_initial_mapping functions in e500 machines.
--- hw/ppc/e500.c | 41 +++++++++++++++++++---------------------- hw/ppc/e500.h | 2 -- hw/ppc/ppce500_spin.c | 30 +++++++++--------------------- include/hw/ppc/ppc.h | 5 +++++ 4 files changed, 33 insertions(+), 45 deletions(-)
hw/ppc/e500.c +19 -22
@@ -721,11 +721,21 @@ static int ppce500_prep_device_tree(PPCE500MachineState *machine, kernel_base, kernel_size, true); } -hwaddr booke206_page_size_to_tlb (uint64_t size) +static hwaddr booke206_page_size_to_tlb (uint64_t size) {return 63 -clz64 (size / KiB); } +void booke206_set_tlb (ppcmas_tlb_t *tlb,target_ulong va,hwaddr pa, +hwaddr len) +{ + tlb->mas1 =booke206_page_size_to_tlb (len) <<MAS1_TSIZE_SHIFT ; + tlb->mas1 |=MAS1_VALID ; + tlb->mas2 = va &TARGET_PAGE_MASK ; + tlb->mas7_3 = pa &TARGET_PAGE_MASK ; + tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; +} +static int booke206_initial_map_tsize (CPUPPCState *env) {struct boot_info *bi = env->load_info;
@@ -751,25 +761,6 @@ static uint64_t mmubooke_initial_mapsize(CPUPPCState *env)return (1ULL <<10 << tsize); } -/* Create -kernel TLB entries for BookE. */ -static void mmubooke_create_initial_mapping (CPUPPCState *env) -{ -ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,0 ); -hwaddr size; -int ps; - - ps =booke206_initial_map_tsize (env); - size = (ps <<MAS1_TSIZE_SHIFT ); - tlb->mas1 =MAS1_VALID | size; - tlb->mas2 =0 ; - tlb->mas7_3 =0 ; - tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; - -#ifdef CONFIG_KVM - env->tlb_dirty = true; -#endif -} -static void ppce500_cpu_reset_sec (void *opaque) {PowerPCCPU *cpu = opaque;
@@ -786,6 +777,8 @@ static void ppce500_cpu_reset(void *opaque)CPUState *cs =CPU (cpu);CPUPPCState *env = &cpu->env;struct boot_info *bi = env->load_info; +uint64_t map_size =mmubooke_initial_mapsize (env); +ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,0 );cpu_reset (cs);
@@ -796,11 +789,15 @@ static void ppce500_cpu_reset(void *opaque) env->gpr[4 ] =0 ; env->gpr[5 ] =0 ; env->gpr[6 ] =EPAPR_MAGIC ; - env->gpr[7 ] =mmubooke_initial_mapsize (env); + env->gpr[7 ] = map_size; env->gpr[8 ] =0 ; env->gpr[9 ] =0 ; env->nip = bi->entry; -mmubooke_create_initial_mapping (env); +/* create initial mapping */ +booke206_set_tlb (tlb,0 ,0 , map_size); +#ifdef CONFIG_KVM + env->tlb_dirty = true; +#endif } static DeviceState *ppce500_init_mpic_qemu(PPCE500MachineState *pms,
hw/ppc/e500.h +0 -2
@@ -41,8 +41,6 @@ struct PPCE500MachineClass {void ppce500_init (MachineState *machine); -hwaddr booke206_page_size_to_tlb (uint64_t size); -#define TYPE_PPCE500_MACHINE "ppce500-base-machine"OBJECT_DECLARE_TYPE (PPCE500MachineState, PPCE500MachineClass,PPCE500_MACHINE )
hw/ppc/ppce500_spin.c +9 -21
@@ -33,6 +33,7 @@#include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/hw_accel.h" +#include "hw/ppc/ppc.h" #include "e500.h" #include "qom/object.h"
@@ -70,30 +71,12 @@ static void spin_reset(DeviceState *dev) } } -static void mmubooke_create_initial_mapping (CPUPPCState *env, -target_ulong va, -hwaddr pa, -hwaddr len) -{ -ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,1 ); -hwaddr size; - - size = (booke206_page_size_to_tlb (len) <<MAS1_TSIZE_SHIFT ); - tlb->mas1 =MAS1_VALID | size; - tlb->mas2 = (va &TARGET_PAGE_MASK ) |MAS2_M ; - tlb->mas7_3 = pa &TARGET_PAGE_MASK ; - tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; -#ifdef CONFIG_KVM - env->tlb_dirty = true; -#endif -} -static void spin_kick (CPUState *cs,run_on_cpu_data data) {CPUPPCState *env =cpu_env (cs);SpinInfo *curspin = data.host_ptr; -hwaddr map_size =64 * MiB; -hwaddr map_start; +hwaddr map_start, map_size =64 * MiB; +ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,1 );cpu_synchronize_state (cs);stl_p (&curspin->pir, env->spr[SPR_BOOKE_PIR ]);
@@ -107,7 +90,12 @@ static void spin_kick(CPUState *cs, run_on_cpu_data data) env->gpr[9 ] =0 ; map_start =ldq_p (&curspin->addr) & ~(map_size -1 ); -mmubooke_create_initial_mapping (env,0 , map_start, map_size); +/* create initial mapping */ +booke206_set_tlb (tlb,0 , map_start, map_size); + tlb->mas2 |=MAS2_M ; +#ifdef CONFIG_KVM + env->tlb_dirty = true; +#endif cs->halted =0 ; cs->exception_index =-1 ;
include/hw/ppc/ppc.h +5 -0
@@ -116,6 +116,11 @@ enum {#define PPC_SERIAL_MM_BAUDBASE 399193 +#ifndef CONFIG_USER_ONLY +void booke206_set_tlb (ppcmas_tlb_t *tlb,target_ulong va,hwaddr pa, +hwaddr len); +#endif +/* ppc_booke.c */ void ppc_booke_timers_init (PowerPCCPU *cpu,uint32_t freq,uint32_t flags);#endif
Signature · 1 line
2.30.9
Re: [PATCH 1/2] hw/ppc: Consolidate e500 initial mapping creation functions
Am 16. Juli 2024 12:07:57 UTC schrieb BALATON Zoltan <[email protected]>:
Quoted 75 lines
Add
booke206_set_tlb()utility function and use it to replace very similarcreate_initial_mappingfunctions in e500 machines.Signed-off-by BALATON Zoltan <[email protected]>---
hw/ppc/e500.c | 41 +++++++++++++++++++---------------------- hw/ppc/e500.h | 2 -- hw/ppc/ppce500_spin.c | 30 +++++++++--------------------- include/hw/ppc/ppc.h | 5 +++++ 4 files changed, 33 insertions(+), 45 deletions(-)hw/ppc/e500.c +13
-20@@ -721,11 +721,21 @@ static int ppce500_prep_device_tree(PPCE500MachineState *machine, kernel_base, kernel_size, true); } -hwaddr booke206_page_size_to_tlb (uint64_t size) +static hwaddr booke206_page_size_to_tlb (uint64_t size) {return 63 -clz64 (size / KiB); } +void booke206_set_tlb (ppcmas_tlb_t *tlb,target_ulong va,hwaddr pa, +hwaddr len) +{ + tlb->mas1 =booke206_page_size_to_tlb (len) <<MAS1_TSIZE_SHIFT ; + tlb->mas1 |=MAS1_VALID ; + tlb->mas2 = va &TARGET_PAGE_MASK ; + tlb->mas7_3 = pa &TARGET_PAGE_MASK ; + tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; +} +static int booke206_initial_map_tsize (CPUPPCState *env) {struct boot_info *bi = env->load_info;@@ -751,25 +761,6 @@ static uint64_t mmubooke_initial_mapsize(CPUPPCState *env)return (1ULL <<10 << tsize); } -/* Create -kernel TLB entries for BookE. */ -static void mmubooke_create_initial_mapping (CPUPPCState *env) -{ -ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,0 ); -hwaddr size; -int ps; - - ps =booke206_initial_map_tsize (env); - size = (ps <<MAS1_TSIZE_SHIFT ); - tlb->mas1 =MAS1_VALID | size; - tlb->mas2 =0 ; - tlb->mas7_3 =0 ; - tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; - -#ifdef CONFIG_KVM - env->tlb_dirty = true; -#endif -} -static void ppce500_cpu_reset_sec (void *opaque) {PowerPCCPU *cpu = opaque;@@ -786,6 +777,8 @@ static void ppce500_cpu_reset(void *opaque)CPUState *cs =CPU (cpu);CPUPPCState *env = &cpu->env;struct boot_info *bi = env->load_info; +uint64_t map_size =mmubooke_initial_mapsize (env); +ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,0 );cpu_reset (cs);@@ -796,11 +789,15 @@ static void ppce500_cpu_reset(void *opaque) env->gpr[4 ] =0 ;
hw/ppc/e500.c static void ppce500_cpu_reset(void *opaque) · line 797
Quoted 10 lines
hw/ppc/e500.c +3
-2env->gpr[5 ] =0 ; env->gpr[6 ] =EPAPR_MAGIC ; - env->gpr[7 ] =mmubooke_initial_mapsize (env); + env->gpr[7 ] = map_size; env->gpr[8 ] =0 ; env->gpr[9 ] =0 ; env->nip = bi->entry; -mmubooke_create_initial_mapping (env); +/* create initial mapping */ +booke206_set_tlb (tlb,0 ,0 , map_size);
Both invocations of booke206_set_tlb() are followed by:
hw/ppc/e500.c static void ppce500_cpu_reset(void *opaque) · line 800
Quoted 3 lines
hw/ppc/e500.c +3
-0+#ifdef CONFIG_KVM + env->tlb_dirty = true; +#endif
Doesn't it make sense to move these three lines into booke206_set_tlb()? The two copies you're resolving did so, too.
Best regards,
Bernhard
Quoted 91 lines
hw/ppc/e500.c +0
-0} static DeviceState *ppce500_init_mpic_qemu(PPCE500MachineState *pms,hw/ppc/e500.h +0
-2@@ -41,8 +41,6 @@ struct PPCE500MachineClass {void ppce500_init (MachineState *machine); -hwaddr booke206_page_size_to_tlb (uint64_t size); -#define TYPE_PPCE500_MACHINE "ppce500-base-machine"OBJECT_DECLARE_TYPE (PPCE500MachineState, PPCE500MachineClass,PPCE500_MACHINE )hw/ppc/ppce500_spin.c +9
-21@@ -33,6 +33,7 @@#include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/hw_accel.h" +#include "hw/ppc/ppc.h" #include "e500.h" #include "qom/object.h" @@ -70,30 +71,12 @@ static void spin_reset(DeviceState *dev) } } -static void mmubooke_create_initial_mapping (CPUPPCState *env, -target_ulong va, -hwaddr pa, -hwaddr len) -{ -ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,1 ); -hwaddr size; - - size = (booke206_page_size_to_tlb (len) <<MAS1_TSIZE_SHIFT ); - tlb->mas1 =MAS1_VALID | size; - tlb->mas2 = (va &TARGET_PAGE_MASK ) |MAS2_M ; - tlb->mas7_3 = pa &TARGET_PAGE_MASK ; - tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; -#ifdef CONFIG_KVM - env->tlb_dirty = true; -#endif -} -static void spin_kick (CPUState *cs,run_on_cpu_data data) {CPUPPCState *env =cpu_env (cs);SpinInfo *curspin = data.host_ptr; -hwaddr map_size =64 * MiB; -hwaddr map_start; +hwaddr map_start, map_size =64 * MiB; +ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,1 );cpu_synchronize_state (cs);stl_p (&curspin->pir, env->spr[SPR_BOOKE_PIR ]);@@ -107,7 +90,12 @@ static void spin_kick(CPUState *cs, run_on_cpu_data data) env->gpr[9 ] =0 ; map_start =ldq_p (&curspin->addr) & ~(map_size -1 ); -mmubooke_create_initial_mapping (env,0 , map_start, map_size); +/* create initial mapping */ +booke206_set_tlb (tlb,0 , map_start, map_size); + tlb->mas2 |=MAS2_M ; +#ifdef CONFIG_KVM + env->tlb_dirty = true; +#endif cs->halted =0 ; cs->exception_index =-1 ;include/hw/ppc/ppc.h +5
-0@@ -116,6 +116,11 @@ enum {#define PPC_SERIAL_MM_BAUDBASE 399193 +#ifndef CONFIG_USER_ONLY +void booke206_set_tlb (ppcmas_tlb_t *tlb,target_ulong va,hwaddr pa, +hwaddr len); +#endif +/* ppc_booke.c */ void ppc_booke_timers_init (PowerPCCPU *cpu,uint32_t freq,uint32_t flags);#endif
Re: [PATCH 1/2] hw/ppc: Consolidate e500 initial mapping creation functions
Am 15. August 2024 19:01:47 UTC schrieb Bernhard Beschow <[email protected]>:
Quoted 91 lines
Am 16. Juli 2024 12:07:57 UTC schrieb BALATON Zoltan <[email protected]>:
Quoted 75 lines
Add
booke206_set_tlb()utility function and use it to replace very similarcreate_initial_mappingfunctions in e500 machines.Signed-off-by BALATON Zoltan <[email protected]>---
hw/ppc/e500.c | 41 +++++++++++++++++++---------------------- hw/ppc/e500.h | 2 -- hw/ppc/ppce500_spin.c | 30 +++++++++--------------------- include/hw/ppc/ppc.h | 5 +++++ 4 files changed, 33 insertions(+), 45 deletions(-)hw/ppc/e500.c +13
-20@@ -721,11 +721,21 @@ static int ppce500_prep_device_tree(PPCE500MachineState *machine, kernel_base, kernel_size, true); } -hwaddr booke206_page_size_to_tlb (uint64_t size) +static hwaddr booke206_page_size_to_tlb (uint64_t size) {return 63 -clz64 (size / KiB); } +void booke206_set_tlb (ppcmas_tlb_t *tlb,target_ulong va,hwaddr pa, +hwaddr len) +{ + tlb->mas1 =booke206_page_size_to_tlb (len) <<MAS1_TSIZE_SHIFT ; + tlb->mas1 |=MAS1_VALID ; + tlb->mas2 = va &TARGET_PAGE_MASK ; + tlb->mas7_3 = pa &TARGET_PAGE_MASK ; + tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; +} +static int booke206_initial_map_tsize (CPUPPCState *env) {struct boot_info *bi = env->load_info;@@ -751,25 +761,6 @@ static uint64_t mmubooke_initial_mapsize(CPUPPCState *env)return (1ULL <<10 << tsize); } -/* Create -kernel TLB entries for BookE. */ -static void mmubooke_create_initial_mapping (CPUPPCState *env) -{ -ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,0 ); -hwaddr size; -int ps; - - ps =booke206_initial_map_tsize (env); - size = (ps <<MAS1_TSIZE_SHIFT ); - tlb->mas1 =MAS1_VALID | size; - tlb->mas2 =0 ; - tlb->mas7_3 =0 ; - tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; - -#ifdef CONFIG_KVM - env->tlb_dirty = true; -#endif -} -static void ppce500_cpu_reset_sec (void *opaque) {PowerPCCPU *cpu = opaque;@@ -786,6 +777,8 @@ static void ppce500_cpu_reset(void *opaque)CPUState *cs =CPU (cpu);CPUPPCState *env = &cpu->env;struct boot_info *bi = env->load_info; +uint64_t map_size =mmubooke_initial_mapsize (env); +ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,0 );cpu_reset (cs);@@ -796,11 +789,15 @@ static void ppce500_cpu_reset(void *opaque) env->gpr[4 ] =0 ;hw/ppc/e500.c static void ppce500_cpu_reset(void *opaque) · line 797
Quoted 10 lines
hw/ppc/e500.c +3
-2env->gpr[5 ] =0 ; env->gpr[6 ] =EPAPR_MAGIC ; - env->gpr[7 ] =mmubooke_initial_mapsize (env); + env->gpr[7 ] = map_size; env->gpr[8 ] =0 ; env->gpr[9 ] =0 ; env->nip = bi->entry; -mmubooke_create_initial_mapping (env); +/* create initial mapping */ +booke206_set_tlb (tlb,0 ,0 , map_size);Both invocations of
booke206_set_tlb()are followed by:
Quoted 5 lines
hw/ppc/e500.c static void ppce500_cpu_reset(void *opaque) · line 800
Quoted 3 lines
hw/ppc/e500.c +3
-0+#ifdef CONFIG_KVM + env->tlb_dirty = true; +#endif Doesn't it make sense to move these three lines into
booke206_set_tlb()? The two copies you're resolving did so, too.
Ping
Quoted 95 lines
Best regards,
BernhardQuoted 91 lines
hw/ppc/e500.c +0
-0} static DeviceState *ppce500_init_mpic_qemu(PPCE500MachineState *pms,hw/ppc/e500.h +0
-2@@ -41,8 +41,6 @@ struct PPCE500MachineClass {void ppce500_init (MachineState *machine); -hwaddr booke206_page_size_to_tlb (uint64_t size); -#define TYPE_PPCE500_MACHINE "ppce500-base-machine"OBJECT_DECLARE_TYPE (PPCE500MachineState, PPCE500MachineClass,PPCE500_MACHINE )hw/ppc/ppce500_spin.c +9
-21@@ -33,6 +33,7 @@#include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/hw_accel.h" +#include "hw/ppc/ppc.h" #include "e500.h" #include "qom/object.h" @@ -70,30 +71,12 @@ static void spin_reset(DeviceState *dev) } } -static void mmubooke_create_initial_mapping (CPUPPCState *env, -target_ulong va, -hwaddr pa, -hwaddr len) -{ -ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,1 ); -hwaddr size; - - size = (booke206_page_size_to_tlb (len) <<MAS1_TSIZE_SHIFT ); - tlb->mas1 =MAS1_VALID | size; - tlb->mas2 = (va &TARGET_PAGE_MASK ) |MAS2_M ; - tlb->mas7_3 = pa &TARGET_PAGE_MASK ; - tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; -#ifdef CONFIG_KVM - env->tlb_dirty = true; -#endif -} -static void spin_kick (CPUState *cs,run_on_cpu_data data) {CPUPPCState *env =cpu_env (cs);SpinInfo *curspin = data.host_ptr; -hwaddr map_size =64 * MiB; -hwaddr map_start; +hwaddr map_start, map_size =64 * MiB; +ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,1 );cpu_synchronize_state (cs);stl_p (&curspin->pir, env->spr[SPR_BOOKE_PIR ]);@@ -107,7 +90,12 @@ static void spin_kick(CPUState *cs, run_on_cpu_data data) env->gpr[9 ] =0 ; map_start =ldq_p (&curspin->addr) & ~(map_size -1 ); -mmubooke_create_initial_mapping (env,0 , map_start, map_size); +/* create initial mapping */ +booke206_set_tlb (tlb,0 , map_start, map_size); + tlb->mas2 |=MAS2_M ; +#ifdef CONFIG_KVM + env->tlb_dirty = true; +#endif cs->halted =0 ; cs->exception_index =-1 ;include/hw/ppc/ppc.h +5
-0@@ -116,6 +116,11 @@ enum {#define PPC_SERIAL_MM_BAUDBASE 399193 +#ifndef CONFIG_USER_ONLY +void booke206_set_tlb (ppcmas_tlb_t *tlb,target_ulong va,hwaddr pa, +hwaddr len); +#endif +/* ppc_booke.c */ void ppc_booke_timers_init (PowerPCCPU *cpu,uint32_t freq,uint32_t flags);#endif
Re: [PATCH 1/2] hw/ppc: Consolidate e500 initial mapping creation functions
Quoted 7 lines · Bernhard Beschow
Am 15. August 2024 19:01:47 UTC schrieb Bernhard Beschow <[email protected]>:
Quoted 6 lines
Am 16. Juli 2024 12:07:57 UTC schrieb BALATON Zoltan <[email protected]>:
Quoted 5 lines
Add
booke206_set_tlb()utility function and use it to replace very similarcreate_initial_mappingfunctions in e500 machines.Signed-off-by BALATON Zoltan <[email protected]>---
[...]
Quoted 6 lines
Quoted 6 lines
hw/ppc/e500.c static void ppce500_cpu_reset(void *opaque) · line 797
Quoted 3 lines
hw/ppc/e500.c +2
-1-mmubooke_create_initial_mapping (env); +/* create initial mapping */ +booke206_set_tlb (tlb,0 ,0 , map_size);Both invocations of
booke206_set_tlb()are followed by:
Quoted 7 lines
Quoted 5 lines
hw/ppc/e500.c static void ppce500_cpu_reset(void *opaque) · line 800
Quoted 3 lines
hw/ppc/e500.c +3
-0+#ifdef CONFIG_KVM + env->tlb_dirty = true; +#endif Doesn't it make sense to move these three lines into
booke206_set_tlb()? The two copies you're resolving did so, too.Ping
Did not forget but had no time to look at it yet. I'll come back to it when I'll have time.
Regards,
BALATON Zoltan
Quoted 3 lines
Quoted 3 lines
Best regards,
Bernhard
Re: [PATCH 1/2] hw/ppc: Consolidate e500 initial mapping creation functions
In reply to Bernhard BeschowQuoted 89 lines · Bernhard Beschow
Am 16. Juli 2024 12:07:57 UTC schrieb BALATON Zoltan <[email protected]>:
Quoted 75 lines
Add
booke206_set_tlb()utility function and use it to replace very similarcreate_initial_mappingfunctions in e500 machines.Signed-off-by BALATON Zoltan <[email protected]>---
hw/ppc/e500.c | 41 +++++++++++++++++++---------------------- hw/ppc/e500.h | 2 -- hw/ppc/ppce500_spin.c | 30 +++++++++--------------------- include/hw/ppc/ppc.h | 5 +++++ 4 files changed, 33 insertions(+), 45 deletions(-)hw/ppc/e500.c +13
-20@@ -721,11 +721,21 @@ static int ppce500_prep_device_tree(PPCE500MachineState *machine, kernel_base, kernel_size, true); } -hwaddr booke206_page_size_to_tlb (uint64_t size) +static hwaddr booke206_page_size_to_tlb (uint64_t size) {return 63 -clz64 (size / KiB); } +void booke206_set_tlb (ppcmas_tlb_t *tlb,target_ulong va,hwaddr pa, +hwaddr len) +{ + tlb->mas1 =booke206_page_size_to_tlb (len) <<MAS1_TSIZE_SHIFT ; + tlb->mas1 |=MAS1_VALID ; + tlb->mas2 = va &TARGET_PAGE_MASK ; + tlb->mas7_3 = pa &TARGET_PAGE_MASK ; + tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; +} +static int booke206_initial_map_tsize (CPUPPCState *env) {struct boot_info *bi = env->load_info;@@ -751,25 +761,6 @@ static uint64_t mmubooke_initial_mapsize(CPUPPCState *env)return (1ULL <<10 << tsize); } -/* Create -kernel TLB entries for BookE. */ -static void mmubooke_create_initial_mapping (CPUPPCState *env) -{ -ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,0 ); -hwaddr size; -int ps; - - ps =booke206_initial_map_tsize (env); - size = (ps <<MAS1_TSIZE_SHIFT ); - tlb->mas1 =MAS1_VALID | size; - tlb->mas2 =0 ; - tlb->mas7_3 =0 ; - tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; - -#ifdef CONFIG_KVM - env->tlb_dirty = true; -#endif -} -static void ppce500_cpu_reset_sec (void *opaque) {PowerPCCPU *cpu = opaque;@@ -786,6 +777,8 @@ static void ppce500_cpu_reset(void *opaque)CPUState *cs =CPU (cpu);CPUPPCState *env = &cpu->env;struct boot_info *bi = env->load_info; +uint64_t map_size =mmubooke_initial_mapsize (env); +ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,0 );cpu_reset (cs);@@ -796,11 +789,15 @@ static void ppce500_cpu_reset(void *opaque) env->gpr[4 ] =0 ;hw/ppc/e500.c static void ppce500_cpu_reset(void *opaque) · line 797
Quoted 10 lines
hw/ppc/e500.c +3
-2env->gpr[5 ] =0 ; env->gpr[6 ] =EPAPR_MAGIC ; - env->gpr[7 ] =mmubooke_initial_mapsize (env); + env->gpr[7 ] = map_size; env->gpr[8 ] =0 ; env->gpr[9 ] =0 ; env->nip = bi->entry; -mmubooke_create_initial_mapping (env); +/* create initial mapping */ +booke206_set_tlb (tlb,0 ,0 , map_size);Both invocations of
booke206_set_tlb()are followed by:
Quoted 5 lines
hw/ppc/e500.c static void ppce500_cpu_reset(void *opaque) · line 800
Quoted 3 lines
hw/ppc/e500.c +3
-0+#ifdef CONFIG_KVM + env->tlb_dirty = true; +#endif Doesn't it make sense to move these three lines into
booke206_set_tlb()? The two copies you're resolving did so, too.
No because tlb_dirty is in env and booke206_set_tlb only operates on the tlb entry. I don't want to pass the env just for this as this way it separates operations on tlb and on env and is also more consistent with the ppc440 case.
Regards,
BALATON Zoltan
Quoted 96 lines
Best regards,
BernhardQuoted 91 lines
hw/ppc/e500.c +0
-0} static DeviceState *ppce500_init_mpic_qemu(PPCE500MachineState *pms,hw/ppc/e500.h +0
-2@@ -41,8 +41,6 @@ struct PPCE500MachineClass {void ppce500_init (MachineState *machine); -hwaddr booke206_page_size_to_tlb (uint64_t size); -#define TYPE_PPCE500_MACHINE "ppce500-base-machine"OBJECT_DECLARE_TYPE (PPCE500MachineState, PPCE500MachineClass,PPCE500_MACHINE )hw/ppc/ppce500_spin.c +9
-21@@ -33,6 +33,7 @@#include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/hw_accel.h" +#include "hw/ppc/ppc.h" #include "e500.h" #include "qom/object.h" @@ -70,30 +71,12 @@ static void spin_reset(DeviceState *dev) } } -static void mmubooke_create_initial_mapping (CPUPPCState *env, -target_ulong va, -hwaddr pa, -hwaddr len) -{ -ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,1 ); -hwaddr size; - - size = (booke206_page_size_to_tlb (len) <<MAS1_TSIZE_SHIFT ); - tlb->mas1 =MAS1_VALID | size; - tlb->mas2 = (va &TARGET_PAGE_MASK ) |MAS2_M ; - tlb->mas7_3 = pa &TARGET_PAGE_MASK ; - tlb->mas7_3 |=MAS3_UR |MAS3_UW |MAS3_UX |MAS3_SR |MAS3_SW |MAS3_SX ; -#ifdef CONFIG_KVM - env->tlb_dirty = true; -#endif -} -static void spin_kick (CPUState *cs,run_on_cpu_data data) {CPUPPCState *env =cpu_env (cs);SpinInfo *curspin = data.host_ptr; -hwaddr map_size =64 * MiB; -hwaddr map_start; +hwaddr map_start, map_size =64 * MiB; +ppcmas_tlb_t *tlb =booke206_get_tlbm (env,1 ,0 ,1 );cpu_synchronize_state (cs);stl_p (&curspin->pir, env->spr[SPR_BOOKE_PIR ]);@@ -107,7 +90,12 @@ static void spin_kick(CPUState *cs, run_on_cpu_data data) env->gpr[9 ] =0 ; map_start =ldq_p (&curspin->addr) & ~(map_size -1 ); -mmubooke_create_initial_mapping (env,0 , map_start, map_size); +/* create initial mapping */ +booke206_set_tlb (tlb,0 , map_start, map_size); + tlb->mas2 |=MAS2_M ; +#ifdef CONFIG_KVM + env->tlb_dirty = true; +#endif cs->halted =0 ; cs->exception_index =-1 ;include/hw/ppc/ppc.h +5
-0@@ -116,6 +116,11 @@ enum {#define PPC_SERIAL_MM_BAUDBASE 399193 +#ifndef CONFIG_USER_ONLY +void booke206_set_tlb (ppcmas_tlb_t *tlb,target_ulong va,hwaddr pa, +hwaddr len); +#endif +/* ppc_booke.c */ void ppc_booke_timers_init (PowerPCCPU *cpu,uint32_t freq,uint32_t flags);#endif
PATCH 2/2 hw/ppc: Consolidate ppc440 initial mapping creation functions
In reply to BALATON ZoltanAdd a utility function and use it to replace very similar create_initial_mapping functions in 440 based machines.
--- hw/ppc/ppc440_bamboo.c | 28 +++----------------------- hw/ppc/ppc_booke.c | 10 ++++++++++ hw/ppc/sam460ex.c | 45 ++++++++++-------------------------------- hw/ppc/virtex_ml507.c | 28 +++----------------------- include/hw/ppc/ppc.h | 2 ++ 5 files changed, 28 insertions(+), 85 deletions(-)
hw/ppc/ppc440_bamboo.c +3 -25
@@ -110,29 +110,6 @@ static int bamboo_load_device_tree(MachineState *machine,return 0 ; } -/* Create reset TLB entries for BookE, spanning the 32bit addr space. */ -static void mmubooke_create_initial_mapping (CPUPPCState *env, -target_ulong va, -hwaddr pa) -{ -ppcemb_tlb_t *tlb = &env->tlb.tlbe[0 ]; - - tlb->attr =0 ; - tlb->prot =PAGE_VALID | ((PAGE_READ |PAGE_WRITE |PAGE_EXEC ) <<4 ); - tlb->size =1U <<31 ;/* up to 0x80000000 */ - tlb->EPN = va &TARGET_PAGE_MASK ; - tlb->RPN = pa &TARGET_PAGE_MASK ; - tlb->PID =0 ; - - tlb = &env->tlb.tlbe[1 ]; - tlb->attr =0 ; - tlb->prot =PAGE_VALID | ((PAGE_READ |PAGE_WRITE |PAGE_EXEC ) <<4 ); - tlb->size =1U <<31 ;/* up to 0xffffffff */ - tlb->EPN =0x80000000 &TARGET_PAGE_MASK ; - tlb->RPN =0x80000000 &TARGET_PAGE_MASK ; - tlb->PID =0 ; -} -static void main_cpu_reset (void *opaque) {PowerPCCPU *cpu = opaque;
@@ -143,8 +120,9 @@ static void main_cpu_reset(void *opaque) env->gpr[3 ] =FDT_ADDR ; env->nip = entry; -/* Create a mapping for the kernel. */ -mmubooke_create_initial_mapping (env,0 ,0 ); +/* Create a mapping spanning the 32bit addr space. */ +booke_set_tlb (&env->tlb.tlbe[0 ],0 ,0 ,1U <<31 ); +booke_set_tlb (&env->tlb.tlbe[1 ],0x80000000 ,0x80000000 ,1U <<31 ); }static void bamboo_init (MachineState *machine)
hw/ppc/ppc_booke.c +10 -0
@@ -31,6 +31,16 @@#include "hw/loader.h" #include "kvm_ppc.h" +void booke_set_tlb (ppcemb_tlb_t *tlb,target_ulong va,hwaddr pa, +target_ulong size) +{ + tlb->attr =0 ; + tlb->prot =PAGE_RWX <<4 |PAGE_VALID ; + tlb->size = size; + tlb->EPN = va &TARGET_PAGE_MASK ; + tlb->RPN = pa &TARGET_PAGE_MASK ; + tlb->PID =0 ; +}/* Timer Control Register */
hw/ppc/sam460ex.c +10 -35
68 lines not on this page · raw message
hw/ppc/virtex_ml507.c +3 -25
@@ -67,29 +67,6 @@ static struct boot_infovoid *vfdt; } boot_info; -/* Create reset TLB entries for BookE, spanning the 32bit addr space. */ -static void mmubooke_create_initial_mapping (CPUPPCState *env, -target_ulong va, -hwaddr pa) -{ -ppcemb_tlb_t *tlb = &env->tlb.tlbe[0 ]; - - tlb->attr =0 ; - tlb->prot =PAGE_VALID | ((PAGE_READ |PAGE_WRITE |PAGE_EXEC ) <<4 ); - tlb->size =1U <<31 ;/* up to 0x80000000 */ - tlb->EPN = va &TARGET_PAGE_MASK ; - tlb->RPN = pa &TARGET_PAGE_MASK ; - tlb->PID =0 ; - - tlb = &env->tlb.tlbe[1 ]; - tlb->attr =0 ; - tlb->prot =PAGE_VALID | ((PAGE_READ |PAGE_WRITE |PAGE_EXEC ) <<4 ); - tlb->size =1U <<31 ;/* up to 0xffffffff */ - tlb->EPN =0x80000000 &TARGET_PAGE_MASK ; - tlb->RPN =0x80000000 &TARGET_PAGE_MASK ; - tlb->PID =0 ; -} -static PowerPCCPU *ppc440_init_xilinx (const char *cpu_type,uint32_t sysclk) {PowerPCCPU *cpu;
@@ -139,8 +116,9 @@ static void main_cpu_reset(void *opaque) env->gpr[3 ] = bi->fdt; env->nip = bi->bootstrap_pc; -/* Create a mapping for the kernel. */ -mmubooke_create_initial_mapping (env,0 ,0 ); +/* Create a mapping spanning the 32bit addr space. */ +booke_set_tlb (&env->tlb.tlbe[0 ],0 ,0 ,1U <<31 ); +booke_set_tlb (&env->tlb.tlbe[1 ],0x80000000 ,0x80000000 ,1U <<31 ); env->gpr[6 ] =tswap32 (EPAPR_MAGIC ); env->gpr[7 ] = bi->ima_size; }
include/hw/ppc/ppc.h +2 -0
@@ -119,6 +119,8 @@ enum {#ifndef CONFIG_USER_ONLY void booke206_set_tlb (ppcmas_tlb_t *tlb,target_ulong va,hwaddr pa,hwaddr len); +void booke_set_tlb (ppcemb_tlb_t *tlb,target_ulong va,hwaddr pa, +target_ulong size);#endif /* ppc_booke.c */
Signature · 1 line
2.30.9
Quoted 7 lines · BALATON Zoltan
Embedded PPC has always enabled MMU so it needs initial mappings to start. This code is duplicated within machines which this small series aims to consolidate into helper functions to reduce duplicated code and make the board code simpler.
Regards,
BALATON Zoltan
I tested this with my virtex-ml507 images:
Cheers,
Edgar
Quoted 18 lines
BALATON Zoltan (2):
hw/ppc: Consolidate e500 initial mapping creation functions hw/ppc: Consolidate ppc440 initial mapping creation functionshw/ppc/e500.c | 41 ++++++++++++++++++-------------------- hw/ppc/e500.h | 2 -- hw/ppc/ppc440_bamboo.c | 28 +++----------------------- hw/ppc/ppc_booke.c | 10 ++++++++++ hw/ppc/ppce500_spin.c | 30 +++++++++------------------- hw/ppc/sam460ex.c | 45 ++++++++++-------------------------------- hw/ppc/virtex_ml507.c | 28 +++----------------------- include/hw/ppc/ppc.h | 7 +++++++ 8 files changed, 61 insertions(+), 130 deletions(-)Signature · 1 line
2.30.9
Quoted 4 lines · BALATON Zoltan
Embedded PPC has always enabled MMU so it needs initial mappings to start. This code is duplicated within machines which this small series aims to consolidate into helper functions to reduce duplicated code and make the board code simpler.
Ping?
Quoted 18 lines
Regards,
BALATON ZoltanBALATON Zoltan (2):
hw/ppc: Consolidate e500 initial mapping creation functions hw/ppc: Consolidate ppc440 initial mapping creation functionshw/ppc/e500.c | 41 ++++++++++++++++++-------------------- hw/ppc/e500.h | 2 -- hw/ppc/ppc440_bamboo.c | 28 +++----------------------- hw/ppc/ppc_booke.c | 10 ++++++++++ hw/ppc/ppce500_spin.c | 30 +++++++++------------------- hw/ppc/sam460ex.c | 45 ++++++++++-------------------------------- hw/ppc/virtex_ml507.c | 28 +++----------------------- include/hw/ppc/ppc.h | 7 +++++++ 8 files changed, 61 insertions(+), 130 deletions(-)
Quoted 7 lines · BALATON Zoltan
Quoted 4 lines · BALATON Zoltan
Embedded PPC has always enabled MMU so it needs initial mappings to start. This code is duplicated within machines which this small series aims to consolidate into helper functions to reduce duplicated code and make the board code simpler.
Ping?
Ping^2
Quoted 20 lines
Quoted 18 lines
Regards,
BALATON ZoltanBALATON Zoltan (2):
hw/ppc: Consolidate e500 initial mapping creation functions hw/ppc: Consolidate ppc440 initial mapping creation functionshw/ppc/e500.c | 41 ++++++++++++++++++-------------------- hw/ppc/e500.h | 2 -- hw/ppc/ppc440_bamboo.c | 28 +++----------------------- hw/ppc/ppc_booke.c | 10 ++++++++++ hw/ppc/ppce500_spin.c | 30 +++++++++------------------- hw/ppc/sam460ex.c | 45 ++++++++++-------------------------------- hw/ppc/virtex_ml507.c | 28 +++----------------------- include/hw/ppc/ppc.h | 7 +++++++ 8 files changed, 61 insertions(+), 130 deletions(-)