diff options
| author | Mike Baiocchi <mbaiocch@us.ibm.com> | 2017-08-17 08:25:25 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-22 11:23:39 -0400 |
| commit | 16e8d675a6e36b7c4b21350377eb0a9e820bf86e (patch) | |
| tree | 875c759b43fcb96c29f866b10b0da87ceea0c3a3 /src | |
| parent | 79533c5c0ffa43b2bf6d7b2684d21959c1078d67 (diff) | |
| download | talos-hostboot-16e8d675a6e36b7c4b21350377eb0a9e820bf86e.tar.gz talos-hostboot-16e8d675a6e36b7c4b21350377eb0a9e820bf86e.zip | |
Update TPM_REQUIRED "SENSOR_NAME" Attribute Enum
Change-Id: If38b03348f19d255f551b75876a12fb3f3062757
RTC:173353
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44884
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/secureboot/trusted/trustedboot.C | 4 | ||||
| -rwxr-xr-x | src/usr/targeting/common/xmltohb/attribute_types_hb.xml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/usr/secureboot/trusted/trustedboot.C b/src/usr/secureboot/trusted/trustedboot.C index 083fc0859..93ba27ed8 100644 --- a/src/usr/secureboot/trusted/trustedboot.C +++ b/src/usr/secureboot/trusted/trustedboot.C @@ -1399,6 +1399,7 @@ bool getTpmRequiredSensorValue(bool& o_isTpmRequired) SENSOR::getSensorReadingData tpmRequiredData; SENSOR::SensorBase tpmRequired(TARGETING::SENSOR_NAME_TPM_REQUIRED, pTopLevel); + errlHndl_t err = tpmRequired.readSensorData(tpmRequiredData); if (nullptr == err) { @@ -1418,7 +1419,8 @@ bool getTpmRequiredSensorValue(bool& o_isTpmRequired) // error reading sensor, so consider sensor not available TRACFCOMP( g_trac_trustedboot,ERR_MRK"getTpmRequiredSensorValue: " "Unable to read Tpm Required Sensor: rc = 0x%04X " - "(sensorNum=0x%X, enum=0x%X) Deleting Error plid=0x%04X", + "(sensorNum=0x%X, enum=0x%X) Deleting Error plid=0x%04X." + " Considering Sensor NOT required", err->reasonCode(), sensorNum, TARGETING::SENSOR_NAME_TPM_REQUIRED, err->plid()); diff --git a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml index c711dbc93..5d63a077a 100755 --- a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml @@ -436,7 +436,7 @@ <id>SENSOR_NAME</id> <description>Enumeration indicating the IPMI sensor name, which will be used by hostboot when determining the sensor number to return. - he sensor name consists of one byte of sensor type plus one byte of + The sensor name consists of one byte of sensor type plus one byte of sub-type, to differentiate similar sensors under the same target. Our implementaion uses the IPMI defined entity ID as the sub-type. </description> @@ -546,7 +546,7 @@ </enumerator> <enumerator> <name>TPM_REQUIRED</name> - <value>0xFFFF</value> + <value>0xCC03</value> </enumerator> </enumerationType> <attribute> |
