Sensor errors flooding console on IPL

    -Delete error logs generated due to bad completion
     codes returne by the BMC in response to sensor commands
     for sensors which are non-existant. This is a temporary
     change until the SDR is finalized and sensor numbers are
     updated.

    -Add additional sensor numbers to genHwsvMrwXml.pl script
     to match the current SDR for BMC build level 1/23

Change-Id: Ia02a83876b6da1c3f2ab27118d9baa7698c28d30
RTC:123044
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15463
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 25 insertions, 13 deletions

diff --git a/src/usr/ipmi/ipmisensor.C b/src/usr/ipmi/ipmisensor.C
index d478869f3..4ee5bdc5d 100644
--- a/src/usr/ipmi/ipmisensor.C
+++ b/src/usr/ipmi/ipmisensor.C
@@ -173,22 +173,28 @@ namespace SENSOR
                     break;
                 }
             }
-            // shift the sensor number into to bytes 0-3 and then
-            // or in the HUID to bytes 4-7
-            uint64_t userdata2 = getSensorNumber();
 
-            userdata2 = (userdata2 << 32) | TARGETING::get_huid(iv_target);
+            // $TODO RTC:123045 - Remove when SDR is finalized
+            // for now we will not create an error for bad sensor
+            // numbers
+            if( i_rc != IPMI::CC_BADSENSOR )
+            {
+                // shift the sensor number into to bytes 0-3 and then
+                // or in the HUID to bytes 4-7
+                uint64_t userdata2 = getSensorNumber();
+
+                userdata2 = (userdata2 << 32) | TARGETING::get_huid(iv_target);
 
-            l_err = new ERRORLOG::ErrlEntry(
+                l_err = new ERRORLOG::ErrlEntry(
                                 ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                 IPMI::MOD_IPMISENSOR,
                                 l_reasonCode,
                                 i_rc, userdata2, true);
 
-            l_err->collectTrace(IPMI_COMP_NAME);
+                l_err->collectTrace(IPMI_COMP_NAME);
 
+            }
         }
-
         return l_err;
     }
 
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index e3176c443..bfa9fc93c 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -2186,10 +2186,10 @@ sub generate_sys
             0x0b00,0x09,  <!-- Power_Cap  -->
             0x0c00,0x06,  <!-- PCI -->
             0x0d00,0x00,  <!-- Boot_watchdog -->
-            0x0e00,0x85,  <!-- Reboot_Count -->
+            0x0e00,0x1d,  <!-- Boot_Count -->
             0x1000,0x82,  <!-- System_Event -->
             0x1010,0x83,  <!-- APSS Fault -->
-            0xFFFF,0xFF,
+            0xC615,0x88,  <!-- Activate Power Limit -->
             0xFFFF,0xFF,
             0xFFFF,0xFF,
             0xFFFF,0xFF,
@@ -3295,16 +3295,18 @@ sub generate_ex_core
     # call to do any fsp per-ex_core attributes
     do_plugin('fsp_ex_core', $proc, $ex, $ordinalId );
 
+    my $snbase=0x4d;
 
     # $TODO RTC:110399
     if( $haveFSPs == 0 )
     {
+     my $procsn = sprintf("0x%02X",($snbase+$ordinalId));
       print "\n<!-- IPMI Sensor numbers for Core status -->
     <attribute>
         <id>IPMI_SENSORS</id>
          <default>
              0x0100, 0x13, <!-- Temperature sensor -->
-             0x0500, 0x02, <!-- State sensor -->
+             0x0500, $procsn, <!-- State sensor -->
              0xFFFF, 0xFF,
              0xFFFF, 0xFF,
              0xFFFF, 0xFF,
@@ -4130,7 +4132,7 @@ sub generate_centaur
     <attribute>
         <id>IPMI_SENSORS</id>
         <default>
-            0x0100, 0x12,  <!-- Temperature sensor -->
+            0x0100, 0x0F,  <!-- Temperature sensor -->
             0x0500, 0x01,  <!-- State sensor -->
             0xFFFF, 0xFF,
             0xFFFF, 0xFF,
@@ -4448,12 +4450,16 @@ sub generate_is_dimm
         # $TODO RTC:110399
         if( $haveFSPs == 0 )
         {
+     my $snbase = 0x49;
+     my $sntbase = 0x10;
+     my $dimmsn = sprintf("0x%02X",($snbase+$dimmPos));
+     my $dimmtsn = sprintf("0x%02X",($sntbase+$dimmPos));
             print "\n<!-- IPMI Sensor numbers for DIMM status -->
     <attribute>
         <id>IPMI_SENSORS</id>
         <default>
-            0x0100, 0x13,  <!-- Temperature sensor -->
-            0x0500, 0x01,  <!-- State sensor -->
+            0x0100, $dimmtsn,  <!-- Temperature sensor -->
+            0x0500, $dimmsn,  <!-- State sensor -->
             0xFFFF, 0xFF,
             0xFFFF, 0xFF,
             0xFFFF, 0xFF,