From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.156.1624492113556073213 for ; Wed, 23 Jun 2021 16:48:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=afmLcABH; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: guo.dong@intel.com) IronPort-SDR: D4xXiJ0BKxTU50HEYJFP2cpqqBKX4F8BPHEl5sRFfKDeuiJlTDuTu/ODGeZSYr3nSyaAGMnNxO Y37GQK1vYuPg== X-IronPort-AV: E=McAfee;i="6200,9189,10024"; a="271207394" X-IronPort-AV: E=Sophos;i="5.83,295,1616482800"; d="scan'208";a="271207394" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2021 16:48:32 -0700 IronPort-SDR: 5OtQDC71W92fZClSOBr8zww/pmitoLwxlqBRI/L/6eoxioaFFdzh0U2byqBgKl+yiTHw7fWSZG AFe4WePdLypg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,295,1616482800"; d="scan'208";a="557133541" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by fmsmga001.fm.intel.com with ESMTP; 23 Jun 2021 16:48:32 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Wed, 23 Jun 2021 16:48:32 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) 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.2242.4; Wed, 23 Jun 2021 16:48:31 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4 via Frontend Transport; Wed, 23 Jun 2021 16:48:31 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.175) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.4; Wed, 23 Jun 2021 16:48:31 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bubyV/ZWZbCji65tbjUUZuSbjQzHQ/JpG0943Ag3x26iL6Md/VkkRhyTI4HggOVKMDTd1n6C1IozCPBdlrRDSFIf/BA+a+x9JH/2CclU7P1rY0L2ueabAGv/hMlByO4A6DoZDt2ErElcN3mTRRqEDcfPZkkQ89/Bs3efuFO957RluuME6cDopmQ5fAAiJKUIw94zZ9uBMczYrAla8YKJCFuG3MRx9TzBvGoJjSFceGAA1Xr/HIE6bM8exooZA0Z3Bxtpy48z8xMboTdm+C33+j/ekNcqSjQwwWrC4YFjKosCRUN0q/sl5BnxG2/mMBIGX1DlD3jnSgWloo2XoOv+bw== 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-SenderADCheck; bh=O5xy9A6BfrQyc2orab3dE/bZGVoEUGzjJsMnKayw41k=; b=nNzJpUgIG4h/iIFgXj0ihb393z84FHrvhkkNjeWbOs0K+EMC7tzBI1jjcEHk05AB+nCUtASzTP4tLxi/ugcEKm6UW2ZwsgSU0kh2zutCng1iOsz1enjewoeWZ6mZNia44mQEB0yv5/z/QTawiS8P4Zx6xWXgNx3/9LwakrhKZzI4nZWNHH16TPGeRr2jJbak6shqbFQxUcPGAJE+BWT9q1VBdfXTVoKbUH6Ia1X+y7PgOZi1v/Cj4czAvYtbjA3i2HyZgBPtgJ8NRcOkVnJl7Ol351QBmikn7Utld2Tm9E9m2kzmq160VlEByWljIrOKMConfAO2ajS1oOtao0AI7g== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O5xy9A6BfrQyc2orab3dE/bZGVoEUGzjJsMnKayw41k=; b=afmLcABHz+VaOFKC72HQZYwqlqyw2GJXBadGxEfPbN3Q2vGec2KDcG6ms33jvOB/FPNmU5KZNDvxCBbeBAV31DsNWtGgpT+m/8g5GRYIvsJcaK5EBysJXMufUbJffNbN0yG7AeO57DWBX8zFXUZVajXKJ5uGYBrWTjWPpry7Nhg= Received: from BYAPR11MB3622.namprd11.prod.outlook.com (2603:10b6:a03:fe::30) by BYAPR11MB3477.namprd11.prod.outlook.com (2603:10b6:a03:7c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.21; Wed, 23 Jun 2021 23:48:29 +0000 Received: from BYAPR11MB3622.namprd11.prod.outlook.com ([fe80::247b:262c:b8da:710b]) by BYAPR11MB3622.namprd11.prod.outlook.com ([fe80::247b:262c:b8da:710b%7]) with mapi id 15.20.4242.023; Wed, 23 Jun 2021 23:48:29 +0000 From: "Guo Dong" To: "Liu, Zhiguang" , "devel@edk2.groups.io" CC: "Ma, Maurice" , "You, Benjamin" Subject: Re: [Patch V2 10/12] UefiPayloadPkg: Add macro to disable some drivers Thread-Topic: [Patch V2 10/12] UefiPayloadPkg: Add macro to disable some drivers Thread-Index: AQHXZ9rma43rSIfr1EeP48Laro6ufKsiQw1A Date: Wed, 23 Jun 2021 23:48:29 +0000 Message-ID: References: <20210623025235.3311-1-zhiguang.liu@intel.com> <20210623025235.3311-11-zhiguang.liu@intel.com> In-Reply-To: <20210623025235.3311-11-zhiguang.liu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [68.104.146.79] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 24cc9731-2fcf-4f28-561f-08d936a166c2 x-ms-traffictypediagnostic: BYAPR11MB3477: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3383; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rz1/ikY/F7sg7hophpeoRh5+zTAiaU0KY2O13n/c8nXDEH3ymn2zxhqkctUvMp1eba4uvYnEIg6MQlo5l2jTQx4Fj0X1TqPZASPbLX7J7uETkye+F3a8xVd5tM9VfkFF8AEU5bD6tFDVA5N7zfUh+ARWF1LFCNANKXzJym5Wq12eIe2+POIjCiiYgQZnB4jHKYv4tknseRAyYyKyR5JJtecBgp7DpxyHaisBHLbcmSzHQ9D+vuoIi+8hghOlhXx6c9CugBKJUiqiDgW0VM06UHifXEhftgJvll5aB+h4pWANPKQLnqt+A+j+1moUcCb59n9JkOWJC0gr80QePZi+uxhFFm/Z6REh6P3L6SQvqnW0wPwPBiacHd2UyVThrjPyrq37xhvcmAedUcdCyraIheDTC4vqa4yLB3+yGmVgFGeVxKQIdoxHo7kqT3SdM3yEDDsbBfZdZLa5j6XbXXI0fWRsDH8kTH+HJTxaBlLSRuW9jC3xbAAmpS7/PVJFX4LcYzvceUyzjCzw+9yfMyHnmD3hA/wo82tVjC9gRAKPOdX85pBkHXdOVKF4s0Ny3gtVIgBhQn97DQIfDiYroujkCKQvVTW1LTB5cNBQm98/w86cjZxCAGNVBLg7A7j5uW+dFHwRdDgejaHAFzTYq+tZqg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR11MB3622.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(136003)(366004)(346002)(396003)(39860400002)(376002)(19627235002)(186003)(478600001)(71200400001)(26005)(33656002)(8676002)(86362001)(122000001)(38100700002)(52536014)(7696005)(5660300002)(6506007)(64756008)(53546011)(66556008)(8936002)(66946007)(66476007)(76116006)(110136005)(316002)(4326008)(55016002)(2906002)(107886003)(9686003)(54906003)(66446008)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?+dqEzPxo9GtJ7a+eX0hhqqjH7Ffyp1ExujICcvVPaLDsw30+g4X3PNqYjHfX?= =?us-ascii?Q?EukOSd7Spn1QeYSOYzvZaiNB9nwPptIF+vSlZFMNJ5QThjGPuHeGwLJRqno7?= =?us-ascii?Q?oE2Yf9FqOsowcUkFckjXC+EuEOdBAtZpc6NaUPGl0fzLrvkyft/aOWsSbitK?= =?us-ascii?Q?lrVc7mOgO2pMMDhX4YNwDYF4YgnIOPZPdGL0FXgzv/ybxeqt/wL4czIrWFa8?= =?us-ascii?Q?c3B4cwsvDTw3Yba3QTMekXG7ePHLkfhry3cf3g7egDGbYYgSJaFfJOeFBrM5?= =?us-ascii?Q?gzyLQl/b/CRU6LeS9KYYz50SoFcJpESXgDBTk9Hiqk/3H02Gjx1jKWW1eV66?= =?us-ascii?Q?GtjuRZb9B86sjSAXRGCvL2h2u/BOch/g8d7lRm2nfPeejJXGcNXb52atQutv?= =?us-ascii?Q?p11LjrsN1KTqGsOd+2rBvA5Bs7xO/D261pa0PuxfI+EalfbR4/VfCYiY8Tz/?= =?us-ascii?Q?mdHSso8vLu0aEgqiQKzTfucFvsbA8E2FSmxebLDL3S7rG+sAT/OfL3W117Jo?= =?us-ascii?Q?DjFFPXioY8rI0SihSjkCX67WXJVfSVGPcSzBwd7eB2V+wpGeDWtH7KRYjYj1?= =?us-ascii?Q?A03G9kQGo1wEra/WGJS/gopcp6W7OgiGSj8YkdOSxrxbia60tu63G9zV7Vll?= =?us-ascii?Q?a90mBv2vw5HlzaFwH0WSlhmgBvB1ZJvpVQn6yTVL21J8Z8O7xrMZnUuIvLaq?= =?us-ascii?Q?UjhyUsYovbptOLS2RNsl+AybYMUV1yu8UCuHLgcEGcDsV5tCaCsVIdIqOMMh?= =?us-ascii?Q?aGExVAtJDYoM3HVCi7Bkwptse3PEIl2GYyU28eSXxnLkpIbc5M6KsWYfXoz/?= =?us-ascii?Q?L4/D6nXwajVGht5gY2+ytxd+3QPmS6HNg8ySNJphFg+wc/2CQ2XXHIuQxheA?= =?us-ascii?Q?wfAvp2vbTDtlVrvtO9vhrNMx4kXaMi1ByPhM+yQGT+54Wrla+9re2Jns16Dx?= =?us-ascii?Q?qoho8SNhNYoA6WD30dDusumwbitmOjq7SL8aj98ustdERnTBE4f6+YFHKgkX?= =?us-ascii?Q?7VaCEM29ogTPMjYxG/la6A62sUyTeUx6hM+nEY2DSluutQbtWQtpe5L6DJcC?= =?us-ascii?Q?MV8u1zM0sNPqXGErXriPqLuPxpCDvUlRDdl2nu/Vc931qIqjjtijKQhs/oca?= =?us-ascii?Q?VzfisIp25mmOVk9zTk9ghtQYVvUyjXBAkNC+aEkkqApVfbCcBCGEghG+VaxW?= =?us-ascii?Q?3TZv4EbYjow8q0QvEOwPYuMvm0x0xIYd1HTt0ih7ucK29Mc9+f4iJyn2B9Ml?= =?us-ascii?Q?JXtig8nXiLuA7hRBRjlkL1BUDM1W2KZUFWc9c3lQkyGFnHEF4b+DXmzOAy72?= =?us-ascii?Q?d1Ivqjp/S2IZXrNzCThEdGiI?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3622.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24cc9731-2fcf-4f28-561f-08d936a166c2 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jun 2021 23:48:29.0163 (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: FtdTT4auQluOfYKRCoaMWelL3V6bkyauXccJ49PkJ+sCztGIF6Vwgjhm7CWr65ALtpZwzZzucyMS0WJqhiiFrw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3477 Return-Path: guo.dong@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Please update the MACRO as below. > + DEFINE EMU_VARIABLE_ENABLE =3D FALSE Change to: DEFINE EMU_VARIABLE_ENABLE =3D TRUE > +!if $(EMU_VARIABLE_ENABLE) =3D=3D FALSE Change to=20 +!if $(EMU_VARIABLE_ENABLE) =3D=3D TRUE With that: Reviewed-by: Guo Dong > -----Original Message----- > From: Liu, Zhiguang > Sent: Tuesday, June 22, 2021 7:53 PM > To: devel@edk2.groups.io > Cc: Ma, Maurice ; Dong, Guo > ; You, Benjamin > Subject: [Patch V2 10/12] UefiPayloadPkg: Add macro to disable some drive= rs >=20 > V2: > Change DISABLE_VARIABLE to EMU_VARIABLE_ENABLE >=20 > Cc: Maurice Ma > Cc: Guo Dong > Cc: Benjamin You > Signed-off-by: Zhiguang Liu > --- > UefiPayloadPkg/UefiPayloadPkg.dsc | 11 ++++++++++- > UefiPayloadPkg/UefiPayloadPkg.fdf | 7 +++++++ > 2 files changed, 17 insertions(+), 1 deletion(-) >=20 > diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc > b/UefiPayloadPkg/UefiPayloadPkg.dsc > index 155aea4bc4..85055e9091 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.dsc > +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc > @@ -87,6 +87,12 @@ > # >=20 > DEFINE SHELL_TYPE =3D BUILD_SHELL >=20 >=20 >=20 > + # >=20 > + # Disable features >=20 > + # >=20 > + DEFINE EMU_VARIABLE_ENABLE =3D FALSE >=20 > + DEFINE DISABLE_RESET_SYSTEM =3D FALSE >=20 > + >=20 > [BuildOptions] >=20 > *_*_*_CC_FLAGS =3D -D DISABLE_NEW_DEPRECATED_INTERFACE= S >=20 > GCC:*_UNIXGCC_*_CC_FLAGS =3D -DMDEPKG_NDEBUG >=20 > @@ -431,10 +437,13 @@ > MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf >=20 > MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >=20 >=20 > MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCoun > terRuntimeDxe.inf >=20 > +!if $(DISABLE_RESET_SYSTEM) =3D=3D FALSE >=20 >=20 > MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntime > Dxe.inf >=20 > +!endif >=20 >=20 > PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntime > Dxe.inf >=20 > +!if $(EMU_VARIABLE_ENABLE) =3D=3D FALSE >=20 > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >=20 > - >=20 > +!endif >=20 > # >=20 > # Following are the DXE drivers >=20 > # >=20 > diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf > b/UefiPayloadPkg/UefiPayloadPkg.fdf > index 6073f9c1b4..4d186692da 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.fdf > +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf > @@ -105,9 +105,16 @@ INF > MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf >=20 > INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >=20 > INF > MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCoun > terRuntimeDxe.inf >=20 > + >=20 > +!if $(DISABLE_RESET_SYSTEM) =3D=3D FALSE >=20 > INF > MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntime > Dxe.inf >=20 > +!endif >=20 > + >=20 > INF > PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntime > Dxe.inf >=20 > + >=20 > +!if $(EMU_VARIABLE_ENABLE) =3D=3D FALSE >=20 > INF > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >=20 > +!endif >=20 >=20 >=20 > INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf >=20 > INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf >=20 > -- > 2.30.0.windows.2