@@ -307,21 +307,21 @@ GeneratePcdConfInput(
307
307
pIdentInfo -> DimmLocation .AsUint64 = 0 ;
308
308
// Update the DIMM location field
309
309
pPmttModuleInfo = GetDimmModuleByPidFromPmtt (pDimm -> pRegionsGoal [Index ]-> pDimms [Index2 ]-> DimmID , gNvmDimmData -> PMEMDev .pPmttHead );
310
- if (pPmttModuleInfo == NULL ) {
311
- NVDIMM_ERR ("DIMM Module with pid: %d not found in PMTT" , pDimm -> DimmID );
312
- pIdentInfo -> DimmLocation .Split .SocketId = pDimm -> SocketId ;
313
- pIdentInfo -> DimmLocation .Split .DieId = MAX_DIEID_SINGLE_DIE_SOCKET ;
314
- pIdentInfo -> DimmLocation .Split .MemControllerId = pDimm -> ImcId ;
315
- pIdentInfo -> DimmLocation .Split .ChannelId = pDimm -> ChannelId ;
316
- pIdentInfo -> DimmLocation .Split .SlotId = pDimm -> ChannelPos ;
317
- }
318
- else {
310
+ if (pPmttModuleInfo != NULL ) {
319
311
pIdentInfo -> DimmLocation .Split .SocketId = pPmttModuleInfo -> SocketId ;
320
312
pIdentInfo -> DimmLocation .Split .DieId = pPmttModuleInfo -> DieId ;
321
313
pIdentInfo -> DimmLocation .Split .MemControllerId = pPmttModuleInfo -> MemControllerId ;
322
314
pIdentInfo -> DimmLocation .Split .ChannelId = pPmttModuleInfo -> ChannelId ;
323
315
pIdentInfo -> DimmLocation .Split .SlotId = pPmttModuleInfo -> SlotId ;
324
316
}
317
+ else {
318
+ NVDIMM_ERR ("DIMM Module with pid: %d not found in PMTT" , pDimm -> pRegionsGoal [Index ]-> pDimms [Index2 ]-> DimmID );
319
+ pIdentInfo -> DimmLocation .Split .SocketId = pDimm -> pRegionsGoal [Index ]-> pDimms [Index2 ]-> SocketId ;
320
+ pIdentInfo -> DimmLocation .Split .DieId = MAX_DIEID_SINGLE_DIE_SOCKET ;
321
+ pIdentInfo -> DimmLocation .Split .MemControllerId = pDimm -> pRegionsGoal [Index ]-> pDimms [Index2 ]-> ImcId ;
322
+ pIdentInfo -> DimmLocation .Split .ChannelId = pDimm -> pRegionsGoal [Index ]-> pDimms [Index2 ]-> ChannelId ;
323
+ pIdentInfo -> DimmLocation .Split .SlotId = pDimm -> pRegionsGoal [Index ]-> pDimms [Index2 ]-> ChannelPos ;
324
+ }
325
325
326
326
pCurrentOffset = (UINT8 * )pCurrentOffset + sizeof (NVDIMM_IDENTIFICATION_INFORMATION3 );
327
327
}
0 commit comments