diff options
author | Jesse Larrew <jlarrew@linux.vnet.ibm.com> | 2013-04-24 02:00:35 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-04-26 02:08:23 -0400 |
commit | 5d88aa85c00bb4026dd986430dc496effc637d42 (patch) | |
tree | 206edc195104eb8258a36b25f5247055211164c2 /arch/powerpc/include | |
parent | 8002b0c54b16931ad71771e6c97e46aca1be4456 (diff) |
powerpc/pseries: Update CPU maps when device tree is updated
Platform events such as partition migration or the new PRRN firmware
feature can cause the NUMA characteristics of a CPU to change, and these
changes will be reflected in the device tree nodes for the affected
CPUs.
This patch registers a handler for Open Firmware device tree updates
and reconfigures the CPU and node maps whenever the associativity
changes. Currently, this is accomplished by marking the affected CPUs in
the cpu_associativity_changes_mask and allowing
arch_update_cpu_topology() to retrieve the new associativity information
using hcall_vphn().
Protecting the NUMA cpu maps from concurrent access during an update
operation will be addressed in a subsequent patch in this series.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r-- | arch/powerpc/include/asm/firmware.h | 3 | ||||
-rw-r--r-- | arch/powerpc/include/asm/prom.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h index 6e336e0978b1..0df54646f968 100644 --- a/arch/powerpc/include/asm/firmware.h +++ b/arch/powerpc/include/asm/firmware.h | |||
@@ -51,6 +51,7 @@ | |||
51 | #define FW_FEATURE_SET_MODE ASM_CONST(0x0000000040000000) | 51 | #define FW_FEATURE_SET_MODE ASM_CONST(0x0000000040000000) |
52 | #define FW_FEATURE_BEST_ENERGY ASM_CONST(0x0000000080000000) | 52 | #define FW_FEATURE_BEST_ENERGY ASM_CONST(0x0000000080000000) |
53 | #define FW_FEATURE_TYPE1_AFFINITY ASM_CONST(0x0000000100000000) | 53 | #define FW_FEATURE_TYPE1_AFFINITY ASM_CONST(0x0000000100000000) |
54 | #define FW_FEATURE_PRRN ASM_CONST(0x0000000200000000) | ||
54 | 55 | ||
55 | #ifndef __ASSEMBLY__ | 56 | #ifndef __ASSEMBLY__ |
56 | 57 | ||
@@ -66,7 +67,7 @@ enum { | |||
66 | FW_FEATURE_MULTITCE | FW_FEATURE_SPLPAR | FW_FEATURE_LPAR | | 67 | FW_FEATURE_MULTITCE | FW_FEATURE_SPLPAR | FW_FEATURE_LPAR | |
67 | FW_FEATURE_CMO | FW_FEATURE_VPHN | FW_FEATURE_XCMO | | 68 | FW_FEATURE_CMO | FW_FEATURE_VPHN | FW_FEATURE_XCMO | |
68 | FW_FEATURE_SET_MODE | FW_FEATURE_BEST_ENERGY | | 69 | FW_FEATURE_SET_MODE | FW_FEATURE_BEST_ENERGY | |
69 | FW_FEATURE_TYPE1_AFFINITY, | 70 | FW_FEATURE_TYPE1_AFFINITY | FW_FEATURE_PRRN, |
70 | FW_FEATURE_PSERIES_ALWAYS = 0, | 71 | FW_FEATURE_PSERIES_ALWAYS = 0, |
71 | FW_FEATURE_POWERNV_POSSIBLE = FW_FEATURE_OPAL | FW_FEATURE_OPALv2, | 72 | FW_FEATURE_POWERNV_POSSIBLE = FW_FEATURE_OPAL | FW_FEATURE_OPALv2, |
72 | FW_FEATURE_POWERNV_ALWAYS = 0, | 73 | FW_FEATURE_POWERNV_ALWAYS = 0, |
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index 2ea8b856d605..bc2da154f68b 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h | |||
@@ -128,6 +128,7 @@ struct of_drconf_cell { | |||
128 | #define OV5_CMO 0x0480 /* Cooperative Memory Overcommitment */ | 128 | #define OV5_CMO 0x0480 /* Cooperative Memory Overcommitment */ |
129 | #define OV5_XCMO 0x0440 /* Page Coalescing */ | 129 | #define OV5_XCMO 0x0440 /* Page Coalescing */ |
130 | #define OV5_TYPE1_AFFINITY 0x0580 /* Type 1 NUMA affinity */ | 130 | #define OV5_TYPE1_AFFINITY 0x0580 /* Type 1 NUMA affinity */ |
131 | #define OV5_PRRN 0x0540 /* Platform Resource Reassignment */ | ||
131 | #define OV5_PFO_HW_RNG 0x0E80 /* PFO Random Number Generator */ | 132 | #define OV5_PFO_HW_RNG 0x0E80 /* PFO Random Number Generator */ |
132 | #define OV5_PFO_HW_842 0x0E40 /* PFO Compression Accelerator */ | 133 | #define OV5_PFO_HW_842 0x0E40 /* PFO Compression Accelerator */ |
133 | #define OV5_PFO_HW_ENCR 0x0E20 /* PFO Encryption Accelerator */ | 134 | #define OV5_PFO_HW_ENCR 0x0E20 /* PFO Encryption Accelerator */ |