powerpc/mpc85xx:Make L2 cache type independent of CHASSIS2
PATCH 1/1 powerpc/mpc85xx:Make L2 cache type independent of CHASSIS2
CHASSIS2 architecture never defines type of L2 cache present in SoC. it is dependent upon the core present in the SoC.
for example,
- e6500 core has L2 cluster (Kibo)
- e5500 core has Backside L2 Cache
Signed-off-by Prabhakar Kushwaha <[email protected]>
--- arch/powerpc/cpu/mpc85xx/cpu_init.c | 6 +++--- arch/powerpc/cpu/mpc85xx/fdt.c | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu_init.c +3 -3
@@ -284,7 +284,7 @@ static void __fsl_serdes__init(void) } __attribute__((weak,alias ("__fsl_serdes__init" )))void fsl_serdes_init (void ); -#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2 +#if defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2 ) && defined(CONFIG_E6500 )int enable_cluster_l2 (void ) {int i =0 ;
@@ -350,7 +350,7 @@ int cpu_init_r(void)#endif #ifdef CONFIG_L2_CACHE ccsr_l2cache_t *l2cache = (void __iomem *)CONFIG_SYS_MPC85xx_L2_ADDR; -#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2 ) +#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2 ) && defined(CONFIG_E6500 )struct ccsr_cluster_l2 * l2cache = (void __iomem *)CONFIG_SYS_FSL_CLUSTER_1_L2 ;#endif #if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE ) && defined(CONFIG_MP )
@@ -533,7 +533,7 @@ int cpu_init_r(void) } skip_l2: -#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2 ) +#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2 ) && defined(CONFIG_E6500 )if (l2cache->l2csr0 &L2CSR0_L2E )print_size ((l2cache->l2cfg0 &0x3fff ) *64 *1024 ," enabled\n" );
arch/powerpc/cpu/mpc85xx/fdt.c +1 -1
@@ -273,7 +273,7 @@ static inline void ft_fixup_l2cache(void *blob)if (has_l2) {#ifdef CONFIG_SYS_CACHE_STASHING u32 *reg = (u32 *)fdt_getprop (blob, off,"reg" ,0 ); -#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2 +#if defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2 ) && defined(CONFIG_E6500 )/* Only initialize every eighth thread */ if (reg && !((*reg) %8 )) #else
arch/powerpc/cpu/mpc85xx/start.S +1 -1
@@ -691,7 +691,7 @@ delete_temp_tlbs: #endif /* #if (CONFIG_SYS_CCSRBAR_DEFAULT != CONFIG_SYS_CCSRBAR_PHYS) */ -#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2 +#if defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) && defined(CONFIG_E6500) create_ccsr_l2_tlb: /* * Create a TLB for the MMR location of CCSR
Signature · 1 line
1.7.9.5
PATCH 1/1 powerpc/mpc85xx:Make L2 cache type independent of CHASSIS2
Quoted 8 lines · Prabhakar Kushwaha
CHASSIS2 architecture never defines type of L2 cache present in SoC. it is dependent upon the core present in the SoC.
for example,
- e6500 core has L2 cluster (Kibo)
- e5500 core has Backside L2 CacheSigned-off-by Prabhakar Kushwaha <[email protected]>---
Applied to u-boot-mpc85xx/next, pending merging to u-boot-mpc85xx/master branch.
York