IPMI Boot Watchdog Timer Updates for New AMI Level

Change-Id: I16e1ad1ad1acc31af8920be8becb599a73ce86ec
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15460
Tested-by: Jenkins Server
Reviewed-by: Elizabeth Liner <eliner@us.ibm.com>
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 11 insertions, 6 deletions

diff --git a/src/usr/ipmi/ipmiconfig.C b/src/usr/ipmi/ipmiconfig.C
index 5175b49a5..cdfb1167b 100644
--- a/src/usr/ipmi/ipmiconfig.C
+++ b/src/usr/ipmi/ipmiconfig.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -30,10 +30,10 @@
     // Information contained in the Get Interface Capabilities command
     //
     // Request to response time default, in seconds
-const uint8_t IPMI::g_bmc_timeout = 1;
+const uint8_t IPMI::g_bmc_timeout = 5;
 
     // Number of allowed outstanding requests default
-const uint8_t IPMI::g_outstanding_req = 0xff;
+const uint8_t IPMI::g_outstanding_req = 0x01;
 
     // The size of the BMC input buffer default (our write)
 const uint8_t IPMI::g_xmit_buffer_size = 0x40;
diff --git a/src/usr/ipmi/ipmirp.C b/src/usr/ipmi/ipmirp.C
index 9112fdabd..3e4141ad0 100644
--- a/src/usr/ipmi/ipmirp.C
+++ b/src/usr/ipmi/ipmirp.C
@@ -268,11 +268,16 @@ void IpmiRP::getInterfaceCapabilities(void)
 
         // Protect the members as we're on another thread.
         mutex_lock(&iv_mutex);
-
-        iv_outstanding_req = data[0];
+        // @TODO RTC:123041 - In theory the number of outstanding requests is
+        //       set via the response data below, but currently the response
+        //       value isn't correct so the default will be used.
+        //iv_outstanding_req = data[0];
         iv_xmit_buffer_size = data[1];
         iv_recv_buffer_size = data[2];
-        iv_bmc_timeout = data[3];
+        // @TODO RTC:123041 - In theory the BMC timeout is set via the response
+        //       data below, but currently the response value isn't correct so
+        //       the default will be used.
+        //iv_bmc_timeout = data[3];
         iv_retries = data[4];
 
         IPMI_TRAC("get_capabilities: requests %d, in buf %d, "