From: Alexei Alexei.Fedorov@arm.com
Update Watchdog PCD access to align with the changes made in Tianocore edk2\ArmPkg\ArmPkg.dec for fixing Bug #361 "ARM Generic Watchdog base addresses must be declared as UINT64 values" https://bugzilla.tianocore.org/show_bug.cgi?id=361
PcdGenericWatchdogControlBase & PcdGenericWatchdogRefreshBase are declared as UINT32 values in ArmPkg.dec, but for platforms with addresses in the memory area above 4GB this causes build error F000: Too large PCD value for datum type [UINT32] of PCD gArmTokenSpaceGuid.PcdGenericWatchdogControlBase
Change-Id: Ie4376ef69d5c939751268ed090b8949aeed978be Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Alexei Fedorov alexei.fedorov@arm.com Signed-off-by: Evan Lloyd evan.lloyd@arm.com --- Platforms/ARM/Juno/AcpiTables/Gtdt.aslc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc b/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc index 5e2daf9abb8344ff121dace4fa827838b10ac287..5e83802d576b11178a7fdb556086dea41ee0859f 100644 --- a/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc +++ b/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc @@ -92,9 +92,15 @@ #if (JUNO_WATCHDOG_COUNT != 0) { EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( - FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 93, 0), + FixedPcdGet64 (PcdGenericWatchdogRefreshBase), + FixedPcdGet64 (PcdGenericWatchdogControlBase), + 93, + 0), EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( - FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 94, EFI_ACPI_5_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER) + FixedPcdGet64 (PcdGenericWatchdogRefreshBase), + FixedPcdGet64 (PcdGenericWatchdogControlBase), + 94, + EFI_ACPI_5_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER) } #endif };
On 6 February 2017 at 19:26, evan.lloyd@arm.com wrote:
From: Alexei Alexei.Fedorov@arm.com
Update Watchdog PCD access to align with the changes made in Tianocore edk2\ArmPkg\ArmPkg.dec for fixing Bug #361 "ARM Generic Watchdog base addresses must be declared as UINT64 values" https://bugzilla.tianocore.org/show_bug.cgi?id=361
PcdGenericWatchdogControlBase & PcdGenericWatchdogRefreshBase are declared as UINT32 values in ArmPkg.dec, but for platforms with addresses in the memory area above 4GB this causes build error F000: Too large PCD value for datum type [UINT32] of PCD gArmTokenSpaceGuid.PcdGenericWatchdogControlBase
Change-Id: Ie4376ef69d5c939751268ed090b8949aeed978be Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Alexei Fedorov alexei.fedorov@arm.com Signed-off-by: Evan Lloyd evan.lloyd@arm.com
Applied, thanks
Platforms/ARM/Juno/AcpiTables/Gtdt.aslc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc b/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc index 5e2daf9abb8344ff121dace4fa827838b10ac287..5e83802d576b11178a7fdb556086dea41ee0859f 100644 --- a/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc +++ b/Platforms/ARM/Juno/AcpiTables/Gtdt.aslc @@ -92,9 +92,15 @@ #if (JUNO_WATCHDOG_COUNT != 0) { EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(
FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 93, 0),
FixedPcdGet64 (PcdGenericWatchdogRefreshBase),FixedPcdGet64 (PcdGenericWatchdogControlBase),93,0), EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(
FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 94, EFI_ACPI_5_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER)
FixedPcdGet64 (PcdGenericWatchdogRefreshBase),FixedPcdGet64 (PcdGenericWatchdogControlBase),94,EFI_ACPI_5_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER)#endif }; -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
-
Ard Biesheuvel -
evan.lloyd＠arm.com