From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.17578.1683251200165208204 for ; Thu, 04 May 2023 18:46:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=EulHmqWL; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: gua.guo@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683251200; x=1714787200; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=9hIh+CPhdyiIYkYAqobfyLDD51WUkuBNW9+hbuJ/ySY=; b=EulHmqWLFfDbzTrWfeTid/6GrT+a+8ueo3JUH9QAYlVdRsHMc1C9yhLZ rGFPWwiz5MfrW/9z1esJP+lg8YICNkvJcfBBzwGdrMhbIbsh/2UbTDvHy 3iQW1rQU1ZWJE1/oqEL89m5EH8hbMoWNsxR8vXhAJyZmyPcJ5ZaxlBcw7 a2Y0jeAHvp2EqijX7gnHJc0m+51fHKe/RzsntTsKQ7w1/FFenJxP2GtDF B5LMkrURnVgTzBTsb+tny5Pa058dGuoJ61HrDCphMLItvebqQSRRkP5KO At7xEXHZnIpz+TwXsToBqsxYGCGvawB4cHRfo+atetCVrx9hUwCgKj9+j g==; X-IronPort-AV: E=McAfee;i="6600,9927,10700"; a="329465731" X-IronPort-AV: E=Sophos;i="5.99,250,1677571200"; d="scan'208";a="329465731" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2023 18:46:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10700"; a="691401721" X-IronPort-AV: E=Sophos;i="5.99,250,1677571200"; d="scan'208";a="691401721" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga007.jf.intel.com with ESMTP; 04 May 2023 18:46:39 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 4 May 2023 18:46:39 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Thu, 4 May 2023 18:46:39 -0700 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.40) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Thu, 4 May 2023 18:46:38 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GDt7mJCR2IagR49xex910nGCNE3nJt+jfUCZM7/fmTl+81bSXeFsOcHxjc60tGdJ598Z6gwP4DoINggLYjahKq4XoMliJJd48sq+klhF1ME1cXVCCov2Zjm2XMW17p0uqygGsCg4YHPmKGuXKXpCOdduQlbHzeKLq4omqFXittXbK3dZ+E/xMItHW2PHIqCwvEQ1TXNdr7Lh+KMYJIWqEtXseUKfJLsuDiyq0KbTbNj1jAfS+ErflQg3vq/x0ooo+hE2qe1xYN045RnxcDH4+6O085d9hKnkPAWLWnDeX5xmf3W/PVP6clrNkAFoNxHLih31+Pl5rEYvrGt2I/nffQ== 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=thJvJOugTUHjgIHFVR1lYIjDBpeBHaBeRa1Ii80/eSk=; b=MtasCCwvuPu7Lk5T800kMdbTej40S9DpyUmI+/SusdAWj51BddEDmMKyGes3ei+3seHUMHH+wcwzA0cXLE8X8njz1FX5aPTCM+zQ0ptal11y1duBbl3q83QjlLiKoHMOYS0eh+FbIebUP3f6Wksbdnvgmg6WC2/NDxsftiqM4bIzjFLtSOXQ2DH6B8uxc4BOk/qSBSIo77xzzqYzzE6Q4OVsL2Ej0GZLAXqjqbGm28h4KabLguHWQBXxAkOQPBQpI8wgNMQX3OOvcICzUD/k5hDYs4Q1ICxqjvBQq871DZi4d0HepuTmfulZfbJNwMC6SCk9vnmUMA8jV1fiqTHu1A== 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 Received: from BL1PR11MB5478.namprd11.prod.outlook.com (2603:10b6:208:31d::12) by PH8PR11MB6659.namprd11.prod.outlook.com (2603:10b6:510:1c2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.26; Fri, 5 May 2023 01:46:36 +0000 Received: from BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::2176:be49:df74:bcc7]) by BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::2176:be49:df74:bcc7%3]) with mapi id 15.20.6363.027; Fri, 5 May 2023 01:46:35 +0000 From: "Guo, Gua" To: Benjamin Doron , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Lu, James" Subject: Re: [PATCH] UefiPayloadPkg: Use clearer debug flags with more flexibility Thread-Topic: [PATCH] UefiPayloadPkg: Use clearer debug flags with more flexibility Thread-Index: AQHZftkA615zwV0R8ka8zU2XL8g9pK9K6OpA Date: Fri, 5 May 2023 01:46:35 +0000 Message-ID: References: <20230504223622.77792-1-benjamin.doron00@gmail.com> In-Reply-To: <20230504223622.77792-1-benjamin.doron00@gmail.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BL1PR11MB5478:EE_|PH8PR11MB6659:EE_ x-ms-office365-filtering-correlation-id: 3b0d3e3f-b534-4fe6-a097-08db4d0a8fab x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: s7tUCEkrar8joaZkwKL50x6IUD7feLO0s8whptLOWrw11EBGZOEwfWduefdxPmmR8RPkOslhv2b0G4ehFBTbMh3uF9ghtABIiZltXow+08gu0hftOWP4njaNdy8RJ3neRdIsuhPOKSWhf/jcituAuq9XRgdCl6i+DF3RW9CEUpHWfFWXdhG7PxI82Ek8lMRJsJfsLifXm0ZptKMKLha6xHIfgo2HkXKMHtxK9f3rtOB7mFCPFaTLTUI0KVWK9ya4vZixwP3TMN/p8ESDZp/jAGeg59nsalrxpyY6Lp0aiWKXEjDJFXcNcZgiRlhNor/HcsJ0Vxy1+LQ0rLodCDeQ0D87cyiOaj3DQ/rN+nimW9Ri5zU6TwMYds98Ul41xteidJ/nVyTr5pB9AAWF58qKoZsthUXJr/tBEsdbECn7ZIgW84qH+MPDFWnzlhCNOb1n6Nd0LA3Owk8TN9eatd2CqssrcwZ9tqXK3SfZo4+q+Q8b84wXNqt9c1ryWMfs5al+uTnmZZ71dOcjGSm2pIfnfIUWwqXjsCzUeJMTqLaVyvikDeT4yaifQJfwOYiiNcKAey69J8poMTGth27oLqebpiBxKrtVQ61QRLk7utdoFBHMFNn5NwRLGSlHm+AZ2Oib x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL1PR11MB5478.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(136003)(366004)(39860400002)(376002)(346002)(451199021)(7696005)(76116006)(4326008)(66946007)(66556008)(66446008)(64756008)(71200400001)(66476007)(316002)(54906003)(110136005)(33656002)(86362001)(478600001)(83380400001)(107886003)(6506007)(9686003)(53546011)(41300700001)(52536014)(8936002)(8676002)(5660300002)(82960400001)(2906002)(55016003)(38070700005)(186003)(38100700002)(122000001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?7tBHrOsFmIcuJgnmcyXzhfsrrwPs5Obm3Stdb/am3pzW+mfg4qcAHOlm/kl+?= =?us-ascii?Q?nGYIrQ+Tcp/UcYQ/JA7PFX2r4TRbqqtWGNxdq7nv2sYHQj/rK52BoE+w2aid?= =?us-ascii?Q?IMTj43W271DeVQtlIht1zT84YUcQB9i1FUk4Uv6hKYjbctjfrUV9qc1j1nYg?= =?us-ascii?Q?qBBkM+g/B+mg8aQFBjUVediKLct7EN0dvy6i7WqcLpQWRjyAG2h5an1FSWet?= =?us-ascii?Q?bso8nqJ2YzxqQrp9hal0Qj+LJgVWKsHmN5CUwvKnwg5zxB+ypIUWCsuegbi8?= =?us-ascii?Q?+fJuZBvfI9pJ/aijekYdy4jP37+fH8tUCSob0l/MBqNRsZB/8zWEPS01AZmh?= =?us-ascii?Q?djczYs3ZEZ6HaYXxWCqixRLr5Z5yvfRBIdBhZ0BJd9DZza0xe4MZQKSZ/Jun?= =?us-ascii?Q?rKgd4jArhy/u7XuCkF+BUH/dPvgz4UmZdIwHOBdR6MK5a4JW3heppS8nRYLw?= =?us-ascii?Q?MbZUhqLU1f75LOwxg97AigZmWGXBLqLctWk7zmQ3jcd0+3ILIj2FRm+Ll1Ys?= =?us-ascii?Q?b+QTKioR2cYOxhp+U+oAB9rGd2HLxYZ++tWZV32iMKUIdWfHmx8qQSrIpGWA?= =?us-ascii?Q?vv1dMyJHCTrW3WSzn+fIVkvKZbNzi8MuQJnMGrlNzV1oUnLvlPfqzayZPN7B?= =?us-ascii?Q?AtZxg1fVayd1VziqcX/wHO1KS5/uFLhBt8HHNrp9LEPX/CuWOzoxmADnSP1+?= =?us-ascii?Q?NBnB9aTCPiKH5QMTuU8gkCCIqjVDkPSEOsEDzStZC6ZAmbmro2SLDgDzGV00?= =?us-ascii?Q?0H4dXTZOoIHAyTyxJdbyTS0icnsx+xvMY07Y8ztIQi5xlPDygebKtEJFDOOP?= =?us-ascii?Q?OGiFjl83MUr10u+Gd02M2EYXeb/LkIq37HU7EmOq37Bd2OckwZGoDu9h8N7y?= =?us-ascii?Q?z9YnwFjHnvxiPS/I5Frkbptz7RBFYnjzPgjFBtKPww5pI9lMtiF2UwhlIWZs?= =?us-ascii?Q?Gm/Lcn0/BUtNVPK7PepM4ju2oJuss3IH1hukxVD7beS6lO8ec1YbJQs4ATqE?= =?us-ascii?Q?n6BHL/Lp3KA6x+WOceFu+wRo+Km3QbEuIRitMoaP/SBIKSJob6U4i9rjyUg8?= =?us-ascii?Q?2edbHSNkwz3rWrxlEM21JxozYxrG7EF82ZtsdcsZLaj/Mq4UInt1PLTG8wBU?= =?us-ascii?Q?+1AkEY3L83dJCU8bLkmmEmygOFkWlmc0GsP0iMi4E5tiAgrbpVW+uqMX3U4b?= =?us-ascii?Q?A4TA5imVHa8mcw/bodAXy8i+lJVxBMYqXGG7+iJ13luqEbBkXlaQGzcneQsa?= =?us-ascii?Q?+N7Dt+iIqBXIaV1tx7V2a+CGo9QJwS8aOoVOKHtbiUVmWN9IAtjFGskxzDzp?= =?us-ascii?Q?hqnsYeqiVle6G9lvZKsFmeIFWmRwRcqYxfMSfB6FBDmWtJwBVcyFUtwD/vR9?= =?us-ascii?Q?x0FmT+slqhobUuxRAgSFReCJbQ9OWZo3NxYemj7aJZx4uMjndKx348pnXp2t?= =?us-ascii?Q?8yIagewQlhkEF0WKr58ojjhjKqMAexIOSUIrgIgYCJkC5n9kTVhHpOdt9tPJ?= =?us-ascii?Q?/3Iz4TkaE1IK600PfzBMMCPnJ5001fO+k0we6sS2wxei6oBNvQ3CCpib+Q?= =?us-ascii?Q?=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5478.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b0d3e3f-b534-4fe6-a097-08db4d0a8fab X-MS-Exchange-CrossTenant-originalarrivaltime: 05 May 2023 01:46:35.8299 (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: Ck9JRDhb1xeyUUKtSCQ/DKWqEEnIkqiuAUEhVk/CeudFU2/HgFUXkHrwvbqn6jZjM8ykfBxGkzRJLG4HBtWRqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB6659 Return-Path: gua.guo@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Could you also create Edk2 PR ? -----Original Message----- From: Benjamin Doron =20 Sent: Friday, May 5, 2023 6:36 AM To: devel@edk2.groups.io Cc: Dong, Guo ; Ni, Ray ; Rhodes, Sea= n ; Lu, James ; Guo, Gua Subject: [PATCH] UefiPayloadPkg: Use clearer debug flags with more flexibil= ity The default behaviour is that RELEASE builds have all DebugLib macros remov= ed by MDEPKG_NDEBUG. Currently, UefiPayloadPkg has been using USE_CBMEM_FOR= _CONSOLE to disable this behaviour, but it's unclear that this option chang= es DEBUG build behaviour too. Therefore, add a new build flag, RELEASE_LOGGING, that can be used to set t= he logging behaviour. The USE_CBMEM_FOR_CONSOLE flag only selects the libra= ry and options specific to it. For instance, logs can only be retrieved whe= n the boot completes, so do not produce a CPU breakpoint or deadloop in thi= s case. There are also cases where the platform builder may want behaviour or infor= mation from the DEBUG_CODE macros. Therefore, separate this into another bu= ild flag. Bitwise ORs enable this flexibility. Cc: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: Benjamin Doron --- UefiPayloadPkg/UefiPayloadPkg.dsc | 44 +++++++++++++++++++------------ 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index 998d22290922..360ea71b149d 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -26,7 +26,6 @@ FLASH_DEFINITION =3D UefiPayloadPkg/UefiPayloadPkg.fd= f PCD_DYNAMIC_AS_DYNAMICEX =3D TRUE - DEFINE SOURCE_DEBUG_ENA= BLE =3D FALSE DEFINE PS2_KEYBOARD_ENABLE =3D FALSE DE= FINE RAM_DISK_ENABLE =3D FALSE DEFINE SIO_BUS_ENABLE = =3D FALSE@@ -40,7 +39,6 @@ DEFINE PS2_MOUSE_ENABLE =3D TRUE DEFINE CRYPTO_PROTOCOL_SU= PPORT =3D FALSE DEFINE SD_MMC_TIMEOUT =3D 1000000- DE= FINE USE_CBMEM_FOR_CONSOLE =3D FALSE DEFINE BOOTSPLASH_IMAGE = =3D FALSE DEFINE NVME_ENABLE =3D TRUE @@ -101,6 += 99,15 @@ # [Vendor] [Device] [----ClockR= ate---] [------------Offset-----------] [Bar] [Stride] [RxFifo] [TxFifo] = [Rsvd] [Vendor] DEFINE PCI_SERIAL_PARAMETERS =3D {0xff,0xff, 0x= 00,0x00, 0x0,0x20,0x1c,0x00, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x00, 0x01= , 0x0,0x0, 0x0,0x0, 0x0,0x0, 0xff,0xff} + #+ # Debug options+ #+ DEFINE= RELEASE_LOGGING =3D FALSE+ DEFINE USE_CBMEM_FOR_CONSOLE = =3D FALSE+ DEFINE ENABLE_DEBUG_CODE =3D FALSE++ DEFINE SOUR= CE_DEBUG_ENABLE =3D FALSE+ # # Shell options: [BUILD_SHELL, MI= N_BIN, NONE, UEFI_BIN] #@@ -135,7 +142,7 @@ [BuildOptions] *_*_*_CC_FLAGS =3D -D DISABLE_NEW_DEPREC= ATED_INTERFACES-!if $(USE_CBMEM_FOR_CONSOLE) =3D=3D FALSE+!if $(RELEASE_LOG= GING) =3D=3D FALSE GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG I= NTEL:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG MSFT:RELEASE_*_*_CC_FL= AGS =3D /D MDEPKG_NDEBUG@@ -436,6 +443,21 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE gEfiMdeMod= ulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE + #+ # Build the PcdDebugProp= ertyMask from build flags+ #+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMa= sk|0x03+!if $(ENABLE_DEBUG_CODE) =3D=3D TRUE+ gEfiMdePkgTokenSpaceGuid.Pcd= DebugPropertyMask|(gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask | 0x04)+!e= ndif+!if $(USE_CBMEM_FOR_CONSOLE) =3D=3D FALSE+ !if $(SOURCE_DEBUG_ENABLE)= =3D=3D TRUE+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|(gEfiMdePkgT= okenSpaceGuid.PcdDebugPropertyMask | 0x10)+ !else+ gEfiMdePkgTokenSpace= Guid.PcdDebugPropertyMask|(gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask | = 0x28)+ !endif+!endif+ gUefiPayloadPkgTokenSpaceGuid.PcdPcdDriverFile|{ 0= x57, 0x72, 0xcf, 0x80, 0xab, 0x87, 0xf9, 0x47, 0xa3, 0xfe, 0xD5, 0x0B, 0x76= , 0xd8, 0x95, 0x41 } !if $(SOURCE_DEBUG_ENABLE)@@ -484,20 +506,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c= , 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0= x31 } gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x7 gEfi= MdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F-!if $(USE_CBMEM_FOR= _CONSOLE) =3D=3D FALSE- !if $(SOURCE_DEBUG_ENABLE)- gEfiMdePkgTokenSpac= eGuid.PcdDebugPropertyMask|0x17- !else- gEfiMdePkgTokenSpaceGuid.PcdDeb= ugPropertyMask|0x2F- !endif-!else- !if $(TARGET) =3D=3D DEBUG- gEfiMde= PkgTokenSpaceGuid.PcdDebugPropertyMask|0x07- !else- gEfiMdePkgTokenSpac= eGuid.PcdDebugPropertyMask|0x03- !endif-!endif gEfiMdeModulePkgTokenSpac= eGuid.PcdMaxSizeNonPopulateCapsule|$(MAX_SIZE_NON_POPULATE_CAPSULE)+ # = # The following parameters are set by Library/PlatformHookLib #@@ -541,7 = +551,7 @@ gUefiCpuPkgTokenSpaceGuid.PcdCpuApLoopMode|1 gUefiCpuPkgTokenSpaceGuid= .PcdCpuMicrocodePatchAddress|0x0 gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocod= ePatchRegionSize|0x0-!if ($(TARGET) =3D=3D DEBUG || $(USE_CBMEM_FOR_CONSOLE= ) =3D=3D TRUE)+!if ($(TARGET) =3D=3D DEBUG || $(RELEASE_LOGGING) =3D=3D TRU= E) gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE !else gEf= iMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE--=20 2.39.2