summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorMark Wenning <wenning@us.ibm.com>2012-09-18 13:42:55 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2012-11-07 12:08:57 -0600
commitb23d4daee35dfc8761aecc86ade077be1bcac548 (patch)
treeaf9d0bae4e63f21b6d098492e73f9b7b8d09be6b /src/include
parent899d62da619d299b0869c8e2b8c7b416985243af (diff)
downloadtalos-hostboot-b23d4daee35dfc8761aecc86ade077be1bcac548.tar.gz
talos-hostboot-b23d4daee35dfc8761aecc86ade077be1bcac548.zip
pore_gen_cpureg
Change-Id: Ic5cb0817118bf0de7d706124708e5b8551ba4258 RTC: 41425 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1899 Tested-by: Jenkins Server Reviewed-by: Van H. Lee <vanlee@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/kernel/cpumgr.H8
-rw-r--r--src/include/usr/hwpf/istepreasoncodes.H3
-rw-r--r--src/include/usr/isteps/istep15list.H10
3 files changed, 18 insertions, 3 deletions
diff --git a/src/include/kernel/cpumgr.H b/src/include/kernel/cpumgr.H
index e5015feef..3d9fd2e02 100644
--- a/src/include/kernel/cpumgr.H
+++ b/src/include/kernel/cpumgr.H
@@ -149,17 +149,19 @@ class CpuManager
*
* bit 0 - 64 bit mode.
* bit 3 - Hypervisor mode.
+ * bit 51 - Machine-check enable
*/
- static const uint64_t WAKEUP_MSR_VALUE = 0x9000000000000000;
+ static const uint64_t WAKEUP_MSR_VALUE = 0x9000000000001000;
/** Desired value for LPCR after wakeup.
*
* bit 49 - Wake-up from external interrupt.
* bit 50 - Wake-up from decrementer.
* bit 51 - Wake-up from machine check.
- * bit 60, 61 - LPES(0,1) = 1 (see ISA).
+ * bit 60 - LPES(0) = 1 (see ISA).
+ * bit 61 - LPES(1) = 0 (P8 RFC02204 forces to 0)
*/
- static const uint64_t WAKEUP_LPCR_VALUE = 0x000000000000700C;
+ static const uint64_t WAKEUP_LPCR_VALUE = 0x0000000000007008;
protected:
CpuManager();
diff --git a/src/include/usr/hwpf/istepreasoncodes.H b/src/include/usr/hwpf/istepreasoncodes.H
index 72e852827..6ff163c6a 100644
--- a/src/include/usr/hwpf/istepreasoncodes.H
+++ b/src/include/usr/hwpf/istepreasoncodes.H
@@ -94,6 +94,7 @@ enum istepModuleId
ISTEP_PROC_FAB_IOVALID_EROR = 0x2d,
ISTEP_LOAD_PORE_IMAGE = 0x2e,
ISTEP_APPLY_PORE_GEN_CPU_REGS = 0x2f,
+ ISTEP_PROC_PORESLW_INIT = 0x30,
};
/**
@@ -126,6 +127,8 @@ enum istepReasonCode
ISTEP_STEP_NINETEEN = ISTEP_COMP_ID | 0x13,
ISTEP_LOAD_PAYLOAD_FAILED = ISTEP_COMP_ID | 0x14,
ISTEP_START_PAYLOAD_FAILED = ISTEP_COMP_ID | 0x15,
+ ISTEP_RESET_PORE_BARS_FAILED = ISTEP_COMP_ID | 0x16,
+ ISTEP_P8_PORESLW_INIT_FAILED = ISTEP_COMP_ID | 0x17,
}; // end ISTEP
}
diff --git a/src/include/usr/isteps/istep15list.H b/src/include/usr/isteps/istep15list.H
index d50e48cec..a64579dbc 100644
--- a/src/include/usr/isteps/istep15list.H
+++ b/src/include/usr/isteps/istep15list.H
@@ -34,6 +34,8 @@
* : Build runtime winkle images
* 15.2 proc_set_pore_bar
* : Tell SLW Eng where winkle image is
+ * 15.3 proc_poreslw_init
+ * : Initialize the PORE-SLW engine
*
* *****************************************************************
* THIS FILE WAS GENERATED ON 2012-04-12:1228
@@ -83,6 +85,14 @@ namespace INITSERVICE
}
},
+ {
+ ISTEPNAME(15,03,"proc_poreslw_init"),
+ BUILD_WINKLE_IMAGES::call_proc_poreslw_init,
+ {
+ START_FN,
+ EXT_IMAGE,
+ }
+ },
// END OF LIST!
};
OpenPOWER on IntegriCloud