From nobody Tue Feb 10 05:26:25 2026 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+93354+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+93354+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1662532079; cv=none; d=zohomail.com; s=zohoarc; b=RAE+kuLLbLktdlSHpsQps535QdAT+TmWWlgQHZiZTWkRlBAOhXsjbL2/g6hMnXTk0toXdGzsjkr4IkFG3IgnaCfABW4sYOGvnNuPYvEIj9BAiAo5DG1rBiopXCFB2POyCApS+5APuCJTYQbx5lR7bGEe0O33s8VNqcLTIfWmgB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662532079; 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=dT1oOZwhT3fAEJukDcH+OUwZIVu5imHSrUCRqgRgYqw=; b=nEp8jiud4ERj6K8FlaUwtRD4bsAON3t1Ubl9UfRBfjcs7JxZjUH7Q3seCnSgQbvOQe0tjK7PJxJKfQA+vQLsPKBfYnMae3aBP59ndAawsqIipju0Dhv7ptPzHCszdXAgHBffd/Mnb1Cvc5qvYGDCcMhnOWklCPmo6DpXRiFKkAg= 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+93354+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 1662532079983915.0140700634163; Tue, 6 Sep 2022 23:27:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id UML8YY1788612xL1w0Nfu42S; Tue, 06 Sep 2022 23:27:59 -0700 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web08.4705.1662532076879836693 for ; Tue, 06 Sep 2022 23:27:57 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="383088399" X-IronPort-AV: E=Sophos;i="5.93,295,1654585200"; d="scan'208";a="383088399" X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 23:27:50 -0700 X-IronPort-AV: E=Sophos;i="5.93,295,1654585200"; d="scan'208";a="682687465" X-Received: from nldesimo-desk1.amr.corp.intel.com ([10.24.80.62]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 23:27:49 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Chasel Chiu , Sai Chaganty , Isaac Oram , Eric Dong , Liming Gao , Benjamin Doron , Michael Kubacki , Jeremy Soller Subject: [edk2-devel] [edk2-platforms] [PATCH V2 4/5] MinPlatformPkg: Add PcdDefaultTerminalType support to SerialPortTerminalLib Date: Tue, 6 Sep 2022 23:27:34 -0700 Message-Id: <20220907062735.5734-5-nathaniel.l.desimone@intel.com> In-Reply-To: <20220907062735.5734-1-nathaniel.l.desimone@intel.com> References: <20220907062735.5734-1-nathaniel.l.desimone@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,nathaniel.l.desimone@intel.com X-Gm-Message-State: yDPpRK8tHNKqMydjDgS1HY1gx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1662532079; bh=lkmPJKoUJbQF3PLj4IJCfOsHe75Pj/DJPkpQ0tHwemM=; h=Cc:Date:From:Reply-To:Subject:To; b=st2wMwzh5Mjj8Qppv/9TVaD2KjIZQBv78l8XDsdzgx2gDkUC47FvBkPW+/zDr7/onwR xhIVBXs5pkNT+uG9Ig545N7U0ScG6/yG79ao8x3F46JRp86sxE2zQq5sbic2ptj6dp5oq Wl7h7zLz42hX6N4PvSYK35JdvzbSdjeQKpc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1662532080808100014 Content-Type: text/plain; charset="utf-8" - Sets the terminal type GUID for ConIn, ConOut, and ConErr to the terminal type indicated by PcdDefaultTerminalType. - Some improvements to the comments in SerialPortTerminalLib Cc: Chasel Chiu Cc: Sai Chaganty Cc: Isaac Oram Cc: Eric Dong Cc: Liming Gao Cc: Benjamin Doron Cc: Michael Kubacki Cc: Jeremy Soller Signed-off-by: Nate DeSimone --- .../SerialPortTerminalLib.c | 66 ++++++++++++++----- .../SerialPortTerminalLib.h | 11 +++- .../SerialPortTerminalLib.inf | 17 ++++- 3 files changed, 71 insertions(+), 23 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Library/SerialPortTerminalLib/Se= rialPortTerminalLib.c b/Platform/Intel/MinPlatformPkg/Library/SerialPortTer= minalLib/SerialPortTerminalLib.c index 66e8ee018b..ca5e966cb5 100644 --- a/Platform/Intel/MinPlatformPkg/Library/SerialPortTerminalLib/SerialPor= tTerminalLib.c +++ b/Platform/Intel/MinPlatformPkg/Library/SerialPortTerminalLib/SerialPor= tTerminalLib.c @@ -1,13 +1,26 @@ /** @file - Main file for NULL named library for Serial Port Terminal Redirection li= brary. + Main file for NULL named library for the Serial Port Terminal Redirectio= n library. =20 - Copyright (c) 2020, Intel Corporation. All rights reserved.
+ This library adds a Terminal Device connected to SerialDxe to the UEFI C= onsole + Variables. This allows BIOS Setup, UEFI Shell, etc. to be used on a head= less + system via a null modem and terminal + emulator. + + Copyright (c) 2020 - 2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include "SerialPortTerminalLib.h" =20 +GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID *mTerminalType[] =3D { + &gEfiPcAnsiGuid, + &gEfiVT100Guid, + &gEfiVT100PlusGuid, + &gEfiVTUTF8Guid, + &gEfiTtyTermGuid +}; + GLOBAL_REMOVE_IF_UNREFERENCED SERIAL_DEVICE_PATH mSerialDevicePath =3D { { { @@ -59,10 +72,36 @@ AddSerialTerminal ( VOID ) { - DEBUG ((DEBUG_INFO, "[AddSerialPortTerminal]\n")); + UINT8 DefaultTerminalType; + + // + // Update the Terminal Device Configuration Parameters + // + mSerialDevicePath.Uart.BaudRate =3D PcdGet64 (PcdUartDefaultBaudRate); + mSerialDevicePath.Uart.DataBits =3D PcdGet8 (PcdUartDefaultDataBits); + mSerialDevicePath.Uart.Parity =3D PcdGet8 (PcdUartDefaultParity); + mSerialDevicePath.Uart.StopBits =3D PcdGet8 (PcdUartDefaultStopBits); + DefaultTerminalType =3D PcdGet8 (PcdDefaultTerminalType); + DEBUG ((DEBUG_INFO, "[AddSerialPortTerminal] [%d, %d, %d, %d, %d]\n", + (int) mSerialDevicePath.Uart.BaudRate, + (int) mSerialDevicePath.Uart.DataBits, + (int) mSerialDevicePath.Uart.Parity, + (int) mSerialDevicePath.Uart.StopBits, + (int) DefaultTerminalType)); + + if (DefaultTerminalType >=3D 0 && + DefaultTerminalType < (sizeof (mTerminalType) / sizeof (mTerminalTyp= e[0]))) { + CopyMem ( + (VOID *) &(mSerialDevicePath.TerminalType.Guid), + (VOID *) mTerminalType[DefaultTerminalType], + sizeof (EFI_GUID) + ); + } else { + DEBUG ((DEBUG_WARN, "PcdDefaultTerminalType has invalid value: %d\n", = (int) DefaultTerminalType)); + } =20 // - // Append Serial Terminal into "ConIn" + // Append Serial Terminal into "ConIn", "ConOut", and "ErrOut" // EfiBootManagerUpdateConsoleVariable (ConOut, (EFI_DEVICE_PATH_PROTOCOL *= ) &mSerialDevicePath, NULL); EfiBootManagerUpdateConsoleVariable (ConIn, (EFI_DEVICE_PATH_PROTOCOL *)= &mSerialDevicePath, NULL); @@ -71,13 +110,12 @@ AddSerialTerminal ( =20 =20 /** - Constructor for the Serial Port Device controller library. + Constructor for the Serial Port Terminal Device library. =20 - @param ImageHandle the image handle of the process - @param SystemTable the EFI System Table pointer + @param ImageHandle The Image Handle of the process + @param SystemTable The EFI System Table pointer =20 - @retval EFI_SUCCESS the shell command handlers were installed suc= essfully - @retval EFI_UNSUPPORTED the shell level required was not found. + @retval EFI_SUCCESS The Serial Port Terminal Device was installed succ= essfully **/ EFI_STATUS EFIAPI @@ -86,15 +124,7 @@ SerialPortTerminalLibConstructor ( IN EFI_SYSTEM_TABLE *SystemTable ) { - mSerialDevicePath.Uart.BaudRate =3D PcdGet64(PcdUartDefaultBaudRate); - mSerialDevicePath.Uart.DataBits =3D PcdGet8(PcdUartDefaultDataBits); - mSerialDevicePath.Uart.Parity =3D PcdGet8(PcdUartDefaultParity); - mSerialDevicePath.Uart.StopBits =3D PcdGet8(PcdUartDefaultStopBits); - DEBUG ((DEBUG_INFO, "[SerialPortTerminalLibConstructor] [%d, %d, %d, %d]= \n", - mSerialDevicePath.Uart.BaudRate, - mSerialDevicePath.Uart.DataBits, - mSerialDevicePath.Uart.Parity, - mSerialDevicePath.Uart.StopBits)); + DEBUG ((DEBUG_INFO, "[SerialPortTerminalLibConstructor]\n")); =20 AddSerialTerminal(); =20 diff --git a/Platform/Intel/MinPlatformPkg/Library/SerialPortTerminalLib/Se= rialPortTerminalLib.h b/Platform/Intel/MinPlatformPkg/Library/SerialPortTer= minalLib/SerialPortTerminalLib.h index bfa73cca7d..33415721cd 100644 --- a/Platform/Intel/MinPlatformPkg/Library/SerialPortTerminalLib/SerialPor= tTerminalLib.h +++ b/Platform/Intel/MinPlatformPkg/Library/SerialPortTerminalLib/SerialPor= tTerminalLib.h @@ -1,7 +1,12 @@ /** @file - Header file for NULL named library for for Serial Port Terminal Redirect= ion library. + Header file for NULL named library for the Serial Port Terminal Redirect= ion library. =20 - Copyright (c) 2020, Intel Corporation. All rights reserved.
+ This library adds a Terminal Device connected to SerialDxe to the UEFI C= onsole + Variables. This allows BIOS Setup, UEFI Shell, etc. to be used on a head= less + system via a null modem and terminal + emulator. + + Copyright (c) 2020 -2022, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -12,8 +17,10 @@ #include #include #include +#include #include #include +#include #include =20 // diff --git a/Platform/Intel/MinPlatformPkg/Library/SerialPortTerminalLib/Se= rialPortTerminalLib.inf b/Platform/Intel/MinPlatformPkg/Library/SerialPortT= erminalLib/SerialPortTerminalLib.inf index dc5bb91a8e..ac1a06b2a5 100644 --- a/Platform/Intel/MinPlatformPkg/Library/SerialPortTerminalLib/SerialPor= tTerminalLib.inf +++ b/Platform/Intel/MinPlatformPkg/Library/SerialPortTerminalLib/SerialPor= tTerminalLib.inf @@ -1,5 +1,9 @@ ## @file -# Component information file for Serial Port Terminal Redirection Library +# Component information file for the Serial Port Terminal Redirection libr= ary. +# +# This library adds a Terminal Device connected to SerialDxe to the UEFI = Console +# Variables. This allows BIOS Setup, UEFI Shell, etc. to be used on a hea= dless +# system via a null modem and terminal # # Copyright (c) 2020, Intel Corporation. All rights reserved.
# @@ -18,22 +22,29 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - BoardModulePkg/BoardModulePkg.dec - MinPlatformPkg/MinPlatformPkg.dec =20 [Sources] SerialPortTerminalLib.c SerialPortTerminalLib.h =20 [LibraryClasses] + BaseMemoryLib DevicePathLib DebugLib UefiDriverEntryPoint UefiBootManagerLib UefiLib =20 +[Guids] + gEfiPcAnsiGuid + gEfiVT100Guid + gEfiVT100PlusGuid + gEfiVTUTF8Guid + gEfiTtyTermGuid + [Pcd] gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType --=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 (#93354): https://edk2.groups.io/g/devel/message/93354 Mute This Topic: https://groups.io/mt/93519774/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-