From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 0236AD80144 for ; Thu, 9 May 2024 00:09:31 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=vhP/+Tkt2WcSTbLOYShVVR5oak4X+CDMy1jvy9pClU0=; c=relaxed/simple; d=groups.io; h=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:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1715213370; v=1; b=wvBaWrNmWXTO9WSnAxF2KIJ16hXbxhs8ltEiTXSDlB1bkZCwU+8NYsG7zHRZPXhjEcDDwq3b 1PVP70bYuGb3z12QKtBv0nu2C7w5bMoWqdH9waiCkPpix92YsfF9HnZbNWq3LpDgg0ccDlkF3Qs FIMW+UczQa1m7oYcu9APWNjMCJSxTN4wjtZcGYw5gYuJ33X8Xujheau1dFp2vEpgn4BVS/AukDO 7tX6Q45PLk6H1faDatEDTcTjT43yXd/5vrVBMPJSdfE24RV0OaKTQXvZqgfhSy5BCrOBYZSFOcg qzwOORGtpL12J2R5DvxWeSfyqOxZcPHZ16JLBe134s5wg== X-Received: by 127.0.0.2 with SMTP id oPiEYY7687511xieeT9XQIpO; Wed, 08 May 2024 17:09:30 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by mx.groups.io with SMTP id smtpd.web10.2567.1715213366885136606 for ; Wed, 08 May 2024 17:09:27 -0700 X-CSE-ConnectionGUID: t2W9dbDoTCuXAVOjPafBGw== X-CSE-MsgGUID: 0ZlI7fiUQyWSJIO9OB/WCw== X-IronPort-AV: E=McAfee;i="6600,9927,11067"; a="11044572" X-IronPort-AV: E=Sophos;i="6.08,146,1712646000"; d="scan'208";a="11044572" X-Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2024 17:09:27 -0700 X-CSE-ConnectionGUID: Dc96GPtkRsuPZvbGZNJB4g== X-CSE-MsgGUID: smtxxn5xTiGkGipWcyfftg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,146,1712646000"; d="scan'208";a="33745137" X-Received: from nldesimo-desk.amr.corp.intel.com ([10.241.240.67]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2024 17:09:27 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Sai Chaganty , Rosen Chuang , Saloni Kasbekar , Chasel Chiu , Liming Gao , Eric Dong Subject: [edk2-devel] [edk2-platforms] [PATCH v1 2/2] AlderlakeOpenBoardPkg: Include MpInfo2HobPei Date: Wed, 8 May 2024 17:09:18 -0700 Message-ID: <20240509000918.2336-3-nathaniel.l.desimone@intel.com> In-Reply-To: <20240509000918.2336-1-nathaniel.l.desimone@intel.com> References: <20240509000918.2336-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 Resent-Date: Wed, 08 May 2024 17:09:27 -0700 Resent-From: nathaniel.l.desimone@intel.com Reply-To: devel@edk2.groups.io,nathaniel.l.desimone@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: mIa2Cch52B7c12L6FZ5uR6qHx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=wvBaWrNm; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) Because Alder Lake FSP includes an older version of CpuMpPei MpInfo2HobPei is needed to boot with newer versions of EDK II. Accordingly, this change adds MpInfo2HobPei to FvPostMemory. Cc: Sai Chaganty Cc: Rosen Chuang Cc: Saloni Kasbekar Cc: Chasel Chiu Cc: Liming Gao Cc: Eric Dong Signed-off-by: Nate DeSimone --- .../AlderlakePRvp/OpenBoardPkg.dsc | 10 +++++++++- .../AlderlakePRvp/OpenBoardPkg.fdf | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc index edd03cba68..092cb34831 100644 --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.dsc @@ -1,7 +1,7 @@ ## @file # The main build description file for the AlderlakePRvp board. # -# Copyright (c) 2022, Intel Corporation. All rights reserved.
+# Copyright (c) 2022 - 2024, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -342,6 +342,14 @@ ResetSystemLib|$(PLATFORM_SI_PACKAGE)/Pch/Library/BaseResetSystemLib/BaseResetSy } + # + # ADL FSP includes an older version of CpuMpPei, so the compatibility PEIM + # is needed when using FSP Dispatch mode. + # +!if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection == 0 + $(PLATFORM_PACKAGE)/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.inf +!endif + # # Security # diff --git a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf index ae7896e5e0..c8ceb8684c 100644 --- a/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf +++ b/Platform/Intel/AlderlakeOpenBoardPkg/AlderlakePRvp/OpenBoardPkg.fdf @@ -1,7 +1,7 @@ ## @file # FDF file of Platform. # -# Copyright (c) 2022, Intel Corporation. All rights reserved.
+# Copyright (c) 2022 - 2024, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -344,6 +344,14 @@ INF $(PLATFORM_BOARD_PACKAGE)/OpenBoardPlatformInit/OpenBoardPlatformInitPei/Ope INF $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf INF IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf +# +# ADL FSP includes an older version of CpuMpPei, so the compatibility PEIM +# is needed when using FSP Dispatch mode. +# +!if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection == 0 + INF $(PLATFORM_PACKAGE)/FspWrapper/MpInfo2HobPei/MpInfo2HobPei.inf +!endif + [FV.FvPostMemory] BlockSize = $(FLASH_BLOCK_SIZE) -- 2.44.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118708): https://edk2.groups.io/g/devel/message/118708 Mute This Topic: https://groups.io/mt/105992898/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-