1 files changed, 48 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c
index 1045ff49cc6d..1130c53ad652 100644
--- a/arch/powerpc/kernel/rtasd.c
+++ b/arch/powerpc/kernel/rtasd.c
@@ -29,6 +29,7 @@
 #include <asm/nvram.h>
 #include <linux/atomic.h>
 #include <asm/machdep.h>
+#include <asm/topology.h>
 
 
 static DEFINE_SPINLOCK(rtasd_log_lock);
@@ -87,6 +88,8 @@ static char *rtas_event_type(int type)
                         return "Resource Deallocation Event";
                 case RTAS_TYPE_DUMP:
                         return "Dump Notification Event";
+                case RTAS_TYPE_PRRN:
+                        return "Platform Resource Reassignment Event";
         }
 
         return rtas_type[0];
@@ -265,9 +268,51 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
                 spin_unlock_irqrestore(&rtasd_log_lock, s);
                 return;
         }
+}
+
+#ifdef CONFIG_PPC_PSERIES
+static s32 prrn_update_scope;
 
+static void prrn_work_fn(struct work_struct *work)
+{
+        /*
+         * For PRRN, we must pass the negative of the scope value in
+         * the RTAS event.
+         */
+        pseries_devicetree_update(-prrn_update_scope);
 }
 
+static DECLARE_WORK(prrn_work, prrn_work_fn);
+
+void prrn_schedule_update(u32 scope)
+{
+        flush_work(&prrn_work);
+        prrn_update_scope = scope;
+        schedule_work(&prrn_work);
+}
+
+static void handle_rtas_event(const struct rtas_error_log *log)
+{
+        if (log->type == RTAS_TYPE_PRRN) {
+                /* For PRRN Events the extended log length is used to denote
+                 * the scope for calling rtas update-nodes.
+                 */
+                if (prrn_is_enabled())
+                        prrn_schedule_update(log->extended_log_length);
+        }
+
+        return;
+}
+
+#else
+
+static void handle_rtas_event(const struct rtas_error_log *log)
+{
+        return;
+}
+
+#endif
+
 static int rtas_log_open(struct inode * inode, struct file * file)
 {
         return 0;
@@ -388,8 +433,10 @@ static void do_event_scan(void)
                         break;
                 }
 
-                if (error == 0)
+                if (error == 0) {
                         pSeries_log_error(logdata, ERR_TYPE_RTAS_LOG, 0);
+                        handle_rtas_event((struct rtas_error_log *)logdata);
+                }
 
         } while(error == 0);
 }