提交 4b83c330 编写于 作者: A Anton Blanchard 提交者: Benjamin Herrenschmidt

powerpc/numa: Add form 1 NUMA affinity

Firmware changed the way it represents memory and cpu affinity on POWER7.
Unfortunately the old method now caps the topology to work around issues
with legacy operating systems. For Linux to get the correct topology we
need to use the new form 1 affinity information.

We set the form 1 field in the client architecture, and if we see "1" in the
ibm,associativity-form property firmware supports form 1 affinity and
we should look at the first field in the ibm,associativity-reference-points
array. If not we use the second field as we always have.
Signed-off-by: NAnton Blanchard <anton@samba.org>
Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
上级 dbc9632a
...@@ -653,6 +653,7 @@ static void __init early_cmdline_parse(void) ...@@ -653,6 +653,7 @@ static void __init early_cmdline_parse(void)
#else #else
#define OV5_CMO 0x00 #define OV5_CMO 0x00
#endif #endif
#define OV5_TYPE1_AFFINITY 0x80 /* Type 1 NUMA affinity */
/* Option Vector 6: IBM PAPR hints */ /* Option Vector 6: IBM PAPR hints */
#define OV6_LINUX 0x02 /* Linux is our OS */ #define OV6_LINUX 0x02 /* Linux is our OS */
...@@ -706,7 +707,7 @@ static unsigned char ibm_architecture_vec[] = { ...@@ -706,7 +707,7 @@ static unsigned char ibm_architecture_vec[] = {
OV5_DONATE_DEDICATE_CPU | OV5_MSI, OV5_DONATE_DEDICATE_CPU | OV5_MSI,
0, 0,
OV5_CMO, OV5_CMO,
0, OV5_TYPE1_AFFINITY,
0, 0,
0, 0,
0, 0,
......
...@@ -242,10 +242,11 @@ EXPORT_SYMBOL_GPL(of_node_to_nid); ...@@ -242,10 +242,11 @@ EXPORT_SYMBOL_GPL(of_node_to_nid);
*/ */
static int __init find_min_common_depth(void) static int __init find_min_common_depth(void)
{ {
int depth; int depth, index;
const unsigned int *ref_points; const unsigned int *ref_points;
struct device_node *rtas_root; struct device_node *rtas_root;
unsigned int len; unsigned int len;
struct device_node *options;
rtas_root = of_find_node_by_path("/rtas"); rtas_root = of_find_node_by_path("/rtas");
...@@ -258,11 +259,23 @@ static int __init find_min_common_depth(void) ...@@ -258,11 +259,23 @@ static int __init find_min_common_depth(void)
* configuration (should be all 0's) and the second is for a normal * configuration (should be all 0's) and the second is for a normal
* NUMA configuration. * NUMA configuration.
*/ */
index = 1;
ref_points = of_get_property(rtas_root, ref_points = of_get_property(rtas_root,
"ibm,associativity-reference-points", &len); "ibm,associativity-reference-points", &len);
/*
* For type 1 affinity information we want the first field
*/
options = of_find_node_by_path("/options");
if (options) {
const char *str;
str = of_get_property(options, "ibm,associativity-form", NULL);
if (str && !strcmp(str, "1"))
index = 0;
}
if ((len >= 2 * sizeof(unsigned int)) && ref_points) { if ((len >= 2 * sizeof(unsigned int)) && ref_points) {
depth = ref_points[1]; depth = ref_points[index];
} else { } else {
dbg("NUMA: ibm,associativity-reference-points not found.\n"); dbg("NUMA: ibm,associativity-reference-points not found.\n");
depth = -1; depth = -1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册