From 93c73a3eac40a47e40ff949acc6279e87d772d45 Mon Sep 17 00:00:00 2001 From: Prasad Bg Ranganath Date: Wed, 13 Dec 2017 10:15:16 -0600 Subject: Proc VPD:POUND W Version 3-F support This commit adds support for versions 3-F to use the #W version 2 format. If a new revision (0x10+) is added,this procedure will have to be updated 0x01 = supported 0x02-0x0F = supported with current version2 format 0x10 = next major revision, i.e. the next format change must jump up to 0x10 Change-Id: If2dbd1186bcb232bbfb780a45af5b6dbf7172fff Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50864 Tested-by: FSP CI Jenkins Reviewed-by: Michael S. Floyd Reviewed-by: Daniel M. Crowell Reviewed-by: RAHUL BATRA Tested-by: Jenkins Server Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50870 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW --- .../chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.C | 9 ++++++++- .../chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.H | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/import/chips') diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.C index 26b638489..40a2b03de 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.C @@ -99,12 +99,19 @@ fapi2::ReturnCode p9_pm_get_poundw_bucket_attr( //VDM Data for bucket 5: varies by version //#V Bucket ID #6: 0x1 byte //VDM Data for bucket 6: varies by version + + // Note on bucket versions + // Version 1 - orignal format + // Version 2-F - will all use version 2 format + // Version 0x10 - next major revision + if( *l_fullVpdData == POUNDW_VERSION_1) { //Set the size of the bucket l_bucketSize = POUNDW_BUCKETID_SIZE + PW_VER_1_VDMDATA_SIZE; } - else if( *l_fullVpdData == POUNDW_VERSION_2) + else if( (*l_fullVpdData >= POUNDW_VERSION_2) && + (*l_fullVpdData <= POUNDW_VERSION_F) ) { //Set the size of the bucket l_bucketSize = POUNDW_BUCKETID_SIZE + PW_VER_2_VDMDATA_SIZE; diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.H index b7f97caea..6e425ba3b 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.H +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_get_poundw_bucket_attr.H @@ -46,6 +46,7 @@ enum poundwBucketParms { POUNDW_VERSION_1 = 0x01, POUNDW_VERSION_2 = 0x02, + POUNDW_VERSION_F = 0x0F, POUNDW_VERSION_SIZE = 0x01, // version is uint8_t POUNDW_BUCKETID_SIZE = 0x01, // bucket ID is uint8_t PW_VER_1_VDMDATA_SIZE = 0x28, -- cgit v1.2.1