AmlCodeGenRdQWordMemory's and AmlCodeGenRdDWordMemory's Cacheable and MemoryRangeType parameters treat specific values as having specific meanings. This change adds enums to map those meanings to their corresponding values.
Signed-off-by: Jeshua Smith <jesh...@nvidia.com> --- .../Include/Library/AmlLib/AmlLib.h | 33 +++++++++++++++++++ .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 12 +++---- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h index 510c79a399..6a273059fb 100644 --- a/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h +++ b/DynamicTablesPkg/Include/Library/AmlLib/AmlLib.h @@ -59,6 +59,39 @@ typedef void *AML_DATA_NODE_HANDLE; #endif // AML_HANDLE +/** Cacheable parameter values + + Possible values are: + 0-The memory is non-cacheable + 1-The memory is cacheable + 2-The memory is cacheable and supports + write combining + 3-The memory is cacheable and prefetchable + +**/ +typedef enum { + AML_MEMORY_NONCACHEABLE = 0, + AML_MEMORY_CACHEABLE = 1, + AML_MEMORY_CACHEABLE_WC = 2, + AML_MEMORY_CACHEABLE_PF = 3 +} AML_MEMORY_CACHEABILITY; + +/** MemoryRangeType parameter values + + Possible values are: + 0-AddressRangeMemory + 1-AddressRangeReserved + 2-AddressRangeACPI + 3-AddressRangeNVS + +**/ +typedef enum { + AML_MEMORY_RANGE_TYPE_MEMORY = 0, + AML_MEMORY_RANGE_TYPE_RESERVED = 1, + AML_MEMORY_RANGE_TYPE_ACPI = 2, + AML_MEMORY_RANGE_TYPE_NVS = 3 +} AML_MEMORY_RANGE_TYPE; + /** Parse the definition block. The function parses the whole AML blob. It starts with the ACPI DSDT/SSDT diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c index 9ddaddc198..7df7117352 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c @@ -566,7 +566,7 @@ GeneratePciCrs ( IsPosDecode, TRUE, TRUE, - TRUE, + AML_MEMORY_CACHEABLE, TRUE, 0, AddrMapInfo->PciAddress, @@ -575,7 +575,7 @@ GeneratePciCrs ( AddrMapInfo->AddressSize, 0, NULL, - 0, + AML_MEMORY_RANGE_TYPE_MEMORY, TRUE, CrsNode, NULL @@ -588,7 +588,7 @@ GeneratePciCrs ( IsPosDecode, TRUE, TRUE, - TRUE, + AML_MEMORY_CACHEABLE, TRUE, 0, AddrMapInfo->PciAddress, @@ -597,7 +597,7 @@ GeneratePciCrs ( AddrMapInfo->AddressSize, 0, NULL, - 0, + AML_MEMORY_RANGE_TYPE_MEMORY, TRUE, CrsNode, NULL @@ -718,7 +718,7 @@ ReserveEcamSpace ( TRUE, TRUE, TRUE, - FALSE, // non-cacheable + AML_MEMORY_NONCACHEABLE, TRUE, 0, AddressMinimum, @@ -727,7 +727,7 @@ ReserveEcamSpace ( AddressMaximum - AddressMinimum + 1, 0, NULL, - 0, + AML_MEMORY_RANGE_TYPE_MEMORY, TRUE, CrsNode, NULL -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109265): https://edk2.groups.io/g/devel/message/109265 Mute This Topic: https://groups.io/mt/101722936/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-