[PATCH 5/11] Update numa.c to use platform_has_feature()
From: Nathan Fontenot <hidden>
Date: 2013-03-09 04:03:39
Update the numa code to use the new platform_has_feature() when checking for type 1 affinity. Signed-off-by: Nathan Fontenot <redacted> --- arch/powerpc/mm/numa.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) Index: powerpc/arch/powerpc/mm/numa.c ===================================================================
--- powerpc.orig/arch/powerpc/mm/numa.c 2013-03-08 19:23:06.000000000 -0600
+++ powerpc/arch/powerpc/mm/numa.c 2013-03-08 19:57:27.000000000 -0600@@ -291,9 +291,7 @@ static int __init find_min_common_depth(void) { int depth; - struct device_node *chosen; struct device_node *root; - const char *vec5; if (firmware_has_feature(FW_FEATURE_OPAL)) root = of_find_node_by_path("/ibm,opal");
@@ -325,24 +323,10 @@ distance_ref_points_depth /= sizeof(int); -#define VEC5_AFFINITY_BYTE 5 -#define VEC5_AFFINITY 0x80 - - if (firmware_has_feature(FW_FEATURE_OPAL)) + if (firmware_has_feature(FW_FEATURE_OPAL) || + platform_has_feature(OV5_TYPE1_AFFINITY)) { + dbg("Using form 1 affinity\n"); form1_affinity = 1; - else { - chosen = of_find_node_by_path("/chosen"); - if (chosen) { - vec5 = of_get_property(chosen, - "ibm,architecture-vec-5", NULL); - if (vec5 && (vec5[VEC5_AFFINITY_BYTE] & - VEC5_AFFINITY)) { - dbg("Using form 1 affinity\n"); - form1_affinity = 1; - } - - of_node_put(chosen); - } } if (form1_affinity) {