From nobody Fri May 17 23:55:47 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+107406+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+107406+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1690829026; cv=none; d=zohomail.com; s=zohoarc; b=an5zjeiMzRJqK2heDMzUyIVLs+zkAjdpX7nTEkrM0hS7ad6Fd1ftZOr6eCnrMxMpuI16Wy+Q4nIjEtgjJek71+1ihy5cDUq3CmgEJpXietzxgayM9h8sTViUDZfIA267DZdonUfMB/VTPGw+08Xk+PAdJ3NnTU9vNTyyUHMLx9Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690829026; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=9A39kGxWetRTNvUMaBk8+2VuX1exXTACxQeWG1D2xxw=; b=Oj2yW1Sn46+wBAq99OISt199A/OHQzv+pSKJ7MCoeUB/Ty+mrsMJUlPNrM35jtetTPkczrFuuoRD1tVxXEUoijC2QEMCchzQv86Vy+b8MAMX3bU6jWZAJIlyjPGhZKpFL3/yXC2H3tHBXLFeDdjpkm/vdrp7x+UTZMz27aCg+Uc= 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+107406+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 1690829026452602.8432781400336; Mon, 31 Jul 2023 11:43:46 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=1RT1Hjunlj+hlXg5MX9/VP4fgavNAztwW3QcC4cRr5Q=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-IronPort-AV:X-IronPort-AV:X-Received:X-ExtLoop1:X-IronPort-AV:X-IronPort-AV:X-Received:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:X-Gm-Message-State:Content-Transfer-Encoding; s=20140610; t=1690829026; v=1; b=Mv0LBFI2CJChUWqQIGOaQgW2BkHMA3AZXS+RnWilw6OztEkES/EwL7MkB4mO661u7gkkCOSd b3gu3AEdshWYql7lT45RpoiOhXFKVvvON4298eOVVffqkg+S17fUGl2fNkJyrsD3W//+VOUJGwH QUbYfBY1T2uiR4piBapRMZzc= X-Received: by 127.0.0.2 with SMTP id lEInYY1788612x8cbo4sViI9; Mon, 31 Jul 2023 11:43:46 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.230.1690829024744708060 for ; Mon, 31 Jul 2023 11:43:45 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10788"; a="435413519" X-IronPort-AV: E=Sophos;i="6.01,245,1684825200"; d="scan'208";a="435413519" X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jul 2023 11:43:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10788"; a="731673605" X-IronPort-AV: E=Sophos;i="6.01,245,1684825200"; d="scan'208";a="731673605" X-Received: from nldesimo-desk.amr.corp.intel.com ([10.241.240.243]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jul 2023 11:43:43 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH 1/2] MdePkg: Add missing status codes Date: Mon, 31 Jul 2023 11:43:13 -0700 Message-Id: <20230731184314.1253-2-nathaniel.l.desimone@intel.com> In-Reply-To: <20230731184314.1253-1-nathaniel.l.desimone@intel.com> References: <20230731184314.1253-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 Precedence: Bulk 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,nathaniel.l.desimone@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: VEWk86qa6ajJXrnXn85GRwDHx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1690829026767100003 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4514 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 Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Nate DeSimone Reviewed-by: Michael D Kinney --- 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) =20 +/// +/// 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) =20 +/// +/// 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. =20 diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiB= aseType.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 =20 #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 ///@} =20 /// --=20 2.30.2 -=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 (#107406): https://edk2.groups.io/g/devel/message/107406 Mute This Topic: https://groups.io/mt/100468026/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- From nobody Fri May 17 23:55:47 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+107407+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+107407+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1690829026; cv=none; d=zohomail.com; s=zohoarc; b=RGh5O4oHalfaXh45lsBg9orW+NuaHmL8oPDSsPOa2MS3UTuOxKlgqSoPcVbqrxtHNe1kVG59hY9iZYRiIwoX4rpRD5gtCkIy6BDt1TdL1E+Zr/aV1WjLi8VIKxFqQNRIOKu84ELrBZL3R236e46J9YU0SdJpQ+iCl9XXufCH5VY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690829026; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=VuQwZcoD5kYjuf2YyCAiTikn0soFjIG8CWsXoocLvxc=; b=IU0f7qGpmOOw8JfmIlH9rLzGOXO+JP4oH6gkmpvoyo/uYCF71iJ4pDl6hAkJU3pdx9kKlP28D9PIGsp+Kt92KLyzIkxVQSZ0Yl9p/tJj4VZojFhotT2MTkfdbf8y2MiCWKEzExWVTKTxj9Sla1c1S7zSxgGnvWV106slc123P0Y= 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+107407+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 1690829026894965.3413483333192; Mon, 31 Jul 2023 11:43:46 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=XAWbEi2sgAEmPsgG5oetuUtK9gf8PHmNVlXc4QMlEtw=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-IronPort-AV:X-IronPort-AV:X-Received:X-ExtLoop1:X-IronPort-AV:X-IronPort-AV:X-Received:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:X-Gm-Message-State:Content-Transfer-Encoding; s=20140610; t=1690829026; v=1; b=erM8bICPfgLV1iEeteRFOgYZs66/W950PVrbwb26monIZPnCk8Efs5Ylxc6FQcCzEhp4StJe 9GSST5HWJKZ/cwPrfwAVYCAjitaGXQ3DdsjjmkkWRJ09uVK0rd5OHUfeSsl3fX1IZWPfTuTCtUZ e3HVrE8gK9sJ8kK2ZcDgZW+o= X-Received: by 127.0.0.2 with SMTP id MhiHYY1788612xl1am9dArOp; Mon, 31 Jul 2023 11:43:46 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.203.1690829025624097045 for ; Mon, 31 Jul 2023 11:43:45 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10788"; a="435413521" X-IronPort-AV: E=Sophos;i="6.01,245,1684825200"; d="scan'208";a="435413521" X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jul 2023 11:43:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10788"; a="731673608" X-IronPort-AV: E=Sophos;i="6.01,245,1684825200"; d="scan'208";a="731673608" X-Received: from nldesimo-desk.amr.corp.intel.com ([10.241.240.243]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jul 2023 11:43:43 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [PATCH 2/2] MdePkg: Add new status codes to PrintLib Date: Mon, 31 Jul 2023 11:43:14 -0700 Message-Id: <20230731184314.1253-3-nathaniel.l.desimone@intel.com> In-Reply-To: <20230731184314.1253-1-nathaniel.l.desimone@intel.com> References: <20230731184314.1253-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 Precedence: Bulk 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,nathaniel.l.desimone@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 2PLRYps23v3Q124wcYVlSOjlx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1690829028428100007 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4514 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 Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Nate DeSimone Reviewed-by: Michael D Kinney --- MdePkg/Library/BasePrintLib/PrintLibInternal.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/MdePkg/Library/BasePrintLib/PrintLibInternal.c b/MdePkg/Librar= y/BasePrintLib/PrintLibInternal.c index 42b598a432..c666c6614c 100644 --- a/MdePkg/Library/BasePrintLib/PrintLibInternal.c +++ b/MdePkg/Library/BasePrintLib/PrintLibInternal.c @@ -8,8 +8,8 @@ =20 #include "PrintLibInternal.h" =20 -#define WARNING_STATUS_NUMBER 5 -#define ERROR_STATUS_NUMBER 33 +#define WARNING_STATUS_NUMBER 7 +#define ERROR_STATUS_NUMBER 35 =20 // // Safe print checks @@ -37,6 +37,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mWarningString= [][24+1] =3D { "Warning Write Failure", // RETURN_WARN_WRITE_FAILURE =3D 3 "Warning Buffer Too Small", // RETURN_WARN_BUFFER_TOO_SMALL =3D 4 "Warning Stale Data", // RETURN_WARN_STALE_DATA =3D 5 + "Warning File System", // RETURN_WARN_FILE_SYSTEM =3D 6 + "Warning Reset Required", // RETURN_WARN_RESET_REQUIRED =3D 7 }; =20 // @@ -75,7 +77,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mErrorString[]= [20+1] =3D { "Reserved (30)", // RESERVED =3D 30= | MAX_BIT "End of File", // RETURN_END_OF_FILE =3D 31= | MAX_BIT "Invalid Language", // RETURN_INVALID_LANGUAGE =3D 32= | MAX_BIT - "Compromised Data" // RETURN_COMPROMISED_DATA =3D 33= | MAX_BIT + "Compromised Data", // RETURN_COMPROMISED_DATA =3D 33= | MAX_BIT + "IP Address Conflict", // RETURN_IP_ADDRESS_CONFLICT =3D 34= | MAX_BIT + "HTTP Error" // RETURN_HTTP_ERROR =3D 35= | MAX_BIT }; =20 /** --=20 2.30.2 -=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 (#107407): https://edk2.groups.io/g/devel/message/107407 Mute This Topic: https://groups.io/mt/100468027/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-