* [edk2-devel] [PATCH 1/2] MdePkg: Add missing status codes
2023-07-31 18:43 [edk2-devel] [PATCH v1 0/2] MdePkg: Add missing status codes Nate DeSimone
@ 2023-07-31 18:43 ` Nate DeSimone
2023-07-31 18:43 ` [edk2-devel] [PATCH 2/2] MdePkg: Add new status codes to PrintLib Nate DeSimone
2023-07-31 20:39 ` [edk2-devel] [PATCH v1 0/2] MdePkg: Add missing status codes Michael D Kinney
2 siblings, 0 replies; 4+ messages in thread
From: Nate DeSimone @ 2023-07-31 18:43 UTC (permalink / raw)
To: devel; +Cc: Michael D Kinney, Liming Gao, Zhiguang Liu
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4514
Upon review it has been found that MdePkg is missing two
status code definitions:
1. EFI_IP_ADDRESS_CONFLICT - Added in UEFI Spec v2.5
2. EFI_WARN_RESET_REQUIRED - Added in UEFI Spec v2.6
These missing status codes have been added.
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
MdePkg/Include/Base.h | 10 ++++++++++
MdePkg/Include/Uefi/UefiBaseType.h | 2 ++
2 files changed, 12 insertions(+)
diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index d209e6de28..4472ede2b4 100644
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -1133,6 +1133,11 @@ typedef UINTN RETURN_STATUS;
///
#define RETURN_COMPROMISED_DATA ENCODE_ERROR (33)
+///
+/// There is an address conflict address allocation.
+///
+#define RETURN_IP_ADDRESS_CONFLICT ENCODE_ERROR (34)
+
///
/// A HTTP error occurred during the network operation.
///
@@ -1172,6 +1177,11 @@ typedef UINTN RETURN_STATUS;
///
#define RETURN_WARN_FILE_SYSTEM ENCODE_WARNING (6)
+///
+/// The operation will be processed across a system reset.
+///
+#define RETURN_WARN_RESET_REQUIRED ENCODE_WARNING (7)
+
/**
Returns a 16-bit signature built from 2 ASCII characters.
diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index 83975a08eb..df9a0d3709 100644
--- a/MdePkg/Include/Uefi/UefiBaseType.h
+++ b/MdePkg/Include/Uefi/UefiBaseType.h
@@ -141,6 +141,7 @@ typedef union {
#define EFI_END_OF_FILE RETURN_END_OF_FILE
#define EFI_INVALID_LANGUAGE RETURN_INVALID_LANGUAGE
#define EFI_COMPROMISED_DATA RETURN_COMPROMISED_DATA
+#define EFI_IP_ADDRESS_CONFLICT RETURN_IP_ADDRESS_CONFLICT
#define EFI_HTTP_ERROR RETURN_HTTP_ERROR
#define EFI_WARN_UNKNOWN_GLYPH RETURN_WARN_UNKNOWN_GLYPH
@@ -149,6 +150,7 @@ typedef union {
#define EFI_WARN_BUFFER_TOO_SMALL RETURN_WARN_BUFFER_TOO_SMALL
#define EFI_WARN_STALE_DATA RETURN_WARN_STALE_DATA
#define EFI_WARN_FILE_SYSTEM RETURN_WARN_FILE_SYSTEM
+#define EFI_WARN_RESET_REQUIRED RETURN_WARN_RESET_REQUIRED
///@}
///
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107406): https://edk2.groups.io/g/devel/message/107406
Mute This Topic: https://groups.io/mt/100468026/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 4+ messages in thread* [edk2-devel] [PATCH 2/2] MdePkg: Add new status codes to PrintLib
2023-07-31 18:43 [edk2-devel] [PATCH v1 0/2] MdePkg: Add missing status codes Nate DeSimone
2023-07-31 18:43 ` [edk2-devel] [PATCH 1/2] " Nate DeSimone
@ 2023-07-31 18:43 ` Nate DeSimone
2023-07-31 20:39 ` [edk2-devel] [PATCH v1 0/2] MdePkg: Add missing status codes Michael D Kinney
2 siblings, 0 replies; 4+ messages in thread
From: Nate DeSimone @ 2023-07-31 18:43 UTC (permalink / raw)
To: devel; +Cc: Michael D Kinney, Liming Gao, Zhiguang Liu
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4514
PrintLib does not correctly decode the follow status codes:
1. EFI_IP_ADDRESS_CONFLICT
2. EFI_HTTP_ERROR
3. EFI_WARN_FILE_SYSTEM
4. EFI_WARN_RESET_REQUIRED
These missing status codes have been added.
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
MdePkg/Library/BasePrintLib/PrintLibInternal.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
index 42b598a432..c666c6614c 100644
--- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c
+++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c
@@ -8,8 +8,8 @@
#include "PrintLibInternal.h"
-#define WARNING_STATUS_NUMBER 5
-#define ERROR_STATUS_NUMBER 33
+#define WARNING_STATUS_NUMBER 7
+#define ERROR_STATUS_NUMBER 35
//
// Safe print checks
@@ -37,6 +37,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mWarningString[][24+1] = {
"Warning Write Failure", // RETURN_WARN_WRITE_FAILURE = 3
"Warning Buffer Too Small", // RETURN_WARN_BUFFER_TOO_SMALL = 4
"Warning Stale Data", // RETURN_WARN_STALE_DATA = 5
+ "Warning File System", // RETURN_WARN_FILE_SYSTEM = 6
+ "Warning Reset Required", // RETURN_WARN_RESET_REQUIRED = 7
};
//
@@ -75,7 +77,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mErrorString[][20+1] = {
"Reserved (30)", // RESERVED = 30 | MAX_BIT
"End of File", // RETURN_END_OF_FILE = 31 | MAX_BIT
"Invalid Language", // RETURN_INVALID_LANGUAGE = 32 | MAX_BIT
- "Compromised Data" // RETURN_COMPROMISED_DATA = 33 | MAX_BIT
+ "Compromised Data", // RETURN_COMPROMISED_DATA = 33 | MAX_BIT
+ "IP Address Conflict", // RETURN_IP_ADDRESS_CONFLICT = 34 | MAX_BIT
+ "HTTP Error" // RETURN_HTTP_ERROR = 35 | MAX_BIT
};
/**
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107407): https://edk2.groups.io/g/devel/message/107407
Mute This Topic: https://groups.io/mt/100468027/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [edk2-devel] [PATCH v1 0/2] MdePkg: Add missing status codes
2023-07-31 18:43 [edk2-devel] [PATCH v1 0/2] MdePkg: Add missing status codes Nate DeSimone
2023-07-31 18:43 ` [edk2-devel] [PATCH 1/2] " Nate DeSimone
2023-07-31 18:43 ` [edk2-devel] [PATCH 2/2] MdePkg: Add new status codes to PrintLib Nate DeSimone
@ 2023-07-31 20:39 ` Michael D Kinney
2 siblings, 0 replies; 4+ messages in thread
From: Michael D Kinney @ 2023-07-31 20:39 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io
Cc: Gao, Liming, Liu, Zhiguang, Kinney, Michael D
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Monday, July 31, 2023 11:43 AM
> To: devel@edk2.groups.io
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com>
> Subject: [PATCH v1 0/2] MdePkg: Add missing status codes
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4514
>
> Upon review it has been found that MdePkg is missing two
> status code definitions:
>
> 1. EFI_IP_ADDRESS_CONFLICT - Added in UEFI Spec v2.5
> 2. EFI_WARN_RESET_REQUIRED - Added in UEFI Spec v2.6
>
> Moreover, PrintLib does not correctly decode the follow status codes:
>
> 1. EFI_IP_ADDRESS_CONFLICT
> 2. EFI_HTTP_ERROR
> 3. EFI_WARN_FILE_SYSTEM
> 4. EFI_WARN_RESET_REQUIRED
>
> These missing status codes and the missing decodings have been added.
>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
>
> Nate DeSimone (2):
> MdePkg: Add missing status codes
> MdePkg: Add new status codes to PrintLib
>
> MdePkg/Include/Base.h | 10 ++++++++++
> MdePkg/Include/Uefi/UefiBaseType.h | 2 ++
> MdePkg/Library/BasePrintLib/PrintLibInternal.c | 10 +++++++---
> 3 files changed, 19 insertions(+), 3 deletions(-)
>
> --
> 2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107409): https://edk2.groups.io/g/devel/message/107409
Mute This Topic: https://groups.io/mt/100468025/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 4+ messages in thread