From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-x230.google.com (mail-io0-x230.google.com [IPv6:2607:f8b0:4001:c06::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0249781FE2 for ; Tue, 7 Feb 2017 00:41:15 -0800 (PST) Received: by mail-io0-x230.google.com with SMTP id v96so85054966ioi.0 for ; Tue, 07 Feb 2017 00:41:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=yKyyC/njrvP+y5F+ZVxtQjv+GinMc9XphQ2FZ1CpXZE=; b=BiikLIHChmhOOP5a3084ooUcV/1aJmSkk0212VjUiRszHGDsognXRskN01o3spu1jB zZyBCRV8XLiUq3XnGmA4gihcU0Z5RaJ9Ag6ljB/p2fS+1SB1h1+Kzx4VNxHdJQgd9EbS fXNR5cvU+MwzQloq5vEZnUUVeLmbHoxky238U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=yKyyC/njrvP+y5F+ZVxtQjv+GinMc9XphQ2FZ1CpXZE=; b=ZrWoCi4OW5VUKGt5Uu98lggEPSUvOO9NuE6pHKP2bZ/eJOmTdwa1AOJSVo9g8s9i8L aZjJaFs39+TsVCcCLATQIaS/yZNp1+Axsygop0JWBeNssnMo4qXv+2Ao5NwkPy9GByL9 rCZ4rm96b0F2hpJcSopyDcz8ZdgfhiuWOu1MwT3mZFs40zXPVSCRdT5YT8ljicE0GdsU cDUDtUsY0yUralHoX8wIFoj5CqKlsoYHnycc81drlv7GcMNDd90GmOc4KjesRidLxV+k 29aqSrbT421w1uenBwaPjjP7HMhF5pCD+K0etDv5jchTcLJKLRCgQWGqbb6er/JdI1LJ qJbQ== X-Gm-Message-State: AMke39mXo45392tE1VE6klsLt9vmWDceiGWVSZfrYn3Ylo8m6Qn+njzRLGmHUrVgsuCdtN68LdwIbJXk38delK5W X-Received: by 10.107.53.215 with SMTP id k84mr2835767ioo.45.1486456874290; Tue, 07 Feb 2017 00:41:14 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.144.139 with HTTP; Tue, 7 Feb 2017 00:41:13 -0800 (PST) In-Reply-To: <20170206190554.6720-1-evan.lloyd@arm.com> References: <20170206190554.6720-1-evan.lloyd@arm.com> From: Ard Biesheuvel Date: Tue, 7 Feb 2017 08:41:13 +0000 Message-ID: To: Evan Lloyd Cc: "edk2-devel@lists.01.org" , Leif Lindholm , Ryan Harkin Subject: Re: [PATCH] ArmPkg: Bug #361 fix Watchdog PCDs X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2017 08:41:15 -0000 Content-Type: text/plain; charset=UTF-8 On 6 February 2017 at 19:05, wrote: > From: Alexei > > "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 range above 4GB this causes build > error F000: Too large PCD value for datum type [UINT32] > of PCD gArmTokenSpaceGuid.PcdGenericWatchdogControlBase > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Alexei Fedorov > Signed-off-by: Evan Lloyd Applied, thanks. > --- > ArmPkg/ArmPkg.dec | 6 +++--- > ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h | 10 +++++----- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec > index 090ed99513669e32aee2f083e1dcf8327be40842..8e9cf199becc65a9f6fe08e2d5b216bc2af4c31d 100644 > --- a/ArmPkg/ArmPkg.dec > +++ b/ArmPkg/ArmPkg.dec > @@ -2,7 +2,7 @@ > # ARM processor package. > # > # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.
> -# Copyright (c) 2011 - 2015, ARM Limited. All rights reserved. > +# Copyright (c) 2011 - 2017, ARM Limited. All rights reserved. > # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the BSD License > @@ -252,8 +252,8 @@ [PcdsFixedAtBuild.common, PcdsDynamic.common] > # 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 578fd1e85f8e11b42e546f92123fd041a2d3b153..9e2aebcfd5e557269bbc36556dbcbc8f6809aeb0 100644 > --- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h > +++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h > @@ -1,6 +1,6 @@ > /** @file > * > -* Copyright (c) 2013-2014, ARM Limited. All rights reserved. > +* Copyright (c) 2013-2017, ARM Limited. All rights reserved. > * > * This program and the accompanying materials > * are licensed and made available under the terms and conditions of the BSD > @@ -15,12 +15,12 @@ > #define __GENERIC_WATCHDOG_H__ > > // Refresh Frame: > -#define GENERIC_WDOG_REFRESH_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogRefreshBase) + 0x000) > +#define GENERIC_WDOG_REFRESH_REG ((UINTN)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 ((UINTN)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x000) > +#define GENERIC_WDOG_OFFSET_REG ((UINTN)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x008) > +#define GENERIC_WDOG_COMPARE_VALUE_REG ((UINTN)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x010) > > // Values of bit 0 of the Control/Status Register > #define GENERIC_WDOG_ENABLED 1 > -- > Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") >