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>

1 files changed, 13 insertions, 7 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;
     }