Fix to update DIMM location correctly when PMTT table is missing.

Signed-off-by: Sandesh Shetty <[email protected]>
intel · Mar 3, 2020 · e8977d7 · e8977d7
1 parent 4e6f359
commit e8977d7
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/DcpmPkg/driver/Utils/PlatformConfigData.c b/DcpmPkg/driver/Utils/PlatformConfigData.c
@@ -307,21 +307,21 @@ GeneratePcdConfInput(
         pIdentInfo->DimmLocation.AsUint64 = 0;
         // Update the DIMM location field
         pPmttModuleInfo = GetDimmModuleByPidFromPmtt(pDimm->pRegionsGoal[Index]->pDimms[Index2]->DimmID, gNvmDimmData->PMEMDev.pPmttHead);
-        if (pPmttModuleInfo == NULL) {
-          NVDIMM_ERR("DIMM Module with pid: %d not found in PMTT", pDimm->DimmID);
-          pIdentInfo->DimmLocation.Split.SocketId = pDimm->SocketId;
-          pIdentInfo->DimmLocation.Split.DieId = MAX_DIEID_SINGLE_DIE_SOCKET;
-          pIdentInfo->DimmLocation.Split.MemControllerId = pDimm->ImcId;
-          pIdentInfo->DimmLocation.Split.ChannelId = pDimm->ChannelId;
-          pIdentInfo->DimmLocation.Split.SlotId = pDimm->ChannelPos;
-        }
-        else {
+        if (pPmttModuleInfo != NULL) {
           pIdentInfo->DimmLocation.Split.SocketId = pPmttModuleInfo->SocketId;
           pIdentInfo->DimmLocation.Split.DieId = pPmttModuleInfo->DieId;
           pIdentInfo->DimmLocation.Split.MemControllerId = pPmttModuleInfo->MemControllerId;
           pIdentInfo->DimmLocation.Split.ChannelId = pPmttModuleInfo->ChannelId;
           pIdentInfo->DimmLocation.Split.SlotId = pPmttModuleInfo->SlotId;
         }
+        else {
+          NVDIMM_ERR("DIMM Module with pid: %d not found in PMTT", pDimm->pRegionsGoal[Index]->pDimms[Index2]->DimmID);
+          pIdentInfo->DimmLocation.Split.SocketId = pDimm->pRegionsGoal[Index]->pDimms[Index2]->SocketId;
+          pIdentInfo->DimmLocation.Split.DieId = MAX_DIEID_SINGLE_DIE_SOCKET;
+          pIdentInfo->DimmLocation.Split.MemControllerId = pDimm->pRegionsGoal[Index]->pDimms[Index2]->ImcId;
+          pIdentInfo->DimmLocation.Split.ChannelId = pDimm->pRegionsGoal[Index]->pDimms[Index2]->ChannelId;
+          pIdentInfo->DimmLocation.Split.SlotId = pDimm->pRegionsGoal[Index]->pDimms[Index2]->ChannelPos;
+        }
 
         pCurrentOffset = (UINT8 *)pCurrentOffset + sizeof(NVDIMM_IDENTIFICATION_INFORMATION3);
       }