From nobody Sun Apr 28 22:19:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66436+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66436+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1603160523; cv=none; d=zohomail.com; s=zohoarc; b=gvdCNVgXx5jJvJdG+KrnA0iDsfbZgGFVQWtP7l0uFOaf6KmVJxyCKxtd81QZOOHB8iA2waRfJ/O5AwpWfaRcVOTPB54UikOL8ItQ+6fTl5wzvj3OkeTqyRQ9X68uiK3+ayc0BmGcJUvTdTQjUnE0BGoMBwI+RKUWe8fpb9ze+p8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603160523; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ZyrVA2GM/ibQagoAOUI4bHAvaY8XLDqERFCj+WJ+JGk=; b=dN512OlJhnUY8gPCj1vyHaM7IEbH5+MNjs9qAkEGzETDGyPJLCysXN+wa1+YV3HYw2oo4Pc3XJ2lMJE8n+KKmpy8aA9yEx5rxvbgJ4rznT6sbODTiWzAGWd+p9hY6EeMbm28HN7Bl/47xBUfrJP7uiTEh2UFb3tgK6HOFs70ogs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66436+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603160523118354.3407158333031; Mon, 19 Oct 2020 19:22:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id VDn8YY1788612xwZNPRcqTRE; Mon, 19 Oct 2020 19:22:02 -0700 X-Received: from mga02.intel.com (mga02.intel.com []) by mx.groups.io with SMTP id smtpd.web12.10887.1603160515520632101 for ; Mon, 19 Oct 2020 19:21:57 -0700 IronPort-SDR: jkNgzhrDEPlSaSG0E2RoG5Cnb4x+mIHXpWF1vn7M8OmFw2/7vJrXNwoYXNovhampaUegTe8Ymw 34ZJ7uNC0J4A== X-IronPort-AV: E=McAfee;i="6000,8403,9779"; a="154082275" X-IronPort-AV: E=Sophos;i="5.77,395,1596524400"; d="scan'208";a="154082275" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2020 19:21:57 -0700 IronPort-SDR: ulxxNleX87ag7apUOl7rcEL4KgrVh4UMCSy06CH3oxcrJto5rB9RHNWeCAUibhLQ+6kyGuKija MhhbPV3TiS8g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,395,1596524400"; d="scan'208";a="523322873" X-Received: from hengluo-dev.ccr.corp.intel.com ([10.239.153.154]) by fmsmga005.fm.intel.com with ESMTP; 19 Oct 2020 19:21:55 -0700 From: "Heng Luo" To: devel@edk2.groups.io Cc: Eric Dong , Chasel Chiu , Nate DeSimone Subject: [edk2-devel] [PATCH 1/2] BoardModulePkg: Add SerialPortTerminalLib Date: Tue, 20 Oct 2020 10:21:43 +0800 Message-Id: <20201020022144.2261-2-heng.luo@intel.com> In-Reply-To: <20201020022144.2261-1-heng.luo@intel.com> References: <20201020022144.2261-1-heng.luo@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,heng.luo@intel.com X-Gm-Message-State: uNAsO7u1yCx22NLJhPYrnG8wx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603160522; bh=bh6EIuDHrmW5UdNU9o2tqKlNxAcl59Ge31lgktPBPD4=; h=Cc:Date:From:Reply-To:Subject:To; b=jaqtlQU86+boDpYjrXkSgd4zeXVa9b5yUMcZ/umuES+AsIbM1GXx4MqXOpJj/mjhxxj FroqYanIno9F9oTzYM+MIQ6oKT/FZ8+QllY49jb4XffBBqj965wZxaZgpZJrQPA165pNB fi+jVy0n/e7SQPKABpoUdilC+wY/s4dj1Yw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3014 Add the serial port terminal library to get console redirect after the shell is loaded. Cc: Eric Dong Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Heng Luo --- Platform/Intel/BoardModulePkg/Library/SerialPortTerminalLib/SerialPortTerm= inalLib.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++++++++++++++++++++++++++++++++++ Platform/Intel/BoardModulePkg/Library/SerialPortTerminalLib/SerialPortTerm= inalLib.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ Platform/Intel/BoardModulePkg/Library/SerialPortTerminalLib/SerialPortTerm= inalLib.inf | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+) diff --git a/Platform/Intel/BoardModulePkg/Library/SerialPortTerminalLib/Se= rialPortTerminalLib.c b/Platform/Intel/BoardModulePkg/Library/SerialPortTer= minalLib/SerialPortTerminalLib.c new file mode 100644 index 0000000000..36c0e7110f --- /dev/null +++ b/Platform/Intel/BoardModulePkg/Library/SerialPortTerminalLib/SerialPor= tTerminalLib.c @@ -0,0 +1,93 @@ +/** @file + Main file for NULL named library for Serial Port Deviceboard controller = librarr. + + INTEL CONFIDENTIAL + Copyright (c) 2020, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include "SerialPortTerminalLib.h" + +GLOBAL_REMOVE_IF_UNREFERENCED SERIAL_DEVICE_PATH mSerialDevicePath =3D { + { + { + HARDWARE_DEVICE_PATH, + HW_VENDOR_DP, + { + (UINT8) sizeof (VENDOR_DEVICE_PATH), + (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8) + } + }, + EDKII_SERIAL_PORT_LIB_VENDOR_GUID + }, + { + { + MESSAGING_DEVICE_PATH, + MSG_UART_DP, + { + (UINT8) sizeof (UART_DEVICE_PATH), + (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8) + } + }, + 0, // Reserved + 115200, // BaudRate + 8, // DataBits + 1, // Parity + 1 // StopBits + }, + { + { + MESSAGING_DEVICE_PATH, + MSG_VENDOR_DP, + { + (UINT8) (sizeof (VENDOR_DEVICE_PATH)), + (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8), + } + }, + DEVICE_PATH_MESSAGING_PC_ANSI + }, + gEndEntire +}; + +/** + Updates the ConOut, ConIn, ErrOut variables with the serial terminal dev= ice path + @param none + @retval none +**/ +VOID +AddSerialTerminal ( + VOID + ) +{ + DEBUG ((DEBUG_INFO, "[AddSerialPortTerminal]\n")); + + // + // Append Serial Terminal into "ConIn" + // + EfiBootManagerUpdateConsoleVariable (ConOut, (EFI_DEVICE_PATH_PROTOCOL *= ) &mSerialDevicePath, NULL); + EfiBootManagerUpdateConsoleVariable (ConIn, (EFI_DEVICE_PATH_PROTOCOL *)= &mSerialDevicePath, NULL); + EfiBootManagerUpdateConsoleVariable (ErrOut, (EFI_DEVICE_PATH_PROTOCOL *= ) &mSerialDevicePath, NULL); +} + + +/** + Constructor for the Serial Port Device controller library. + + @param ImageHandle the image handle of the process + @param SystemTable the EFI System Table pointer + + @retval EFI_SUCCESS the shell command handlers were installed suc= essfully + @retval EFI_UNSUPPORTED the shell level required was not found. +**/ +EFI_STATUS +EFIAPI +SerialPortTerminalLibConstructor ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + AddSerialTerminal(); + + return EFI_SUCCESS; +} diff --git a/Platform/Intel/BoardModulePkg/Library/SerialPortTerminalLib/Se= rialPortTerminalLib.h b/Platform/Intel/BoardModulePkg/Library/SerialPortTer= minalLib/SerialPortTerminalLib.h new file mode 100644 index 0000000000..afb3eb2cb3 --- /dev/null +++ b/Platform/Intel/BoardModulePkg/Library/SerialPortTerminalLib/SerialPor= tTerminalLib.h @@ -0,0 +1,49 @@ +/** @file + Header file for NULL named library for Ps2 keyboard controller library. + + INTEL CONFIDENTIAL + Copyright (c) 2020, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef _PS2_KBC_LIB_H +#define _PS2_KBC_LIB_H + +#include +#include +#include +#include +#include +#include + +// +// Below is the platform console device path +// +typedef struct { + VENDOR_DEVICE_PATH Guid; + UART_DEVICE_PATH Uart; + VENDOR_DEVICE_PATH TerminalType; + EFI_DEVICE_PATH_PROTOCOL End; +} SERIAL_DEVICE_PATH; + +#define gPciRootBridge \ + { \ + { \ + ACPI_DEVICE_PATH, \ + ACPI_DP, \ + { \ + (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), \ + (UINT8) ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8) \ + }, \ + }, \ + EISA_PNP_ID (0x0A03), \ + 0 \ + } + +#define gEndEntire \ + { \ + END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { END_DEVICE_PAT= H_LENGTH, 0 } \ + } + +#endif diff --git a/Platform/Intel/BoardModulePkg/Library/SerialPortTerminalLib/Se= rialPortTerminalLib.inf b/Platform/Intel/BoardModulePkg/Library/SerialPortT= erminalLib/SerialPortTerminalLib.inf new file mode 100644 index 0000000000..4f63d1626f --- /dev/null +++ b/Platform/Intel/BoardModulePkg/Library/SerialPortTerminalLib/SerialPor= tTerminalLib.inf @@ -0,0 +1,35 @@ +## @file +# Component information file for Serial Port Terminal Redirection Library +# +# INTEL CONFIDENTIAL +# Copyright (c) 2020, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## +[Defines] + INF_VERSION =3D 0x00010006 + BASE_NAME =3D SerialPortTerminalLib + FILE_GUID =3D E12BFA46-95F2-4ADC-9774-7E38DE78741E + MODULE_TYPE =3D UEFI_DRIVER + VERSION_STRING =3D 1.2 + LIBRARY_CLASS =3D NULL|UEFI_DRIVER + CONSTRUCTOR =3D SerialPortTerminalLibConstructor + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + BoardModulePkg/BoardModulePkg.dec + +[Sources] + SerialPortTerminalLib.c + SerialPortTerminalLib.h + +[LibraryClasses] + DevicePathLib + DebugLib + UefiDriverEntryPoint + UefiBootManagerLib + UefiLib + +[Pcd] --=20 2.24.0.windows.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 (#66436): https://edk2.groups.io/g/devel/message/66436 Mute This Topic: https://groups.io/mt/77674093/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 Sun Apr 28 22:19:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66437+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66437+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1603160526; cv=none; d=zohomail.com; s=zohoarc; b=ntA33HQ2ICbmAuqaIzjkAARpikgRO/bPkLznoi3CwARLzu5N4e5LHpMRrpT0XobsXVxSrROF9ZWLYfZIfNE3cA5i0o0+IdPl206FDDumyKiOA9oQJSeCVDS0q/2xkXAllZOpRKX0ple5f4C9f5dZhxl7ORlGD9UTDdkHHpLOt6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603160526; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=6gY1lrsyynSyTzOspBX69zXjmCFuWEEhguCnq7eUtgg=; b=C2va/uo+CRURuFmCiwK4uNsv/vHK9njjKzzXOIlsxHmyI2ShPBVK0VuOJ1Nc7IvRNaSJFA6kj1HkwQN4z0ocGZ22VmF9WIIJCTlBYYs2ueuSKfnwn+WD8wthfL0Mk2c/yceceLwrIH5WW2QlVs/BKcZRBgzq5EysLdbvr+vH3cc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66437+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1603160526284570.7280529974028; Mon, 19 Oct 2020 19:22:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id K4maYY1788612xUnYc12ChE4; Mon, 19 Oct 2020 19:22:05 -0700 X-Received: from mga02.intel.com (mga02.intel.com []) by mx.groups.io with SMTP id smtpd.web12.10887.1603160515520632101 for ; Mon, 19 Oct 2020 19:22:00 -0700 IronPort-SDR: vbp/cEQA1wYNv06hpzKmS6Tbf2yOjH40AKIEKNNI/39mOvz7XmEt88wBvFEe8gj22m2KvVXnW8 UJRJ/w2vfY0A== X-IronPort-AV: E=McAfee;i="6000,8403,9779"; a="154082283" X-IronPort-AV: E=Sophos;i="5.77,395,1596524400"; d="scan'208";a="154082283" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2020 19:22:00 -0700 IronPort-SDR: RTuH87av+Q6pOLgrUFDCyeYfV8pzu71H8GXX4HP+SHjTz7trGXURKyY7EZZdOtrsxz3jMS4jrn qVZK8peyyzvw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,395,1596524400"; d="scan'208";a="523322882" X-Received: from hengluo-dev.ccr.corp.intel.com ([10.239.153.154]) by fmsmga005.fm.intel.com with ESMTP; 19 Oct 2020 19:21:59 -0700 From: "Heng Luo" To: devel@edk2.groups.io Cc: Eric Dong , Chasel Chiu , Nate DeSimone Subject: [edk2-devel] [PATCH 2/2] UpXtreme: console redirect after the shell is loaded Date: Tue, 20 Oct 2020 10:21:44 +0800 Message-Id: <20201020022144.2261-3-heng.luo@intel.com> In-Reply-To: <20201020022144.2261-1-heng.luo@intel.com> References: <20201020022144.2261-1-heng.luo@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,heng.luo@intel.com X-Gm-Message-State: TeqBHbp1UqWCrzxySLzKgrqtx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1603160525; bh=8j2V1uAuISNMRJ1Ox1F/ONQCZciL5dWxg8JQKg12rDw=; h=Cc:Date:From:Reply-To:Subject:To; b=VczplUvEYNxiNsYLCmzwADDx46bpQLGYjwYGF42/kHial+vSUDRTSzMAsvThiIUr85x f1UF3DQqPYnB6t6xWCFPoGfp6saLbNR8Dl42Q8SD86gQUq3/361JscLJ1CSNnRbHgJ7jd SZcvBZHnPYirAAyB7IpyEI6bJzcdnLZxQrc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3014 Use SerialPortTerminalLib to get console redirect after the shell is loaded: 1. Add SerialPortTerminalLib to BdsDxe driver, to add the serial device to ConIn and ConOut variables 2. Include SerialDxe and TerminalDxe to the Up Xtreme's OpenBoardPkg.dsc and OpenBoardPkg.fdf Cc: Eric Dong Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Heng Luo --- Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc | 9 +++++= +++- Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.d= sc b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc index fb493973e2..6eb7eb1d90 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc @@ -39,7 +39,8 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc + !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc =20 @@ -82,6 +83,12 @@ [Components.X64] !include $(PLATFORM_PACKAGE)/Include/Dsc/CoreDxeInclude.dsc !include $(PLATFORM_SI_PACKAGE)/SiPkgDxe.dsc +MdeModulePkg/Universal/BdsDxe/BdsDxe.inf{ + + NULL|BoardModulePkg/Library/SerialPortTerminalLib/SerialPortTerminalLib.= inf +} +MdeModulePkg/Universal/SerialDxe/SerialDxe.inf +MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf =20 ####################################### # Build Option Includes diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.f= df b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf index 0d99114961..e15cb7dfa9 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.fdf @@ -342,6 +342,8 @@ INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridg= eDxe.inf INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf +INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf +INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf INF BoardModulePkg/LegacySioDxe/LegacySioDxe.inf --=20 2.24.0.windows.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 (#66437): https://edk2.groups.io/g/devel/message/66437 Mute This Topic: https://groups.io/mt/77674096/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-