pnor: Introduce an IPMI-based PNOR driver implementation

Similar to the AST MBOX implementation, the IPMI PNOR implementation negotiates the layout of the LPC FW space with the BMC, but using IPMI rather than the AST mailbox as a protocol transport. The same protocol is still used and has simply been adapted to the new interface. Note that currently the change of transport has had a 2-3x impact on boot performance. Optimisation is an ongoing effort. Change-Id: I7f838f5b5e88ac877a725386a33df58ee5e7213c Signed-off-by: Andrew Jeffery <andrewrj@au1.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/65942 Tested-by: Jenkins Server <pfd-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>
open-power · Oct 10, 2018 · c829113 · c829113
1 parent 4874662
commit c829113
Show file tree

Hide file tree

Showing 11 changed files with 1,270 additions and 21 deletions.
diff --git a/src/include/usr/ipmi/ipmiif.H b/src/include/usr/ipmi/ipmiif.H
@@ -291,6 +291,9 @@ namespace IPMI
     inline const command_t pnor_response(void)
     { return std::make_pair(NETFUN_IBM, 0x08); }
 
+    inline const command_t hiomap_event(void)
+    { return std::make_pair(NETFUN_IBM, 0x0f); }
+
     // $TODO RTC:123256 - need to add code to get dcmi capabilities
     // This is a dcmi message used to request the
     // user defined power limit from the BMC.
@@ -307,6 +310,10 @@ namespace IPMI
     inline const command_t test_drop(void)
     { return std::make_pair(NETFUN_APP, 0x3e); }
 
+    // IPMI PNOR
+    inline const command_t pnor_hiomap_request(void)
+    { return std::make_pair(NETFUN_IBM, 0x5a); }
+
     /**
      * Send message asynchronously
      * @param[in] i_cmd, the network function and command

diff --git a/src/include/usr/pnor/pnor_reasoncodes.H b/src/include/usr/pnor/pnor_reasoncodes.H
@@ -112,6 +112,9 @@ namespace PNOR
 
         // ast_mboxdd.C
         MOD_ASTMBOXDD_DO_MESSAGE        = 0xE0, /**< astMbox::doMessage */
+
+        // pnor_ipmidd.C
+        MOD_IPMIPNORDD_SEND_MESSAGE     = 0xF0, /**< PnorDD::sendMessage */
     };
 
     enum PNORReasonCode
@@ -177,8 +180,8 @@ namespace PNOR
         RC_BASE_EXT_MISMATCH         = PNOR_COMP_ID | 0x2F,
         RC_KEY_TRAN_FLAG_UNSET       = PNOR_COMP_ID | 0x30,
         RC_BAD_SECURE_MAGIC_NUM      = PNOR_COMP_ID | 0x31,
-        RC_MBOX_BAD_SEQUENCE         = PNOR_COMP_ID | 0x32,
-        RC_MBOX_ERROR_STATUS         = PNOR_COMP_ID | 0x33,
+        RC_HIOMAP_BAD_SEQUENCE       = PNOR_COMP_ID | 0x32,
+        RC_HIOMAP_ERROR_STATUS       = PNOR_COMP_ID | 0x33,
         RC_UNSIGNED_PNOR_SECTION     = PNOR_COMP_ID | 0x34,
         RC_NOT_A_LOADED_SECTION      = PNOR_COMP_ID | 0x35,
         RC_NOT_A_SUPPORTED_SECTION   = PNOR_COMP_ID | 0x36,

diff --git a/src/usr/ipmibase/ipmirp.C b/src/usr/ipmibase/ipmirp.C
@@ -598,23 +598,31 @@ void IpmiRP::execute(void)
             // bottom of this loop will start the transmit process.
             // Be sure to push_back to ensure ordering of transmission.
         case IPMI::MSG_STATE_SEND:
-            if (!l_shutdown_pending)
+        {
+            IPMI::Message* l_ipmi_msg =
+                static_cast<IPMI::Message*>(msg->extra_data);
+            const IPMI::command_t l_pnor = IPMI::pnor_hiomap_request();
+            bool l_is_pnor = (l_ipmi_msg->iv_netfun == l_pnor.first &&
+                              l_ipmi_msg->iv_cmd == l_pnor.second);
+            IPMI_TRAC(WARN_MRK "Got message (0x%x:0x%x): l_is_pnor: %d",
+                      l_ipmi_msg->iv_netfun, l_ipmi_msg->iv_cmd, l_is_pnor);
+            /* PNOR requests always allowed, else we hang shutdown */
+            if (!l_shutdown_pending || l_is_pnor)
             {
                 iv_sendq.push_back(msg);
             }
             // shutting down, do not accept new messages
             else
             {
                 IPMI_TRAC(WARN_MRK "IPMI shutdown pending. Message dropped");
-                IPMI::Message* ipmi_msg =
-                    static_cast<IPMI::Message*>(msg->extra_data);
-                response(ipmi_msg, IPMI::CC_BADSTATE);
+                response(l_ipmi_msg, IPMI::CC_BADSTATE);
                 msg_free(msg);
             }
             break;
 
             // State changes from the IPMI hardware. These are async
             // messages so we get rid of them here.
+        }
         case IPMI::MSG_STATE_IDLE:
             msg_free(msg);
             // No-op - we do it at the bottom of the loop.

