Mirocom/EDK2-fork
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ArmVirtPkg: Kvmtool: Rely on InterruptMap to generate PCI related tables

Browse Source 
Kvmtool always generates a PCI host device tree node. Thus PCI related
ACPI tables are always generated. Rely on the presence of PCI devices
in the interrupt-map information instead.

Reported-by: Sarah Walker <sarah.walker2@arm.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
This commit is contained in:
Pierre Gondois
2025-03-13 13:30:59 +01:00
committed by mergify[bot]
parent 8c208049d4
commit 5a1c723cfa
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c
View File

@@ -641,6 +641,7 @@ GetStandardNameSpaceObject (
EFI_STATUS Status;
EDKII_PLATFORM_REPOSITORY_INFO *PlatformRepo;
UINTN AcpiTableCount;
BOOLEAN PciSupportPresent;
CM_OBJ_DESCRIPTOR CmObjDesc;
if ((This == NULL) || (CmObject == NULL)) {
@@ -649,8 +650,9 @@ GetStandardNameSpaceObject (
return EFI_INVALID_PARAMETER;
}
Status = EFI_NOT_FOUND;
PlatformRepo = This->PlatRepoInfo;
Status = EFI_NOT_FOUND;
PlatformRepo = This->PlatRepoInfo;
PciSupportPresent = TRUE;
switch (GET_CM_OBJECT_ID (CmObjectId)) {
case EStdObjCfgMgrInfo:
@@ -667,12 +669,12 @@ GetStandardNameSpaceObject (
AcpiTableCount = ARRAY_SIZE (PlatformRepo->CmAcpiTableList);
//
// Get Pci config space information.
// Get Pci interrupt map information.
//
Status = DynamicPlatRepoGetObject (
PlatformRepo->DynamicPlatformRepo,
CREATE_CM_ARCH_COMMON_OBJECT_ID (
EArchCommonObjPciConfigSpaceInfo
EArchCommonObjPciInterruptMapInfo
),
CM_NULL_TOKEN,
&CmObjDesc
@@ -683,31 +685,34 @@ GetStandardNameSpaceObject (
// present, Kvmtool was launched without the PCIe option.
// Therefore, reduce the table count by 3.
//
AcpiTableCount -= 3;
AcpiTableCount -= 3;
PciSupportPresent = FALSE;
} else if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
}
//
// Get the Gic version.
//
Status = DynamicPlatRepoGetObject (
PlatformRepo->DynamicPlatformRepo,
CREATE_CM_ARM_OBJECT_ID (EArmObjGicDInfo),
CM_NULL_TOKEN,
&CmObjDesc
);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
}
if (PciSupportPresent) {
//
// Get the Gic version.
//
Status = DynamicPlatRepoGetObject (
PlatformRepo->DynamicPlatformRepo,
CREATE_CM_ARM_OBJECT_ID (EArmObjGicDInfo),
CM_NULL_TOKEN,
&CmObjDesc
);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
}
if (((CM_ARM_GICD_INFO *)CmObjDesc.Data)->GicVersion < 3) {
//
// IORT is only required for GicV3/4
//
AcpiTableCount -= 1;
if (((CM_ARM_GICD_INFO *)CmObjDesc.Data)->GicVersion < 3) {
//
// IORT is only required for GicV3/4
//
AcpiTableCount -= 1;
}
}
Status = HandleCmObject (