From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=LWkaSo0Z; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: hao.a.wu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646718204; x=1678254204; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=EVcXYmSeV1eAeycEJS/tccpPQZ+yPj6LalXDlHxx504=; b=LWkaSo0Zr0PMiO+V8UOrFEv7fyb9ZYcVcfdYwwSpqj75H6rrXrl1fPjc 6l94ChLYP/FwUzfGhlh850Ru621nY7SLOQjvuM+casMMwdBuwemNPMd4H 801cXMgLGctTRsLC2UGXpOYMdHfX5wF6N7JREfucyOU8EACzzueVPTBEz Xh/z8V7TJ9H8hCExH/VL/F0R13/Ir/2C6jcQOeKZqdUjBWOMmVgL7+XIk W2kdqyIjho9SzOH9uyiJcJ4Y10rt/8nAh05XM4ili6y9e238Dtczcp+AZ 5rfqVCxAYG7V4M6EK7BYVYDEPau/cg6FV4ATKbfhgK4Z/f0CZrvC1lk0p w==; 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" 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" 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: [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> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 --- 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=0D ACPI 4.0 definitions from the ACPI Specification Revision 4.0a April 5, = 2010=0D =0D - Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2010 - 2022, Intel Corporation. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D **/=0D =0D @@ -690,6 +690,7 @@ typedef struct { // Boot Error Severity types=0D //=0D #define EFI_ACPI_4_0_ERROR_SEVERITY_CORRECTABLE 0x00=0D +#define EFI_ACPI_4_0_ERROR_SEVERITY_RECOVERABLE 0x00=0D #define EFI_ACPI_4_0_ERROR_SEVERITY_FATAL 0x01=0D #define EFI_ACPI_4_0_ERROR_SEVERITY_CORRECTED 0x02=0D #define EFI_ACPI_4_0_ERROR_SEVERITY_NONE 0x03=0D 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.=0D =0D Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
=0D - Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.
=0D Copyright (c) 2020, ARM Ltd. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D **/=0D @@ -1361,6 +1361,7 @@ typedef struct { // Boot Error Severity types=0D //=0D #define EFI_ACPI_5_0_ERROR_SEVERITY_CORRECTABLE 0x00=0D +#define EFI_ACPI_5_0_ERROR_SEVERITY_RECOVERABLE 0x00=0D #define EFI_ACPI_5_0_ERROR_SEVERITY_FATAL 0x01=0D #define EFI_ACPI_5_0_ERROR_SEVERITY_CORRECTED 0x02=0D #define EFI_ACPI_5_0_ERROR_SEVERITY_NONE 0x03=0D 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.=0D =0D Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
=0D - Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.
=0D (C) Copyright 2015 Hewlett Packard Enterprise Development LP
=0D Copyright (c) 2020, ARM Ltd. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -1376,10 +1376,16 @@ typedef struct { //=0D // Boot Error Severity types=0D //=0D -#define EFI_ACPI_5_1_ERROR_SEVERITY_CORRECTABLE 0x00=0D +#define EFI_ACPI_5_1_ERROR_SEVERITY_RECOVERABLE 0x00=0D #define EFI_ACPI_5_1_ERROR_SEVERITY_FATAL 0x01=0D #define EFI_ACPI_5_1_ERROR_SEVERITY_CORRECTED 0x02=0D #define EFI_ACPI_5_1_ERROR_SEVERITY_NONE 0x03=0D +//=0D +// The term 'Correctable' is no longer being used as an error severity of = the=0D +// reported error since ACPI Specification Version 5.1 Errata B.=0D +// The below macro is considered as deprecated and should no longer be use= d.=0D +//=0D +#define EFI_ACPI_5_1_ERROR_SEVERITY_CORRECTABLE 0x00=0D =0D ///=0D /// Generic Error Data Entry Definition=0D 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=0D ACPI 6.0 definitions from the ACPI Specification Revision 6.0 Errata A J= anuary, 2016.=0D =0D - Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved.
=0D (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP
=0D Copyright (c) 2020, ARM Ltd. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -1560,10 +1560,16 @@ typedef struct { //=0D // Boot Error Severity types=0D //=0D -#define EFI_ACPI_6_0_ERROR_SEVERITY_CORRECTABLE 0x00=0D +#define EFI_ACPI_6_0_ERROR_SEVERITY_RECOVERABLE 0x00=0D #define EFI_ACPI_6_0_ERROR_SEVERITY_FATAL 0x01=0D #define EFI_ACPI_6_0_ERROR_SEVERITY_CORRECTED 0x02=0D #define EFI_ACPI_6_0_ERROR_SEVERITY_NONE 0x03=0D +//=0D +// The term 'Correctable' is no longer being used as an error severity of = the=0D +// reported error since ACPI Specification Version 5.1 Errata B.=0D +// The below macro is considered as deprecated and should no longer be use= d.=0D +//=0D +#define EFI_ACPI_6_0_ERROR_SEVERITY_CORRECTABLE 0x00=0D =0D ///=0D /// Generic Error Data Entry Definition=0D 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=0D ACPI 6.1 definitions from the ACPI Specification Revision 6.1 January, 2= 016.=0D =0D - Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.
=0D (C) Copyright 2016 Hewlett Packard Enterprise Development LP
=0D Copyright (c) 2020, ARM Ltd. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -1566,10 +1566,16 @@ typedef struct { //=0D // Boot Error Severity types=0D //=0D -#define EFI_ACPI_6_1_ERROR_SEVERITY_CORRECTABLE 0x00=0D +#define EFI_ACPI_6_1_ERROR_SEVERITY_RECOVERABLE 0x00=0D #define EFI_ACPI_6_1_ERROR_SEVERITY_FATAL 0x01=0D #define EFI_ACPI_6_1_ERROR_SEVERITY_CORRECTED 0x02=0D #define EFI_ACPI_6_1_ERROR_SEVERITY_NONE 0x03=0D +//=0D +// The term 'Correctable' is no longer being used as an error severity of = the=0D +// reported error since ACPI Specification Version 5.1 Errata B.=0D +// The below macro is considered as deprecated and should no longer be use= d.=0D +//=0D +#define EFI_ACPI_6_1_ERROR_SEVERITY_CORRECTABLE 0x00=0D =0D ///=0D /// Generic Error Data Entry Definition=0D 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=0D ACPI 6.2 definitions from the ACPI Specification Revision 6.2 May, 2017.= =0D =0D - Copyright (c) 2017, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.
=0D Copyright (c) 2020, ARM Ltd. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D **/=0D @@ -1738,10 +1738,16 @@ typedef struct { //=0D // Boot Error Severity types=0D //=0D -#define EFI_ACPI_6_2_ERROR_SEVERITY_CORRECTABLE 0x00=0D +#define EFI_ACPI_6_2_ERROR_SEVERITY_RECOVERABLE 0x00=0D #define EFI_ACPI_6_2_ERROR_SEVERITY_FATAL 0x01=0D #define EFI_ACPI_6_2_ERROR_SEVERITY_CORRECTED 0x02=0D #define EFI_ACPI_6_2_ERROR_SEVERITY_NONE 0x03=0D +//=0D +// The term 'Correctable' is no longer being used as an error severity of = the=0D +// reported error since ACPI Specification Version 5.1 Errata B.=0D +// The below macro is considered as deprecated and should no longer be use= d.=0D +//=0D +#define EFI_ACPI_6_2_ERROR_SEVERITY_CORRECTABLE 0x00=0D =0D ///=0D /// Generic Error Data Entry Definition=0D 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=0D ACPI 6.3 definitions from the ACPI Specification Revision 6.3 Jan, 2019.= =0D =0D - Copyright (c) 2017, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.
=0D Copyright (c) 2019 - 2020, ARM Ltd. All rights reserved.
=0D =0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -1702,10 +1702,16 @@ typedef struct { //=0D // Boot Error Severity types=0D //=0D -#define EFI_ACPI_6_3_ERROR_SEVERITY_CORRECTABLE 0x00=0D +#define EFI_ACPI_6_3_ERROR_SEVERITY_RECOVERABLE 0x00=0D #define EFI_ACPI_6_3_ERROR_SEVERITY_FATAL 0x01=0D #define EFI_ACPI_6_3_ERROR_SEVERITY_CORRECTED 0x02=0D #define EFI_ACPI_6_3_ERROR_SEVERITY_NONE 0x03=0D +//=0D +// The term 'Correctable' is no longer being used as an error severity of = the=0D +// reported error since ACPI Specification Version 5.1 Errata B.=0D +// The below macro is considered as deprecated and should no longer be use= d.=0D +//=0D +#define EFI_ACPI_6_3_ERROR_SEVERITY_CORRECTABLE 0x00=0D =0D ///=0D /// Generic Error Data Entry Definition=0D 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=0D ACPI 6.4 definitions from the ACPI Specification Revision 6.4 Jan, 2021.= =0D =0D - Copyright (c) 2017, Intel Corporation. All rights reserved.
=0D + Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.
=0D Copyright (c) 2019 - 2021, ARM Ltd. All rights reserved.
=0D =0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -1783,10 +1783,16 @@ typedef struct { //=0D // Boot Error Severity types=0D //=0D -#define EFI_ACPI_6_4_ERROR_SEVERITY_CORRECTABLE 0x00=0D +#define EFI_ACPI_6_4_ERROR_SEVERITY_RECOVERABLE 0x00=0D #define EFI_ACPI_6_4_ERROR_SEVERITY_FATAL 0x01=0D #define EFI_ACPI_6_4_ERROR_SEVERITY_CORRECTED 0x02=0D #define EFI_ACPI_6_4_ERROR_SEVERITY_NONE 0x03=0D +//=0D +// The term 'Correctable' is no longer being used as an error severity of = the=0D +// reported error since ACPI Specification Version 5.1 Errata B.=0D +// The below macro is considered as deprecated and should no longer be use= d.=0D +//=0D +#define EFI_ACPI_6_4_ERROR_SEVERITY_CORRECTABLE 0x00=0D =0D ///=0D /// Generic Error Data Entry Definition=0D --=20 2.27.0.windows.1