github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 22:14:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

powerpc: Add Power12 architected mode

Browse Source 
PVR value of 0x0f000008 means we are arch v3.2 compliant (i.e.
Power12). This is used by phyp and kvm when booting as a pseries guest
to detect the presence of new Power12 features and to enable the
appropriate hwcap and facility bits.

Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Mahesh Salgaonkar <mahesh@linux.ibm.com>
Tested-by: Praveen K Pandey <praveen@linux.ibm.com>
Reviewed-by: Nikhil Kumar Singh <nikhilks@linux.ibm.com>
Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20260806051120.3703698-4-mahesh@linux.ibm.com
This commit is contained in:
Ritesh Harjani (IBM) 2026-08-06 10:41:19 +05:30 committed by Madhavan Srinivasan
parent e671e147ea
commit 287df870bf
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/include/asm/prom.h
View File

@ -117,7 +117,8 @@ extern unsigned int boot_cpu_node_count;
#define OV1_PPC_2_07 0x01 /* set if we support PowerPC 2.07 */
#define OV1_PPC_3_00 0x80 /* set if we support PowerPC 3.00 */
#define OV1_PPC_3_1 0x40 /* set if we support PowerPC 3.1 */
#define OV1_PPC_3_1 0x40 /* set if we support PowerPC 3.1 */
#define OV1_PPC_3_2 0x20 /* set if we support PowerPC 3.2 */
/* Option vector 2: Open Firmware options supported */
#define OV2_REAL_MODE 0x20 /* set if we want OF in real mode */

1
arch/powerpc/include/uapi/asm/cputable.h
View File

@ -53,6 +53,7 @@
#define PPC_FEATURE2_ARCH_3_1 0x00040000 /* ISA 3.1 */
#define PPC_FEATURE2_MMA 0x00020000 /* Matrix Multiply Assist */
#define PPC_FEATURE2_ARCH_3_2 0x00010000 /* ISA 3.2 */
#define PPC_FEATURE2_DMF 0x00008000 /* Dense Math Facility */
/*
* IMPORTANT!

14
arch/powerpc/kernel/cpu_specs_book3s_64.h
View File

@ -303,6 +303,20 @@ static struct cpu_spec cpu_specs[] __initdata = {
.cpu_restore = __restore_cpu_power10,
.platform = "power11",
},
{ /* 3.2-compliant processor, i.e. Power12 "architected" mode */
.pvr_mask = 0xffffffff,
.pvr_value = 0x0f000008,
.cpu_name = "Power12 (architected)",
.cpu_features = CPU_FTRS_POWER12,
.cpu_user_features = COMMON_USER_POWER12,
.cpu_user_features2 = COMMON_USER2_POWER12,
.mmu_features = MMU_FTRS_POWER12,
.icache_bsize = 128,
.dcache_bsize = 128,
.cpu_setup = __setup_cpu_power12,
.cpu_restore = __restore_cpu_power12,
.platform = "power12",
},
{ /* Power7 */
.pvr_mask = 0xffff0000,
.pvr_value = 0x003f0000,

12
arch/powerpc/kernel/prom_init.c
View File

@ -953,7 +953,7 @@ struct option_vector7 {
} __packed;
struct ibm_arch_vec {
struct { __be32 mask, val; } pvrs[16];
struct { __be32 mask, val; } pvrs[18];
u8 num_vectors;
@ -1021,6 +1021,14 @@ static const struct ibm_arch_vec ibm_architecture_vec_template __initconst = {
.mask = cpu_to_be32(0xffff0000), /* POWER11 */
.val = cpu_to_be32(0x00820000),
},
{
.mask = cpu_to_be32(0xffff0000), /* POWER12 */
.val = cpu_to_be32(0x00830000),
},
{
.mask = cpu_to_be32(0xffffffff), /* all 3.2-compliant */
.val = cpu_to_be32(0x0f000008),
},
{
.mask = cpu_to_be32(0xffffffff), /* P11 compliant */
.val = cpu_to_be32(0x0f000007),
@ -1054,7 +1062,7 @@ static const struct ibm_arch_vec ibm_architecture_vec_template __initconst = {
.byte1 = 0,
.arch_versions = OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 |
OV1_PPC_2_04 | OV1_PPC_2_05 | OV1_PPC_2_06 | OV1_PPC_2_07,
.arch_versions3 = OV1_PPC_3_00 | OV1_PPC_3_1,
.arch_versions3 = OV1_PPC_3_00 | OV1_PPC_3_1 | OV1_PPC_3_2,
},
.vec2_len = VECTOR_LENGTH(sizeof(struct option_vector2)),