MdePkg/AcpiXX.h: Update Error Severity type for Generic Error Status Block

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 <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

diff --git a/MdePkg/Include/IndustryStandard/Acpi40.h b/MdePkg/Include/IndustryStandard/Acpi40.h
index 862113dff906b65626424fcb8957b399863de865..a2da09346f1ce17d96daedbe5a14d5a32f0e3074 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi40.h
+++ b/MdePkg/Include/IndustryStandard/Acpi40.h
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI 4.0 definitions from the ACPI Specification Revision 4.0a April 5, 2010\r
 \r
-  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2022, Intel Corporation. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
@@ -690,6 +690,7 @@ typedef struct {
 // Boot Error Severity types\r
 //\r
 #define EFI_ACPI_4_0_ERROR_SEVERITY_CORRECTABLE  0x00\r
+#define EFI_ACPI_4_0_ERROR_SEVERITY_RECOVERABLE  0x00\r
 #define EFI_ACPI_4_0_ERROR_SEVERITY_FATAL        0x01\r
 #define EFI_ACPI_4_0_ERROR_SEVERITY_CORRECTED    0x02\r
 #define EFI_ACPI_4_0_ERROR_SEVERITY_NONE         0x03\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi50.h b/MdePkg/Include/IndustryStandard/Acpi50.h
index be8f85f577ce83ff66663250ff04228302bda358..76706aa640f8de61867f8c74d86b444214116ed9 100644 (file)
--- 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.\r
 \r
   Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2020, ARM Ltd. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
@@ -1361,6 +1361,7 @@ typedef struct {
 // Boot Error Severity types\r
 //\r
 #define EFI_ACPI_5_0_ERROR_SEVERITY_CORRECTABLE  0x00\r
+#define EFI_ACPI_5_0_ERROR_SEVERITY_RECOVERABLE  0x00\r
 #define EFI_ACPI_5_0_ERROR_SEVERITY_FATAL        0x01\r
 #define EFI_ACPI_5_0_ERROR_SEVERITY_CORRECTED    0x02\r
 #define EFI_ACPI_5_0_ERROR_SEVERITY_NONE         0x03\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi51.h b/MdePkg/Include/IndustryStandard/Acpi51.h
index d8ee3ef8f2d0e5c17c25305dc51a635632624b73..01ef544c3a29d0bed2e4b9985001019112bb780c 100644 (file)
--- 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 January, 2016.\r
 \r
   Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
   Copyright (c) 2020, ARM Ltd. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
@@ -1376,10 +1376,16 @@ typedef struct {
 //\r
 // Boot Error Severity types\r
 //\r
-#define EFI_ACPI_5_1_ERROR_SEVERITY_CORRECTABLE  0x00\r
+#define EFI_ACPI_5_1_ERROR_SEVERITY_RECOVERABLE  0x00\r
 #define EFI_ACPI_5_1_ERROR_SEVERITY_FATAL        0x01\r
 #define EFI_ACPI_5_1_ERROR_SEVERITY_CORRECTED    0x02\r
 #define EFI_ACPI_5_1_ERROR_SEVERITY_NONE         0x03\r
+//\r
+// The term 'Correctable' is no longer being used as an error severity of the\r
+// reported error since ACPI Specification Version 5.1 Errata B.\r
+// The below macro is considered as deprecated and should no longer be used.\r
+//\r
+#define EFI_ACPI_5_1_ERROR_SEVERITY_CORRECTABLE  0x00\r
 \r
 ///\r
 /// Generic Error Data Entry Definition\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi60.h b/MdePkg/Include/IndustryStandard/Acpi60.h
index f4ab016d706b1e0d16044a0e9935590d09d0f21f..5ac3be6ad71c03f5289be2210b441ffdab842e9c 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi60.h
+++ b/MdePkg/Include/IndustryStandard/Acpi60.h
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI 6.0 definitions from the ACPI Specification Revision 6.0 Errata A January, 2016.\r
 \r
-  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
   Copyright (c) 2020, ARM Ltd. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
@@ -1560,10 +1560,16 @@ typedef struct {
 //\r
 // Boot Error Severity types\r
 //\r
-#define EFI_ACPI_6_0_ERROR_SEVERITY_CORRECTABLE  0x00\r
+#define EFI_ACPI_6_0_ERROR_SEVERITY_RECOVERABLE  0x00\r
 #define EFI_ACPI_6_0_ERROR_SEVERITY_FATAL        0x01\r
 #define EFI_ACPI_6_0_ERROR_SEVERITY_CORRECTED    0x02\r
 #define EFI_ACPI_6_0_ERROR_SEVERITY_NONE         0x03\r
+//\r
+// The term 'Correctable' is no longer being used as an error severity of the\r
+// reported error since ACPI Specification Version 5.1 Errata B.\r
+// The below macro is considered as deprecated and should no longer be used.\r
+//\r
+#define EFI_ACPI_6_0_ERROR_SEVERITY_CORRECTABLE  0x00\r
 \r
 ///\r
 /// Generic Error Data Entry Definition\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi61.h b/MdePkg/Include/IndustryStandard/Acpi61.h
index 5ab31e752088272cc11dfb9d8c53f751bdea8eb3..7af67d832bb2d8fe9b97ca4ae25515e0b75e11ff 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi61.h
+++ b/MdePkg/Include/IndustryStandard/Acpi61.h
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI 6.1 definitions from the ACPI Specification Revision 6.1 January, 2016.\r
 \r
-  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.<BR>\r
  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   Copyright (c) 2020, ARM Ltd. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
@@ -1566,10 +1566,16 @@ typedef struct {
 //\r
 // Boot Error Severity types\r
 //\r
-#define EFI_ACPI_6_1_ERROR_SEVERITY_CORRECTABLE  0x00\r
+#define EFI_ACPI_6_1_ERROR_SEVERITY_RECOVERABLE  0x00\r
 #define EFI_ACPI_6_1_ERROR_SEVERITY_FATAL        0x01\r
 #define EFI_ACPI_6_1_ERROR_SEVERITY_CORRECTED    0x02\r
 #define EFI_ACPI_6_1_ERROR_SEVERITY_NONE         0x03\r
+//\r
+// The term 'Correctable' is no longer being used as an error severity of the\r
+// reported error since ACPI Specification Version 5.1 Errata B.\r
+// The below macro is considered as deprecated and should no longer be used.\r
+//\r
+#define EFI_ACPI_6_1_ERROR_SEVERITY_CORRECTABLE  0x00\r
 \r
 ///\r
 /// Generic Error Data Entry Definition\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi62.h b/MdePkg/Include/IndustryStandard/Acpi62.h
index 0ede23c716f7646ccaa3d816b9f865d7a0f14c98..313db6304486bd43fcb159a2b77a08eb8fd3a5e2 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi62.h
+++ b/MdePkg/Include/IndustryStandard/Acpi62.h
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI 6.2 definitions from the ACPI Specification Revision 6.2 May, 2017.\r
 \r
-  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2020, ARM Ltd. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
@@ -1738,10 +1738,16 @@ typedef struct {
 //\r
 // Boot Error Severity types\r
 //\r
-#define EFI_ACPI_6_2_ERROR_SEVERITY_CORRECTABLE  0x00\r
+#define EFI_ACPI_6_2_ERROR_SEVERITY_RECOVERABLE  0x00\r
 #define EFI_ACPI_6_2_ERROR_SEVERITY_FATAL        0x01\r
 #define EFI_ACPI_6_2_ERROR_SEVERITY_CORRECTED    0x02\r
 #define EFI_ACPI_6_2_ERROR_SEVERITY_NONE         0x03\r
+//\r
+// The term 'Correctable' is no longer being used as an error severity of the\r
+// reported error since ACPI Specification Version 5.1 Errata B.\r
+// The below macro is considered as deprecated and should no longer be used.\r
+//\r
+#define EFI_ACPI_6_2_ERROR_SEVERITY_CORRECTABLE  0x00\r
 \r
 ///\r
 /// Generic Error Data Entry Definition\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi63.h b/MdePkg/Include/IndustryStandard/Acpi63.h
index e4d58259465df50300628a5a7b222c2b694c697a..b1e9d5db5b66c420a104136d048c803dba781285 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi63.h
+++ b/MdePkg/Include/IndustryStandard/Acpi63.h
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI 6.3 definitions from the ACPI Specification Revision 6.3 Jan, 2019.\r
 \r
-  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2019 - 2020, ARM Ltd. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
@@ -1702,10 +1702,16 @@ typedef struct {
 //\r
 // Boot Error Severity types\r
 //\r
-#define EFI_ACPI_6_3_ERROR_SEVERITY_CORRECTABLE  0x00\r
+#define EFI_ACPI_6_3_ERROR_SEVERITY_RECOVERABLE  0x00\r
 #define EFI_ACPI_6_3_ERROR_SEVERITY_FATAL        0x01\r
 #define EFI_ACPI_6_3_ERROR_SEVERITY_CORRECTED    0x02\r
 #define EFI_ACPI_6_3_ERROR_SEVERITY_NONE         0x03\r
+//\r
+// The term 'Correctable' is no longer being used as an error severity of the\r
+// reported error since ACPI Specification Version 5.1 Errata B.\r
+// The below macro is considered as deprecated and should no longer be used.\r
+//\r
+#define EFI_ACPI_6_3_ERROR_SEVERITY_CORRECTABLE  0x00\r
 \r
 ///\r
 /// Generic Error Data Entry Definition\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/IndustryStandard/Acpi64.h
index a79b7f2eaae16b47c17a89a16c6d67fcaaad4cbf..232697f2281b39a0004f07ad161347fff565e58c 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi64.h
+++ b/MdePkg/Include/IndustryStandard/Acpi64.h
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI 6.4 definitions from the ACPI Specification Revision 6.4 Jan, 2021.\r
 \r
-  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2019 - 2021, ARM Ltd. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
@@ -1783,10 +1783,16 @@ typedef struct {
 //\r
 // Boot Error Severity types\r
 //\r
-#define EFI_ACPI_6_4_ERROR_SEVERITY_CORRECTABLE  0x00\r
+#define EFI_ACPI_6_4_ERROR_SEVERITY_RECOVERABLE  0x00\r
 #define EFI_ACPI_6_4_ERROR_SEVERITY_FATAL        0x01\r
 #define EFI_ACPI_6_4_ERROR_SEVERITY_CORRECTED    0x02\r
 #define EFI_ACPI_6_4_ERROR_SEVERITY_NONE         0x03\r
+//\r
+// The term 'Correctable' is no longer being used as an error severity of the\r
+// reported error since ACPI Specification Version 5.1 Errata B.\r
+// The below macro is considered as deprecated and should no longer be used.\r
+//\r
+#define EFI_ACPI_6_4_ERROR_SEVERITY_CORRECTABLE  0x00\r
 \r
 ///\r
 /// Generic Error Data Entry Definition\r