From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.89]) by mx.groups.io with SMTP id smtpd.web11.22211.1627640585868354813 for ; Fri, 30 Jul 2021 03:23:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=dyoKS9h2; spf=pass (domain: arm.com, ip: 40.107.22.89, mailfrom: christopher.jones@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=icIMa0qn84/ap72PhkmGsb6rOgGn3SVAQD7RntmzIpQ=; b=dyoKS9h2FjNGFFO5tX44AFJOc9jA34VYEIWrTJWdPig6e+iiV2GcQgypjazUyEcKS+8YVISGP5OpUVIHHN27f4oLR5/ZA3LeqK3xq7q0FxVqPrqd0DcEKI4H/2HuyKdyqBmg3bWqgy3j3IR24qYZxp+zTHDan+z+M/cHEY7dB04= Received: from AS8P251CA0028.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:2f2::24) by AM0PR08MB4516.eurprd08.prod.outlook.com (2603:10a6:208:13b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.29; Fri, 30 Jul 2021 10:23:02 +0000 Received: from AM5EUR03FT063.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:2f2:cafe::30) by AS8P251CA0028.outlook.office365.com (2603:10a6:20b:2f2::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.17 via Frontend Transport; Fri, 30 Jul 2021 10:23:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT063.mail.protection.outlook.com (10.152.16.226) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Fri, 30 Jul 2021 10:23:01 +0000 Received: ("Tessian outbound 1942ea606101:v100"); Fri, 30 Jul 2021 10:23:01 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 256413b9ee546211 X-CR-MTA-TID: 64aa7808 Received: from 7887a92486ab.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 9D9D853A-91D2-48A4-B340-89F6BD7B63A4.1; Fri, 30 Jul 2021 10:22:55 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 7887a92486ab.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 30 Jul 2021 10:22:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NZvOdzCjls22kcC/0x+DNWeIFlTVHmtZfbtifN+QpUNPBjU2NFvN5+8Leo4fTRKGpI0bwd916o3uHxYlFVCu7X3DleCz/oINx6sjNe7cDBlnUeEthTvTae8ajoEYxD204Xks3OcZAkWwIdBPAub+Cx+UEBvM2NlvouvfOi6eWTmRFsl4smC8aRDAB2bj3jM9mXriQYZOjteS9vmtPZPzl/LTcabOEXBVEmoVq9zp9OamPdiiYqNxlww8HoEYzGc3eWi9E0KONEngScDCymYclch/aq2TAmwm5bPkwpKSadvvkQYgcc8EXGkOe+djbEXDRXmYx70snpLXGjMNTiwCiQ== 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=icIMa0qn84/ap72PhkmGsb6rOgGn3SVAQD7RntmzIpQ=; b=dl1SYytx2t2D4wr2sQ7ojiqrR8UbfAB4S8oDma4Ln80syKwAqKTohxOV+w3Q8Y1Cxy6Kn3SWxROuot38tfxOWFdFLSiJYOo6v8yvouoTmBbqq2Q+35dBCf5Kd/jpO0i/zaI7Vry7BEE8lG2367Smeg7paKz7TuWfocWO2j/ulQSvojPM9WveLdPKYxtp5qtz7OVG25/aqleVBY60yL0nFtHoD+/tprW4HHWByhfgWkmpcOmGp4E1UqqL4Val5JZFUWANbzjO1sdAtwXBgarcA2KrfP79YY1Mn1Eu9utMe/UqWbIWGo5hX/QsC47RK8ldMiOb8LOvskA35j+HKKh62Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=icIMa0qn84/ap72PhkmGsb6rOgGn3SVAQD7RntmzIpQ=; b=dyoKS9h2FjNGFFO5tX44AFJOc9jA34VYEIWrTJWdPig6e+iiV2GcQgypjazUyEcKS+8YVISGP5OpUVIHHN27f4oLR5/ZA3LeqK3xq7q0FxVqPrqd0DcEKI4H/2HuyKdyqBmg3bWqgy3j3IR24qYZxp+zTHDan+z+M/cHEY7dB04= Received: from DB6PR1001CA0006.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:b7::16) by AM6PR08MB4658.eurprd08.prod.outlook.com (2603:10a6:20b:c4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18; Fri, 30 Jul 2021 10:22:53 +0000 Received: from DB5EUR03FT042.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:b7:cafe::51) by DB6PR1001CA0006.outlook.office365.com (2603:10a6:4:b7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.20 via Frontend Transport; Fri, 30 Jul 2021 10:22:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT042.mail.protection.outlook.com (10.152.21.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4373.18 via Frontend Transport; Fri, 30 Jul 2021 10:22:53 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Fri, 30 Jul 2021 10:22:42 +0000 Received: from e125153.arm.com (10.57.39.90) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Fri, 30 Jul 2021 10:22:42 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [PATCH RESEND v1 03/13] MdePkg: Rename SBSA Generic Watchdog to Arm Generic Watchdog Date: Fri, 30 Jul 2021 11:22:31 +0100 Message-ID: <20210730102241.508-4-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210730102241.508-1-christopher.jones@arm.com> References: <20210730102241.508-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 51eb1dff-5adf-41d0-42b4-08d953440296 X-MS-TrafficTypeDiagnostic: AM6PR08MB4658:|AM0PR08MB4516: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:854;OLM:854; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: cARzwQdWqVXAekPlQ7RUNszl1T4gg8g3Yc9D4lGfZAZvdARGyK5zcqJDxxmBZJemP/7IeYGQfWxNu0GAqykMUM3CE6usUjoZt7CqEGG8KlElHnsNY2hrN68FNuKUshZXPXnH7E6nL1uuKzjR9l50BlFNLH8t7UGGCe0g4IbTvrh8pWOkbuVFKBi0bYy6+xZw3ryquq8vUmXAwHPeb647JpXxrBHpC+ZvVPqKqcMt9uMPzgZGCpbApr1PSOWVQ1UAlQByyF0Nq4K2PB7fCa4ya/l+Q+iBKnbkwdf5HZQ6+3mGEuNKOMcmBEENiZrt4fNsuCcwyu6A/NVGofbCTXhU4hzideXdY0bdFOJoPmXwVPp++yN8MLx0BVY0CN8ZifYuO1wdirXTzwktvjeLfpS3cJAs80w6Ux6HzqZYIIAiBIQXOakYysfvj0NU80xX1hhgFYzqjpV0aFI2JYTJI7fjx4munRmOGEWdY0Fj5VvGICvZ/mGwWfF8ejAHiu6TvwMiKNrTE5jD8uotYKA1tTHwkLtSCxxeK1DXJ5Ao0AgQ8aXOZX4tojnOBG9uaFhoGJapcKhSqXyaqR3Mh69XVxVrifxZW6wPOUv3bQ2Bn/neIAUQvUSmovES9Ft5+CEsMuAy6TbEIK+9uRoC4Fas8a5Zj4QXeVPez0vp1o7fybJlcY8/R7SFsUYX22xFWuIfXGX2gHn0JtVDlHQT2+7FfWG852Eb72fm6OvUfyhMrRh6hZKdTqOvsEO2iXGGjWjxg0cZ53QFNptZ73I4WGo9jHJ6/TFHTmBlnEUzCGozigZgT62HMlVgUdyXoPLtwFPzws6EzSmZAg8d3ggtQaMRYMKvK/vFzUB9jLd0H7nSJ9yZSQhLPlTf8elqS+T2AP6sgve7 X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(136003)(396003)(39850400004)(346002)(376002)(46966006)(36840700001)(426003)(7696005)(36860700001)(83380400001)(8676002)(2906002)(4326008)(316002)(8936002)(6666004)(336012)(54906003)(82310400003)(81166007)(2616005)(82740400003)(356005)(86362001)(6916009)(19627235002)(1076003)(70206006)(70586007)(186003)(16799955002)(478600001)(47076005)(5660300002)(36756003)(26005)(41533002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4658 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT063.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: af353ac1-eba6-4adf-a2db-08d95343fd99 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /l5vtgnN37WvMn7tn6sLN5bdmxMTxPaGthUCIVcYrkka04lVRzuu0ACG8lv4C9A0/Y7M+QWNzwxjgP19tQ2QRclMgmz1oTqm12FD7IVWWVN9SQLQkJildvez8j7B7DZwc7CG+E5TkUjBNeKCJI7mDSgalMkDthJT21g0EDOW6KLUaYJvmMT27t7+ZIfK4hVJHradAyups3WfYRXEsT13AxU4IXgSGRfpwM1QFgDWpRy6FDpn11u7JKVeuDuvVfgjYlI98PYbIhV9wDbG2zVZoqnmlDqaO33k1UNQnJz4FHrUiCrvQzazxeGpt5AR3uOzVbGQeCDDt65aJeOgfkOby0WUmZLTpzCz0545RqOZ/kIy6dgv0STSp90ZGoAKVuboO7fTYiqNofIbXjCryG28xDV1m3ixGM7OCHOGHT982b3NkLTmTUQdsDFKKj3vB+NRqNSdqcTcTUyYe8MUzqheVss7HCmVgXHsRwDzbYup6vM7ZGfxctROc+fSpUBSpKmt/LmXMeC+2z+IHZCmsfRsCZ2855rSp0fzBuSY1vCfB65zNYMYjDdrQoae0pxfjaptcj1+WKUxPXkCoxIMQBNC4ziueW+TQXmKbP9oL3WV4oxWafrvN6/CSYkdngcDrlMBq6qjiLXmzwY4ky2V9Tc+F4nTKi+cIc7nFy+lCtlbhRidqQphrQ6+hwccHwcZ6GGZpvfWKNtoga3nNFd2rbfzLxFlbs0fAw/bm0BxQA46MnVhh//CEMmmm1AmjDONF6ry7EkyQctoZLhlcdEKuEsvYIF4GFZTSjcF8bvNRsNyg0E4P7YDxqTqO6r0PSEEDYNUbMJ65MnjB4tSEAFiPgfhlwoKVxt+VygltCsU/mXFDO4= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(396003)(39850400004)(376002)(346002)(136003)(36840700001)(46966006)(426003)(7696005)(86362001)(83380400001)(336012)(6666004)(1076003)(26005)(47076005)(16799955002)(82740400003)(82310400003)(36756003)(6916009)(5660300002)(478600001)(2616005)(8676002)(81166007)(2906002)(70206006)(186003)(8936002)(36860700001)(316002)(19627235002)(70586007)(54906003)(4326008)(41533002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2021 10:23:01.5409 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51eb1dff-5adf-41d0-42b4-08d953440296 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT063.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4516 Content-Type: text/plain Bugzilla: 3516 (https://bugzilla.tianocore.org/show_bug.cgi?id=3516) Make changes to ACPI 6.4 header according to the latest specification: - ACPI 6.4 January 2021, Section 5.2.24, Table 5.100 & Section 5.2.24.2 - Mantis ID 2126 (https://mantis.uefi.org/mantis/view.php?id=2126) Signed-off-by: Chris Jones --- MdePkg/Include/IndustryStandard/Acpi64.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/IndustryStandard/Acpi64.h index 5a0e5b29c7e41cfa03ebc28e306719762b72b76d..9a1339c78e915d451847190ec7000e4961b6cac5 100644 --- a/MdePkg/Include/IndustryStandard/Acpi64.h +++ b/MdePkg/Include/IndustryStandard/Acpi64.h @@ -1373,7 +1373,7 @@ typedef struct { /// Platform Timer Type /// #define EFI_ACPI_6_4_GTDT_GT_BLOCK 0 -#define EFI_ACPI_6_4_GTDT_SBSA_GENERIC_WATCHDOG 1 +#define EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG 1 /// /// GT Block Structure @@ -1415,7 +1415,7 @@ typedef struct { #define EFI_ACPI_6_4_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY BIT1 /// -/// SBSA Generic Watchdog Structure +/// Arm Generic Watchdog Structure /// typedef struct { UINT8 Type; @@ -1425,14 +1425,14 @@ typedef struct { UINT64 WatchdogControlFramePhysicalAddress; UINT32 WatchdogTimerGSIV; UINT32 WatchdogTimerFlags; -} EFI_ACPI_6_4_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE; +} EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE; /// -/// SBSA Generic Watchdog Timer Flags. All other bits are reserved and must be 0. +/// Arm Generic Watchdog Timer Flags. All other bits are reserved and must be 0. /// -#define EFI_ACPI_6_4_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE BIT0 -#define EFI_ACPI_6_4_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY BIT1 -#define EFI_ACPI_6_4_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER BIT2 +#define EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE BIT0 +#define EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY BIT1 +#define EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_FLAG_SECURE_TIMER BIT2 // // NVDIMM Firmware Interface Table definition. -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")