All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v4 7/13] Update numa.c to use updated firmware_has_feature()
Date: Wed, 24 Apr 2013 10:58:23 -0500	[thread overview]
Message-ID: <5178011F.2090406@linux.vnet.ibm.com> (raw)
In-Reply-To: <5177FB74.2050709@linux.vnet.ibm.com>

Update the numa code to use the updated firmware_has_feature() when checking
for type 1 affinity.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
---
 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-04-23 12:54:23.000000000 -0500
+++ powerpc/arch/powerpc/mm/numa.c	2013-04-23 15:19:15.000000000 -0500
@@ -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) ||
+	    firmware_has_feature(FW_FEATURE_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) {

  parent reply	other threads:[~2013-04-24 15:59 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-24 15:34 [PATCH v4 0/13] NUMA CPU Reconfiguration using PRRN Nathan Fontenot
2013-04-24 15:47 ` [PATCH v4 1/13] Expose pseries devicetree_update() Nathan Fontenot
2013-04-24 15:49 ` [PATCH v4 2/13] Correct buffer parsing in update_dt_node() Nathan Fontenot
2013-04-26  3:01   ` Stephen Rothwell
2013-04-24 15:51 ` [PATCH v4 3/13] Add PRRN RTAS event handler Nathan Fontenot
2013-04-24 15:53 ` [PATCH v4 4/13] Move architecture vector definitions to prom.h Nathan Fontenot
2013-04-24 15:55 ` [PATCH v4 5/13] Use ARRAY_SIZE to iterate over firmware_features_table array Nathan Fontenot
2013-04-26  3:08   ` Stephen Rothwell
2013-04-24 15:57 ` [PATCH v4 6/13] Update firmware_has_feature() to check architecture vector 5 bits Nathan Fontenot
2013-04-24 15:58 ` Nathan Fontenot [this message]
2013-04-24 16:00 ` [PATCH v4 8/13] Update CPU maps when device tree is updated Nathan Fontenot
2013-04-24 16:02 ` [PATCH v4 9/13] Use stop machine to update cpu maps Nathan Fontenot
2013-04-24 16:03 ` [PATCH v4 10/13] Update NUMA VDSO information when updating CPU maps Nathan Fontenot
2013-04-24 16:05 ` [PATCH v4 11/13] RE-enable Virtual Processor Home Node updating Nathan Fontenot
2013-04-24 16:06 ` [PATCH v4 12/13] Enable PRRN handling Nathan Fontenot
2013-04-24 16:07 ` [PATCH v4 13/13] Add /proc interface to control topology updates Nathan Fontenot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5178011F.2090406@linux.vnet.ibm.com \
    --to=nfont@linux.vnet.ibm.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.