summaryrefslogtreecommitdiffstats
path: root/src/usr/pnor
diff options
context:
space:
mode:
authorAndrew Jeffery <andrewrj@au1.ibm.com>2018-10-15 14:50:54 +1030
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-10-15 16:11:03 -0500
commit95165ec1e1116f5675c8410f230ecce95af86c6d (patch)
tree77bf916f2256c57324e2d9f76fc8a97adfa19867 /src/usr/pnor
parent79549236b644e839dc672aaf5964add580c6caa4 (diff)
downloadtalos-hostboot-95165ec1e1116f5675c8410f230ecce95af86c6d.tar.gz
talos-hostboot-95165ec1e1116f5675c8410f230ecce95af86c6d.zip
Revert "sio: Add test for availability - LPC error tweak"
This reverts commit 627379aeaa27e30d66ebb0aecf218708d465162c, which incorrectly attempted to account for LPC errors during testing for SIO absence. The broken patch interprets the OPBM status as LPCHC status and expects an LPCHC SYNC Abnormal error, however as it's the OPBM status that indicates the error we never hit the LPCHC error path to populate the errl with the error RC expected by the SIO driver. Change-Id: Ib993d4a2b9b4e5018d9273a1c82f8b5c21ec9a25 Signed-off-by: Andrew Jeffery <andrewrj@au1.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67459 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/pnor')
-rw-r--r--src/usr/pnor/ast_mboxdd.C5
-rw-r--r--src/usr/pnor/sfc_ast2400.C7
-rw-r--r--src/usr/pnor/sfc_ast2500.C5
3 files changed, 1 insertions, 16 deletions
diff --git a/src/usr/pnor/ast_mboxdd.C b/src/usr/pnor/ast_mboxdd.C
index 5b6e58300..b7504e934 100644
--- a/src/usr/pnor/ast_mboxdd.C
+++ b/src/usr/pnor/ast_mboxdd.C
@@ -365,11 +365,6 @@ errlHndl_t astMbox::initializeMbox(void)
do
{
- // The BMC may have disabled SIO access, but there's not much point in
- // testing whether it's available as there's no alternative action if
- // it is not. Instead, just try the SIO accesses and bail out with the
- // errl if they fail.
-
//First disable SIO Mailbox engine to configure it
// 0x30 - Enable/Disable Reg
l_data = SIO::DISABLE_DEVICE;
diff --git a/src/usr/pnor/sfc_ast2400.C b/src/usr/pnor/sfc_ast2400.C
index aa0e2bb07..e8e612efa 100644
--- a/src/usr/pnor/sfc_ast2400.C
+++ b/src/usr/pnor/sfc_ast2400.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2018 */
+/* Contributors Listed Below - COPYRIGHT 2014,2016 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
@@ -95,11 +95,6 @@ errlHndl_t SfcAST2400::hwInit( )
uint32_t l_lpc_addr;
do
{
- // The BMC may have disabled SIO access, but there's not much point in
- // testing whether it's available as there's no alternative action if
- // it is not. Instead, just try the SIO accesses and bail out with the
- // errl if they fail.
-
/* Enable device 0x0D*/
uint8_t l_data = SIO::ENABLE_DEVICE;
size_t l_len = sizeof(l_data);
diff --git a/src/usr/pnor/sfc_ast2500.C b/src/usr/pnor/sfc_ast2500.C
index 9f4d88ae1..39465f9b2 100644
--- a/src/usr/pnor/sfc_ast2500.C
+++ b/src/usr/pnor/sfc_ast2500.C
@@ -94,11 +94,6 @@ errlHndl_t SfcAST2500::hwInit( )
uint32_t l_lpc_addr;
do
{
- // The BMC may have disabled SIO access, but there's not much point in
- // testing whether it's available as there's no alternative action if
- // it is not. Instead, just try the SIO accesses and bail out with the
- // errl if they fail.
-
/* Enable device 0x0D*/
uint8_t l_data = SIO::ENABLE_DEVICE;
size_t l_len = sizeof(l_data);
OpenPOWER on IntegriCloud