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

DynamicTablesPkg: AcpiSsdtPcieLibArm: Correct translation value 

The translation value in ACPI should be the difference between the CPU and PCIe address.

Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
Reviewed-by: Pierre Gondois <pierre.gondois@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
This commit is contained in:
Jeff Brasen 2022-07-08 14:59:01 -06:00 committed by mergify[bot]
parent f0064ac3af
commit 6cda306da1
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c
View File

@ -540,6 +540,7 @@ GeneratePciCrs (
UINT32 RefCount; UINT32 RefCount;
CM_ARM_PCI_ADDRESS_MAP_INFO *AddrMapInfo; CM_ARM_PCI_ADDRESS_MAP_INFO *AddrMapInfo;
AML_OBJECT_NODE_HANDLE CrsNode; AML_OBJECT_NODE_HANDLE CrsNode;
BOOLEAN IsPosDecode;
ASSERT (Generator != NULL); ASSERT (Generator != NULL);
ASSERT (CfgMgrProtocol != NULL); ASSERT (CfgMgrProtocol != NULL);
@ -609,6 +610,11 @@ GeneratePciCrs (
} }
Translation = (AddrMapInfo->CpuAddress != AddrMapInfo->PciAddress); Translation = (AddrMapInfo->CpuAddress != AddrMapInfo->PciAddress);
if (AddrMapInfo->CpuAddress >= AddrMapInfo->PciAddress) {
IsPosDecode = TRUE;
} else {
IsPosDecode = FALSE;
}
switch (AddrMapInfo->SpaceCode) { switch (AddrMapInfo->SpaceCode) {
case PCI_SS_IO: case PCI_SS_IO:
@ -616,12 +622,12 @@ GeneratePciCrs (
FALSE, FALSE,
TRUE, TRUE,
TRUE, TRUE,
TRUE, IsPosDecode,
3, 3,
0, 0,
AddrMapInfo->PciAddress, AddrMapInfo->PciAddress,
AddrMapInfo->PciAddress + AddrMapInfo->AddressSize - 1, AddrMapInfo->PciAddress + AddrMapInfo->AddressSize - 1,
Translation ? AddrMapInfo->CpuAddress : 0, Translation ? AddrMapInfo->CpuAddress - AddrMapInfo->PciAddress : 0,
AddrMapInfo->AddressSize, AddrMapInfo->AddressSize,
0, 0,
NULL, NULL,
@ -635,7 +641,7 @@ GeneratePciCrs (
case PCI_SS_M32: case PCI_SS_M32:
Status = AmlCodeGenRdDWordMemory ( Status = AmlCodeGenRdDWordMemory (
FALSE, FALSE,
TRUE, IsPosDecode,
TRUE, TRUE,
TRUE, TRUE,
TRUE, TRUE,
@ -643,7 +649,7 @@ GeneratePciCrs (
0, 0,
AddrMapInfo->PciAddress, AddrMapInfo->PciAddress,
AddrMapInfo->PciAddress + AddrMapInfo->AddressSize - 1, AddrMapInfo->PciAddress + AddrMapInfo->AddressSize - 1,
Translation ? AddrMapInfo->CpuAddress : 0, Translation ? AddrMapInfo->CpuAddress - AddrMapInfo->PciAddress : 0,
AddrMapInfo->AddressSize, AddrMapInfo->AddressSize,
0, 0,
NULL, NULL,
@ -657,7 +663,7 @@ GeneratePciCrs (
case PCI_SS_M64: case PCI_SS_M64:
Status = AmlCodeGenRdQWordMemory ( Status = AmlCodeGenRdQWordMemory (
FALSE, FALSE,
TRUE, IsPosDecode,
TRUE, TRUE,
TRUE, TRUE,
TRUE, TRUE,
@ -665,7 +671,7 @@ GeneratePciCrs (
0, 0,
AddrMapInfo->PciAddress, AddrMapInfo->PciAddress,
AddrMapInfo->PciAddress + AddrMapInfo->AddressSize - 1, AddrMapInfo->PciAddress + AddrMapInfo->AddressSize - 1,
Translation ? AddrMapInfo->CpuAddress : 0, Translation ? AddrMapInfo->CpuAddress - AddrMapInfo->PciAddress : 0,
AddrMapInfo->AddressSize, AddrMapInfo->AddressSize,
0, 0,
NULL, NULL,