diff --git a/src/usr/pnor/HBconfig b/src/usr/pnor/HBconfig
@@ -1,15 +1,21 @@
 config PNORDD_IS_SFC
     default y
-    depends on !PNORDD_IS_BMCMBOX
+    depends on !PNORDD_IS_BMCMBOX && !PNORDD_IS_IPMI
     help
         The Serial Flash Controller is based on the SFC backends
 
 config PNORDD_IS_BMCMBOX
     default n
-    depends on !PNORDD_IS_SFC
+    depends on !PNORDD_IS_SFC && !PNORDD_IS_IPMI
     help
         The Serial Flash Controller is using the MBOX BMC protocol
 
+config PNORDD_IS_IPMI
+    default n
+    depends on !PNORDD_IS_SFC && !PNORDD_IS_BMCMBOX
+    help
+        The Serial Flash Controller is managed via IPMI
+
 config SFC_IS_IBM_DPSS
     default n
     depends on !SFC_IS_AST2400 && !SFC_IS_FAKE && !SFC_IS_AST2500 && PNORDD_IS_SFC

diff --git a/src/usr/pnor/ast_mboxdd.C b/src/usr/pnor/ast_mboxdd.C
@@ -241,7 +241,7 @@ errlHndl_t astMbox::doMessage(mboxMessage& io_msg)
             /*@
              * @errortype
              * @moduleid     PNOR::MOD_ASTMBOXDD_DO_MESSAGE
-             * @reasoncode   PNOR::RC_MBOX_BAD_SEQUENCE
+             * @reasoncode   PNOR::RC_HIOMAP_BAD_SEQUENCE
              * @userdata1[48:55] mbox status 1 reg
              * @userdata1[56:63] mbox flag reg
              * @userdata2[32:39] original command code
@@ -254,7 +254,7 @@ errlHndl_t astMbox::doMessage(mboxMessage& io_msg)
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             PNOR::MOD_ASTMBOXDD_DO_MESSAGE,
-                                            PNOR::RC_MBOX_BAD_SEQUENCE,
+                                            PNOR::RC_HIOMAP_BAD_SEQUENCE,
                                           TWO_UINT8_TO_UINT16(l_stat1, l_flags),
                                             FOUR_UINT8_TO_UINT32(old_cmd,
                                                     io_msg.iv_cmd,
@@ -282,7 +282,7 @@ errlHndl_t astMbox::doMessage(mboxMessage& io_msg)
             /*@
              * @errortype
              * @moduleid     PNOR::MOD_ASTMBOXDD_DO_MESSAGE
-             * @reasoncode   PNOR::RC_MBOX_ERROR_STATUS
+             * @reasoncode   PNOR::RC_HIOMAP_ERROR_STATUS
              * @userdata1[48:55] mbox status 1 reg
              * @userdata1[56:63] mbox flag reg
              * @userdata2[32:39] original command code
@@ -295,7 +295,7 @@ errlHndl_t astMbox::doMessage(mboxMessage& io_msg)
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             PNOR::MOD_ASTMBOXDD_DO_MESSAGE,
-                                            PNOR::RC_MBOX_ERROR_STATUS,
+                                            PNOR::RC_HIOMAP_ERROR_STATUS,
                                           TWO_UINT8_TO_UINT16(l_stat1, l_flags),
                                             FOUR_UINT8_TO_UINT32(old_cmd,
                                                     io_msg.iv_cmd,

diff --git a/src/usr/pnor/makefile b/src/usr/pnor/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2017
+# Contributors Listed Below - COPYRIGHT 2011,2018
 # [+] Google Inc.
 # [+] International Business Machines Corp.
 #
@@ -33,6 +33,7 @@ OBJS += $(if $(CONFIG_SECUREBOOT),spnorrp.o)
 OBJS += $(if $(CONFIG_PNORDD_IS_SFC),pnordd.o)
 OBJS += $(if $(CONFIG_PNORDD_IS_BMCMBOX),ast_mboxdd.o)
 OBJS += $(if $(CONFIG_PNORDD_IS_BMCMBOX),pnor_mboxdd.o)
+OBJS += $(if $(CONFIG_PNORDD_IS_IPMI),pnor_ipmidd.o)
 OBJS += pnor_common.o
 OBJS += pnorvalid.o
 OBJS += ecc.o