From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.57280.1675699284835350611 for ; Mon, 06 Feb 2023 08:01:24 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=k5hnIEu/; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: andrei.warkentin@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675699284; x=1707235284; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=U1fIE+2B/30iNZIJse3zXDyXU3d5Lb1h3qLD+lIZMnE=; b=k5hnIEu/zrbhWKyV8qI40u6nRZlg0vbD48Qgz39bLUFEBKouxZgAQ6wR 8XirCIIgtdkK7gW2F0p6DCu5IPnJ2/ZEkBi+m7IC5qtiva2B2i90tjB6k aG0UhETDLFZW7LJjhA5znjOhyDhCKIuKkz4u50NKUtFyFfffyZnrFkP0v jp80Mes1Ho56VKuKa514SnCCzMYtmltoAnCHCBLTT2vSSH6k46Aiq9zYo xyfmLO/VmgWYMotrYVN1BXRp2J49GBTF3lfE30uL2cAY/GN+pRDvu7FNt Er4LhjzYfwvOXzIhTbyhFLzRhind2m3SpKFtgnkeEwxzfu+fyAWEJPUiP g==; X-IronPort-AV: E=McAfee;i="6500,9779,10613"; a="317248179" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="317248179" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2023 08:01:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10613"; a="755281946" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="755281946" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by FMSMGA003.fm.intel.com with ESMTP; 06 Feb 2023 08:01:06 -0800 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.16; Mon, 6 Feb 2023 08:01:06 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) 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.16; Mon, 6 Feb 2023 08:01:06 -0800 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.16 via Frontend Transport; Mon, 6 Feb 2023 08:01:06 -0800 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (104.47.56.48) 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.16; Mon, 6 Feb 2023 08:01:05 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZWtXRruQN7WXGylbYEaRMOYNR4tIA2Gst90tcz5O2nnwSWchv29DFowwbn+nqw9BSB5Hlcli0rsYbhfEi2tn2O4ONx2N2FkD09HynPf2F7GfTkw1QKau59m3/kchsBj+vuW4CcJHlKJDoCrT3+U75vSk8JYr1YGZ8zSQfc14Mdie6C9sWvc3zSYGb/nWJqF6AnSNbYvZ/A79f3pWHypg7L1Q0ncl9hWwtH0x8YocdWFwnQSWFc3FWl2PSumQQoM790sx64yPmjindNlT+YJF3FzOticl15pvRvw366xEvZsWsY5DxXtdcXkuvu4XrOZfzGJhkB81r8sJJBci7DPsqw== 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=wqCGbDF3DRIPSVw2bY7/lN9VI5ns+R9eFJ0E29lAYko=; b=HYsozJKe9Eox/Z9ixUvmvVR3sGSllcsOAk2cI5hSk7gE0QT3UQOFmqn1CX5ENw4cfP0oAlD2Rduy4eWrcJC+VXtZVqrAZT+HvQoOby9gNu+6qlX6UsiAASILwFYn7NBMf8xFAY5E0JNhtL6PTpGUkD68EIeZ9WG8TU3Bmcngdu55KQs/0g+NH/Wy0uvyLCq77HGqApUEsJJMLNN9egZDuRmV/RurmN+gU5RBTGY7m16P/tt5CIxXnUOwOq2WTFFW93SxulUZm9uf+DD9iHdMq+U+xKRR+1tJI5fC8gnwBLWQQfHiWR4BZbK+/mleFMx6i1kdAC9kIq0BKvbFahtagQ== 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 PH8PR11MB6856.namprd11.prod.outlook.com (2603:10b6:510:22b::7) by CH3PR11MB7938.namprd11.prod.outlook.com (2603:10b6:610:12f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Mon, 6 Feb 2023 16:01:03 +0000 Received: from PH8PR11MB6856.namprd11.prod.outlook.com ([fe80::9dba:633a:320c:87b]) by PH8PR11MB6856.namprd11.prod.outlook.com ([fe80::9dba:633a:320c:87b%5]) with mapi id 15.20.6064.032; Mon, 6 Feb 2023 16:01:02 +0000 From: "Andrei Warkentin" To: "devel@edk2.groups.io" , "sunilvl@ventanamicro.com" CC: Ard Biesheuvel , "Yao, Jiewen" , "Justen, Jordan L" , "Gerd Hoffmann" Subject: Re: [edk2-devel] [edk2-staging/RiscV64QemuVirt PATCH V7 11/20] ArmVirtPkg/PlatformHasAcpiDtDxe: Move to OvmfPkg Thread-Topic: [edk2-devel] [edk2-staging/RiscV64QemuVirt PATCH V7 11/20] ArmVirtPkg/PlatformHasAcpiDtDxe: Move to OvmfPkg Thread-Index: AQHZM01cZ//q6y+4KkarGOf+aeNul67CIc6g Date: Mon, 6 Feb 2023 16:01:02 +0000 Message-ID: References: <20230128191807.2080547-1-sunilvl@ventanamicro.com> <20230128191807.2080547-12-sunilvl@ventanamicro.com> In-Reply-To: <20230128191807.2080547-12-sunilvl@ventanamicro.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: PH8PR11MB6856:EE_|CH3PR11MB7938:EE_ x-ms-office365-filtering-correlation-id: a14bd6f2-7228-4d74-4d56-08db085b58dd x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TSMyGKqNYNBIo6rruubqmiaCk5ec88ihHUdfK46yRDek7vxSakArhf/90oBWlp/WO8mBB6DPIT9IcnWDdDFpyuZLpt07S0xgRCsAIRbtO0S2pEMiGQ9tYWB6qSxKottjL+0KNpsLILFHGgsLhD57iZZvDPWRVFxW5kW/QGWhyEvYKHNEA6XCbNEul+/qc6CTq4SO5HPMUU48YCJevxsCu9PS6KKXz7eggHJP2jSVYW8DfPsW2x1MEjycCOxrKOr4VOdIvdsV880D5GwcYsAG4Z822s7i1JeNnNRs6Mc7dlkBgx6e+b8SaGl6KBDCr9V8kQhJXhuC4H1dBfbslMgbGi5COwrIyUIzwJ7zDjlNr1hnMS28ZuW/c8/JsoLC65sKuMAcXDqtb14KqpowI/Gxp4lm1A17/CXla3BqZfX0sy2csbiVsrWVOON45HLA5AZrDORRaBnDVw+IHNSx+FrIjkQXxfC93rGJNzrCOd1FmShIZXacZN/tfsErscdwjTKJwsKuyPN9YKD5XJKmGxK45JX7rnfY2EDKhBOxmWG+Le/EiXXF9x8ePYej3qrbYiBhCyXmScNBm9xjJRq3r73BXZFi7ZLkoP580fcXK34NjUWWrEE09xWqWT4xZ9h2FW9JTt6ZFvNPuhBa5y4RsC+O7eamov33kRj0hb5hS5zLYHjvbGxCjRvuVdBTOXuyw7PslnV9E8tYFteYysD7/OTlHiyAb9juhv2iSKS80GA5EUZJlWj9G1Lz67ESbS/Q6jsE1djBL6bn7/Pub1PAGEJyfPVCL4ALxr2Nj9OeIVSeC1Y= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH8PR11MB6856.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(6029001)(366004)(346002)(136003)(39860400002)(396003)(376002)(451199018)(66899018)(478600001)(52536014)(33656002)(86362001)(8936002)(41300700001)(66556008)(66446008)(64756008)(76116006)(66476007)(8676002)(66946007)(5660300002)(4326008)(2906002)(82960400001)(38100700002)(38070700005)(122000001)(316002)(19627235002)(7696005)(71200400001)(966005)(53546011)(54906003)(55016003)(110136005)(6506007)(186003)(9686003)(26005)(83380400001)(156123004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?SNO7hULgKg8mkyLv+WDiBycnaFRG0GEPLoaMQaS/OBfTd0mEK9ThrJb0TFnX?= =?us-ascii?Q?jZwhp0pLP30HpsTGgRmlJclW7/VuVFrdLq2OSC3I6xUxQDrd9QzaqjP3UV3S?= =?us-ascii?Q?r/6YYAC8Gm4tlnD5Otywbl0Y78uk/ccN8J28l9+ovvs8m2VLqwP8nESfCEff?= =?us-ascii?Q?0DO5iF+if65odmUH/EqS/p6qcCtOBerKCsSVMKCw74QD9W4DPu0KEaV8QKE3?= =?us-ascii?Q?9ZjMH7cgf4bqcbx4QkaOyFxRRXCQ4TV7UBiHvaqIY7A8KpAGWXqbhztL0aJ2?= =?us-ascii?Q?2lGEEgS0EAF7EqjinWVBTvbCIWfa6uSyWo3GeytRWGp0QMZfEG79E5imQ7go?= =?us-ascii?Q?JSBlZbD9eJyxS9jTofhkXXS5S1LOGt1EdtdLrARgiS0V3okLbowmRuR8gPGr?= =?us-ascii?Q?ZWr/gReRt2z7iDs5AYuh7onId27n9/UmOb5ug2xwYSJysHUA99vom91Pot0P?= =?us-ascii?Q?G8l8xI1cEFuuD2hAa8Mg9LA4q4neYZ49jtwqmjPfN7QOE8EL0+DQUpcpWGvS?= =?us-ascii?Q?ZvRHx+b6TG+04Uw6+XieJcOh3YURSjRVcMW/ftcIUoLrK7/aCG5+hSiYrs6K?= =?us-ascii?Q?mrAl677OX7AE/OZl+xHIujd/g6ww0ltbWNiriNRFAnjXidTUDpIBD+KLW6Qo?= =?us-ascii?Q?COzdLjYG748FhqM8WIC6UgI0doWhjhjp27dZIgoyamCJyHATja6Pu0JG6usL?= =?us-ascii?Q?SZjeyVqYBBAEm+vse9urzVvvJnCs/Y5Vd2D+6s0KfyB/ayhAcx/hQN4TrVES?= =?us-ascii?Q?J7Q9bIom1hqNIXyu6qvEtPbALTEDq+dqXQtBzGtx5e0/BMo62sHsmg795Aup?= =?us-ascii?Q?r8V4fgjxMtELaO+leyv3gdjh3diHobxTIUSphYA4B7o969cfbjZ8I5NBSMTR?= =?us-ascii?Q?9T+WOQnhU4CJdL9Ia5IHmUPq/7I/9NYMELJ1vH9JSObpxMmFFBjwLlZRPg5b?= =?us-ascii?Q?6ojh4vOgIo5f3GuXAkD0g43S1Ekwwp2yZshR8e+idv2GO1kTh58sRyKek90l?= =?us-ascii?Q?QtbcM9qgcdfl8cGRJXa8K3S8sh5UJMQOwujitFyRjm4upAqBUB3nCUSnqdZX?= =?us-ascii?Q?VuqEdNumuMUpexWn/JenqX42j9KV/8f7pu2WUvl8I+ORF+CaQfopgVmINQgZ?= =?us-ascii?Q?EN8QVX0BddcQlVeSJQN0emtOsdqf7g3GY6gDfmLEsL8xnT3Gq3Cma91gKD96?= =?us-ascii?Q?53WBvrHkG8kDrRaeVDrJxPAlWGsXbziRErm8L8+a7Kdxce0WMvv6WfJAQvPA?= =?us-ascii?Q?C9E6rykhFJt0DqJTolOeSm4UVS7Yi2U72l8518VBrDamctBvP5lpogJyKxFZ?= =?us-ascii?Q?BlUO1aYuUOXIHN+Hu192DHuU0EhsjIFi6ah0M58vS8pUU97dNXd53mqHqFxf?= =?us-ascii?Q?9dt+lCEsnzgAylR/JeH7WUjFmHFmzlfiVy6HqJefdo7VtEVVfh8tANZSGbGK?= =?us-ascii?Q?zSmBZzPE5Njy9u4DG3LhKhQTWUValZIN2l6tvOzezljdJKtDhuk4JF5psBrJ?= =?us-ascii?Q?5NTkAEsjqO6k7JiasS6iGcvawK1Q4/ZBtQ5i2gWedzZvxTOPqhT3C6qeuFiB?= =?us-ascii?Q?dq9XviTmU9TwktS9w8/vAtwIZ8zR8zcn8wiUDcA+se/g1uy9TVIZSU3epIBm?= =?us-ascii?Q?fg=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB6856.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a14bd6f2-7228-4d74-4d56-08db085b58dd X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Feb 2023 16:01:02.8845 (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: nfIKHwhvCtP65SGqRe0ejkKIt8mha1AJ24OJDDVYvGW0u3MgQTmbkDtoFyU3v2DLWF8FqZ19s0H8seL6OiFzi6M9VdVo97sE1WSXZeToK4E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB7938 Return-Path: andrei.warkentin@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Andrei Warkentin -----Original Message----- From: devel@edk2.groups.io On Behalf Of Sunil V L Sent: Saturday, January 28, 2023 1:18 PM To: devel@edk2.groups.io Cc: Ard Biesheuvel ; Yao, Jiewen ; Justen, Jordan L ; Gerd Hoffmann Subject: [edk2-devel] [edk2-staging/RiscV64QemuVirt PATCH V7 11/20] ArmVirt= Pkg/PlatformHasAcpiDtDxe: Move to OvmfPkg REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4076 This module is required by other architectures like RISC-V. Hence, move this to OvmfPkg. Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Signed-off-by: Sunil V L --- ArmVirtPkg/ArmVirtPkg.dec | 9 = --------- OvmfPkg/OvmfPkg.dec | 7 = +++++++ {ArmVirtPkg =3D> OvmfPkg}/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf | = 3 +-- {ArmVirtPkg =3D> OvmfPkg}/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c | = 0 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec index 89= d21ec3a364..4645c91a8375 100644 --- a/ArmVirtPkg/ArmVirtPkg.dec +++ b/ArmVirtPkg/ArmVirtPkg.dec @@ -34,8 +34,6 @@ [Guids.common] gEarly16550UartBaseAddressGuid =3D { 0xea67ca3e, 0x1f54, 0x436b, { 0x9= 7, 0x88, 0xd4, 0xeb, 0x29, 0xc3, 0x42, 0x67 } } gArmVirtSystemMemorySizeGuid =3D { 0x504eccb9, 0x1bf0, 0x4420, { 0x8= 6, 0x5d, 0xdc, 0x66, 0x06, 0xd4, 0x13, 0xbf } } =20 - gArmVirtVariableGuid =3D { 0x50bea1e5, 0xa2c5, 0x46e9, { 0x9b, 0x3a, 0= x59, 0x59, 0x65, 0x16, 0xb0, 0x0a } } - [PcdsFeatureFlag] # # Feature Flag PCD that defines whether TPM2 support is enabled @@ -69,1= 0 +67,3 @@ [PcdsFixedAtBuild, PcdsPatchableInModule] # Cloud Hypervisor has no other way to pass Rsdp address to the guest ex= cept use a PCD. # gArmVirtTokenSpaceGuid.PcdCloudHvAcpiRsdpBaseAddress|0x0|UINT64|0x000000= 05 - -[PcdsDynamic] - # - # Whether to force disable ACPI, regardless of the fw_cfg settings - # exposed by QEMU - # - gArmVirtTokenSpaceGuid.PcdForceNoAcpi|0x0|BOOLEAN|0x00000003 diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index a22eb246c625..= e52602db5b79 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -157,6 +157,7 @@ [Guids] gVMMBootOrderGuid =3D {0x668f4529, 0x63d0, 0x4bb5, {= 0xb6, 0x5d, 0x6f, 0xbb, 0x9d, 0x36, 0xa4, 0x4a}} gUefiOvmfPkgTdxAcpiHobGuid =3D {0x6a0c5870, 0xd4ed, 0x44f4, {= 0xa1, 0x35, 0xdd, 0x23, 0x8b, 0x6f, 0x0c, 0x8d}} gEfiNonCcFvGuid =3D {0xae047c6d, 0xbce9, 0x426c, {= 0xae, 0x03, 0xa6, 0x8e, 0x3b, 0x8a, 0x04, 0x88}} + gOvmfVariableGuid =3D {0x50bea1e5, 0xa2c5, 0x46e9, {= 0x9b, 0x3a, 0x59, 0x59, 0x65, 0x16, 0xb0, 0x0a}} =20 [Ppis] # PPI whose presence in the PPI database signals that the TPM base addre= ss @@ -463,6 +464,12 @@ [PcdsDynamic, PcdsDynamicEx] # 2 - set by GOP Driver. gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource|0|UINT8|0x64 =20 + # + # Whether to force disable ACPI, regardless of the fw_cfg settings #=20 + exposed by QEMU # + gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|0x0|BOOLEAN|0x69 + [PcdsFeatureFlag] gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE|BOOLEAN|0= x1c gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|FALSE|BOOLEAN= |0x1d diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf b/Ovm= fPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf similarity index 89% rename from ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf rename to OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf index e900aa992661..85873f73b2eb 100644 --- a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf +++ b/OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf @@ -19,7 +19,6 @@ [Sources] PlatformHasAcpiDtDxe.c =20 [Packages] - ArmVirtPkg/ArmVirtPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec @@ -38,7 +37,7 @@ [Guids] gEdkiiPlatformHasDeviceTreeGuid ## SOMETIMES_PRODUCES ## PROTOCOL =20 [Pcd] - gArmVirtTokenSpaceGuid.PcdForceNoAcpi + gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi =20 [Depex] gEfiVariableArchProtocolGuid diff --git a/ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c b/OvmfP= kg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c similarity index 100% rename from ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c rename to OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.c -- 2.38.0