diff options
| -rw-r--r-- | src/usr/fapi2/test/fapi2GetVpdTest.H | 4 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 76 | ||||
| -rwxr-xr-x | src/usr/targeting/common/xmltohb/target_types.xml | 4 | ||||
| -rw-r--r-- | src/usr/vpd/dvpd.H | 10 | ||||
| -rw-r--r-- | src/usr/vpd/ipvpd.C | 4 | ||||
| -rw-r--r-- | src/usr/vpd/makefile | 2 | ||||
| -rwxr-xr-x | src/usr/vpd/test/dvpdtest.H | 4 |
7 files changed, 103 insertions, 1 deletions
diff --git a/src/usr/fapi2/test/fapi2GetVpdTest.H b/src/usr/fapi2/test/fapi2GetVpdTest.H index cfd560b28..a72acedbe 100644 --- a/src/usr/fapi2/test/fapi2GetVpdTest.H +++ b/src/usr/fapi2/test/fapi2GetVpdTest.H @@ -52,6 +52,10 @@ void testGetVPD(void) testDecode_MT(); testGetVPD_Override(); + + testGetVPD_DQ(); + + testGetVPD_CK(); } }; // GetVPDTest class diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 503614012..598edf1eb 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -10806,6 +10806,82 @@ DEPRECATED!!!! </hwpfToHbAttrMap> </attribute> +<attribute> + <id>VPD_OVERRIDE_DQ_ENABLE</id> + <description> + Set equal to 1 to activate the use of ATTR_VPD_OVERRIDE_DQ. + </description> + <simpleType> + <uint8_t> + </uint8_t> + </simpleType> + <persistency>volatile-zeroed</persistency> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_VPD_OVERRIDE_DQ_ENABLE</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<attribute> + <id>VPD_OVERRIDE_DQ</id> + <description> + Byte-for-byte override for the bucket of DQ data that would + normally come from VPD. If ATTR_VPD_OVERRIDE_DQ_ENABLE!=0 then + the value of this attribute will be returned to callers of + fapi2::getVPD() instead of the actual VPD contents. + </description> + <simpleType> + <uint8_t> + </uint8_t> + <array>160</array> + </simpleType> + <persistency>volatile-zeroed</persistency> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_VPD_OVERRIDE_DQ</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<attribute> + <id>VPD_OVERRIDE_CK_ENABLE</id> + <description> + Set equal to 1 to activate the use of ATTR_VPD_OVERRIDE_CK. + </description> + <simpleType> + <uint8_t> + </uint8_t> + </simpleType> + <persistency>volatile-zeroed</persistency> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_VPD_OVERRIDE_CK_ENABLE</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + +<attribute> + <id>VPD_OVERRIDE_CK</id> + <description> + Byte-for-byte override for the bucket of CK data that would + normally come from VPD. If ATTR_VPD_OVERRIDE_CK_ENABLE!=0 then + the value of this attribute will be returned to callers of + fapi2::getVPD() instead of the actual VPD contents. + </description> + <simpleType> + <uint8_t> + </uint8_t> + <array>16</array> + </simpleType> + <persistency>volatile-zeroed</persistency> + <readable/> + <hwpfToHbAttrMap> + <id>ATTR_VPD_OVERRIDE_CK</id> + <macro>DIRECT</macro> + </hwpfToHbAttrMap> +</attribute> + <!--TOOD RTC: 151938 Make sure that these are set up by parseMRW script--> <attribute> <id>MEMVPD_FREQS_MHZ</id> diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 1d6345ab6..768d6f5c0 100755 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -1786,6 +1786,10 @@ <attribute><id>VPD_OVERRIDE_MT_ENABLE</id></attribute> <attribute><id>VPD_OVERRIDE_MR</id></attribute> <attribute><id>VPD_OVERRIDE_MR_ENABLE</id></attribute> + <attribute><id>VPD_OVERRIDE_DQ</id></attribute> + <attribute><id>VPD_OVERRIDE_DQ_ENABLE</id></attribute> + <attribute><id>VPD_OVERRIDE_CK</id></attribute> + <attribute><id>VPD_OVERRIDE_CK_ENABLE</id></attribute> <attribute><id>MSS_VPD_MT_0_VERSION_LAYOUT</id></attribute> <attribute><id>MSS_VPD_MT_1_VERSION_DATA</id></attribute> <attribute><id>MSS_VPD_MT_2_SIGNATURE_HASH</id></attribute> diff --git a/src/usr/vpd/dvpd.H b/src/usr/vpd/dvpd.H index bd3185956..73279e844 100644 --- a/src/usr/vpd/dvpd.H +++ b/src/usr/vpd/dvpd.H @@ -194,6 +194,16 @@ namespace DVPD { XX, "XX" }, { XY, "XY" }, { XZ, "XZ" }, + { Q0, "Q0" }, + { Q1, "Q1" }, + { Q2, "Q2" }, + { Q3, "Q3" }, + { Q4, "Q4" }, + { Q5, "Q5" }, + { Q6, "Q6" }, + { Q7, "Q7" }, + { Q8, "Q8" }, + { CK, "CK" }, // ------------------------------------------------------------------- // DO NOT USE!! This is for test purposes ONLY! diff --git a/src/usr/vpd/ipvpd.C b/src/usr/vpd/ipvpd.C index 8067d24a5..4afe49ebe 100644 --- a/src/usr/vpd/ipvpd.C +++ b/src/usr/vpd/ipvpd.C @@ -149,6 +149,10 @@ errlHndl_t IpVpdFacade::read ( TARGETING::Target * i_target, break; } + TRACSCOMP( g_trac_vpd, + INFO_MRK"IpVpdFacade::read: Record offset for %s is 0x%.4x", + recordName, recordOffset ); + if(IPVPD::FULL_RECORD == i_args.keyword) { // full record diff --git a/src/usr/vpd/makefile b/src/usr/vpd/makefile index 0b58dfbee..edfa47803 100644 --- a/src/usr/vpd/makefile +++ b/src/usr/vpd/makefile @@ -50,6 +50,6 @@ BINARY_FILES += $(IMGDIR)/vpo_djvpd.dat:cb2c6de3ad46cdd53605d156e22c4bda8d637a42 BINARY_FILES += $(IMGDIR)/cvpd.dat:2e33352ca95279b992927336567adf960dca7d46 #Direct memory vpd -BINARY_FILES += $(IMGDIR)/dvpd.dat:be4cd7ff59c75151920d17c636612d27caf991b6 +BINARY_FILES += $(IMGDIR)/dvpd.dat:4f63863d997257549c0a754fab717b4cb03d779d include ${ROOTPATH}/config.mk diff --git a/src/usr/vpd/test/dvpdtest.H b/src/usr/vpd/test/dvpdtest.H index 30daedafa..e7c61cdd2 100755 --- a/src/usr/vpd/test/dvpdtest.H +++ b/src/usr/vpd/test/dvpdtest.H @@ -66,6 +66,10 @@ dvpdTestData dvpdData[] = { { DVPD::MEMD, DVPD::MR }, { DVPD::MEMD, DVPD::MT }, + { DVPD::MEMD, DVPD::Q0 }, + { DVPD::MEMD, DVPD::Q1 }, + { DVPD::MEMD, DVPD::Q8 }, + { DVPD::MEMD, DVPD::CK }, }; TARGETING::Target* getFunctionalMcsTarget() |
