On 13 May 2015 at 19:53, Jayanthi A jayanthi.annadurai@broadcom.com wrote:

Modify generic watchdog base address type to 64 bit PCD to allow platforms to map generic watchdog in 64bit address space.

Signed-off-by: Jayanthi A jayanthi.annadurai@broadcom.com

This looks reasonable to me, but please make sure you change all instances, notably the ones in ArmPlatformPkg/ArmJunoPkg/AcpiTables/Gtdt.aslc

---

ArmPkg/ArmPkg.dec | 4 ++-- ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 7ca80a1..b5cdd49 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -238,8 +238,8 @@ # ARM Generic Watchdog #

• gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0x2A440000|UINT32|0x00000007
• gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0x2A450000|UINT32|0x00000008

• gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0x2A440000|UINT64|0x00000007

• gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0x2A450000|UINT64|0x00000008 gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum|93|UINT32|0x00000009

  #

diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h index 578fd1e..6641b9e 100644 --- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h +++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h @@ -15,12 +15,12 @@ #define __GENERIC_WATCHDOG_H__

// Refresh Frame: -#define GENERIC_WDOG_REFRESH_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogRefreshBase) + 0x000) +#define GENERIC_WDOG_REFRESH_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogRefreshBase) + 0x000)

// Control Frame: -#define GENERIC_WDOG_CONTROL_STATUS_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogControlBase) + 0x000) -#define GENERIC_WDOG_OFFSET_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogControlBase) + 0x008) -#define GENERIC_WDOG_COMPARE_VALUE_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogControlBase) + 0x010) +#define GENERIC_WDOG_CONTROL_STATUS_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x000) +#define GENERIC_WDOG_OFFSET_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x008) +#define GENERIC_WDOG_COMPARE_VALUE_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x010)

// Values of bit 0 of the Control/Status Register

#define GENERIC_WDOG_ENABLED 1

2.1.0

---

Linaro-uefi mailing list Linaro-uefi@lists.linaro.org https://lists.linaro.org/mailman/listinfo/linaro-uefi