Upl pci seg lib #6456
Upl pci seg lib #6456
Conversation
tianocore-assign-reviewers
bot
requested review from
benjamindoron,
gdong1,
gguo11837463,
jameslu8 and
Sean-StarLabs
| CopyMem (&mPciSegments[0], &pPciSegments[0], sizeof (PCI_SEGMENT_INFO)); | ||
|
|
||
| for (Index = 1; Index <= PciRootBridgeInfo->Count; Index++) { | ||
| if (mPciSegments[Index2].SegmentNumber == pPciSegments[Index].SegmentNumber) { |
There was a problem hiding this comment.
when index2 == 1 (2 SegmentNumber data present in mPciSegments array), we need to compare both mPciSegments[0].SegmentNumber and mPciSegments[1].SegmentNumber, if one of them matched the corresponding StartBus and EndBus should be updated.
So we need nested for loop to support such cases.
You might be able to use NumberOfRootBridges variable for how many SegmentNumber data we have created in mPciSegments array and use "Index2 < NumberOfRootBridges" as nested for loop condition to compare if any other rootbridge sharing the existing Segment number.
| @@ -182,6 +220,14 @@ Get_UPLSegInfo ( | |||
| // | |||
| UplSegmentInfo = (UPL_PCI_SEGMENT_INFO_HOB *)GET_GUID_HOB_DATA (GuidHob); | |||
| if (UplSegmentInfo->Count <= (GET_GUID_HOB_DATA_SIZE (GuidHob) - sizeof (UPL_PCI_SEGMENT_INFO_HOB)) / sizeof (UPL_SEGMENT_INFO)) { | |||
| GuidHob = GetFirstGuidHob (&gUefiAcpiBoardInfoGuid); | |||
There was a problem hiding this comment.
FdtParserLib.c has updated UplSegmentInfo->SegmentInfo[*].BaseAddress basing on pci-rb->reg() property, may I know why we need to update again here by another HOB?
There was a problem hiding this comment.
just in case , if the reg attribute wasn't exist.
| @@ -55,18 +57,53 @@ RetrieveMultiSegmentInfoFromHob ( | |||
| mPciSegments = (PCI_SEGMENT_INFO *)AllocatePool (Size); | |||
| ASSERT (mPciSegments != NULL); | |||
| ZeroMem (mPciSegments, PciRootBridgeInfo->Count * sizeof (PCI_SEGMENT_INFO)); | |||
| pPciSegments = (PCI_SEGMENT_INFO *)AllocatePool (Size); | |||
| ASSERT (pPciSegments != NULL); | |||
| ZeroMem (pPciSegments, PciRootBridgeInfo->Count * sizeof (PCI_SEGMENT_INFO)); | |||
|
|
|||
| // | |||
| // Create all root bridges with PciRootBridgeInfoHob | |||
| // | |||
| for (Index = 0; Index < PciRootBridgeInfo->Count; Index++) { | |||
| if (UplSegmentInfo->SegmentInfo[Index].SegmentNumber == (UINT16)(PciRootBridgeInfo->RootBridge[Index].Segment)) { | |||
There was a problem hiding this comment.
FdtParserLib will create both PciRootBridgeInfo HOB and UplSegmentInfo Hob following the same RbIndex, so it should be 1:1 mapping each other. Basing on this I think we do not need to compare SegmentNumber here, can you double check?
Merge the PCI root bridge with the same segment address within one. PciSegment element. UefiPayloadPkg/Library/PciSegmentInfoLibAcpiBoardInfo/PciSegmentInfoLibAcpiBoardInfo.c Signed-off-by: Linus Liu <linus.liu@intel.com>
Add back reg attribute of pcirootbridge Signed-off-by: Linus Liu <linus.liu@intel.com>
LinusvPelt
force-pushed
the
UPLPciSegLib
branch
from
b196cb3
to
cf4db83
Compare
Description
<Include a description of the change and why this change was made.>
<For each item, place an "x" in between
[and]if true. Example:[x](you can also check items in GitHub UI)><Create the PR as a Draft PR if it is only created to run CI checks.>
<Delete lines in <> tags before creating the PR.>
How This Was Tested
<Describe the test(s) that were run to verify the changes.>
Integration Instructions
<Describe how these changes should be integrated. Use N/A if nothing is required.>