From 23dbb8a07d108a7b8589e31639b6302b70445b9f Mon Sep 17 00:00:00 2001 From: Ashish Singhal Date: Tue, 14 Nov 2023 20:19:04 -0700 Subject: DynamicTablesPkg: Fix ETE _UID Creation Bugzilla: 4600 (https://bugzilla.tianocore.org/show_bug.cgi?id=4600) Just like CPU _UID, ETE UID also needs to be unique so use AcpiProcessorUid instead of CpuName Signed-off-by: Ashish Singhal Reviewed-by: Sami Mujawar --- .../Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'DynamicTablesPkg') diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.c index 8228c7845a..724f33c660 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTopologyGenerator.c @@ -359,6 +359,7 @@ CreateAmlCpcNode ( @param [in] Generator The SSDT Cpu Topology generator. @param [in] ParentNode Parent node to attach the Cpu node to. + @param [in] GicCInfo CM_ARM_GICC_INFO object used to create the node. @param [in] CpuName Value used to generate the node name. @param [out] EtNodePtr If not NULL, return the created Cpu node. @@ -372,6 +373,7 @@ EFIAPI CreateAmlEtd ( IN ACPI_CPU_TOPOLOGY_GENERATOR *Generator, IN AML_NODE_HANDLE ParentNode, + IN CM_ARM_GICC_INFO *GicCInfo, IN UINT32 CpuName, OUT AML_OBJECT_NODE_HANDLE *EtNodePtr OPTIONAL ) @@ -397,7 +399,7 @@ CreateAmlEtd ( Status = AmlCodeGenNameInteger ( "_UID", - CpuName, + GicCInfo->AcpiProcessorUid, EtNode, NULL ); @@ -474,6 +476,7 @@ CreateAmlEtNode ( Status = CreateAmlEtd ( Generator, Node, + GicCInfo, CpuName, NULL ); -- cgit v1.2.3