linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
To: linuxppc-dev@ozlabs.org
Subject: [PATCH 1/11] Expose pseries devicetree_update()
Date: Fri, 08 Mar 2013 21:59:26 -0600	[thread overview]
Message-ID: <513AB39E.8000504@linux.vnet.ibm.com> (raw)
In-Reply-To: <513AB2E3.6090209@linux.vnet.ibm.com>

From: Jesse Larrew <jlarrew@linux.vnet.ibm.com>

When rtasd receives a PRRN event, it needs to make a series of RTAS
calls (ibm,update-nodes and ibm,update-properties) to retrieve the
updated device tree information. These calls are already handled in the
pseries_devtree_update() routine used in partition migration.

This patch simply exposes pseries_devicetree_update() so it can be
called by rtasd. pseries_devicetree_update() and supporting functions
are also modified to take a 32-bit 'scope' parameter. This parameter is
required by the ibm,update-nodes/ibm,update-properties RTAS calls, and
the appropriate value is contained within the RTAS event for PRRN
notifications. In pseries_devicetree_update() it was previously
hard-coded to 1, the scope value for partition migration.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
---
 arch/powerpc/include/asm/rtas.h           |    1 +
 arch/powerpc/platforms/pseries/mobility.c |   21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

Index: powerpc/arch/powerpc/include/asm/rtas.h
===================================================================
--- powerpc.orig/arch/powerpc/include/asm/rtas.h	2013-03-08 19:23:06.000000000 -0600
+++ powerpc/arch/powerpc/include/asm/rtas.h	2013-03-08 19:56:13.000000000 -0600
@@ -276,6 +276,7 @@
 		const char *uname, int depth, void *data);
 
 extern void pSeries_log_error(char *buf, unsigned int err_type, int fatal);
+extern int pseries_devicetree_update(s32 scope);
 
 #ifdef CONFIG_PPC_RTAS_DAEMON
 extern void rtas_cancel_event_scan(void);
Index: powerpc/arch/powerpc/platforms/pseries/mobility.c
===================================================================
--- powerpc.orig/arch/powerpc/platforms/pseries/mobility.c	2013-03-08 19:23:07.000000000 -0600
+++ powerpc/arch/powerpc/platforms/pseries/mobility.c	2013-03-08 19:56:13.000000000 -0600
@@ -37,14 +37,16 @@
 #define UPDATE_DT_NODE	0x02000000
 #define ADD_DT_NODE	0x03000000
 
-static int mobility_rtas_call(int token, char *buf)
+#define MIGRATION_SCOPE	(1)
+
+static int mobility_rtas_call(int token, char *buf, s32 scope)
 {
 	int rc;
 
 	spin_lock(&rtas_data_buf_lock);
 
 	memcpy(rtas_data_buf, buf, RTAS_DATA_BUF_SIZE);
-	rc = rtas_call(token, 2, 1, NULL, rtas_data_buf, 1);
+	rc = rtas_call(token, 2, 1, NULL, rtas_data_buf, scope);
 	memcpy(buf, rtas_data_buf, RTAS_DATA_BUF_SIZE);
 
 	spin_unlock(&rtas_data_buf_lock);
@@ -123,7 +125,7 @@
 	return 0;
 }
 
-static int update_dt_node(u32 phandle)
+static int update_dt_node(u32 phandle, s32 scope)
 {
 	struct update_props_workarea *upwa;
 	struct device_node *dn;
@@ -151,7 +153,8 @@
 	upwa->phandle = phandle;
 
 	do {
-		rc = mobility_rtas_call(update_properties_token, rtas_buf);
+		rc = mobility_rtas_call(update_properties_token, rtas_buf,
+					scope);
 		if (rc < 0)
 			break;
 
@@ -219,7 +222,7 @@
 	return rc;
 }
 
-static int pseries_devicetree_update(void)
+int pseries_devicetree_update(s32 scope)
 {
 	char *rtas_buf;
 	u32 *data;
@@ -235,7 +238,7 @@
 		return -ENOMEM;
 
 	do {
-		rc = mobility_rtas_call(update_nodes_token, rtas_buf);
+		rc = mobility_rtas_call(update_nodes_token, rtas_buf, scope);
 		if (rc && rc != 1)
 			break;
 
@@ -256,7 +259,7 @@
 					delete_dt_node(phandle);
 					break;
 				case UPDATE_DT_NODE:
-					update_dt_node(phandle);
+					update_dt_node(phandle, scope);
 					break;
 				case ADD_DT_NODE:
 					drc_index = *data++;
@@ -276,7 +279,7 @@
 	int rc;
 	int activate_fw_token;
 
-	rc = pseries_devicetree_update();
+	rc = pseries_devicetree_update(MIGRATION_SCOPE);
 	if (rc) {
 		printk(KERN_ERR "Initial post-mobility device tree update "
 		       "failed: %d\n", rc);
@@ -292,7 +295,7 @@
 
 	rc = rtas_call(activate_fw_token, 0, 1, NULL);
 	if (!rc) {
-		rc = pseries_devicetree_update();
+		rc = pseries_devicetree_update(MIGRATION_SCOPE);
 		if (rc)
 			printk(KERN_ERR "Secondary post-mobility device tree "
 			       "update failed: %d\n", rc);

  reply	other threads:[~2013-03-09  3:59 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-09  3:56 [PATCH 0/11] NUMA CPU Reconfiguration using PRRN Nathan Fontenot
2013-03-09  3:59 ` Nathan Fontenot [this message]
2013-03-14  8:49   ` [PATCH 1/11] Expose pseries devicetree_update() Paul Mackerras
2013-03-09  4:00 ` [PATCH2/11] Add PRRN Event Handler Nathan Fontenot
2013-03-14  8:51   ` Paul Mackerras
2013-03-19 18:01     ` Nathan Fontenot
2013-03-09  4:01 ` [PATCH 3/11] Move architecture vector definitions to prom.h Nathan Fontenot
2013-03-14  8:52   ` Paul Mackerras
2013-03-09  4:02 ` [PATCH 4/11] Add platform_has_feature() Nathan Fontenot
2013-03-14  8:56   ` Paul Mackerras
2013-03-19 18:03     ` Nathan Fontenot
2013-03-14  8:59   ` Paul Mackerras
2013-03-19 18:05     ` Nathan Fontenot
2013-03-14 13:42   ` Michael Ellerman
2013-03-19 18:15     ` Nathan Fontenot
2013-03-22  3:56       ` Michael Ellerman
2013-03-09  4:03 ` [PATCH 5/11] Update numa.c to use platform_has_feature() Nathan Fontenot
2013-03-09  4:04 ` [PATCH 6/11] Update CPU maps Nathan Fontenot
2013-03-09  4:05 ` [PATCH 7/11] Use stop machine to update cpu maps Nathan Fontenot
2013-03-09  4:07 ` [PATCH 8/11] Update numa cpu vdso info Nathan Fontenot
2013-03-14  9:02   ` Paul Mackerras
2013-03-09  4:08 ` [PATCH 9/11] Re-enable Virtual Private Home Node capabilities Nathan Fontenot
2013-03-09  4:08 ` [PATCH 10/11] Enable PRRN Nathan Fontenot
2013-03-09  4:10 ` [PATCH 11/11] 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=513AB39E.8000504@linux.vnet.ibm.com \
    --to=nfont@linux.vnet.ibm.com \
    --cc=linuxppc-dev@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).