Gitiles
Code Review Sign In
gerrit.openbmc.org / premsjha / op-build / 9abc3a01c9d281c09a9bf51f89cdd1839ff76ec8 / . / openpower / package / hostboot / hostboot-0004-revert-OCC-v3.patch
blob: 5999ffc31a428ddd9158f5e38b104613f8580a79 [file] [log] [blame]
Matt Ploetz7e046132015-02-23 22:48:04 -0600[diff] [blame]1From 4619901bd09eccbe26d430195c4e8019f6993b0b Mon Sep 17 00:00:00 2001
2From: Matt Ploetz <maploetz@us.ibm.com>
3Date: Mon, 23 Feb 2015 17:09:14 -0600
4Subject: [PATCH] Revert "Set FIR master in HOMER config data"
5
6This reverts commit 84023756531d9c48d2e4939326f4048f2dadbe28.
7---
8 src/include/usr/hwpf/hwp/occ/occ_common.H | 27 ++----------------
9 src/usr/diag/HBconfig | 6 ----
10 src/usr/hwpf/hwp/occ/occ.C | 2 +-
11 src/usr/hwpf/hwp/occ/occ_common.C | 46 +++++++++++++++++++------------
12 src/usr/hwpf/hwp/occ/runtime/rt_occ.C | 2 +-
13 5 files changed, 33 insertions(+), 50 deletions(-)
14
15diff --git a/src/include/usr/hwpf/hwp/occ/occ_common.H b/src/include/usr/hwpf/hwp/occ/occ_common.H
16index 8245539..1886e51 100644
17--- a/src/include/usr/hwpf/hwp/occ/occ_common.H
18+++ b/src/include/usr/hwpf/hwp/occ/occ_common.H
19@@ -36,38 +36,19 @@ namespace HBOCC
20 struct occHostConfigDataArea_t
21 {
22 uint32_t version;
23-
24- //For computation of timebase frequency
25 uint32_t nestFrequency;
26-
27- // For determining the interrupt type to Host
28- // 0x00000000 = Use FSI2HOST Mailbox
29- // 0x00000001 = Use OCC interrupt line through PSIHB complex
30 uint32_t interruptType;
31-
32- // For informing OCC if it is the FIR master:
33- // 0x00000000 = Default
34- // 0x00000001 = FIR Master
35- uint32_t firMaster;
36-
37- // FIR collection configuration data needed by FIR Master
38- // OCC in the event of a checkstop
39- uint8_t firdataConfig[3072];
40 };
41
42 enum
43 {
44- OccHostDataVersion = 3,
45+ OccHostDataVersion = 2,
46 OCC_LIDID = 0x81e00430,
47 OCC_IBSCOM_RANGE_IN_MB = MEGABYTE,
48
49 // Interrupt Types
50 USE_FSI2HOST_MAILBOX = 0x00000000,
51- USE_PSIHB_COMPLEX = 0x00000001,
52-
53- // FIR Master
54- NOT_FIR_MASTER = 0x00000000,
55- IS_FIR_MASTER = 0x00000001
56+ USE_PSIHB_COMPLEX = 0x00000001
57 };
58
59 enum occAction_t
60@@ -78,15 +59,13 @@ namespace HBOCC
61 /**
62 * @brief Sets up OCC Host data
63 *
64- * @param[in] i_proc: target processor to load
65 * @param[in] i_occHostDataVirtAddr Virtual
66 * address of current
67 * proc's Host data area.
68 *
69 * @return errlHndl_t Error log Host data setup failed
70 */
71- errlHndl_t loadHostDataToHomer(TARGETING::Target* i_proc,
72- void* i_occHostDataVirtAddr);
73+ errlHndl_t loadHostDataToHomer(void* i_occHostDataVirtAddr);
74
75 /**
76 * @brief Execute procedures and steps required to load
77diff --git a/src/usr/diag/HBconfig b/src/usr/diag/HBconfig
78index 973cecd..a516133 100644
79--- a/src/usr/diag/HBconfig
80+++ b/src/usr/diag/HBconfig
81@@ -2,9 +2,3 @@ config HBRT_PRD
82 default n
83 help
84 Enable HBRT PRD.
85-
86-config ENABLE_CHECKSTOP_ANALYSIS
87- default n
88- help
89- Enable collection of FIR data by OCC for checkstops and
90- post-checkstop analysis by PRD on system reboot
91diff --git a/src/usr/hwpf/hwp/occ/occ.C b/src/usr/hwpf/hwp/occ/occ.C
92index ac2f4b1..f56c909 100644
93--- a/src/usr/hwpf/hwp/occ/occ.C
94+++ b/src/usr/hwpf/hwp/occ/occ.C
95@@ -133,7 +133,7 @@ namespace HBOCC
96 (i_homerVirtAddrBase) +
97 tmpOffset + HOMER_OFFSET_TO_OCC_HOST_DATA;
98 void* occHostVirt = reinterpret_cast<void*>(i_homerHostVirtAddr);
99- l_errl = HBOCC::loadHostDataToHomer(i_target,occHostVirt);
100+ l_errl = HBOCC::loadHostDataToHomer(occHostVirt);
101 if( l_errl != NULL )
102 {
103 TRACFCOMP( g_fapiImpTd, ERR_MRK"loading Host Data Area failed!" );
104diff --git a/src/usr/hwpf/hwp/occ/occ_common.C b/src/usr/hwpf/hwp/occ/occ_common.C
105index e444b26..97d36f4 100644
106--- a/src/usr/hwpf/hwp/occ/occ_common.C
107+++ b/src/usr/hwpf/hwp/occ/occ_common.C
108@@ -119,9 +119,14 @@ namespace HBOCC
109
110 /**
111 * @brief Sets up OCC Host data
112+ *
113+ * @param[in] i_occHostDataVirtAddr Virtual
114+ * address of current
115+ * proc's Host data area.
116+ *
117+ * @return errlHndl_t Error log Host data setup failed
118 */
119- errlHndl_t loadHostDataToHomer( TARGETING::Target* i_proc,
120- void* i_occHostDataVirtAddr)
121+ errlHndl_t loadHostDataToHomer(void* i_occHostDataVirtAddr)
122 {
123 TRACUCOMP( g_fapiTd,
124 ENTER_MRK"loadHostDataToHomer(%p)",
125@@ -156,22 +161,6 @@ namespace HBOCC
126 config_data->interruptType = USE_PSIHB_COMPLEX;
127 }
128
129-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
130- // Figure out the FIR master
131- TARGETING::Target* masterproc = NULL;
132- tS.masterProcChipTargetHandle( masterproc );
133- if( masterproc == i_proc )
134- {
135- config_data->firMaster = IS_FIR_MASTER;
136- }
137- else
138- {
139- config_data->firMaster = NOT_FIR_MASTER;
140- }
141-#else
142- config_data->firMaster = 0;
143-#endif
144-
145 TRACUCOMP( g_fapiTd,
146 EXIT_MRK"loadHostDataToHomer");
147
148@@ -181,6 +170,16 @@ namespace HBOCC
149 /**
150 * @brief Execute procedures and steps necessary
151 * to load OCC data in specified processor
152+ *
153+ * @param[in] i_target Target proc to load
154+ * @param[in] i_homerVirtAddrBase Virtual
155+ * address of current
156+ * proc's HOMER
157+ * @param[in] i_homerPhysAddrBase Physical
158+ * address of current
159+ * proc's HOMER
160+ *
161+ * @return errlHndl_t Error log image load failed
162 */
163 errlHndl_t loadOCC(TARGETING::Target* i_target,
164 uint64_t i_homerPhysAddr,
165@@ -300,6 +299,12 @@ namespace HBOCC
166 * @brief Start OCC for specified DCM pair of processors.
167 * If 2nd input is NULL, OCC will be setup on just
168 * one target.
169+ *
170+ * @param[in] i_target0: target of first processor in DCM pair
171+ * @param[in] i_target1: target of second processor in DCM pair
172+ * @param[out] o_failedTarget failed target in case of an error
173+ *
174+ * @return errlHndl_t Error log of startOCC failed
175 */
176 errlHndl_t startOCC (Target* i_target0,
177 Target* i_target1,
178@@ -418,6 +423,11 @@ namespace HBOCC
179 * @brief Stop OCC for specified DCM pair of processors.
180 * If 2nd input is NULL, OCC will be setup on just
181 * one target.
182+ *
183+ * @param[in] i_target0: target of first processor in DCM pair
184+ * @param[in] i_target1: target of second processor in DCM pair
185+ *
186+ * @return errlHndl_t Error log of stopOCC failed
187 */
188 errlHndl_t stopOCC(TARGETING::Target * i_target0,
189 TARGETING::Target * i_target1)
190diff --git a/src/usr/hwpf/hwp/occ/runtime/rt_occ.C b/src/usr/hwpf/hwp/occ/runtime/rt_occ.C
191index 1bc02a8..8583801 100644
192--- a/src/usr/hwpf/hwp/occ/runtime/rt_occ.C
193+++ b/src/usr/hwpf/hwp/occ/runtime/rt_occ.C
194@@ -179,7 +179,7 @@ namespace RT_OCC
195
196 void* occHostVirt = reinterpret_cast <void *> (i_homer_addr_va +
197 HOMER_OFFSET_TO_OCC_HOST_DATA);
198- err = HBOCC::loadHostDataToHomer(proc_target,occHostVirt);
199+ err = HBOCC::loadHostDataToHomer(occHostVirt);
200 if( err != NULL )
201 {
202 TRACFCOMP( g_fapiImpTd, ERR_MRK"loading Host Data Area failed!" );
203--
2041.8.2.2
205