From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.128]) by mx.groups.io with SMTP id smtpd.web11.5407.1622023958502447605 for ; Wed, 26 May 2021 03:12:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@os.amperecomputing.com header.s=selector2 header.b=H1goSv/v; spf=pass (domain: os.amperecomputing.com, ip: 40.107.94.128, mailfrom: nhi@os.amperecomputing.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ANHN2LSUUswCUgEqrQXrMBTLRpTIp/SqWLC0d0jNUZR/9yDXhP/matNhANKXiTI+2tTTunScXG/YRMY+pT/f079MzuIZ6fQC/OsYGkhN0Jj4yV39nIqh8PoM0WTzxirc6fDi5Lwhb38UE5vZOYdC1MTAIp/oiUgHMOIY9CF8xbQESs1jaJieuIs5XFrjAgzInMjytZp+QPL+pnyydKB6sulIQToZRpu/KyAj13WRN0sTnag6RoSwHgJdiOWcN9M3i+vU+Dn9z8zyusTyC1YZNi4yg3JeAGG/eEvO5p+8tZpr6hCf53C7z3TzhGvq4RYS9rNQIF7wdF4CDc4QPdEE8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v0pIo7cu8ud1xEwPAryDGUGId52TrsaODPbY3iv5lts=; b=EzfGsVPbRBULmoa0gcFDJcgqXAr8STPY3pAn+PNa6zb2fUogLixJix3ai92+9fqYbq5YtE0pkueBOr5KzHQy2Qe+cLTxoF6zPovn6LsU8637s8ZQi2FIBiXsFhdnpHr/lo4wJ5NJmHiBZEgAAHWA6dNttT8d9F2mT/f0cHl744J5JZsWM0iNfresWMZx35yRrVEWpo/ic9Y+c/5BRJy6gljQ7kt+5hbPIP6HQ/4/VBjQwn9MmLEiEMVlChLly2bZ4msXk/Tjk7q9MUEqPW1dxsgZJcxiEtWOh2jJx44U0H9HBJ25DlA3Pg46JcxQf28IhjA3yAl4OM+r9ZQGNBbxUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v0pIo7cu8ud1xEwPAryDGUGId52TrsaODPbY3iv5lts=; b=H1goSv/v+8ZopAZmBMy2qtrd9IfnoDcMm/KkNehbsuKH8Am8kNC2n7GRfJwyGBCsad/Ff0J2pRkYCtKb+v0+Fnh8Rpn2Xjjyes+Vag/rpUOzscl69zX/mhJ+4g12BQ+bZ7hivD2sebPVFVYDbMNVGf4Kkdg33anS8iWJLMiEAl0= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=os.amperecomputing.com; Received: from DM6PR01MB5849.prod.exchangelabs.com (2603:10b6:5:205::20) by DM5PR01MB2426.prod.exchangelabs.com (2603:10b6:3:3b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.27; Wed, 26 May 2021 10:12:36 +0000 Received: from DM6PR01MB5849.prod.exchangelabs.com ([fe80::60d2:86dd:1f1c:51dd]) by DM6PR01MB5849.prod.exchangelabs.com ([fe80::60d2:86dd:1f1c:51dd%7]) with mapi id 15.20.4173.020; Wed, 26 May 2021 10:12:36 +0000 From: "Nhi Pham" To: devel@edk2.groups.io CC: Vu Nguyen , Thang Nguyen , Chuong Tran , Phong Vo , Leif Lindholm , Michael D Kinney , Ard Biesheuvel , Nate DeSimone Subject: [edk2-platforms][PATCH v2 27/32] AmpereAltraPkg: Add configuration screen for Watchdog timer Date: Wed, 26 May 2021 17:07:19 +0700 Message-ID: <20210526100724.5359-29-nhi@os.amperecomputing.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210526100724.5359-1-nhi@os.amperecomputing.com> References: <20210526100724.5359-1-nhi@os.amperecomputing.com> X-Originating-IP: [118.69.219.201] X-ClientProxiedBy: HKAPR04CA0008.apcprd04.prod.outlook.com (2603:1096:203:d0::18) To DM6PR01MB5849.prod.exchangelabs.com (2603:10b6:5:205::20) Return-Path: nhi@os.amperecomputing.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (118.69.219.201) by HKAPR04CA0008.apcprd04.prod.outlook.com (2603:1096:203:d0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Wed, 26 May 2021 10:12:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef87cefa-dbab-45c1-370a-08d9202ec928 X-MS-TrafficTypeDiagnostic: DM5PR01MB2426: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hQuIw1z6qHqZJBZSBUMKAy3fjkzdAdLAJjA1SZiAo4XFb/jLOo34OmBwwW87Top22wC1yvwll9VbhuQZrnetEuKxd/QcCaIbyDQwEs4Y9OBYZCM5nwo65P/psYYWeWLHs2t/QMXt1jRLnXrfLYgzoXONX4YAeJJqv0IpqhF/KZC2dxv1+w+MbY8yVsJAl4miw3dTYX41D208UvizBgB6OZzYcYCF34PJMgsySlldb1fzNycf0q0GcEroemB2vY7xsaW6sj20ok0wfrh56tao/76wLCJ3TNxsSTv3xz2e6U0OvYoWVM/+fI2Df6D68uckLEFEoY7AImjeweqBdxNuEmmepHjCS67D7LZ5hfWpWnZbj9fomhKQtiBc2YS1zDtw7P6WiDRolh84TA6GSutPSy0nsHtOku5wfWk/z9fG1xV7eCO8kBF6+TtaqBQYA4Xt+jdd54uHSi3uZCzGzWRe++sJRTbzOL0i1jEaXxGp1Nsw37nqk+VRLwwtdmCfu7V/PqkNMg5qmmRJBJ6QGyBGi4WnnybmjGXQ+pj/iDkkUf2A7AdpaU0+otabc8rwO03kgpBs+sFt3Z2H7neFV0yI+Yww1vZf5/hjP2OH8AmD+tWH9A2SBk1BmE0tTJpoV/dyQWxpOTYG1tNcWtQOvDIG0BXpCf3vDXmgAJrluszONSMhoSR3M+yRpnf9NayV5AvOLa3w0Dt8p7VQMhcGJAJs4r/NZgmiWpC6akweiLF8RC12qBZ/AoPhQXBVIF2MPzGA8Igxio4cV8s4raIdNYr5Jw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR01MB5849.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(39850400004)(136003)(346002)(366004)(376002)(186003)(66476007)(6506007)(2616005)(6486002)(66946007)(52116002)(6916009)(16526019)(66574015)(38100700002)(38350700002)(1076003)(83380400001)(30864003)(66556008)(6512007)(956004)(316002)(478600001)(6666004)(4326008)(8676002)(5660300002)(26005)(86362001)(2906002)(8936002)(54906003)(69590400013)(290074003)(171213001)(44824005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?fmsgNqr1WNUsI8nMIYY5YV0EdDgI/UCKCJP9nMOuWrixzS1E8eJdZ00W1sDw?= =?us-ascii?Q?tA/1QLTtOj+snLM07qZXqq7N6i/MxSlArXvKkkHS9c0SY+8AXe6xVd7ziV22?= =?us-ascii?Q?ovHsufMLVdnivK8T5tWuSbSMbj1xhOpdcrDPlbUrE3EwVx0ipAeUWailHup+?= =?us-ascii?Q?vzdPvwur7tpqxnoWVAYJf76xnyrd3FarZv7a5ugMVKltTIM8zrSc5BbF0Sd+?= =?us-ascii?Q?n0Dh76irdmRwhDki+055pf8qbIIbwttJf5y5546AgcFmMFqalHPREqoJrMFr?= =?us-ascii?Q?H+pB4MFpeMhB8hdrIv+GPIAO3YkFhX8Io1SLim8CDQiwiyAtgRSleCRMCK/i?= =?us-ascii?Q?E0lLxSQHwjMxBWJdcfKmPMQE+RWaekj1Iy/f1DcZhL3llTs7acjDUabXBZiv?= =?us-ascii?Q?OwgJIChQWNNLPZ0j3HvoIT59cXT6kZ8wuaAmbLlUj8JjWu4ZEW8tYPvui5fL?= =?us-ascii?Q?ey49E6QjdqqEdhVTAGZB+QY4ESM4LZ8oZyklcQbT1YLuZOzSNGEK2AvB1Lbf?= =?us-ascii?Q?KUOVB8wBKZ9KXfXiciFholBdK4+NagXYKFIt2OfwgJYqyrseUfZry9RoWQUV?= =?us-ascii?Q?08yR7gqQHIEQ/XAGmGw+ydb8mlhrouXzZT0+2K8jTVFZfoK1rmXCtWXmrnnA?= =?us-ascii?Q?MuD70AnH3u40F8bsnxW7G2qkn+jh2XsPvh2vDM9DUjL8MtrtCl33k1lG5tCR?= =?us-ascii?Q?7TCwZrKNYyvU/CGR8kJEjlSN0L7oUS03aJZBPzNAanoOi4OAiOQ/ZnqGpAun?= =?us-ascii?Q?WYkRFe/EiJ7Nn4vGOyXV/7x4qQ1a71ZsK3owWrmn7SiB17xBxU9nz2YehjfM?= =?us-ascii?Q?vUZOJF59j2U+29CD7MrnwiHAK/AcEy/a3Dn8dyaqDcELNvdZMjqscayn/8d4?= =?us-ascii?Q?ICv+X6PLhJo7l4wzwlHBrfvUkl04oMCAQB2JfxjeuAP8Kkk4puyPjwZFQ5bb?= =?us-ascii?Q?JfAk1ebS4DRCFUopnIUjDd7JQwdTF6AcPbGjgsbWVWmEy15pAbK4te9O3E0F?= =?us-ascii?Q?lPqqxsvrRdufPGIot9FMy7zLDL0bAL2MEov5NiMbWbnsK/OSF5JYcq7IwfNP?= =?us-ascii?Q?JobJRnZZP4dR48mctu/Z2zw9r8S94xqeJsXb6jep1Fw/3/5tkXDJpuOy5+a+?= =?us-ascii?Q?k5bn9QDZV3w2FXSOW4kM/2hjMhg02qedMenMPpXkaiz9sLNigeVgES4FbtBG?= =?us-ascii?Q?8gGH2XSEasRgV/E4qFM9EgT94mmfhktKY7LHk0/Hpbg83fJwJIp3I/eWJDhZ?= =?us-ascii?Q?gLsrSwe5oIk8gMKCY32HdKO/ApMOXju9gv1ApXYhr8omosdiNSM/86sIFCIG?= =?us-ascii?Q?8n/lRB+hLSg5YLes1RYcecte?= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef87cefa-dbab-45c1-370a-08d9202ec928 X-MS-Exchange-CrossTenant-AuthSource: DM6PR01MB5849.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2021 10:12:36.6905 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qtpEdRc3W2Jgmrj0GlDQ5ir48/DQjS07l2zEcUV0djcZaXFtzW4Tp1PaGKNtaww/p4eEyhcclzfhncyU0t9+Uv3uthMKXGr2EWo9mH9lvpg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR01MB2426 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Vu Nguyen Provide menu options to configure Secure Watchdog and Non-Secure Watchdog timer. By default, the values of these options are 5 minutes. Cc: Thang Nguyen Cc: Chuong Tran Cc: Phong Vo Cc: Leif Lindholm Cc: Michael D Kinney Cc: Ard Biesheuvel Cc: Nate DeSimone Signed-off-by: Vu Nguyen --- Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec = | 3 + Platform/Ampere/JadePkg/Jade.dsc = | 1 + Platform/Ampere/JadePkg/Jade.fdf = | 1 + Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/WatchdogConfigDxe.= inf | 50 +++ Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/NVDataStruc.h = | 27 ++ Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/WatchdogConfigDxe.= h | 82 ++++ Silicon/Ampere/AmpereAltraPkg/Include/Guid/WatchdogConfigHii.h = | 19 + Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/Vfr.vfr = | 58 +++ Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/WatchdogConfigDxe.= c | 460 ++++++++++++++++++++ Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/VfrStrings.uni = | 26 ++ 10 files changed, 727 insertions(+) diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec b/Silicon/Amp= ere/AmpereAltraPkg/AmpereAltraPkg.dec index ede85d3a3421..53930869f4f6 100644 --- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec +++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec @@ -56,6 +56,9 @@ [Guids] # GUID for the ACPI HII configuration form gAcpiConfigFormSetGuid =3D { 0x0ceb6764, 0xd415, 0x4b01, { 0xa8, 0x43, 0= xd1, 0x01, 0xbc, 0xb0, 0xd8, 0x29 } } =20 + # GUID for the Watchdog HII configuration form + gWatchdogConfigFormSetGuid =3D { 0xC3F8EC6E, 0x95EE, 0x460C, { 0xA4, 0= x8D, 0xEA, 0x54, 0x2F, 0xFF, 0x01, 0x61 } } + ## NVParam MM GUID gNVParamMmGuid =3D { 0xE4AC5024, 0x29BE, 0x4ADC, { 0x93, 0= x36, 0x87, 0xB5, 0xA0, 0x76, 0x23, 0x2D } } =20 diff --git a/Platform/Ampere/JadePkg/Jade.dsc b/Platform/Ampere/JadePkg/Jad= e.dsc index 26cf8be001ab..391ff75e237c 100755 --- a/Platform/Ampere/JadePkg/Jade.dsc +++ b/Platform/Ampere/JadePkg/Jade.dsc @@ -183,3 +183,4 @@ [Components.common] Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.inf Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.inf Silicon/Ampere/AmpereAltraPkg/Drivers/RasConfigDxe/RasConfigDxe.inf + Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/WatchdogConfigDx= e.inf diff --git a/Platform/Ampere/JadePkg/Jade.fdf b/Platform/Ampere/JadePkg/Jad= e.fdf index c0b71a4732fa..431c9906e98e 100755 --- a/Platform/Ampere/JadePkg/Jade.fdf +++ b/Platform/Ampere/JadePkg/Jade.fdf @@ -358,5 +358,6 @@ [FV.FvMain] INF Silicon/Ampere/AmpereAltraPkg/Drivers/CpuConfigDxe/CpuConfigDxe.inf INF Silicon/Ampere/AmpereAltraPkg/Drivers/AcpiConfigDxe/AcpiConfigDxe.in= f INF Silicon/Ampere/AmpereAltraPkg/Drivers/RasConfigDxe/RasConfigDxe.inf + INF Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/WatchdogConf= igDxe.inf =20 !include Platform/Ampere/AmperePlatformPkg/FvRules.fdf.inc diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/Watchd= ogConfigDxe.inf b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/W= atchdogConfigDxe.inf new file mode 100644 index 000000000000..530b7c3575f6 --- /dev/null +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/WatchdogConfi= gDxe.inf @@ -0,0 +1,50 @@ +## @file +# +# Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION =3D 0x0001001B + BASE_NAME =3D WatchdogConfigDxe + FILE_GUID =3D 135A0CA5-4851-4EF5-9E1A-C6E4610C39A9 + MODULE_TYPE =3D DXE_DRIVER + VERSION_STRING =3D 1.0 + ENTRY_POINT =3D WatchdogConfigInitialize + +[Sources.common] + NVDataStruc.h + Vfr.vfr + VfrStrings.uni + WatchdogConfigDxe.c + WatchdogConfigDxe.h + +[Packages] + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dec + Silicon/Ampere/AmpereSiliconPkg/AmpereSiliconPkg.dec + +[LibraryClasses] + BaseLib + DebugLib + DevicePathLib + HiiLib + NVParamLib + PrintLib + UefiBootServicesTableLib + UefiDriverEntryPoint + +[Guids] + gPlatformManagerFormsetGuid + gWatchdogConfigFormSetGuid + +[Protocols] + gEfiDevicePathProtocolGuid ## CONSUMES + gEfiHiiConfigRoutingProtocolGuid ## CONSUMES + gEfiHiiConfigAccessProtocolGuid ## PRODUCES + +[Depex] + TRUE diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/NVData= Struc.h b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/NVDataStr= uc.h new file mode 100644 index 000000000000..ad95c21e391f --- /dev/null +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/NVDataStruc.h @@ -0,0 +1,27 @@ +/** @file + + Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved. + + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef NVDATASTRUC_H_ +#define NVDATASTRUC_H_ + +#include + +#define WATCHDOG_CONFIG_VARSTORE_ID 0x1234 +#define WATCHDOG_CONFIG_FORM_ID 0x1235 + +#define NWDT_UEFI_DEFAULT_VALUE 300 // 5 minutes +#define SWDT_DEFAULT_VALUE 300 // 5 minutes + +#pragma pack(1) +typedef struct { + UINT32 WatchdogTimerUEFITimeout; + UINT32 SecureWatchdogTimerTimeout; +} WATCHDOG_CONFIG_VARSTORE_DATA; +#pragma pack() + +#endif diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/Watchd= ogConfigDxe.h b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/Wat= chdogConfigDxe.h new file mode 100644 index 000000000000..fa2e5e062379 --- /dev/null +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/WatchdogConfi= gDxe.h @@ -0,0 +1,82 @@ +/** @file + + Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved. + + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef WATCHDOG_CONFIG_DXE_H_ +#define WATCHDOG_CONFIG_DXE_H_ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "NVDataStruc.h" + +// +// This is the generated IFR binary data for each formset defined in VFR. +// +extern UINT8 VfrBin[]; + +// +// This is the generated String package data for all .UNI files. +// +extern UINT8 WatchdogConfigDxeStrings[]; + +#define WATCHDOG_CONFIG_PRIVATE_SIGNATURE SIGNATURE_32 ('W', 'D', 'T', 'C'= ) + +typedef struct { + UINTN Signature; + + EFI_HANDLE DriverHandle; + EFI_HII_HANDLE HiiHandle; + WATCHDOG_CONFIG_VARSTORE_DATA Configuration; + + // + // Consumed protocol + // + EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting; + + // + // Produced protocol + // + EFI_HII_CONFIG_ACCESS_PROTOCOL ConfigAccess; +} WATCHDOG_CONFIG_PRIVATE_DATA; + +#define WATCHDOG_CONFIG_PRIVATE_FROM_THIS(a) CR (a, WATCHDOG_CONFIG_PRIVA= TE_DATA, ConfigAccess, WATCHDOG_CONFIG_PRIVATE_SIGNATURE) + +#pragma pack(1) + +/// +/// HII specific Vendor Device Path definition. +/// +typedef struct { + VENDOR_DEVICE_PATH VendorDevicePath; + EFI_DEVICE_PATH_PROTOCOL End; +} HII_VENDOR_DEVICE_PATH; + +#pragma pack() + +EFI_STATUS +WatchdogConfigNvParamSet ( + IN WATCHDOG_CONFIG_VARSTORE_DATA *VarStoreConfig + ); + +EFI_STATUS +WatchdogConfigNvParamGet ( + OUT WATCHDOG_CONFIG_VARSTORE_DATA *VarStoreConfig + ); + +#endif /* WATCHDOG_CONFIG_DXE_H_ */ diff --git a/Silicon/Ampere/AmpereAltraPkg/Include/Guid/WatchdogConfigHii.h= b/Silicon/Ampere/AmpereAltraPkg/Include/Guid/WatchdogConfigHii.h new file mode 100644 index 000000000000..16319d61a759 --- /dev/null +++ b/Silicon/Ampere/AmpereAltraPkg/Include/Guid/WatchdogConfigHii.h @@ -0,0 +1,19 @@ +/** @file + + Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved. + + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef WATCHDOG_CONFIG_HII_H_ +#define WATCHDOG_CONFIG_HII_H_ + +#define WATCHDOG_CONFIG_FORMSET_GUID \ + { \ + 0xC3F8EC6E, 0x95EE, 0x460C, { 0xA4, 0x8D, 0xEA, 0x54, 0x2F, 0xFF, 0x01= , 0x61 } \ + } + +extern EFI_GUID gWatchdogConfigFormSetGuid; + +#endif /* WATCHDOG_CONFIG_HII_H_ */ diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/Vfr.vf= r b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/Vfr.vfr new file mode 100644 index 000000000000..96b780ba9e7e --- /dev/null +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/Vfr.vfr @@ -0,0 +1,58 @@ +/** @file + + Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved. + + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include "NVDataStruc.h" + +formset + guid =3D WATCHDOG_CONFIG_FORMSET_GUID, + title =3D STRING_TOKEN(STR_WATCHDOG_CONFIG_FORM), + help =3D STRING_TOKEN(STR_WATCHDOG_CONFIG_FORM_HELP), + classguid =3D gPlatformManagerFormsetGuid, + + // + // Define a variable Storage + // + varstore WATCHDOG_CONFIG_VARSTORE_DATA, + varid =3D WATCHDOG_CONFIG_VARSTORE_ID, + name =3D WatchdogConfigNVData, + guid =3D WATCHDOG_CONFIG_FORMSET_GUID; + + form + formid =3D WATCHDOG_CONFIG_FORM_ID, + title =3D STRING_TOKEN(STR_WATCHDOG_CONFIG_FORM); + subtitle text =3D STRING_TOKEN(STR_WATCHDOG_CONFIG_FORM_HELP); + + oneof varid =3D WatchdogConfigNVData.WatchdogTimerUEFITimeout, + prompt =3D STRING_TOKEN(STR_NWDT_TIMEOUT_UEFI), + help =3D STRING_TOKEN(STR_NWDT_TIMEOUT_UEFI_HELP), + flags =3D RESET_REQUIRED, + option text =3D STRING_TOKEN (STR_WDT_TIME_DISABLE), value =3D 0, fl= ags =3D 0; + option text =3D STRING_TOKEN (STR_WDT_TIME_5MIN), value =3D 300, fla= gs =3D 0; + option text =3D STRING_TOKEN (STR_WDT_TIME_6MIN), value =3D 360, fla= gs =3D 0; + option text =3D STRING_TOKEN (STR_WDT_TIME_10MIN), value =3D 600, fl= ags =3D 0; + option text =3D STRING_TOKEN (STR_WDT_TIME_15MIN), value =3D 900, fl= ags =3D 0; + option text =3D STRING_TOKEN (STR_WDT_TIME_20MIN), value =3D 1200, f= lags =3D 0; + default =3D NWDT_UEFI_DEFAULT_VALUE, + endoneof; + + oneof varid =3D WatchdogConfigNVData.SecureWatchdogTimerTimeout, + prompt =3D STRING_TOKEN(STR_SWDT_TIMEOUT), + help =3D STRING_TOKEN(STR_SWDT_TIMEOUT_HELP), + flags =3D RESET_REQUIRED, + option text =3D STRING_TOKEN (STR_WDT_TIME_DISABLE), value =3D 0, fl= ags =3D 0; + option text =3D STRING_TOKEN (STR_WDT_TIME_5MIN), value =3D 300, fla= gs =3D 0; + option text =3D STRING_TOKEN (STR_WDT_TIME_6MIN), value =3D 360, fla= gs =3D 0; + option text =3D STRING_TOKEN (STR_WDT_TIME_10MIN), value =3D 600, fl= ags =3D 0; + option text =3D STRING_TOKEN (STR_WDT_TIME_15MIN), value =3D 900, fl= ags =3D 0; + option text =3D STRING_TOKEN (STR_WDT_TIME_20MIN), value =3D 1200, f= lags =3D 0; + default =3D SWDT_DEFAULT_VALUE, + endoneof; + + endform; + +endformset; diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/Watchd= ogConfigDxe.c b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/Wat= chdogConfigDxe.c new file mode 100644 index 000000000000..98557b2fde8b --- /dev/null +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/WatchdogConfi= gDxe.c @@ -0,0 +1,460 @@ +/** @file + + Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved. + + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include "WatchdogConfigDxe.h" + +CHAR16 WatchDogConfigVarstoreDataName[] =3D L"WatchdogConfigNVData"; + +EFI_HANDLE mDriverHandle =3D NULL; +WATCHDOG_CONFIG_PRIVATE_DATA *mPrivateData =3D NULL; + +HII_VENDOR_DEVICE_PATH mWatchdogConfigHiiVendorDevicePath =3D { + { + { + HARDWARE_DEVICE_PATH, + HW_VENDOR_DP, + { + (UINT8)(sizeof (VENDOR_DEVICE_PATH)), + (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8) + } + }, + WATCHDOG_CONFIG_FORMSET_GUID + }, + { + END_DEVICE_PATH_TYPE, + END_ENTIRE_DEVICE_PATH_SUBTYPE, + { + (UINT8)(END_DEVICE_PATH_LENGTH), + (UINT8)((END_DEVICE_PATH_LENGTH) >> 8) + } + } +}; + +EFI_STATUS +WatchdogConfigNvParamGet ( + OUT WATCHDOG_CONFIG_VARSTORE_DATA *VarStoreConfig + ) +{ + EFI_STATUS Status; + UINT32 Value; + BOOLEAN SetDefault; + + SetDefault =3D FALSE; + Status =3D NVParamGet ( + NV_SI_WDT_BIOS_EXP_MINS, + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, + &Value + ); + if (EFI_ERROR (Status)) { + VarStoreConfig->WatchdogTimerUEFITimeout =3D NWDT_UEFI_DEFAULT_VALUE; + if (Status =3D=3D EFI_NOT_FOUND) { + SetDefault =3D TRUE; + } else { + ASSERT (FALSE); + } + } else { + VarStoreConfig->WatchdogTimerUEFITimeout =3D Value * 60; + } + + Status =3D NVParamGet ( + NV_SI_SEC_WDT_BIOS_EXP_MINS, + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, + &Value + ); + if (EFI_ERROR (Status)) { + VarStoreConfig->SecureWatchdogTimerTimeout =3D SWDT_DEFAULT_VALUE; + if (Status =3D=3D EFI_NOT_FOUND) { + SetDefault =3D TRUE; + } else { + ASSERT (FALSE); + } + } else { + VarStoreConfig->SecureWatchdogTimerTimeout =3D Value; + } + + if (SetDefault) { + WatchdogConfigNvParamSet (VarStoreConfig); + } + + return EFI_SUCCESS; +} + +EFI_STATUS +WatchdogConfigNvParamSet ( + IN WATCHDOG_CONFIG_VARSTORE_DATA *VarStoreConfig + ) +{ + EFI_STATUS Status; + UINT32 Value; + + Status =3D NVParamGet ( + NV_SI_WDT_BIOS_EXP_MINS, + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, + &Value + ); + if (EFI_ERROR (Status) + || Value !=3D (VarStoreConfig->WatchdogTimerUEFITimeout / 60)) + { + Status =3D NVParamSet ( + NV_SI_WDT_BIOS_EXP_MINS, + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, + NV_PERM_BIOS | NV_PERM_MANU, + (VarStoreConfig->WatchdogTimerUEFITimeout / 60) + ); + if (EFI_ERROR (Status)) { + return Status; + } + } + + Status =3D NVParamGet ( + NV_SI_SEC_WDT_BIOS_EXP_MINS, + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, + &Value + ); + if (EFI_ERROR (Status) + || Value !=3D VarStoreConfig->SecureWatchdogTimerTimeout) + { + Status =3D NVParamSet ( + NV_SI_SEC_WDT_BIOS_EXP_MINS, + NV_PERM_ATF | NV_PERM_BIOS | NV_PERM_MANU | NV_PERM_BMC, + NV_PERM_BIOS | NV_PERM_MANU, + VarStoreConfig->SecureWatchdogTimerTimeout + ); + if (EFI_ERROR (Status)) { + return Status; + } + } + + return EFI_SUCCESS; +} + +/** + This function allows a caller to extract the current configuration for o= ne + or more named elements from the target driver. + + @param This Points to the EFI_HII_CONFIG_ACCESS_PROTO= COL. + @param Request A null-terminated Unicode string in + format. + @param Progress On return, points to a character in the= Request + string. Points to the string's null termi= nator if + request was successful. Points to the mos= t recent + '&' before the first failing name/value p= air (or + the beginning of the string if the failur= e is in + the first name/value pair) if the request= was not + successful. + @param Results A null-terminated Unicode string in + format which has all valu= es filled + in for the names in the Request string. S= tring to + be allocated by the called function. + + @retval EFI_SUCCESS The Results is filled with the requested = values. + @retval EFI_OUT_OF_RESOURCES Not enough memory to store the results. + @retval EFI_INVALID_PARAMETER Request is illegal syntax, or unknown nam= e. + @retval EFI_NOT_FOUND Routing data doesn't match any storage in= this + driver. + +**/ +EFI_STATUS +EFIAPI +WatchdogConfigExtractConfig ( + IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This, + IN CONST EFI_STRING Request, + OUT EFI_STRING *Progress, + OUT EFI_STRING *Results + ) +{ + EFI_STATUS Status; + UINTN BufferSize; + WATCHDOG_CONFIG_PRIVATE_DATA *PrivateData; + EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting; + EFI_STRING ConfigRequest; + EFI_STRING ConfigRequestHdr; + UINTN Size; + BOOLEAN AllocatedRequest; + + if (Progress =3D=3D NULL || Results =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + // + // Initialize the local variables. + // + ConfigRequestHdr =3D NULL; + ConfigRequest =3D NULL; + Size =3D 0; + *Progress =3D Request; + AllocatedRequest =3D FALSE; + + if ((Request !=3D NULL) && !HiiIsConfigHdrMatch (Request, &gWatchdogConf= igFormSetGuid, WatchDogConfigVarstoreDataName)) { + return EFI_NOT_FOUND; + } + + PrivateData =3D WATCHDOG_CONFIG_PRIVATE_FROM_THIS (This); + HiiConfigRouting =3D PrivateData->HiiConfigRouting; + + // + // Get current setting from NVParam. + // + Status =3D WatchdogConfigNvParamGet (&PrivateData->Configuration); + if (EFI_ERROR (Status)) { + return Status; + } + + // + // Convert buffer data to by helper function BlockToConfig(= ) + // + BufferSize =3D sizeof (WATCHDOG_CONFIG_VARSTORE_DATA); + ConfigRequest =3D Request; + if ((Request =3D=3D NULL) || (StrStr (Request, L"OFFSET") =3D=3D NULL)) = { + // + // Request has no request element, construct full request string. + // Allocate and fill a buffer large enough to hold the tem= plate + // followed by "&OFFSET=3D0&WIDTH=3DWWWWWWWWWWWWWWWW" followed by a Nu= ll-terminator + // + ConfigRequestHdr =3D HiiConstructConfigHdr (&gWatchdogConfigFormSetGui= d, WatchDogConfigVarstoreDataName, PrivateData->DriverHandle); + Size =3D (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16); + ConfigRequest =3D AllocateZeroPool (Size); + ASSERT (ConfigRequest !=3D NULL); + if (ConfigRequest =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + AllocatedRequest =3D TRUE; + UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=3D0&WIDTH=3D%016LX", C= onfigRequestHdr, (UINT64)BufferSize); + FreePool (ConfigRequestHdr); + } + + // + // Convert buffer data to by helper function BlockToConfig(= ) + // + Status =3D HiiConfigRouting->BlockToConfig ( + HiiConfigRouting, + ConfigRequest, + (UINT8 *)&PrivateData->Configuration, + BufferSize, + Results, + Progress + ); + + // + // Free the allocated config request string. + // + if (AllocatedRequest) { + FreePool (ConfigRequest); + ConfigRequest =3D NULL; + } + + // + // Set Progress string to the original request string. + // + if (Request =3D=3D NULL) { + *Progress =3D NULL; + } else if (StrStr (Request, L"OFFSET") =3D=3D NULL) { + *Progress =3D Request + StrLen (Request); + } + + return Status; +} + +/** + This function processes the results of changes in configuration. + + @param This Points to the EFI_HII_CONFIG_ACCESS_PROTO= COL. + @param Configuration A null-terminated Unicode string in + format. + @param Progress A pointer to a string filled in with the = offset of + the most recent '&' before the first fail= ing + name/value pair (or the beginning of the = string if + the failure is in the first name/value pa= ir) or + the terminating NULL if all was successfu= l. + + @retval EFI_SUCCESS The Results is processed successfully. + @retval EFI_INVALID_PARAMETER Configuration is NULL. + @retval EFI_NOT_FOUND Routing data doesn't match any storage in= this + driver. + +**/ +EFI_STATUS +EFIAPI +WatchdogConfigRouteConfig ( + IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This, + IN CONST EFI_STRING Configuration, + OUT EFI_STRING *Progress + ) +{ + EFI_STATUS Status; + UINTN BufferSize; + WATCHDOG_CONFIG_PRIVATE_DATA *PrivateData; + EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting; + + if (Configuration =3D=3D NULL || Progress =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + PrivateData =3D WATCHDOG_CONFIG_PRIVATE_FROM_THIS (This); + HiiConfigRouting =3D PrivateData->HiiConfigRouting; + *Progress =3D Configuration; + + // + // Check routing data in . + // Note: if only one Storage is used, then this checking could be skippe= d. + // + if (!HiiIsConfigHdrMatch (Configuration, &gWatchdogConfigFormSetGuid, Wa= tchDogConfigVarstoreDataName)) { + return EFI_NOT_FOUND; + } + + // + // Get configuration data from NVParam + // + Status =3D WatchdogConfigNvParamGet (&PrivateData->Configuration); + if (EFI_ERROR (Status)) { + return Status; + } + + // + // Convert to buffer data by helper function ConfigToBlock(= ) + // + BufferSize =3D sizeof (WATCHDOG_CONFIG_VARSTORE_DATA); + Status =3D HiiConfigRouting->ConfigToBlock ( + HiiConfigRouting, + Configuration, + (UINT8 *)&PrivateData->Configuration, + &BufferSize, + Progress + ); + if (EFI_ERROR (Status)) { + return Status; + } + + // + // Store configuration data back to NVParam + // + Status =3D WatchdogConfigNvParamSet (&PrivateData->Configuration); + if (EFI_ERROR (Status)) { + return Status; + } + + return Status; +} + +/** + This function processes the results of changes in configuration. + + @param This Points to the EFI_HII_CONFIG_ACCESS_PROTO= COL. + @param Action Specifies the type of action taken by the= browser. + @param QuestionId A unique value which is sent to the origi= nal + exporting driver so that it can identify = the type + of data to expect. + @param Type The type of value for the question. + @param Value A pointer to the data being sent to the o= riginal + exporting driver. + @param ActionRequest On return, points to the action requested= by the + callback function. + + @retval EFI_SUCCESS The callback successfully handled the act= ion. + @retval EFI_INVALID_PARAMETER The setup browser call this function with= invalid parameters. + +**/ +EFI_STATUS +EFIAPI +WatchdogConfigCallback ( + IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This, + IN EFI_BROWSER_ACTION Action, + IN EFI_QUESTION_ID QuestionId, + IN UINT8 Type, + IN EFI_IFR_TYPE_VALUE *Value, + OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest + ) +{ + if (Action !=3D EFI_BROWSER_ACTION_CHANGING) { + // + // Do nothing for other UEFI Action. Only do call back when data is ch= anged. + // + return EFI_UNSUPPORTED; + } + if (((Value =3D=3D NULL) + && (Action !=3D EFI_BROWSER_ACTION_FORM_OPEN) + && (Action !=3D EFI_BROWSER_ACTION_FORM_CLOSE)) + || (ActionRequest =3D=3D NULL)) + { + return EFI_INVALID_PARAMETER; + } + + return EFI_SUCCESS; +} + +EFI_STATUS +WatchdogConfigInitialize ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + EFI_HII_HANDLE HiiHandle; + EFI_HII_CONFIG_ROUTING_PROTOCOL *HiiConfigRouting; + + // + // Initialize driver private data + // + mPrivateData =3D AllocateZeroPool (sizeof (WATCHDOG_CONFIG_PRIVATE_DATA)= ); + if (mPrivateData =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + + mPrivateData->Signature =3D WATCHDOG_CONFIG_PRIVATE_SIGNATURE; + + mPrivateData->ConfigAccess.ExtractConfig =3D WatchdogConfigExtractConfig= ; + mPrivateData->ConfigAccess.RouteConfig =3D WatchdogConfigRouteConfig; + mPrivateData->ConfigAccess.Callback =3D WatchdogConfigCallback; + + // + // Locate ConfigRouting protocol + // + Status =3D gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL,= (VOID **)&HiiConfigRouting); + if (EFI_ERROR (Status)) { + return Status; + } + mPrivateData->HiiConfigRouting =3D HiiConfigRouting; + + Status =3D gBS->InstallMultipleProtocolInterfaces ( + &mDriverHandle, + &gEfiDevicePathProtocolGuid, + &mWatchdogConfigHiiVendorDevicePath, + &gEfiHiiConfigAccessProtocolGuid, + &mPrivateData->ConfigAccess, + NULL + ); + ASSERT_EFI_ERROR (Status); + + mPrivateData->DriverHandle =3D mDriverHandle; + + // + // Publish our HII data + // + HiiHandle =3D HiiAddPackages ( + &gWatchdogConfigFormSetGuid, + mDriverHandle, + WatchdogConfigDxeStrings, + VfrBin, + NULL + ); + if (HiiHandle =3D=3D NULL) { + gBS->UninstallMultipleProtocolInterfaces ( + mDriverHandle, + &gEfiDevicePathProtocolGuid, + &mWatchdogConfigHiiVendorDevicePath, + &gEfiHiiConfigAccessProtocolGuid, + &mPrivateData->ConfigAccess, + NULL + ); + return EFI_OUT_OF_RESOURCES; + } + + mPrivateData->HiiHandle =3D HiiHandle; + + return EFI_SUCCESS; +} diff --git a/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/VfrStr= ings.uni b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/VfrStrin= gs.uni new file mode 100644 index 000000000000..1d0f820e456f --- /dev/null +++ b/Silicon/Ampere/AmpereAltraPkg/Drivers/WatchdogConfigDxe/VfrStrings.un= i @@ -0,0 +1,26 @@ +// +// Copyright (c) 2020 - 2021, Ampere Computing LLC. All rights reserved. +// +// SPDX-License-Identifier: BSD-2-Clause-Patent +// + +#langdef en-US "English" + +#string STR_WATCHDOG_CONFIG_FORM #language en-US "Watchdog Configur= ation" +#string STR_WATCHDOG_CONFIG_FORM_HELP #language en-US "Watchdog Configur= ation" + +#string STR_WDT_TIME_DISABLE #language en-US "Disabled" +#string STR_WDT_TIME_3MIN #language en-US "3 minutes" +#string STR_WDT_TIME_4MIN #language en-US "4 minutes" +#string STR_WDT_TIME_5MIN #language en-US "5 minutes" +#string STR_WDT_TIME_6MIN #language en-US "6 minutes" +#string STR_WDT_TIME_10MIN #language en-US "10 minutes" +#string STR_WDT_TIME_15MIN #language en-US "15 minutes" +#string STR_WDT_TIME_20MIN #language en-US "20 minutes" + +#string STR_NWDT_TIMEOUT_OS #language en-US "OS Watchdog Time= out" +#string STR_NWDT_TIMEOUT_OS_HELP #language en-US "Timeout when boo= t OS." +#string STR_NWDT_TIMEOUT_UEFI #language en-US "UEFI Watchdog Ti= meout" +#string STR_NWDT_TIMEOUT_UEFI_HELP #language en-US "Timeout when boo= t UEFI" +#string STR_SWDT_TIMEOUT #language en-US "Secure Watchdog = Timeout" +#string STR_SWDT_TIMEOUT_HELP #language en-US "Timeout when SCP= will reset system if it doesn't receive response from ARMv8." --=20 2.17.1