From ae7fd02c211501aa83e81e9593c28017633da629 Mon Sep 17 00:00:00 2001 From: Matthew Raybuck Date: Tue, 14 May 2019 14:32:05 -0500 Subject: Refactor keyword support for various DIMM types The existing keyword logic didn't use bitmasking when searching for the correct keyword entry. This commit refactors the code to allow for bitmasking and changing the NA module specific keyword to mean that no keyword was found for the given target rather than its previous ambiguous meaning that could be confused with the ALL module specific keyword. Change-Id: I661b70c4eff2740911cd63f8c1042ee8a084d63a RTC:203788 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77357 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Christian R. Geddes Reviewed-by: Michael Baiocchi Reviewed-by: Glenn Miles Reviewed-by: Daniel M. Crowell --- src/include/usr/vpd/spdenums.H | 4 +--- src/include/usr/vpd/vpdreasoncodes.H | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src/include') diff --git a/src/include/usr/vpd/spdenums.H b/src/include/usr/vpd/spdenums.H index 87606349c..a6577ed12 100644 --- a/src/include/usr/vpd/spdenums.H +++ b/src/include/usr/vpd/spdenums.H @@ -341,9 +341,7 @@ enum LRMM_ODT_RTT_PARK_2400_3200 = SPD_FIRST_MOD_SPEC | 0xb2, RMM_CRC = SPD_FIRST_MOD_SPEC | 0xb3, LRMM_CRC = SPD_FIRST_MOD_SPEC | 0xb4, - OCMB_MODULE_PART_NUMBER = SPD_FIRST_MOD_SPEC | 0xb5, - OCMB_MODULE_SERIAL_NUMBER = SPD_FIRST_MOD_SPEC | 0xb6, - SPD_LAST_MOD_SPEC = SPD_FIRST_MOD_SPEC | 0xb7, + SPD_LAST_MOD_SPEC = SPD_FIRST_MOD_SPEC | 0xb5, // This keyword should be last in the list // Invalid Keyword diff --git a/src/include/usr/vpd/vpdreasoncodes.H b/src/include/usr/vpd/vpdreasoncodes.H index e4336c9f8..8d9d6943b 100644 --- a/src/include/usr/vpd/vpdreasoncodes.H +++ b/src/include/usr/vpd/vpdreasoncodes.H @@ -125,10 +125,10 @@ enum vpdReasonCode VPD_MEMTYPE_NOT_SUPPORTED = VPD_COMP_ID | 0x0A, VPD_KEYWORD_NOT_WRITABLE = VPD_COMP_ID | 0x0B, VPD_NOT_SUPPORTED = VPD_COMP_ID | 0x0C, - VPD_MOD_SPECIFIC_MISMATCH_UMM = VPD_COMP_ID | 0x0D, - VPD_MOD_SPECIFIC_MISMATCH_RMM = VPD_COMP_ID | 0x0E, - VPD_MOD_SPECIFIC_MISMATCH_CMM = VPD_COMP_ID | 0x0F, - VPD_MOD_SPECIFIC_MISMATCH_LRMM = VPD_COMP_ID | 0x10, + VPD_MOD_SPECIFIC_MISMATCH_UMM = VPD_COMP_ID | 0x0D, // Deprecated + VPD_MOD_SPECIFIC_MISMATCH_RMM = VPD_COMP_ID | 0x0E, // Deprecated + VPD_MOD_SPECIFIC_MISMATCH_CMM = VPD_COMP_ID | 0x0F, // Deprecated + VPD_MOD_SPECIFIC_MISMATCH_LRMM = VPD_COMP_ID | 0x10, // Deprecated VPD_MOD_SPECIFIC_UNSUPPORTED = VPD_COMP_ID | 0x11, VPD_SIZE_MISMATCH = VPD_COMP_ID | 0x12, VPD_INVALID_WRITE_METHOD = VPD_COMP_ID | 0x13, @@ -158,7 +158,7 @@ enum vpdReasonCode VPD_BAD_REC_NUM = VPD_COMP_ID | 0x3e, VPD_INVALID_MASTER_I2C_PATH = VPD_COMP_ID | 0x3f, VPD_NULL_I2C_MASTER = VPD_COMP_ID | 0x40, - VPD_MOD_SPECIFIC_MISMATCH_DDIMM = VPD_COMP_ID | 0x41, + VPD_INVALID_EEPROM_CONTENT_TYPE = VPD_COMP_ID | 0x41, }; -- cgit v1.2.3