From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 55FECAC1063 for ; Thu, 25 Jan 2024 12:01:54 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Kp6sYK+6P2XegKVseAmm6iggHPQTYAHDi6xXk3090Yg=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1706184113; v=1; b=fn6H18OWB7RFASdgpWhn2o82CTWlcSdKSgeYenQsjWmrdz2Gxwsmwdc+Dj5tW8121o1XfGEm W2lNxSweQ3x/CD9CipPVFQYMabt3cwvhPGbV6foW4f7bF3GPQeyu063rVG/8r8Hd+BIpYQ4v8pJ EtmYInZj6S7jk19/I3/1xHks= X-Received: by 127.0.0.2 with SMTP id iHI3YY7687511x6Tc0ye4HdE; Thu, 25 Jan 2024 04:01:53 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by mx.groups.io with SMTP id smtpd.web11.15810.1706184111829115312 for ; Thu, 25 Jan 2024 04:01:52 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="9519375" X-IronPort-AV: E=Sophos;i="6.05,216,1701158400"; d="scan'208";a="9519375" X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2024 04:01:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="736295775" X-IronPort-AV: E=Sophos;i="6.05,216,1701158400"; d="scan'208";a="736295775" X-Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga003.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 25 Jan 2024 04:01:50 -0800 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 25 Jan 2024 04:01:49 -0800 X-Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 25 Jan 2024 04:01:49 -0800 X-Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Thu, 25 Jan 2024 04:01:49 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 25 Jan 2024 04:01:49 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UU6wLEy2QYlWO78jvVyywH6+U8JLideAv5UBCh71RKRbFLpl6L3SFLb83aovd3QmFzw5Fa5/Thi9qrZD3xkI3WDNUwFsDN6zP3K1BZqqXF+n84NFODhfk/XzKUBDg9eAtz+eFC0g9eDgcdN4r8jPcZ8LLOmf2FZF5ZpBCKk7rDk1XnMrZ3vYyueC/TEkLW3AeR3vB2v2urLpOOfE+QcUbsPkTUHDC4eeEgQzkOT2c+xzZ443l8UuzVJtsZ3Z9Sm3Kz/Fg7kIjab0ZLoMuEzYrJQtzynEg7G5MmVWUXbvrTk5/GDFG9S9sPAyVP1HpbIygbexFO5ORVoSa14S+Vt2Yw== 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=6BC/cye4HshI6AodiC2WOL+aiU/s+BDT2S1Q10gBr9g=; b=Qxz2wGGECBg+Q4z5RhslATVRhV0PNT0WXRFMfC7IEiTrHiw+Wneen5XSpEZTMNVwTaXyVVuk0jf1q6JWmm1lEU/LusFyRvzT0rXeP3V5OrSh3nvK5Aydrfv9oZr8kkrx8EN6jH28XGyI6Pje6ZFBhRdYGG28JT2Y8Pucxf5SLbQtxJsvVEmj0M0NL2OKZXTGQEUH2Dgo/JKtb0ScXLcR7qly4g968CvvdM42SVQZ/Hkzd12EFxh9/amxvbpdX07nTdmkich1mHNEDaIrSfao+rqRm0DEoHCxn4vvucjiRI+stGTLkFALaSnJIlhkDm79Jy1NtsWIXwGvDfH0xmql3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by SA1PR11MB6662.namprd11.prod.outlook.com (2603:10b6:806:256::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.26; Thu, 25 Jan 2024 12:01:46 +0000 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::fdd3:11d7:1c15:6c2d]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::fdd3:11d7:1c15:6c2d%7]) with mapi id 15.20.7228.022; Thu, 25 Jan 2024 12:01:46 +0000 From: "Ni, Ray" To: "devel@edk2.groups.io" , "kraxel@redhat.com" CC: Liming Gao , =?iso-8859-1?B?TOFzemzzIMlyc2Vr?= , Oliver Steffen Subject: Re: [edk2-devel] [PATCH v2 1/2] MdeModulePkg: rename PcdUse5LevelPageTable to PcdEnable5LevelPageTable Thread-Topic: [edk2-devel] [PATCH v2 1/2] MdeModulePkg: rename PcdUse5LevelPageTable to PcdEnable5LevelPageTable Thread-Index: AQHaT2d+6RELXfAf/U+hHrWeD1ZSELDqbU7g Date: Thu, 25 Jan 2024 12:01:46 +0000 Message-ID: References: <20240125082057.309133-1-kraxel@redhat.com> <20240125082057.309133-2-kraxel@redhat.com> In-Reply-To: <20240125082057.309133-2-kraxel@redhat.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|SA1PR11MB6662:EE_ x-ms-office365-filtering-correlation-id: 36c48880-ad5c-42ff-00a1-08dc1d9d679a x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: DTOkU40dSIWJhhzmmSClHgw9QXUYqQMQBTnsQIGBRAqAMsxFI9iwFHkP/9xAi4O5sJCF9YYYlinL6VewKZdr5ppMZqXNP8LIOaNG30CxBbPkBGkt84RprJwFGYahNBd1W2o7rn69q55mv9Kbpg1HKMSeDitPDdVBMHBRe/CkzZzFMzN/iFmO8xbSbDQUSWDeGs6Hpw9NcFXYUmpYxb6s4SARGxHi0ruHGj2gS9RW6cZrJu9sCmnDCZXsvxcaLTYa3WBXth/12VR3q6qRykdkNB4YvJ98u+0WLUomP9n9ecqyv2u+wmi/i2uvaEytJwXn61KV0f52oTrMOI6mC74cn+e6p27xPo2KFr3/Gs/pSjh7AoW2qb2RFqr7W8qC1yBh5kk13FaDnJ6/Z94am1Q2BXyzBZBf5Jvt3BEMuFMAcDuLqb5YPE6bSllGzkcEQJvLRHmEwD9IARyWx6Jque5SAEj6K8SSQLMhAINA6gnXuB22mne55eOiy/uDShkIYJPepfueFdpDYQlp4zbItjRGSDUf3GX58H/Pw/LUTtrrniNGioNs7EecZJYPRp1UjdXpzMt0u2PbW6hObTfLYGFXjdciLB2YaGEG0NFF/7rsfcp+yLO28FZev9XAY6+H3OGpVglRoiNCs7n2t0ZQt/ivFA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?9Lz9yuXrvI8jms+zshPakkR90Ll7ECSS9c1c0MK3FG9i9f8Y9tr0JxX2It?= =?iso-8859-1?Q?rRaJfW2I34dwcVHwxWrC837uzYHKxLXWmHhK5eBIAOfPwjvFWUz0EbhuiR?= =?iso-8859-1?Q?UWkSIKioNqczqK34VlQQv2Ngsdf1VyLs0KYY4iTd5qDRu+G2xiVW6Lsuu6?= =?iso-8859-1?Q?/5JJut+ZxgrklzC8SDD7/bi5jysIN+y0utIo6mExT+0BdwXeKRQmm7cpcT?= =?iso-8859-1?Q?jOT2gYOawduhgFzcxZ/B6lTvvKE33ybhOUW80wk+9oHc03ZizLe2YrZ0f9?= =?iso-8859-1?Q?ZzRDfAxwVmexM/iL2P8gNn82opE26Mkb4MOJ7rRzeBvTHrzyCOfSiIg3MS?= =?iso-8859-1?Q?J4VqmhMKAU6DuwfPX7iWpk6bLffA1C7qSggpuE6XRpnAR9gpQbavArmqCv?= =?iso-8859-1?Q?u1HdrsGyeoAvOGB6pPRQufM37VgJJZ+lLPTPgbCK+TTgt7N5GapPZDEHU/?= =?iso-8859-1?Q?isuWICjNqrX00mh/fl85/7aqlUvWtVsVvmEJ9eDvaT4SVCBqkABLm8Z09K?= =?iso-8859-1?Q?Yh+klHU5m9ddQaJY47HbV3wP+Gv1zdSRPzE7M6MzyRiPecJuQyCvBEgsst?= =?iso-8859-1?Q?AHGBk931WyRZeFoYR4xdzRfGpTNqfx7Wf7cU97RvQHBVGpxLAk4LqO6vKt?= =?iso-8859-1?Q?fGe070omr8GHYfGxHv0Eh3sGdBnmdo5D+PesVwmrhNjaQfYKA/4vwRC0ye?= =?iso-8859-1?Q?frxTPTqGzhPjIsxo6WOBHfryl4hp6IhujXMBmygiSKgKsTBcu8usUU32yk?= =?iso-8859-1?Q?jA3i/5eW9HCeZjI20KpfZZ9OrlETsHx9jWwTD10XHKTFd965MXrszB2VbK?= =?iso-8859-1?Q?XQsYE/rV0vukv4fLLPqck1sAfWqgLkuXGhfJpjzUz7mVY9A6grNYvqsS0g?= =?iso-8859-1?Q?kaY1+nmlho52zQT9o7+MbChlxZXLAi7bVOIkxz00SjosTE+bezRsK3cZ1J?= =?iso-8859-1?Q?TAjRUwOoYUo3//gLoxhueWB8SOl+cv3YHm1U9UCfG9+N5RMpHFGkXYc9jD?= =?iso-8859-1?Q?VkHaTstt1/01HuuSS+7G3PftlT8I74J+ZYUK3mWdY15Dhy5xdwhbtf17NJ?= =?iso-8859-1?Q?KpJO776cmASHakiwf4g23Q1+IH+bGuJ6RQWe+Gib2CiFflIrC8X/kVOCIo?= =?iso-8859-1?Q?gHfRTUk9C5e/3D3143u+Iws0cFzTb1fumLfEGO0b9SH/FBwkERaJoP1I2y?= =?iso-8859-1?Q?Wk1FpSIKNKqUZLHtqpvyBWxn43yAAHAbXRhlUoKH7k6IAFLq2fwR5xOgsB?= =?iso-8859-1?Q?2UXCGsbG6dLS/SdOPqrh3rqmQjYBB7yg/QtND6FRK7ZQz+tfuMrPdqE8Rx?= =?iso-8859-1?Q?xLm+OzcUi9IavLCGHCiEd/2x0/IJoTJkHIuoNupMD5MF9fwegnqYJtM2Rr?= =?iso-8859-1?Q?UdvrRRPVGT/EyclXPw+i2SCras2WhpZXA9hZTy6z+VczVCGwftNkSyGvXl?= =?iso-8859-1?Q?vGoq+Eb0OZ2Ov/WevFTHv4yncaMjVUlmNOjoM2Jgb4PivYM7yEkciyVF/8?= =?iso-8859-1?Q?STlvVeAGwTZVGtHF/h4y/VvjDo2vP2d+trgBXIIg4OWvHiFhX5lPbt97X4?= =?iso-8859-1?Q?oxPzQrOG/bFYCinWjWBkYqGxluKU4PG08sZn9R2ZPOYnzusD2Tj8C7sfa5?= =?iso-8859-1?Q?WQNXD3TXkVQaI=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36c48880-ad5c-42ff-00a1-08dc1d9d679a X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jan 2024 12:01:46.4540 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: WP1hhF/fEF8zgozgKurFH+N2SnCUgPJCSxPBMUT/S4vtzNIN8tVOcGAbPTq00SDuKVE0EfNEx6DokIxO9YGvQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB6662 X-OriginatorOrg: intel.com 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,ray.ni@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: bxjQUqqzJLkAf8nSKo60Se0wx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=fn6H18OW; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Rename an existing PCD might break lots of platform builds. When 5-level paging capability was added to ResetVector, I also considered = to remove the PcdUse5LevelPageTable reference from C code. Let me think about it... Thanks, Ray > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Gerd > Hoffmann > Sent: Thursday, January 25, 2024 4:21 PM > To: devel@edk2.groups.io > Cc: Liming Gao ; L=E1szl=F3 =C9rsek > ; Oliver Steffen ; Gerd Hoffmann > > Subject: [edk2-devel] [PATCH v2 1/2] MdeModulePkg: rename > PcdUse5LevelPageTable to PcdEnable5LevelPageTable >=20 > The PCD will allow but not require 5-level paging. Whenever 5-level > paging is used or not will be decided by the ResetVector, by looking > at CPU capabilities. Rename the PCD to make that clear. >=20 > Signed-off-by: Gerd Hoffmann > --- > MdeModulePkg/MdeModulePkg.dec | 2 +- > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 2 +- > MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c | 4 ++-- > MdeModulePkg/MdeModulePkg.uni | 4 ++-- > 4 files changed, 6 insertions(+), 6 deletions(-) >=20 > diff --git a/MdeModulePkg/MdeModulePkg.dec > b/MdeModulePkg/MdeModulePkg.dec > index a2cd83345f5b..80047f029d36 100644 > --- a/MdeModulePkg/MdeModulePkg.dec > +++ b/MdeModulePkg/MdeModulePkg.dec > @@ -2105,7 +2105,7 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, > PcdsDynamic, PcdsDynamicEx] > # TRUE - 5-Level Paging will be enabled.
> # FALSE - 5-Level Paging will not be enabled.
> # @Prompt Enable 5-Level Paging support in long mode. > - > gEfiMdeModulePkgTokenSpaceGuid.PcdUse5LevelPageTable|FALSE|BOOLEA > N|0x0001105F > + > gEfiMdeModulePkgTokenSpaceGuid.PcdEnable5LevelPageTable|FALSE|BOOLE > AN|0x0001105F >=20 > ## Capsule In Ram is to use memory to deliver the capsules that will b= e > processed after system > # reset.

> diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf > b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf > index f1990eac7760..d73add2d814d 100644 > --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf > +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf > @@ -104,7 +104,7 @@ [Pcd.IA32,Pcd.X64] > gEfiMdeModulePkgTokenSpaceGuid.PcdNullPointerDetectionPropertyMask > ## CONSUMES > gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask = ## > CONSUMES > gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard = ## > CONSUMES > - gEfiMdeModulePkgTokenSpaceGuid.PcdUse5LevelPageTable = ## > SOMETIMES_CONSUMES > + gEfiMdeModulePkgTokenSpaceGuid.PcdEnable5LevelPageTable = ## > SOMETIMES_CONSUMES > gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase = ## > CONSUMES > gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbSize = ## > CONSUMES >=20 > diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c > b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c > index 980c2002d4f5..46528e4f719d 100644 > --- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c > +++ b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c > @@ -745,13 +745,13 @@ CreateIdentityMappingPageTables ( > // > Cr4.UintN =3D AsmReadCr4 (); > Page5LevelSupport =3D (Cr4.Bits.LA57 !=3D 0); > - ASSERT (PcdGetBool (PcdUse5LevelPageTable) =3D=3D Page5LevelSupport)= ; > + ASSERT (PcdGetBool (PcdEnable5LevelPageTable) =3D=3D Page5LevelSuppo= rt); > } else { > // > // If cpu runs in 32bit protected mode PEI, Page table Level in DXE = is decided > by PCD and feature capability. > // > Page5LevelSupport =3D FALSE; > - if (PcdGetBool (PcdUse5LevelPageTable)) { > + if (PcdGetBool (PcdEnable5LevelPageTable)) { > AsmCpuidEx ( > CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS, > CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS_SUB_LEAF_INFO, > diff --git a/MdeModulePkg/MdeModulePkg.uni > b/MdeModulePkg/MdeModulePkg.uni > index a17d34d60b21..7a98dc64832b 100644 > --- a/MdeModulePkg/MdeModulePkg.uni > +++ b/MdeModulePkg/MdeModulePkg.uni > @@ -1332,9 +1332,9 @@ > = "required to be accessed in PcdDxe > driver entry point. So, its value must be set in PEI phase." > = "It can't depend on EFI variable > service, and can't be DynamicExHii PCD." >=20 > -#string > STR_gEfiMdeModulePkgTokenSpaceGuid_PcdUse5LevelPageTable_PROMPT > #language en-US "Enable 5-Level Paging support in long mode" > +#string > STR_gEfiMdeModulePkgTokenSpaceGuid_PcdEnable5LevelPageTable_PROMP > T #language en-US "Enable 5-Level Paging support in long mode" >=20 > -#string > STR_gEfiMdeModulePkgTokenSpaceGuid_PcdUse5LevelPageTable_HELP > #language en-US "Indicates if 5-Level Paging will be enabled in long mode= . 5- > Level Paging will not be enabled" > +#string > STR_gEfiMdeModulePkgTokenSpaceGuid_PcdEnable5LevelPageTable_HELP > #language en-US "Indicates if 5-Level Paging will be enabled in long mode= . 5- > Level Paging will not be enabled" > = "when the PCD is TRUE but CPU > doesn't support 5-Level Paging." > = " TRUE - 5-Level Paging will be > enabled." > = " FALSE - 5-Level Paging will not be > enabled." > -- > 2.43.0 >=20 >=20 >=20 >=20 >=20 -=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 (#114392): https://edk2.groups.io/g/devel/message/114392 Mute This Topic: https://groups.io/mt/103950404/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-