diff options
author | crgeddes <crgeddes@us.ibm.com> | 2016-09-28 14:18:31 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-09-28 16:24:27 -0400 |
commit | 45d5477ac84685301735e5d920e0f5fb71e5b668 (patch) | |
tree | eb619d149bf657bcc5e0152a14d495fbd797fe4d /src | |
parent | 45f933043b60f95f577e697a34e66d149d2227a9 (diff) | |
download | blackbird-hostboot-45d5477ac84685301735e5d920e0f5fb71e5b668.tar.gz blackbird-hostboot-45d5477ac84685301735e5d920e0f5fb71e5b668.zip |
Update dvpd.dat file and the code that parses the vpd
We got an updated version of DVPD for p9 nimbus. The supported
frequencies changed so we had to update some verification code
to handle that
Change-Id: I3fd0ed943252d878f0dd7467aea163dad9866eff
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30429
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
-rwxr-xr-x | src/build/simics/hb-pnor-vpd-preload.pl | 5 | ||||
-rw-r--r-- | src/usr/fapi2/test/getVpdTest.C | 26 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml | 4 | ||||
-rw-r--r-- | src/usr/vpd/makefile | 2 |
4 files changed, 22 insertions, 15 deletions
diff --git a/src/build/simics/hb-pnor-vpd-preload.pl b/src/build/simics/hb-pnor-vpd-preload.pl index f82cca728..70fc244a7 100755 --- a/src/build/simics/hb-pnor-vpd-preload.pl +++ b/src/build/simics/hb-pnor-vpd-preload.pl @@ -353,6 +353,11 @@ sub createCVPDData system( "rm -rf $sysMemVPDFile" ); } + if( $procChipType eq "p9n") + { + $maxProcs = 2; + } + #Centaurs are populated based on populated Processors and special #MCS plugging rules. We can look at $procConfig and $maxProcs #to determine processor config. Centaur plugging is contained diff --git a/src/usr/fapi2/test/getVpdTest.C b/src/usr/fapi2/test/getVpdTest.C index 6005d2d0a..93f9bb524 100644 --- a/src/usr/fapi2/test/getVpdTest.C +++ b/src/usr/fapi2/test/getVpdTest.C @@ -204,7 +204,7 @@ void testDecode_MR(void) // set up VPDInfo fapi2::VPDInfo<fapi2::TARGET_TYPE_MCS> l_info(fapi2::MR); - l_info.iv_freq_mhz = 1866; // index = 0 + l_info.iv_freq_mhz = 2133; // index = 0 l_info.iv_rank_count_dimm_0 = 1; l_info.iv_rank_count_dimm_1 = 4; fapi2::ReturnCode l_rc = fapi2::FAPI2_RC_SUCCESS; @@ -287,7 +287,7 @@ void testDecode_MT(void) // set up VPDInfo fapi2::VPDInfo<fapi2::TARGET_TYPE_MCS> l_info(fapi2::MT); - l_info.iv_freq_mhz = 2667; //index 3 + l_info.iv_freq_mhz = 2400; //index 3 l_info.iv_rank_count_dimm_0 = 4; l_info.iv_rank_count_dimm_1 = 1; @@ -302,7 +302,7 @@ void testDecode_MT(void) // miss: mcs miss, pair match, freq match 0xfe,0xff,0xff,0xff,0xff,'2', // match: - 0x01,0x00,0x00,0x04,0x10,'3', // <-- should be this one + 0x01,0x00,0x00,0x04,0xFF,'3', // <-- should be this one // zero out rest 0}; @@ -367,7 +367,7 @@ void testGetVPD_MR(void) // set up VPDInfo // simics test data will return keyword J0 fapi2::VPDInfo<fapi2::TARGET_TYPE_MCS> l_info(fapi2::MR); - l_info.iv_freq_mhz = 1866; + l_info.iv_freq_mhz = 2133; l_info.iv_rank_count_dimm_0 = 1; l_info.iv_rank_count_dimm_1 = 4; @@ -416,16 +416,18 @@ void testGetVPD_MT(void) // set up VPDInfo // simics test data will return keyword X0 fapi2::VPDInfo<fapi2::TARGET_TYPE_MCS> l_info(fapi2::MT); - l_info.iv_freq_mhz = 2667; - l_info.iv_rank_count_dimm_0 = 4; - l_info.iv_rank_count_dimm_1 = 1; + l_info.iv_freq_mhz = 2400; + + l_info.iv_rank_count_dimm_0 = 2; + l_info.iv_rank_count_dimm_1 = 2; l_rc = testGetVPD(l_fapiTarget, - l_info, - fapi2::MT, - nullptr, //don't test data, just ability to access - numTests, - numFails); + l_info, + fapi2::MT, + nullptr, //don't test data, just ability to access + numTests, + numFails); + if(l_rc) { TS_FAIL ("testGetVPD MT:: testGetVPD decode failed"); diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml index a00e3d9ff..e3e056b67 100644 --- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml @@ -129,10 +129,10 @@ <attribute> <id>MEMVPD_FREQS_MHZ</id> <default> - 1866, 2133, 2400, - 2667, + 0, + 0 </default> </attribute> </targetInstance> diff --git a/src/usr/vpd/makefile b/src/usr/vpd/makefile index 76aedf0e5..af8525ae2 100644 --- a/src/usr/vpd/makefile +++ b/src/usr/vpd/makefile @@ -50,6 +50,6 @@ BINARY_FILES += $(IMGDIR)/vpo_djvpd.dat:9503ceac065b78f93b7ad3d987ff482802c40e8c BINARY_FILES += $(IMGDIR)/cvpd.dat:2e33352ca95279b992927336567adf960dca7d46 #Direct memory vpd -BINARY_FILES += $(IMGDIR)/dvpd.dat:4f63863d997257549c0a754fab717b4cb03d779d +BINARY_FILES += $(IMGDIR)/dvpd.dat:858e524da0da3bde7f802e42eb29218bcf974263 include ${ROOTPATH}/config.mk |