mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 23:51:37 +00:00
eb6d871f4b
Commite320a76db4("powerpc/cputable: Split cpu_specs[] out of cputable.h") moved the cpu_specs to separate header files. Previously PPC_FEATURE_BOOKE was enabled by CONFIG_PPC_BOOK3E_64. The definition in cpu_specs_e500mc.h for PPC64 no longer enables PPC_FEATURE_BOOKE. This breaks user space reading the ELF hwcaps and expect PPC_FEATURE_BOOKE. Debugging an application with gdb is no longer working on e5500/e6500 because the 64-bit detection relies on PPC_FEATURE_BOOKE for Book-E. Fixes:e320a76db4("powerpc/cputable: Split cpu_specs[] out of cputable.h") Cc: stable@vger.kernel.org # v6.1+ Signed-off-by: David Engraf <david.engraf@sysgo.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20240207092758.1058893-1-david.engraf@sysgo.com
77 lines
2.3 KiB
C
77 lines
2.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2001 Ben. Herrenschmidt (benh@kernel.crashing.org)
|
|
*
|
|
* Modifications for ppc64:
|
|
* Copyright (C) 2003 Dave Engebretsen <engebret@us.ibm.com>
|
|
*/
|
|
|
|
#ifdef CONFIG_PPC64
|
|
#define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \
|
|
PPC_FEATURE_HAS_FPU | PPC_FEATURE_64 | \
|
|
PPC_FEATURE_BOOKE)
|
|
#else
|
|
#define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \
|
|
PPC_FEATURE_BOOKE)
|
|
#endif
|
|
|
|
static struct cpu_spec cpu_specs[] __initdata = {
|
|
#ifdef CONFIG_PPC32
|
|
{ /* e500mc */
|
|
.pvr_mask = 0xffff0000,
|
|
.pvr_value = 0x80230000,
|
|
.cpu_name = "e500mc",
|
|
.cpu_features = CPU_FTRS_E500MC,
|
|
.cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
|
|
.cpu_user_features2 = PPC_FEATURE2_ISEL,
|
|
.mmu_features = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS | MMU_FTR_USE_TLBILX,
|
|
.icache_bsize = 64,
|
|
.dcache_bsize = 64,
|
|
.num_pmcs = 4,
|
|
.cpu_setup = __setup_cpu_e500mc,
|
|
.machine_check = machine_check_e500mc,
|
|
.platform = "ppce500mc",
|
|
.cpu_down_flush = cpu_down_flush_e500mc,
|
|
},
|
|
#endif /* CONFIG_PPC32 */
|
|
{ /* e5500 */
|
|
.pvr_mask = 0xffff0000,
|
|
.pvr_value = 0x80240000,
|
|
.cpu_name = "e5500",
|
|
.cpu_features = CPU_FTRS_E5500,
|
|
.cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
|
|
.cpu_user_features2 = PPC_FEATURE2_ISEL,
|
|
.mmu_features = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS | MMU_FTR_USE_TLBILX,
|
|
.icache_bsize = 64,
|
|
.dcache_bsize = 64,
|
|
.num_pmcs = 4,
|
|
.cpu_setup = __setup_cpu_e5500,
|
|
#ifndef CONFIG_PPC32
|
|
.cpu_restore = __restore_cpu_e5500,
|
|
#endif
|
|
.machine_check = machine_check_e500mc,
|
|
.platform = "ppce5500",
|
|
.cpu_down_flush = cpu_down_flush_e5500,
|
|
},
|
|
{ /* e6500 */
|
|
.pvr_mask = 0xffff0000,
|
|
.pvr_value = 0x80400000,
|
|
.cpu_name = "e6500",
|
|
.cpu_features = CPU_FTRS_E6500,
|
|
.cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU |
|
|
PPC_FEATURE_HAS_ALTIVEC_COMP,
|
|
.cpu_user_features2 = PPC_FEATURE2_ISEL,
|
|
.mmu_features = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS | MMU_FTR_USE_TLBILX,
|
|
.icache_bsize = 64,
|
|
.dcache_bsize = 64,
|
|
.num_pmcs = 6,
|
|
.cpu_setup = __setup_cpu_e6500,
|
|
#ifndef CONFIG_PPC32
|
|
.cpu_restore = __restore_cpu_e6500,
|
|
#endif
|
|
.machine_check = machine_check_e500mc,
|
|
.platform = "ppce6500",
|
|
.cpu_down_flush = cpu_down_flush_e6500,
|
|
},
|
|
};
|