powerpc/pseries: Define MCE error event section.

On pseries, the machine check error details are part of RTAS extended
event log passed under Machine check exception section. This patch adds
the definition of rtas MCE event section and related helper
functions.

Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 71e393c46a4903d0d41e75fb30f68fb861af7efe..adefa6493d2923954d4d7953aff53c41d7c4899a 100644 (file)
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -185,6 +185,13 @@ static inline uint8_t rtas_error_disposition(const struct rtas_error_log *elog)
        return (elog->byte1 & 0x18) >> 3;
 }
 
+static inline
+void rtas_set_disposition_recovered(struct rtas_error_log *elog)
+{
+       elog->byte1 &= ~0x18;
+       elog->byte1 |= (RTAS_DISP_FULLY_RECOVERED << 3);
+}
+
 static inline uint8_t rtas_error_extended(const struct rtas_error_log *elog)
 {
        return (elog->byte1 & 0x04) >> 2;
@@ -275,6 +282,7 @@ inline uint32_t rtas_ext_event_company_id(struct rtas_ext_event_log_v6 *ext_log)
 #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')
+#define PSERIES_ELOG_SECT_ID_MCE               (('M' << 8) | 'C')
 
 /* Vendor specific Platform Event Log Format, Version 6, section header */
 struct pseries_errorlog {

diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 851ce326874a48f1d0cce77f5c89d73915cdc23d..3500ad9827066c23de16960ec60c0ed92ec3b024 100644 (file)
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -50,6 +50,101 @@ static irqreturn_t ras_hotplug_interrupt(int irq, void *dev_id);
 static irqreturn_t ras_epow_interrupt(int irq, void *dev_id);
 static irqreturn_t ras_error_interrupt(int irq, void *dev_id);
 
+/* RTAS pseries MCE errorlog section. */
+struct pseries_mc_errorlog {
+       __be32  fru_id;
+       __be32  proc_id;
+       u8      error_type;
+       /*
+        * sub_err_type (1 byte). Bit fields depends on error_type
+        *
+        *   MSB0
+        *   |
+        *   V
+        *   01234567
+        *   XXXXXXXX
+        *
+        * For error_type == MC_ERROR_TYPE_UE
+        *   XXXXXXXX
+        *   X          1: Permanent or Transient UE.
+        *    X         1: Effective address provided.
+        *     X        1: Logical address provided.
+        *      XX      2: Reserved.
+        *        XXX   3: Type of UE error.
+        *
+        * For error_type != MC_ERROR_TYPE_UE
+        *   XXXXXXXX
+        *   X          1: Effective address provided.
+        *    XXXXX     5: Reserved.
+        *         XX   2: Type of SLB/ERAT/TLB error.
+        */
+       u8      sub_err_type;
+       u8      reserved_1[6];
+       __be64  effective_address;
+       __be64  logical_address;
+} __packed;
+
+/* RTAS pseries MCE error types */
+#define MC_ERROR_TYPE_UE               0x00
+#define MC_ERROR_TYPE_SLB              0x01
+#define MC_ERROR_TYPE_ERAT             0x02
+#define MC_ERROR_TYPE_TLB              0x04
+#define MC_ERROR_TYPE_D_CACHE          0x05
+#define MC_ERROR_TYPE_I_CACHE          0x07
+
+/* RTAS pseries MCE error sub types */
+#define MC_ERROR_UE_INDETERMINATE              0
+#define MC_ERROR_UE_IFETCH                     1
+#define MC_ERROR_UE_PAGE_TABLE_WALK_IFETCH     2
+#define MC_ERROR_UE_LOAD_STORE                 3
+#define MC_ERROR_UE_PAGE_TABLE_WALK_LOAD_STORE 4
+
+#define MC_ERROR_SLB_PARITY            0
+#define MC_ERROR_SLB_MULTIHIT          1
+#define MC_ERROR_SLB_INDETERMINATE     2
+
+#define MC_ERROR_ERAT_PARITY           1
+#define MC_ERROR_ERAT_MULTIHIT         2
+#define MC_ERROR_ERAT_INDETERMINATE    3
+
+#define MC_ERROR_TLB_PARITY            1
+#define MC_ERROR_TLB_MULTIHIT          2
+#define MC_ERROR_TLB_INDETERMINATE     3
+
+static inline u8 rtas_mc_error_sub_type(const struct pseries_mc_errorlog *mlog)
+{
+       switch (mlog->error_type) {
+       case    MC_ERROR_TYPE_UE:
+               return (mlog->sub_err_type & 0x07);
+       case    MC_ERROR_TYPE_SLB:
+       case    MC_ERROR_TYPE_ERAT:
+       case    MC_ERROR_TYPE_TLB:
+               return (mlog->sub_err_type & 0x03);
+       default:
+               return 0;
+       }
+}
+
+static
+inline u64 rtas_mc_get_effective_addr(const struct pseries_mc_errorlog *mlog)
+{
+       __be64 addr = 0;
+
+       switch (mlog->error_type) {
+       case    MC_ERROR_TYPE_UE:
+               if (mlog->sub_err_type & 0x40)
+                       addr = mlog->effective_address;
+               break;
+       case    MC_ERROR_TYPE_SLB:
+       case    MC_ERROR_TYPE_ERAT:
+       case    MC_ERROR_TYPE_TLB:
+               if (mlog->sub_err_type & 0x80)
+                       addr = mlog->effective_address;
+       default:
+               break;
+       }
+       return be64_to_cpu(addr);
+}
 
 /*
  * Enable the hotplug interrupt late because processing them may touch other