powerpc/32s: Regroup 603 based CPUs in cputable

In order to selectively build the kernel for 603 SW TLB handling,
regroup all 603 based CPUs together.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/45065263fdb9f5cc2a2d210ec2a762ac8bf5b2bc.1603348103.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 8a4e1ed8a4a2ac9c99cfa60bbba9ae2aab842a0f..b088c3443a99fd786ea8fd2c1743b5772005c73f 100644 (file)
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -503,15 +503,16 @@ static inline void cpu_feature_keys_init(void) { }
 enum {
        CPU_FTRS_POSSIBLE =
 #ifdef CONFIG_PPC_BOOK3S_32
-           CPU_FTRS_603 | CPU_FTRS_604 | CPU_FTRS_740_NOTAU |
+           CPU_FTRS_604 | CPU_FTRS_740_NOTAU |
            CPU_FTRS_740 | CPU_FTRS_750 | CPU_FTRS_750FX1 |
            CPU_FTRS_750FX2 | CPU_FTRS_750FX | CPU_FTRS_750GX |
            CPU_FTRS_7400_NOTAU | CPU_FTRS_7400 | CPU_FTRS_7450_20 |
            CPU_FTRS_7450_21 | CPU_FTRS_7450_23 | CPU_FTRS_7455_1 |
            CPU_FTRS_7455_20 | CPU_FTRS_7455 | CPU_FTRS_7447_10 |
-           CPU_FTRS_7447 | CPU_FTRS_7447A | CPU_FTRS_82XX |
-           CPU_FTRS_G2_LE | CPU_FTRS_E300 | CPU_FTRS_E300C2 |
+           CPU_FTRS_7447 | CPU_FTRS_7447A |
            CPU_FTRS_CLASSIC32 |
+           CPU_FTRS_603 | CPU_FTRS_82XX |
+           CPU_FTRS_G2_LE | CPU_FTRS_E300 | CPU_FTRS_E300C2 |
 #endif
 #ifdef CONFIG_PPC_8xx
            CPU_FTRS_8XX |
@@ -572,15 +573,16 @@ enum {
 enum {
        CPU_FTRS_ALWAYS =
 #ifdef CONFIG_PPC_BOOK3S_32
-           CPU_FTRS_603 & CPU_FTRS_604 & CPU_FTRS_740_NOTAU &
+           CPU_FTRS_604 & CPU_FTRS_740_NOTAU &
            CPU_FTRS_740 & CPU_FTRS_750 & CPU_FTRS_750FX1 &
            CPU_FTRS_750FX2 & CPU_FTRS_750FX & CPU_FTRS_750GX &
            CPU_FTRS_7400_NOTAU & CPU_FTRS_7400 & CPU_FTRS_7450_20 &
            CPU_FTRS_7450_21 & CPU_FTRS_7450_23 & CPU_FTRS_7455_1 &
            CPU_FTRS_7455_20 & CPU_FTRS_7455 & CPU_FTRS_7447_10 &
-           CPU_FTRS_7447 & CPU_FTRS_7447A & CPU_FTRS_82XX &
-           CPU_FTRS_G2_LE & CPU_FTRS_E300 & CPU_FTRS_E300C2 &
+           CPU_FTRS_7447 & CPU_FTRS_7447A &
            CPU_FTRS_CLASSIC32 &
+           CPU_FTRS_603 & CPU_FTRS_82XX &
+           CPU_FTRS_G2_LE & CPU_FTRS_E300 & CPU_FTRS_E300C2 &
 #endif
 #ifdef CONFIG_PPC_8xx
            CPU_FTRS_8XX &

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 086eadd5c3c843a68d9485095eec4d69f5ce1b98..5bf971f7c325515c5dd3d70819d23e9e03e4b4c5 100644 (file)
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -612,45 +612,6 @@ static struct cpu_spec __initdata cpu_specs[] = {
 
 #ifdef CONFIG_PPC32
 #ifdef CONFIG_PPC_BOOK3S_32
-       {       /* 603 */
-               .pvr_mask               = 0xffff0000,
-               .pvr_value              = 0x00030000,
-               .cpu_name               = "603",
-               .cpu_features           = CPU_FTRS_603,
-               .cpu_user_features      = COMMON_USER | PPC_FEATURE_PPC_LE,
-               .mmu_features           = 0,
-               .icache_bsize           = 32,
-               .dcache_bsize           = 32,
-               .cpu_setup              = __setup_cpu_603,
-               .machine_check          = machine_check_generic,
-               .platform               = "ppc603",
-       },
-       {       /* 603e */
-               .pvr_mask               = 0xffff0000,
-               .pvr_value              = 0x00060000,
-               .cpu_name               = "603e",
-               .cpu_features           = CPU_FTRS_603,
-               .cpu_user_features      = COMMON_USER | PPC_FEATURE_PPC_LE,
-               .mmu_features           = 0,
-               .icache_bsize           = 32,
-               .dcache_bsize           = 32,
-               .cpu_setup              = __setup_cpu_603,
-               .machine_check          = machine_check_generic,
-               .platform               = "ppc603",
-       },
-       {       /* 603ev */
-               .pvr_mask               = 0xffff0000,
-               .pvr_value              = 0x00070000,
-               .cpu_name               = "603ev",
-               .cpu_features           = CPU_FTRS_603,
-               .cpu_user_features      = COMMON_USER | PPC_FEATURE_PPC_LE,
-               .mmu_features           = 0,
-               .icache_bsize           = 32,
-               .dcache_bsize           = 32,
-               .cpu_setup              = __setup_cpu_603,
-               .machine_check          = machine_check_generic,
-               .platform               = "ppc603",
-       },
        {       /* 604 */
                .pvr_mask               = 0xffff0000,
                .pvr_value              = 0x00040000,
@@ -1140,6 +1101,45 @@ static struct cpu_spec __initdata cpu_specs[] = {
                .machine_check          = machine_check_generic,
                .platform               = "ppc7450",
        },
+       {       /* 603 */
+               .pvr_mask               = 0xffff0000,
+               .pvr_value              = 0x00030000,
+               .cpu_name               = "603",
+               .cpu_features           = CPU_FTRS_603,
+               .cpu_user_features      = COMMON_USER | PPC_FEATURE_PPC_LE,
+               .mmu_features           = 0,
+               .icache_bsize           = 32,
+               .dcache_bsize           = 32,
+               .cpu_setup              = __setup_cpu_603,
+               .machine_check          = machine_check_generic,
+               .platform               = "ppc603",
+       },
+       {       /* 603e */
+               .pvr_mask               = 0xffff0000,
+               .pvr_value              = 0x00060000,
+               .cpu_name               = "603e",
+               .cpu_features           = CPU_FTRS_603,
+               .cpu_user_features      = COMMON_USER | PPC_FEATURE_PPC_LE,
+               .mmu_features           = 0,
+               .icache_bsize           = 32,
+               .dcache_bsize           = 32,
+               .cpu_setup              = __setup_cpu_603,
+               .machine_check          = machine_check_generic,
+               .platform               = "ppc603",
+       },
+       {       /* 603ev */
+               .pvr_mask               = 0xffff0000,
+               .pvr_value              = 0x00070000,
+               .cpu_name               = "603ev",
+               .cpu_features           = CPU_FTRS_603,
+               .cpu_user_features      = COMMON_USER | PPC_FEATURE_PPC_LE,
+               .mmu_features           = 0,
+               .icache_bsize           = 32,
+               .dcache_bsize           = 32,
+               .cpu_setup              = __setup_cpu_603,
+               .machine_check          = machine_check_generic,
+               .platform               = "ppc603",
+       },
        {       /* 82xx (8240, 8245, 8260 are all 603e cores) */
                .pvr_mask               = 0x7fff0000,
                .pvr_value              = 0x00810000,