diff options
| -rw-r--r-- | src/sbefw/sbeSpMsg.H | 1 | ||||
| -rw-r--r-- | src/sbefw/sbecmdgeneric.C | 9 | ||||
| -rwxr-xr-x | src/test/testcases/testGetCapabilities.py | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/sbefw/sbeSpMsg.H b/src/sbefw/sbeSpMsg.H index 78b6e168..65308ff1 100644 --- a/src/sbefw/sbeSpMsg.H +++ b/src/sbefw/sbeSpMsg.H @@ -453,6 +453,7 @@ typedef struct sbeCapabilityRespMsg uint32_t verMajor:16; uint32_t verMinor:16; uint32_t fwCommitId; + char buildTag[20]; uint32_t capability[SBE_MAX_CAPABILITIES]; // ctor. constructor will initialise all values. sbeCapabilityRespMsg(); diff --git a/src/sbefw/sbecmdgeneric.C b/src/sbefw/sbecmdgeneric.C index e9bf8a47..8d9b324c 100644 --- a/src/sbefw/sbecmdgeneric.C +++ b/src/sbefw/sbecmdgeneric.C @@ -41,8 +41,10 @@ #include "sbeHostMsg.H" #include "sbeHostUtils.H" #include "sbeglobals.H" +#include "sbeXipUtils.H" #include "fapi2.H" +//#include "p9_xip_image.h" using namespace fapi2; @@ -52,6 +54,13 @@ sbeCapabilityRespMsg::sbeCapabilityRespMsg() verMajor= SBE_FW_MAJOR_VERSION; verMinor = SBE_FW_MINOR_VERSION; fwCommitId = SBE_COMMIT_ID; + // Get hbbl section + P9XipHeader *hdr = getXipHdr(); + for(uint32_t idx=0; idx<sizeof(hdr->iv_buildTag); idx++) + { + buildTag[idx] = hdr->iv_buildTag[idx]; + } + // We can remove this for llop once all capabilities // are supported for(uint32_t idx = 0; idx < SBE_MAX_CAPABILITIES; idx++ ) diff --git a/src/test/testcases/testGetCapabilities.py b/src/test/testcases/testGetCapabilities.py index b8760eea..a01975c2 100755 --- a/src/test/testcases/testGetCapabilities.py +++ b/src/test/testcases/testGetCapabilities.py @@ -5,7 +5,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -61,9 +61,9 @@ def main( ): testUtil.runCycles( 10000000 ) testUtil.writeUsFifo( TESTDATA ) testUtil.writeEot( ) - # Ignore first two enteries ( major number, minor number - # and fw version) as they will keep on changing - testUtil.readDsEntry( 2 ) + # Ignore first 7 enteries ( major number, minor number + # and fw version & tag) as they will keep on changing + testUtil.readDsEntry( 7 ) testUtil.readDsFifo( EXPDATA1 ) testUtil.readDsFifo( EXPDATA2 ) testUtil.readDsFifo( EXPDATA3 ) |
