From nobody Sat May 18 21:45:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87344+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87344+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1646718205; cv=none; d=zohomail.com; s=zohoarc; b=jvrDJcUO5+SRKKylEgrrnNXgk7oD4b8lyc7fuwdVyWXpvSi/isyieYny6C3lrfZpR8VHaQd8Mcsg+9A2oykjabrEHHnHM8GJOMZ8S2/HOBThbGfbIN9i2tBJdFDpsTiDAZQWJgbsBhywErfPPfYwfESonWqw6mdLc88kVKlOPhQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646718205; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=hM0uq4bm07rbOSgeElytNXjxHJCpeWTF34d1wyYfFos=; b=EsSngHvT0lGUzFmv12eAQy5qBYc1Wip9b7F1/X6Cfx8BoLwXWEutcBKIh1h1VQxcDFm4WtTAsWElRQ6jFXQLM/8lI0KcwHDbAZCls5/ZWwGBiO/XVSivLk40au8/HiVXzifn4YhxSZt8D37FeuA6/Co3JJ/bvE0J0K0NHe87nRo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87344+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1646718205425928.4073268726529; Mon, 7 Mar 2022 21:43:25 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Qj2mYY1788612xVCBQVBqUYk; Mon, 07 Mar 2022 21:43:25 -0800 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.5328.1646718204733511730 for ; Mon, 07 Mar 2022 21:43:25 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10279"; a="279310707" X-IronPort-AV: E=Sophos;i="5.90,163,1643702400"; d="scan'208";a="279310707" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 21:43:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,163,1643702400"; d="scan'208";a="537429277" X-Received: from wuh-desk.ccr.corp.intel.com ([10.239.160.22]) by orsmga007.jf.intel.com with ESMTP; 07 Mar 2022 21:43:17 -0800 From: "Wu, Hao A" To: devel@edk2.groups.io Cc: Hao A Wu , Michael D Kinney , Liming Gao , Zhiguang Liu , Ray Ni Subject: [edk2-devel] [PATCH v2] MdePkg/AcpiXX.h: Update Error Severity type for Generic Error Status Block Date: Tue, 8 Mar 2022 13:43:16 +0800 Message-Id: <20220308054316.2501-1-hao.a.wu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,hao.a.wu@intel.com X-Gm-Message-State: Mt0yivGBCVCInwNfymaEvdBfx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1646718205; bh=xD1AGUJZWPCinCPJ0vOiH0DLyay7A4+YwdpLw3ANVnA=; h=Cc:Date:From:Reply-To:Subject:To; b=e1coCDdQoUFHJNp1rSzuqpLH3NHfNfi5rG8aSRN1FKMyCQzMczixpBQ0kTCBrokvgBx a/vr1cJIXUSZ9fhT2ScF3ZJbMWox73IIdJy15PWjp2ZoJ0WmcJTS5zxW5giywDKVPk35J YlX6NmXPZktP8ogbFwg69+tYnWtIcnpaf5A= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1646718207282100001 Content-Type: text/plain; charset="utf-8" Starting from ACPI Specification Version 5.1 Errata B, the term 'Correctable' is no longer being used as an error severity of the reported error in Chapter 18 APEI. This commit will a) For Acpi40.h & Acpi50.h Add new macro EFI_ACPI_X_X_ERROR_SEVERITY_RECOVERABLE, since both the terms 'Correctable' and 'Recoverable' are used to denote the same error severity. b) Header files starting from Acpi51.h to Acpi64.h Add new macro EFI_ACPI_X_X_ERROR_SEVERITY_RECOVERABLE. Keeps the origin EFI_ACPI_X_X_ERROR_SEVERITY_CORRECTABLE for compatibility consideration, but add comments to mark it as deprecated and should no longer be used. Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Ray Ni Signed-off-by: Hao A Wu Reviewed-by: Liming Gao --- MdePkg/Include/IndustryStandard/Acpi40.h | 3 ++- MdePkg/Include/IndustryStandard/Acpi50.h | 3 ++- MdePkg/Include/IndustryStandard/Acpi51.h | 10 ++++++++-- MdePkg/Include/IndustryStandard/Acpi60.h | 10 ++++++++-- MdePkg/Include/IndustryStandard/Acpi61.h | 10 ++++++++-- MdePkg/Include/IndustryStandard/Acpi62.h | 10 ++++++++-- MdePkg/Include/IndustryStandard/Acpi63.h | 10 ++++++++-- MdePkg/Include/IndustryStandard/Acpi64.h | 10 ++++++++-- 8 files changed, 52 insertions(+), 14 deletions(-) diff --git a/MdePkg/Include/IndustryStandard/Acpi40.h b/MdePkg/Include/Indu= stryStandard/Acpi40.h index 862113dff9..a2da09346f 100644 --- a/MdePkg/Include/IndustryStandard/Acpi40.h +++ b/MdePkg/Include/IndustryStandard/Acpi40.h @@ -1,7 +1,7 @@ /** @file ACPI 4.0 definitions from the ACPI Specification Revision 4.0a April 5, = 2010 =20 - Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 @@ -690,6 +690,7 @@ typedef struct { // Boot Error Severity types // #define EFI_ACPI_4_0_ERROR_SEVERITY_CORRECTABLE 0x00 +#define EFI_ACPI_4_0_ERROR_SEVERITY_RECOVERABLE 0x00 #define EFI_ACPI_4_0_ERROR_SEVERITY_FATAL 0x01 #define EFI_ACPI_4_0_ERROR_SEVERITY_CORRECTED 0x02 #define EFI_ACPI_4_0_ERROR_SEVERITY_NONE 0x03 diff --git a/MdePkg/Include/IndustryStandard/Acpi50.h b/MdePkg/Include/Indu= stryStandard/Acpi50.h index be8f85f577..76706aa640 100644 --- a/MdePkg/Include/IndustryStandard/Acpi50.h +++ b/MdePkg/Include/IndustryStandard/Acpi50.h @@ -2,7 +2,7 @@ ACPI 5.0 definitions from the ACPI Specification Revision 5.0a November = 13, 2013. =20 Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.
Copyright (c) 2020, ARM Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -1361,6 +1361,7 @@ typedef struct { // Boot Error Severity types // #define EFI_ACPI_5_0_ERROR_SEVERITY_CORRECTABLE 0x00 +#define EFI_ACPI_5_0_ERROR_SEVERITY_RECOVERABLE 0x00 #define EFI_ACPI_5_0_ERROR_SEVERITY_FATAL 0x01 #define EFI_ACPI_5_0_ERROR_SEVERITY_CORRECTED 0x02 #define EFI_ACPI_5_0_ERROR_SEVERITY_NONE 0x03 diff --git a/MdePkg/Include/IndustryStandard/Acpi51.h b/MdePkg/Include/Indu= stryStandard/Acpi51.h index d8ee3ef8f2..01ef544c3a 100644 --- a/MdePkg/Include/IndustryStandard/Acpi51.h +++ b/MdePkg/Include/IndustryStandard/Acpi51.h @@ -2,7 +2,7 @@ ACPI 5.1 definitions from the ACPI Specification Revision 5.1 Errata B J= anuary, 2016. =20 Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.
(C) Copyright 2015 Hewlett Packard Enterprise Development LP
Copyright (c) 2020, ARM Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -1376,10 +1376,16 @@ typedef struct { // // Boot Error Severity types // -#define EFI_ACPI_5_1_ERROR_SEVERITY_CORRECTABLE 0x00 +#define EFI_ACPI_5_1_ERROR_SEVERITY_RECOVERABLE 0x00 #define EFI_ACPI_5_1_ERROR_SEVERITY_FATAL 0x01 #define EFI_ACPI_5_1_ERROR_SEVERITY_CORRECTED 0x02 #define EFI_ACPI_5_1_ERROR_SEVERITY_NONE 0x03 +// +// The term 'Correctable' is no longer being used as an error severity of = the +// reported error since ACPI Specification Version 5.1 Errata B. +// The below macro is considered as deprecated and should no longer be use= d. +// +#define EFI_ACPI_5_1_ERROR_SEVERITY_CORRECTABLE 0x00 =20 /// /// Generic Error Data Entry Definition diff --git a/MdePkg/Include/IndustryStandard/Acpi60.h b/MdePkg/Include/Indu= stryStandard/Acpi60.h index f4ab016d70..5ac3be6ad7 100644 --- a/MdePkg/Include/IndustryStandard/Acpi60.h +++ b/MdePkg/Include/IndustryStandard/Acpi60.h @@ -1,7 +1,7 @@ /** @file ACPI 6.0 definitions from the ACPI Specification Revision 6.0 Errata A J= anuary, 2016. =20 - Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved.
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP
Copyright (c) 2020, ARM Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -1560,10 +1560,16 @@ typedef struct { // // Boot Error Severity types // -#define EFI_ACPI_6_0_ERROR_SEVERITY_CORRECTABLE 0x00 +#define EFI_ACPI_6_0_ERROR_SEVERITY_RECOVERABLE 0x00 #define EFI_ACPI_6_0_ERROR_SEVERITY_FATAL 0x01 #define EFI_ACPI_6_0_ERROR_SEVERITY_CORRECTED 0x02 #define EFI_ACPI_6_0_ERROR_SEVERITY_NONE 0x03 +// +// The term 'Correctable' is no longer being used as an error severity of = the +// reported error since ACPI Specification Version 5.1 Errata B. +// The below macro is considered as deprecated and should no longer be use= d. +// +#define EFI_ACPI_6_0_ERROR_SEVERITY_CORRECTABLE 0x00 =20 /// /// Generic Error Data Entry Definition diff --git a/MdePkg/Include/IndustryStandard/Acpi61.h b/MdePkg/Include/Indu= stryStandard/Acpi61.h index 5ab31e7520..7af67d832b 100644 --- a/MdePkg/Include/IndustryStandard/Acpi61.h +++ b/MdePkg/Include/IndustryStandard/Acpi61.h @@ -1,7 +1,7 @@ /** @file ACPI 6.1 definitions from the ACPI Specification Revision 6.1 January, 2= 016. =20 - Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
Copyright (c) 2020, ARM Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -1566,10 +1566,16 @@ typedef struct { // // Boot Error Severity types // -#define EFI_ACPI_6_1_ERROR_SEVERITY_CORRECTABLE 0x00 +#define EFI_ACPI_6_1_ERROR_SEVERITY_RECOVERABLE 0x00 #define EFI_ACPI_6_1_ERROR_SEVERITY_FATAL 0x01 #define EFI_ACPI_6_1_ERROR_SEVERITY_CORRECTED 0x02 #define EFI_ACPI_6_1_ERROR_SEVERITY_NONE 0x03 +// +// The term 'Correctable' is no longer being used as an error severity of = the +// reported error since ACPI Specification Version 5.1 Errata B. +// The below macro is considered as deprecated and should no longer be use= d. +// +#define EFI_ACPI_6_1_ERROR_SEVERITY_CORRECTABLE 0x00 =20 /// /// Generic Error Data Entry Definition diff --git a/MdePkg/Include/IndustryStandard/Acpi62.h b/MdePkg/Include/Indu= stryStandard/Acpi62.h index 0ede23c716..313db63044 100644 --- a/MdePkg/Include/IndustryStandard/Acpi62.h +++ b/MdePkg/Include/IndustryStandard/Acpi62.h @@ -1,7 +1,7 @@ /** @file ACPI 6.2 definitions from the ACPI Specification Revision 6.2 May, 2017. =20 - Copyright (c) 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.
Copyright (c) 2020, ARM Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -1738,10 +1738,16 @@ typedef struct { // // Boot Error Severity types // -#define EFI_ACPI_6_2_ERROR_SEVERITY_CORRECTABLE 0x00 +#define EFI_ACPI_6_2_ERROR_SEVERITY_RECOVERABLE 0x00 #define EFI_ACPI_6_2_ERROR_SEVERITY_FATAL 0x01 #define EFI_ACPI_6_2_ERROR_SEVERITY_CORRECTED 0x02 #define EFI_ACPI_6_2_ERROR_SEVERITY_NONE 0x03 +// +// The term 'Correctable' is no longer being used as an error severity of = the +// reported error since ACPI Specification Version 5.1 Errata B. +// The below macro is considered as deprecated and should no longer be use= d. +// +#define EFI_ACPI_6_2_ERROR_SEVERITY_CORRECTABLE 0x00 =20 /// /// Generic Error Data Entry Definition diff --git a/MdePkg/Include/IndustryStandard/Acpi63.h b/MdePkg/Include/Indu= stryStandard/Acpi63.h index e4d5825946..b1e9d5db5b 100644 --- a/MdePkg/Include/IndustryStandard/Acpi63.h +++ b/MdePkg/Include/IndustryStandard/Acpi63.h @@ -1,7 +1,7 @@ /** @file ACPI 6.3 definitions from the ACPI Specification Revision 6.3 Jan, 2019. =20 - Copyright (c) 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.
Copyright (c) 2019 - 2020, ARM Ltd. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -1702,10 +1702,16 @@ typedef struct { // // Boot Error Severity types // -#define EFI_ACPI_6_3_ERROR_SEVERITY_CORRECTABLE 0x00 +#define EFI_ACPI_6_3_ERROR_SEVERITY_RECOVERABLE 0x00 #define EFI_ACPI_6_3_ERROR_SEVERITY_FATAL 0x01 #define EFI_ACPI_6_3_ERROR_SEVERITY_CORRECTED 0x02 #define EFI_ACPI_6_3_ERROR_SEVERITY_NONE 0x03 +// +// The term 'Correctable' is no longer being used as an error severity of = the +// reported error since ACPI Specification Version 5.1 Errata B. +// The below macro is considered as deprecated and should no longer be use= d. +// +#define EFI_ACPI_6_3_ERROR_SEVERITY_CORRECTABLE 0x00 =20 /// /// Generic Error Data Entry Definition diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/Indu= stryStandard/Acpi64.h index a79b7f2eaa..232697f228 100644 --- a/MdePkg/Include/IndustryStandard/Acpi64.h +++ b/MdePkg/Include/IndustryStandard/Acpi64.h @@ -1,7 +1,7 @@ /** @file ACPI 6.4 definitions from the ACPI Specification Revision 6.4 Jan, 2021. =20 - Copyright (c) 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.
Copyright (c) 2019 - 2021, ARM Ltd. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -1783,10 +1783,16 @@ typedef struct { // // Boot Error Severity types // -#define EFI_ACPI_6_4_ERROR_SEVERITY_CORRECTABLE 0x00 +#define EFI_ACPI_6_4_ERROR_SEVERITY_RECOVERABLE 0x00 #define EFI_ACPI_6_4_ERROR_SEVERITY_FATAL 0x01 #define EFI_ACPI_6_4_ERROR_SEVERITY_CORRECTED 0x02 #define EFI_ACPI_6_4_ERROR_SEVERITY_NONE 0x03 +// +// The term 'Correctable' is no longer being used as an error severity of = the +// reported error since ACPI Specification Version 5.1 Errata B. +// The below macro is considered as deprecated and should no longer be use= d. +// +#define EFI_ACPI_6_4_ERROR_SEVERITY_CORRECTABLE 0x00 =20 /// /// Generic Error Data Entry Definition --=20 2.27.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#87344): https://edk2.groups.io/g/devel/message/87344 Mute This Topic: https://groups.io/mt/89631710/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-