From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c05::244; helo=mail-pg0-x244.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg0-x244.google.com (mail-pg0-x244.google.com [IPv6:2607:f8b0:400e:c05::244]) (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 E24EA22135D25 for ; Sun, 11 Mar 2018 18:46:59 -0700 (PDT) Received: by mail-pg0-x244.google.com with SMTP id g12so5892549pgs.0 for ; Sun, 11 Mar 2018 18:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=0myFbovE7TW5DmfqdUMJXwb1wAYaj9ng3xammNBKY2A=; b=XvyuDApEjbL3dRoqWjNS3XOBrggrZfBWSHkinbJXqqIUQziSxBN8ubKSY+jeHwgs99 MueM3Qorh3Q3uxiXFLiERR/2lzVopqjgSz8y/zvG0rM+VM6II7yLsUIhV1FhOkjTTjig LBLkVjQ+hQmr/a4dz0VfBDuH4uLaltxCXKULU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=0myFbovE7TW5DmfqdUMJXwb1wAYaj9ng3xammNBKY2A=; b=Xwta2u0xNCGt++H/3hsUTE8MNksRMlBiGX+3tPgMJqyo/o9RuE1C4uwo4aMnExFPMU /vx8TMDhrzhJscFtFcqX5fzhra3KdwOaWoVrK0Db7lKGKPkzS9LTWErsq4ARVouBmJjL 9S7n25L1Rw8hWU+FWULyJ0ZUv1UQExupWxfxGZfG4bb8W1te0gzM6biW9jcR5jfyLCQv xVvZvfrusijCeVurSI8GfaP5+so4Lqs3q40dthofTOKq/+7ro+hqvADOe3QZ4RNJEK2z vBSohQLIgx++X3OqvGnJR5QD12VJhmXO9VaV2cTh0RMnMk7korTWttYns7kXedbUL8wk 5X2Q== X-Gm-Message-State: AElRT7F2WEYghNuh1e0Urqg6QJB/aNb3M95IDgfG8lJEPZEt/ffYcUKu jgrUfyjXNxsdKZmlgjSLfpbVgQ== X-Google-Smtp-Source: AG47ELt/QSVrcOcIiSSaAq8fR5a26xo2AOcyQPflTipxU6PzvowyRVMJuw9+naCWzz1AzmBgQGmV8w== X-Received: by 10.99.188.2 with SMTP id q2mr5302613pge.101.1520819599359; Sun, 11 Mar 2018 18:53:19 -0700 (PDT) Received: from SZX1000114654 ([45.56.152.76]) by smtp.gmail.com with ESMTPSA id v12sm11724075pfe.187.2018.03.11.18.53.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 18:53:18 -0700 (PDT) From: Guo Heyi X-Google-Original-From: Guo Heyi Date: Mon, 12 Mar 2018 09:53:14 +0800 To: Ard Biesheuvel Cc: Heyi Guo , "edk2-devel@lists.01.org" , Chenhui Sun , Leif Lindholm , Graeme Gregory Message-ID: <20180312015314.GB60232@SZX1000114654> References: <1520405747-11023-1-git-send-email-heyi.guo@linaro.org> <1520405747-11023-3-git-send-email-heyi.guo@linaro.org> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [PATCH 3/3] Hisilicon/D05: Support SBSA watchdog X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2018 01:47:00 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Mar 07, 2018 at 04:10:23PM +0000, Ard Biesheuvel wrote: > On 7 March 2018 at 06:55, Heyi Guo wrote: > > From: Chenhui Sun > > > > Add description of SBSA watchdogs to ACPI GTDT on D05. > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Chenhui Sun > > Signed-off-by: Heyi Guo > > Cc: Ard Biesheuvel > > Cc: Leif Lindholm > > Cc: Graeme Gregory > > --- > > Platform/Hisilicon/D05/D05.dsc | 4 ++++ > > Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf | 2 ++ > > Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc | 19 +++++++------------ > > 3 files changed, 13 insertions(+), 12 deletions(-) > > > > diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc > > index 0792b0814ea1..22eaf356224d 100644 > > --- a/Platform/Hisilicon/D05/D05.dsc > > +++ b/Platform/Hisilicon/D05/D05.dsc > > @@ -418,6 +418,10 @@ [PcdsFixedAtBuild.common] > > > > gHisiTokenSpaceGuid.Pcdsoctype|0x1610 > > > > + # SBSA watchdog on Hi1616 > > + gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0x40500000 > > + gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0x40600000 > > + > > ################################################################################ > > # > > # Components Section - list of all EDK II Modules needed by this Platform > > diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf b/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf > > index bb279c8e428e..6955e6145c30 100644 > > --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf > > +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf > > @@ -55,5 +55,7 @@ [FixedPcd] > > gArmTokenSpaceGuid.PcdArmArchTimerIntrNum > > gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum > > gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum > > + gArmTokenSpaceGuid.PcdGenericWatchdogControlBase > > + gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase > > gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase > > > > diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc > > index 2a9d209c00f0..6bc1bde2a490 100644 > > --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc > > +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc > > @@ -29,6 +29,7 @@ > > #define GTDT_TIMER_ALWAYS_ON_CAPABILITY EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY > > > > #define GTDT_GTIMER_FLAGS (GTDT_TIMER_ALWAYS_ON_CAPABILITY | GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED) > > +#define WATCHDOG_SPAN 0x20000000 > > > > Please don't use > > gArmTokenSpaceGuid.PcdGenericWatchdogXXXBase > > to describe two different instances of the IP that are %!@ MB apart. > > Instead, you could introduce your own PCDs in the HiSilicon token > space, but I am also fine with creating local #defines in this file if > the watchdog is not used anywhere else. Yes they are not used anywhere else, and the number of SBSA watchdogs is SoC related, so I will use local #defines. And I think we can simply change the content of the macros when things change in the future. Thanks, Heyi > > > > #pragma pack (1) > > > > @@ -57,22 +58,16 @@ EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { > > FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL2TimerGSIV > > GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL2TimerFlags > > 0xFFFFFFFFFFFFFFFF, // UINT64 CntReadBasePhysicalAddress > > -#ifdef notyet > > - PV660_WATCHDOG_COUNT, // UINT32 PlatformTimerCount > > + HI1616_WATCHDOG_COUNT, // UINT32 PlatformTimerCount > > sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32 PlatfromTimerOffset > > }, > > { > > - EFI_ACPI_6_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( > > - //FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 93, 0), > > - 0, 0, 0, 0), > > - EFI_ACPI_6_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( > > - //FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 94, EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER) > > - 0, 0, 0, 0) > > + EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( > > + FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 400, 0), > > + EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( > > + FixedPcdGet32 (PcdGenericWatchdogRefreshBase) + WATCHDOG_SPAN, FixedPcdGet32 (PcdGenericWatchdogControlBase) + WATCHDOG_SPAN, 496, 0) > > + > > } > > -#else /* !notyet */ > > - 0, 0 > > - } > > -#endif > > }; > > > > // > > -- > > 2.7.4 > >