* [PATCH 1/2] Power7 architected entry
2008-06-18 20:11 [PATCH 0/2] more power7 bits jschopp
@ 2008-06-18 20:18 ` jschopp
2008-06-18 20:51 ` Olof Johansson
2008-06-18 20:23 ` [PATCH 2/2] 2.06 architecture-vec jschopp
1 sibling, 1 reply; 5+ messages in thread
From: jschopp @ 2008-06-18 20:18 UTC (permalink / raw)
To: paulus; +Cc: linuxppc-dev, mikey
Add an entry for Power7 architected mode and add "(raw)" to Power7 raw mode to
distinguish it more clearly.
Signed-off-by: Joel Schopp <jschopp@austin.ibm.com>
---
arch/powerpc/kernel/cputable.c | 48 +++++++++++++++++++++++++++++
arch/powerpc/platforms/pseries/cpu_setup.S | 6 +++
include/asm-powerpc/cputable.h | 9 +++++
3 files changed, 63 insertions(+)
Index: 2.6.26-rc6/arch/powerpc/kernel/cputable.c
===================================================================
--- 2.6.26-rc6.orig/arch/powerpc/kernel/cputable.c
+++ 2.6.26-rc6/arch/powerpc/kernel/cputable.c
@@ -385,10 +385,21 @@ static struct cpu_spec __initdata cpu_sp
.machine_check = machine_check_generic,
.platform = "power6",
},
+ { /* 2.06-compliant processor, i.e. Power7 "architected" mode */
+ .pvr_mask = 0xffffffff,
+ .pvr_value = 0x0f000003,
+ .cpu_name = "POWER7 (architected)",
+ .cpu_features = CPU_FTRS_POWER7,
+ .cpu_user_features = COMMON_USER_POWER7,
+ .icache_bsize = 128,
+ .dcache_bsize = 128,
+ .machine_check = machine_check_generic,
+ .platform = "power7",
+ },
{ /* Power7 */
.pvr_mask = 0xffff0000,
.pvr_value = 0x003f0000,
- .cpu_name = "POWER7",
+ .cpu_name = "POWER7 (raw)",
.cpu_features = CPU_FTRS_POWER7,
.cpu_user_features = COMMON_USER_POWER7,
.icache_bsize = 128,
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/2] 2.06 architecture-vec
2008-06-18 20:11 [PATCH 0/2] more power7 bits jschopp
2008-06-18 20:18 ` [PATCH 1/2] Power7 architected entry jschopp
@ 2008-06-18 20:23 ` jschopp
1 sibling, 0 replies; 5+ messages in thread
From: jschopp @ 2008-06-18 20:23 UTC (permalink / raw)
To: paulus; +Cc: linuxppc-dev, mikey
Add the bits to the architecture-vec so that ibm,client-architecture
lets the firmware know we support the 2.06 architecture.
Signed-off-by: Joel Schopp <jschopp@austin.ibm.com>
Index: 2.6.26-rc6/arch/powerpc/kernel/prom_init.c
===================================================================
--- 2.6.26-rc6.orig/arch/powerpc/kernel/prom_init.c
+++ 2.6.26-rc6/arch/powerpc/kernel/prom_init.c
@@ -620,6 +620,7 @@ static void __init early_cmdline_parse(v
#define OV1_PPC_2_03 0x10 /* set if we support PowerPC 2.03 */
#define OV1_PPC_2_04 0x08 /* set if we support PowerPC 2.04 */
#define OV1_PPC_2_05 0x04 /* set if we support PowerPC 2.05 */
+#define OV1_PPC_2_06 0x02 /* set if we support PowerPC 2.06 */
/* Option vector 2: Open Firmware options supported */
#define OV2_REAL_MODE 0x20 /* set if we want OF in real mode */
@@ -651,6 +652,7 @@ static unsigned char ibm_architecture_ve
W(0xfffe0000), W(0x003a0000), /* POWER5/POWER5+ */
W(0xffff0000), W(0x003e0000), /* POWER6 */
W(0xffff0000), W(0x003f0000), /* POWER7 */
+ W(0xffffffff), W(0x0f000003), /* all 2.06-compliant */
W(0xffffffff), W(0x0f000002), /* all 2.05-compliant */
W(0xfffffffe), W(0x0f000001), /* all 2.04-compliant and earlier */
5 - 1, /* 5 option vectors */
@@ -659,7 +661,7 @@ static unsigned char ibm_architecture_ve
3 - 2, /* length */
0, /* don't ignore, don't halt */
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_04 | OV1_PPC_2_05 | OV1_PPC_2_06,
/* option vector 2: Open Firmware options supported */
34 - 2, /* length */
^ permalink raw reply [flat|nested] 5+ messages in thread