Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

UefiPayloadPkg: Parse PCI RB Segment info when its available in FDT 

When FDT based DTB is parsed, variables mPciRootBridgeInfo and
mUplPciSegmentInfoHob are always dereferenced. If there is no PCI
RB Bridge info or RB Segment info provided in FDT, it leads to
NULL pointer dereferenced.

To address this issue, parse PCI RB and Segment information only
when they are available at FDT. If they are unavailable, skip it
and allow the PciBusDxe and PciHostBridgeDxe to handle them.

Signed-off-by: Ajan Zhong <ajan.zhong@newfw.com>
This commit is contained in:
Ajan Zhong 2025-03-12 10:34:31 +08:00 committed by mergify[bot]
parent 1e0051e293
commit 2aff039da7
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
UefiPayloadPkg/Library/FdtParserLib/FdtParserLib.c
View File

@ -1000,46 +1000,48 @@ ParseDtb (
}
}
// Post processing: TODO: Need to look into it. Such cross dependency on DT nodes
// may not be good idea. Instead have this prop part of RB
mPciRootBridgeInfo->ResourceAssigned = (BOOLEAN)PciEnumDone;
if ((NULL != mPciRootBridgeInfo) && (NULL != mUplPciSegmentInfoHob)) {
// Post processing: TODO: Need to look into it. Such cross dependency on DT nodes
// may not be good idea. Instead have this prop part of RB
mPciRootBridgeInfo->ResourceAssigned = (BOOLEAN)PciEnumDone;
//
// Assign PCI Segment number after all root bridge info ready
//
SegmentNumber = 0;
RbSegNumAlreadyAssigned = AllocateZeroPool (sizeof (UINT8) * RootBridgeCount);
NextPciBaseAddress = 0;
NumberOfRbSegNumAlreadyAssigned = 0;
//
// Assign PCI Segment number after all root bridge info ready
//
SegmentNumber = 0;
RbSegNumAlreadyAssigned = AllocateZeroPool (sizeof (UINT8) * RootBridgeCount);
NextPciBaseAddress = 0;
NumberOfRbSegNumAlreadyAssigned = 0;
//
// Always assign first root bridge segment number as 0
//
CurrentPciBaseAddress = mUplPciSegmentInfoHob->SegmentInfo[0].BaseAddress & ~0xFFFFFFF;
NextPciBaseAddress = CurrentPciBaseAddress;
mUplPciSegmentInfoHob->SegmentInfo[0].SegmentNumber = SegmentNumber;
mPciRootBridgeInfo->RootBridge[0].Segment = SegmentNumber;
RbSegNumAlreadyAssigned[0] = 1;
NumberOfRbSegNumAlreadyAssigned++;
//
// Always assign first root bridge segment number as 0
//
CurrentPciBaseAddress = mUplPciSegmentInfoHob->SegmentInfo[0].BaseAddress & ~0xFFFFFFF;
NextPciBaseAddress = CurrentPciBaseAddress;
mUplPciSegmentInfoHob->SegmentInfo[0].SegmentNumber = SegmentNumber;
mPciRootBridgeInfo->RootBridge[0].Segment = SegmentNumber;
RbSegNumAlreadyAssigned[0] = 1;
NumberOfRbSegNumAlreadyAssigned++;
while (NumberOfRbSegNumAlreadyAssigned < RootBridgeCount) {
for (index = 1; index < RootBridgeCount; index++) {
if (RbSegNumAlreadyAssigned[index] == 1) {
continue;
while (NumberOfRbSegNumAlreadyAssigned < RootBridgeCount) {
for (index = 1; index < RootBridgeCount; index++) {
if (RbSegNumAlreadyAssigned[index] == 1) {
continue;
}
if (CurrentPciBaseAddress == (mUplPciSegmentInfoHob->SegmentInfo[index].BaseAddress & ~0xFFFFFFF)) {
mUplPciSegmentInfoHob->SegmentInfo[index].SegmentNumber = SegmentNumber;
mPciRootBridgeInfo->RootBridge[index].Segment = SegmentNumber;
RbSegNumAlreadyAssigned[index] = 1;
NumberOfRbSegNumAlreadyAssigned++;
} else if (CurrentPciBaseAddress == NextPciBaseAddress) {
NextPciBaseAddress = mUplPciSegmentInfoHob->SegmentInfo[index].BaseAddress & ~0xFFFFFFF;
}
}
if (CurrentPciBaseAddress == (mUplPciSegmentInfoHob->SegmentInfo[index].BaseAddress & ~0xFFFFFFF)) {
mUplPciSegmentInfoHob->SegmentInfo[index].SegmentNumber = SegmentNumber;
mPciRootBridgeInfo->RootBridge[index].Segment = SegmentNumber;
RbSegNumAlreadyAssigned[index] = 1;
NumberOfRbSegNumAlreadyAssigned++;
} else if (CurrentPciBaseAddress == NextPciBaseAddress) {
NextPciBaseAddress = mUplPciSegmentInfoHob->SegmentInfo[index].BaseAddress & ~0xFFFFFFF;
}
SegmentNumber++;
CurrentPciBaseAddress = NextPciBaseAddress;
}
SegmentNumber++;
CurrentPciBaseAddress = NextPciBaseAddress;
}
((EFI_HOB_HANDOFF_INFO_TABLE *)(mHobList))->BootMode = BootMode;