From nobody Fri Apr 26 14:20:53 2024 Delivered-To: importer@patchew.org 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+96405+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1668528583921903.8395465230469; Tue, 15 Nov 2022 08:09:43 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id gOdwYY1788612xv5wAarL92O; Tue, 15 Nov 2022 08:09:42 -0800 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com [40.107.95.61]) by mx.groups.io with SMTP id smtpd.web08.4639.1668513864177735908 for ; Tue, 15 Nov 2022 04:04:24 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ONZQ03QIBAeAYm8uF88xh5dUXz45fafwOObXNKccGG/RRDep4fhNJNXnc1N/LmIuITB8V4Ad0KjyvjX/j48+6Ya9Op48txKxNbq4y4Z9WvUQpZLhYQ2JWAQi1Q50RJdh0Bq3vW1ZnZ2ITD2Zpnux2hMKHem/jtFIIanoFgtP9ORFw2RMZ/cwtaJKLWo2lufvs/qtTdp16z4YY9Qi//jcSck+K3PZQlqeWb34Wlx//D82kmKiDH2TdimeYxAu/hz19gN20CW22Y2JKP0CNCnm0zGoDgasfNf6WQYbqDYeNmjnHIG6HMsu7EwHH0YFJyFwaLN1DHCBcQpFZaPXxlMa2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4IJwQtkOY2Xy0m/jrQMGh5jxNV0exlQF42yTRU7Qt6A=; b=SkFS5cPmmVffFHsACUYUU6fjmJyh+ePY0Z4JSFnkHrhTSOGPTauraCcqo9qd08YnjVQdXU9ONQTirD8XYXlwdPzUG6IpsnG4hOseVYpTJ94AQFI9XQCvrPEXHq1ALe+BeNXiCi0Iv0aOjttB+L1Ek4tP4kWXv002/2pd4u0WJKPkrcZFuebyxI9Lc8FxTLTTzJd2XAcS1C8PTUetwu54O4ifUjmaAhRVDQzs690P2TTnDeq27rXqfoNLGAq/U/UIs/T1jTegZ12X9btrLNi4IcFSXn1ti/ogV6zcI+eQ4vBnLXH/g6NRmbY6cwYpQ8XILIAmiF9LKvsFOGucyPx1Cw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none X-Received: from MN2PR04CA0013.namprd04.prod.outlook.com (2603:10b6:208:d4::26) by MN2PR12MB4077.namprd12.prod.outlook.com (2603:10b6:208:1da::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.18; Tue, 15 Nov 2022 12:04:21 +0000 X-Received: from BL02EPF0000C402.namprd05.prod.outlook.com (2603:10b6:208:d4:cafe::19) by MN2PR04CA0013.outlook.office365.com (2603:10b6:208:d4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.17 via Frontend Transport; Tue, 15 Nov 2022 12:04:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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+96405+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C X-Received: from SATLEXMB04.amd.com (165.204.84.17) by BL02EPF0000C402.mail.protection.outlook.com (10.167.241.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5813.11 via Frontend Transport; Tue, 15 Nov 2022 12:04:21 +0000 X-Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 15 Nov 2022 06:04:18 -0600 X-Received: from BLR-PF2HH7H7.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Tue, 15 Nov 2022 06:04:17 -0600 From: "Abdul Lateef Attar via groups.io" To: CC: Eric Dong , Liming Gao Subject: [edk2-devel] [PATCH 1/2] BoardModulePkg: Copy device path before processing Date: Tue, 15 Nov 2022 17:34:12 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0000C402:EE_|MN2PR12MB4077:EE_ X-MS-Office365-Filtering-Correlation-Id: a72ebd9f-72e9-40de-c2aa-08dac70187c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: 0mxHhf75cJkcU3fyRlIE4GmM57cusYgv9A3Q0WlkQokSqFJ1dtlOk1DfvsZZcl+npOnr8Ubq4RQfICK8sJ//qhiggdTFA74VFFIRwSAUlFLGX6vaURFmfcAJv14gLcqDNV2RPXLJaeb09PxV5d3XLyhoCVAKr/qbdx3M1ME74Wng5tZw15cjmUEiUIaEWrLRs8ccUmcyOZFDFdHrgYOZU5vc/OZPSOkb2jSc2u8OZKOpt4BDeTyZOUD8ViYlE8543L/lUQ9n1WZwt/sCBjbxZ+5BWtQZVG7PX8kT+aalltzu6Wz0YOrdGcne42E5yDg1U99wpeivoZHiMuRWpmOCoWrHeLXorIXzEvHqDPrQgXArCFsWLbIiNzdMbaiozzYxUNWvo4ekUM4gY8aWSpUzqr/wE6l9Bm9FNKwzyHe2dkpFGiT2Mt55lk6APGrIWwabKkJMtvPxCeOsUNYvKHCtPVNKTXwf3BLgllCyKb45vWOus/fKqiiMZuNuST1ow4wsdL1l12ccD28be3mVqfXy5mS4LnynY6vXky7d10hHBiKBbnYtUu1I496jEZitMz8gqvqSNi0/+0LOM2U7h2NhXEQb48rqXqwM+bX9Ijp1GoDKvWAAtnyPcgZjn6vWGc3ZV8/B/NlXcsjLr+xZny3hszy0KyCHtzkFdVScO5CwLbLzFMwmn+OTf8L/IFd0XW2aBIalLkUIA2YZtRbcpZ7zhLk34Yn/U5Nm5bUEdB7buYcOXE77ercgEcakJLJy5kB7QQmsnhX9lPk+brjhmy+wmkCk9CcAKGlW8w8fHutNS4g= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2022 12:04:21.2722 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a72ebd9f-72e9-40de-c2aa-08dac70187c6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0000C402.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4077 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,AbdulLateef.Attar@amd.com X-Gm-Message-State: IqfXV2QtNwz4Zkyf965iVVmDx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1668528582; bh=s/8umI7qJupn98X8BgziuNrplYdUK7BaZnmEwTTuWSE=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=E8Nh/9E/Xn6JMMlQav/WPqvXobAY0vcM1XU7qJJ1nniXHENi6N/URwcg9ktP2g3SvEs n3Gm3EIFK9fK1d6EsYR5jjRwZ3d39bOFgG+nx7Jp/FXjAfEGoSSD7ciCLshIWxrfWkkit p81nUrPicVtRPwe2FqqLAOm9bESLg0JyTe4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1668528585026100003 Content-Type: text/plain; charset="utf-8" From: Abdul Lateef Attar GCC compiler puts the DevicePath PCDs to the read-only section. During boot if try to process the device path after PtrGetPtr it throws a page fault exception. Hence making a local copy using DuplicateDevicePath() to avoid the page fault exception. Cc: Eric Dong Cc: Liming Gao Signed-off-by: Abdul Lateef Attar --- .../Library/BoardBdsHookLib/BoardBdsHookLib.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBds= HookLib.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsH= ookLib.c index 0bcee7c9a4ba..8700118d255a 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib= .c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib= .c @@ -3,6 +3,7 @@ implementation instance of the BDS hook library =20 Copyright (c) 2019, Intel Corporation. All rights reserved.
+ Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -131,7 +132,7 @@ IsTrustedConsole ( =20 switch (ConsoleType) { case ConIn: - TrustedConsoleDevicepath =3D PcdGetPtr (PcdTrustedConsoleInputDevice= Path); + TrustedConsoleDevicepath =3D DuplicateDevicePath (PcdGetPtr (PcdTrus= tedConsoleInputDevicePath)); break; case ConOut: // @@ -147,7 +148,7 @@ IsTrustedConsole ( TempDevicePath =3D NextDevicePathNode (TempDevicePath); } =20 - TrustedConsoleDevicepath =3D PcdGetPtr (PcdTrustedConsoleOutputDevic= ePath); + TrustedConsoleDevicepath =3D DuplicateDevicePath (PcdGetPtr (PcdTrus= tedConsoleOutputDevicePath)); break; default: ASSERT (FALSE); @@ -171,7 +172,9 @@ IsTrustedConsole ( } while (TempDevicePath !=3D NULL); =20 FreePool (ConsoleDevice); - + if (TrustedConsoleDevicepath !=3D NULL) { + FreePool (TrustedConsoleDevicepath); + } return FALSE; } =20 @@ -624,7 +627,7 @@ ConnectTrustedStorage ( EFI_STATUS Status; EFI_HANDLE DeviceHandle; =20 - TrustedStorageDevicepath =3D PcdGetPtr (PcdTrustedStorageDevicePath); + TrustedStorageDevicepath =3D DuplicateDevicePath (PcdGetPtr (PcdTrustedS= torageDevicePath)); DumpDevicePath (L"TrustedStorage", TrustedStorageDevicepath); =20 TempDevicePath =3D TrustedStorageDevicepath; @@ -649,6 +652,9 @@ ConnectTrustedStorage ( =20 FreePool (Instance); } while (TempDevicePath !=3D NULL); + if (TrustedStorageDevicepath !=3D NULL) { + FreePool (TrustedStorageDevicepath); + } } =20 =20 @@ -1031,7 +1037,7 @@ AddConsoleVariable ( EFI_HANDLE GraphicsControllerHandle; EFI_DEVICE_PATH *GopDevicePath; =20 - TempDevicePath =3D ConsoleDevicePath; + TempDevicePath =3D DuplicateDevicePath (ConsoleDevicePath); do { Instance =3D GetNextDevicePathInstance (&TempDevicePath, &Size); if (Instance =3D=3D NULL) { @@ -1074,6 +1080,9 @@ AddConsoleVariable ( =20 FreePool (Instance); } while (TempDevicePath !=3D NULL); + if (TempDevicePath !=3D NULL) { + FreePool (TempDevicePath); + } } =20 =20 --=20 2.25.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 (#96405): https://edk2.groups.io/g/devel/message/96405 Mute This Topic: https://groups.io/mt/95046164/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 Apr 26 14:20:53 2024 Delivered-To: importer@patchew.org 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+96406+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 166852858434036.43499022546234; Tue, 15 Nov 2022 08:09:44 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Qy4WYY1788612xViFPxK9Ylc; Tue, 15 Nov 2022 08:09:44 -0800 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.60]) by mx.groups.io with SMTP id smtpd.web08.4640.1668513866144985342 for ; Tue, 15 Nov 2022 04:04:26 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BQgZIQNOOtP0PTKvU7bY7scuRRXReVCGE4sBIT3izoyA2xFEhlYcoinHDt+WSMzpsX+8h/drIjKw3qcaJne9bL94mC2LzJrNltguM/ugHmwBAgRLeSsCrGccf3M6WA84ZfQcnZ4Lb+ucBdwGNzkECVkhwIpXgu3oYSiFtrjTlMrNkF7PlSYg7X7yOwnSWyDOjxi41NAYTAvKCVScqkHVwkC6K+SRzA0yzcD7u3EoA3p0/8f7zPhE8WI1rv2HSMzIujou8VNNY5hUyd5X4jpHCxV8raLonEqt0ohVuemh+9pPDd144NLOjADJq1DRmJuIPxM2P5fS5m0+isP6OvaqlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KivrSeQ1GzFwh08CgKfXZck3rDs5WwdfWtiTASqT+yo=; b=beItpMvsm87CpGP5fAIMzQtJ1GwgDF8xk+6ynNOKCOXiXVA1NdMqRNiMwPIj/9agHAFEMHOVzG4rnB13oEbdvEdmOprOPW9lOAtOVieUMYm/hsfuMStEmXVJuI7xN8TR3uum/Zd3llQd9wFF1Oj3PdJYzcJIZ5tWOgeXqHADAQwzaG/FZqRRW6wPtbKYoejopwYZVF/UbhJHVHZ5iwT0L0VnzaTE+c/aMGOFlhZd1ELBKYk9n3Pvs6Tv/x+0EHsCZFOPthd9M9ffG/Sf+ZIV5aeSSgYW3DfXcQ4PhAe0IrrC3vFhCfpskSHIv6SOIzlKJ4OR6gIucO5Wo5faFfEKcQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none X-Received: from BL1PR13CA0165.namprd13.prod.outlook.com (2603:10b6:208:2bd::20) by SJ1PR12MB6100.namprd12.prod.outlook.com (2603:10b6:a03:45d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.17; Tue, 15 Nov 2022 12:04:24 +0000 X-Received: from BL02EPF0000C406.namprd05.prod.outlook.com (2603:10b6:208:2bd:cafe::b6) by BL1PR13CA0165.outlook.office365.com (2603:10b6:208:2bd::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.17 via Frontend Transport; Tue, 15 Nov 2022 12:04:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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+96406+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C X-Received: from SATLEXMB04.amd.com (165.204.84.17) by BL02EPF0000C406.mail.protection.outlook.com (10.167.241.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5813.11 via Frontend Transport; Tue, 15 Nov 2022 12:04:23 +0000 X-Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 15 Nov 2022 06:04:22 -0600 X-Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 15 Nov 2022 04:04:22 -0800 X-Received: from BLR-PF2HH7H7.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Tue, 15 Nov 2022 06:04:21 -0600 From: "Abdul Lateef Attar via groups.io" To: CC: Eric Dong , Liming Gao Subject: [edk2-devel] [PATCH 2/2] BoardModulePkg: Adds PCD to load UEFI Shell image Date: Tue, 15 Nov 2022 17:34:13 +0530 Message-ID: <63f0705278c15860ceb3873cf397ddaac0b5cf4f.1668512725.git.AbdulLateef.Attar@amd.com> In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0000C406:EE_|SJ1PR12MB6100:EE_ X-MS-Office365-Filtering-Correlation-Id: dca062b2-b967-4f53-7121-08dac7018908 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: 74GfmSVKvvFSZ+LQorGpA2lm+UR4KGWzqYIEkB4hF4cbyRHSpuXFamHNSEAIz/7p5dqYRe8wnGOtM28kwnZzItT50Cc1syHezJbcYaD+5aIEG05OfXLSTiOE7lO4HMebo/P8Q40+KM/6rRlNuLXXcu9f9NnB4I02S+sDjp5xZeh1CTsXknZ5ROR3n6zDwUJl6EV5aBVTufAbCKhqff/c7ZAdAWmqEKWp7/SujGV2zo5+urW7wmmzSgTQif5H5GL2tVz6UbyPyslJtxQxY/dO+b4KLYKJNgFomyF57bGIQRAvcHPWjvMgGujxMb2k/9pU5g5Eb1CGRSKMIJlsRTcRPYg4M3m7c8Rd+0CTtlJpYHXdFO7mMpXiCWHWUTOnUSSJeJT4mguUQRTzKU8tdNQpmgxIO1kN6Rp7dBLPEMk2S7Ih4cpF3x9W3o67hS7CXTVwZtWIGoj88mR0T6MkzdR1lPHDcrCXk2uJukhzGLWyzR/Ih6KefTTItCea+gemkLH8cg7gvquYh+B65UJ3f4NoUvDeMbgTlRcUmEE75+AdYnamkTanfYjyqo4XBzpL/cou1uDK8yMjG81BMATKFfYd1vIULQnduELtxHNkqZduBt9NdVMYxDHXMJv34zrFF4bOXkRC8YkDdBSltD505z+Od7I3OO5Z5tH+6t/c1+ih5IXNokilECF5JK9WVFBKZmZ6/aTxbfEFSOEoSZmzwwYBJ8u5gH+U6lYkt+J7mNZrQr5iOskAlRjE8JGZmvSl+z9bQGrbQ4AgoZivQjb0I2xCQaRpq6WdP6e+yeM9RCMvpPU= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2022 12:04:23.3804 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dca062b2-b967-4f53-7121-08dac7018908 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0000C406.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6100 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,AbdulLateef.Attar@amd.com X-Gm-Message-State: Wyk5d1j74zg7qeumC0dgdmz2x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1668528584; bh=lT0mZ/xTrVKE59E8EhZXp6gXV9OP9pRYAV0M3VRcXko=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=rYUaDXtdrp3H65x3wQb4cnb1yo7e9bobzHiI8ubgMmlyiCR9X4kSQ06AktiBU3TGfSW j4GRkWoiRNAcZb2gdtxJ5pSHgA55cnf5qH9ig1QES6eMLdif6bEVbvoAwAD7yNVFrQT3T HP+8/NrWKrcq9UQP+nArrlmnkDYOVAQoELU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1668528585043100005 Content-Type: text/plain; charset="utf-8" defines two PCDs, PcdShellFile and PcdShellFileDesc, which holds the GUID and description of the UEFI shell file to be loaded. A PCDs based solution gives flexibility to the user to load different images, by just overriding the DSC file. The user can load a diagnostic image or test image during PCDBootToShellOnly or later stages. Cc: Eric Dong Cc: Liming Gao Signed-off-by: Abdul Lateef Attar --- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 5 +++++ .../Library/BoardBdsHookLib/BoardBdsHookLib.inf | 3 +++ .../Library/BoardBdsHookLib/BoardBootOption.c | 8 +++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/In= tel/MinPlatformPkg/MinPlatformPkg.dec index 2953e9527224..73cbd62be030 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -7,6 +7,7 @@ # for the build infrastructure. # # Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.
+# Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -266,6 +267,10 @@ [PcdsFixedAtBuild, PcdsPatchableInModule] gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUSize|0x00000000|UINT32|0x200= 0002B gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspUOffset|0x00000000|UINT32|0x2= 000002C =20 + # GUID of Shell file to be loaded, default value is gUefiShellFileGuid d= efine in ShellPkg.dec + gMinPlatformPkgTokenSpaceGuid.PcdShellFile|{GUID({0x7c04a583, 0x9e3e, 0x= 4f1c, {0xad, 0x65, 0xe0, 0x52, 0x68, 0xd0, 0xb4, 0xd1}})}|VOID*|0x20000230 + gMinPlatformPkgTokenSpaceGuid.PcdShellFileDesc|L"Internal UEFI Shell 2.0= "|VOID*|0x20000231 + [PcdsDynamic, PcdsDynamicEx] gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0|UINT32|0x90000019 gMinPlatformPkgTokenSpaceGuid.PcdAcpiSleepControlRegisterAddressSpaceId|= 0x00|UINT8|0x0001004B diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBds= HookLib.inf b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBd= sHookLib.inf index 69f3fcb55222..e2ac73498b90 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib= .inf +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHookLib= .inf @@ -2,6 +2,7 @@ # Module Information file for the Bds Hook Library. # # Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -59,6 +60,8 @@ [Pcd] gMinPlatformPkgTokenSpaceGuid.PcdTrustedConsoleInputDevicePath ## CON= SUMES gMinPlatformPkgTokenSpaceGuid.PcdTrustedConsoleOutputDevicePath ## CON= SUMES gMinPlatformPkgTokenSpaceGuid.PcdTrustedStorageDevicePath ## CON= SUMES + gMinPlatformPkgTokenSpaceGuid.PcdShellFile ## CON= SUMES + gMinPlatformPkgTokenSpaceGuid.PcdShellFileDesc ## CON= SUMES =20 [Sources] BoardBdsHook.h diff --git a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoo= tOption.c b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBoot= Option.c index dec3ce93ef71..de1676dad0c7 100644 --- a/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c +++ b/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBootOption= .c @@ -2,6 +2,8 @@ Driver for Platform Boot Options support. =20 Copyright (c) 2019, Intel Corporation. All rights reserved.
+Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -335,7 +337,6 @@ PlatformBootManagerWaitCallback ( =20 EFI_GUID gUefiShellFileGuid =3D { 0x7C04A583, 0x9E3E, 0x4f1c, { 0xAD, 0x65= , 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } }; =20 -#define INTERNAL_UEFI_SHELL_NAME L"Internal UEFI Shell 2.0" #define UEFI_HARD_DRIVE_NAME L"UEFI Hard Drive" =20 /** @@ -352,7 +353,8 @@ RegisterDefaultBootOption ( =20 ShellData =3D NULL; ShellDataSize =3D 0; - RegisterFvBootOption (&gUefiShellFileGuid, INTERNAL_UEFI_SHELL_NA= ME, (UINTN) -1, LOAD_OPTION_ACTIVE, (UINT8 *)ShellData, ShellDataSize); + CopyMem (&gUefiShellFileGuid, PcdGetPtr (PcdShellFile), sizeof (GUID)); + RegisterFvBootOption (&gUefiShellFileGuid, (CHAR16 *) PcdGetPtr (PcdSh= ellFileDesc), (UINTN) -1, LOAD_OPTION_ACTIVE, (UINT8 *)ShellData, ShellData= Size); =20 // // Boot Menu @@ -557,7 +559,7 @@ BootOptionPriority ( return 6; =20 } - if (StrCmp (BootOption->Description, INTERNAL_UEFI_SHELL_NAME) =3D=3D = 0) { + if (StrCmp (BootOption->Description, (CHAR16 *) PcdGetPtr (PcdShellFil= eDesc)) =3D=3D 0) { if (PcdGetBool (PcdBootToShellOnly)) { return 0; } --=20 2.25.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 (#96406): https://edk2.groups.io/g/devel/message/96406 Mute This Topic: https://groups.io/mt/95046165/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-