Merge branch 'next-dlpar' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next

Merge series from Nathan Fontenot to do memory hotplug in the kernel.

1 files changed, 26 insertions, 0 deletions

diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 398106f12617..7a4ede16b283 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -274,6 +274,7 @@ inline uint32_t rtas_ext_event_company_id(struct rtas_ext_event_log_v6 *ext_log)
 #define PSERIES_ELOG_SECT_ID_MANUFACT_INFO      (('M' << 8) | 'I')
 #define PSERIES_ELOG_SECT_ID_CALL_HOME          (('C' << 8) | 'H')
 #define PSERIES_ELOG_SECT_ID_USER_DEF           (('U' << 8) | 'D')
+#define PSERIES_ELOG_SECT_ID_HOTPLUG            (('H' << 8) | 'P')
 
 /* Vendor specific Platform Event Log Format, Version 6, section header */
 struct pseries_errorlog {
@@ -297,6 +298,31 @@ inline uint16_t pseries_errorlog_length(struct pseries_errorlog *sect)
         return be16_to_cpu(sect->length);
 }
 
+/* RTAS pseries hotplug errorlog section */
+struct pseries_hp_errorlog {
+        u8      resource;
+        u8      action;
+        u8      id_type;
+        u8      reserved;
+        union {
+                __be32  drc_index;
+                __be32  drc_count;
+                char    drc_name[1];
+        } _drc_u;
+};
+
+#define PSERIES_HP_ELOG_RESOURCE_CPU    1
+#define PSERIES_HP_ELOG_RESOURCE_MEM    2
+#define PSERIES_HP_ELOG_RESOURCE_SLOT   3
+#define PSERIES_HP_ELOG_RESOURCE_PHB    4
+
+#define PSERIES_HP_ELOG_ACTION_ADD      1
+#define PSERIES_HP_ELOG_ACTION_REMOVE   2
+
+#define PSERIES_HP_ELOG_ID_DRC_NAME     1
+#define PSERIES_HP_ELOG_ID_DRC_INDEX    2
+#define PSERIES_HP_ELOG_ID_DRC_COUNT    3
+
 struct pseries_errorlog *get_pseries_errorlog(struct rtas_error_log *log,
                                               uint16_t section_id);