From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.15465.1627199018144597732 for ; Sun, 25 Jul 2021 00:43:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=sDDdm5dz; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: jiewen.yao@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10055"; a="212078542" X-IronPort-AV: E=Sophos;i="5.84,266,1620716400"; d="scan'208";a="212078542" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2021 00:43:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,266,1620716400"; d="scan'208";a="497746050" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by orsmga001.jf.intel.com with ESMTP; 25 Jul 2021 00:43:37 -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.10; Sun, 25 Jul 2021 00:43:36 -0700 Received: from orsmsx604.amr.corp.intel.com (10.22.229.17) 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.10; Sun, 25 Jul 2021 00:43:36 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Sun, 25 Jul 2021 00:43:36 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.172) 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.2242.10; Sun, 25 Jul 2021 00:43:36 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gt3P+MX4tMP07WjyXzsjC6Gty0TUQpOPYHPCHBUPz9cEdvpyn+RyNnIMm0Mp+LrqkD3tkjXThCadlxVxjiLXvHFCK9YyTLID8E8dCTf04gLpk3olfSHB3SQ0V1Nu+20lLvrldN2kYm/36U505kxGCc39A1x2H2VxeqTvn6+W9DF198+1sdJ8PqV6uG8UwlhKAY8RHbwDGGOfPD3B4EE1ta+bDVfjE9hZbOxcygA3qdOS4cToLHrJOKjnYRw+i+UCovjGABOL7ddt8aCg1ylsDh4tDdPwzxkbuFESIb+CZel3jQDKrj/nJutT0wDzfpJ2Vw+5dtq0kYhz73E23Wi1bA== 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=FR4WiDpX2UaKQ26XB6CshcTTFNvS1kkpwzWIKsujH6U=; b=XRubbVqr2yj7iLDcKuctNU7SEdH97wP87HORyFEK6sXfwsiwG6FLR6BrwdYTXtYrQt1oUPFwpRdQwJ4VMCmXNdou94LB7vj0b3rNR/rWUzMoGDJDgIbhjAR/MM4BNbrqw4d1QgWLvJSd4mE+bf1q+cKIQWDxPeA7/oMb0PTT9apCO05x7anUl7FYXsMyGqgQsgaEuB6S2gAjnGCUtk0D2G2kOSZAzMdKF6ba3zZR9w0DiydSjuMvs9k/+ojMv8H7AGMcK7D+CHDHA78hcrPJXn6is5mtg2jGSJOG0igzt0KDT8AIfMYxwQeNlBeQjpt2Tq3hcwGufacdKZjijxeIyw== 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=FR4WiDpX2UaKQ26XB6CshcTTFNvS1kkpwzWIKsujH6U=; b=sDDdm5dzriWyxzbydFM/bYS6ffVvpb4SToWLDhpV6WnsGsBOLTBajLB525g1adxgiwGAjItOkygEdAk0ycRIscOLOnLEbSfOb0RTFijPvNK5yj9FWOhD7m0AjPp1CWqZ2xVP/j3d2QUqKAdgT/aoeaCTeEUB0CW6DfyLJOrk9Zk= Received: from PH0PR11MB4885.namprd11.prod.outlook.com (2603:10b6:510:35::14) by PH0PR11MB5127.namprd11.prod.outlook.com (2603:10b6:510:3c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.28; Sun, 25 Jul 2021 07:43:34 +0000 Received: from PH0PR11MB4885.namprd11.prod.outlook.com ([fe80::6c99:8170:1c3c:9121]) by PH0PR11MB4885.namprd11.prod.outlook.com ([fe80::6c99:8170:1c3c:9121%3]) with mapi id 15.20.4352.030; Sun, 25 Jul 2021 07:43:34 +0000 From: "Yao, Jiewen" To: "Xu, Min M" , "devel@edk2.groups.io" CC: "Dong, Eric" , "Ni, Ray" Subject: Re: [PATCH V2 3/4] UefiCpuPkg/ResetVector: Add Main32 entry point in Main.asm Thread-Topic: [PATCH V2 3/4] UefiCpuPkg/ResetVector: Add Main32 entry point in Main.asm Thread-Index: AQHXfr3dAIpBhEiaNEeEHV1Dj9l+CatTN3QggAAcEACAAABc0A== Date: Sun, 25 Jul 2021 07:43:34 +0000 Message-ID: References: <385d5e4bc26eb601a1ee6eeb982d5cde06ceab2a.1626931332.git.min.m.xu@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.5.1.3 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: aeccad99-8096-478e-b347-08d94f3fe829 x-ms-traffictypediagnostic: PH0PR11MB5127: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ga4FRMu5nR9GDXYmi8iVStbdlzsqgezt2sib0S2bP8IaOnn0XAj78YlpapjhBvGn786p93SH9znstB0HDvNNj31rkNNsNZdv5TmSz0+TewozXZPicVOdabmQ8JZIsbMqqd8tLYXklHq24nzKvtMMyaKvrXUleLaU7fBqmJ2lXQW8RW4FU6daObZ9cvCgaT00eYkbAfI/KLCdsbrowJ7UE1vXbvyGonFflBocSduBNo76W8aOSOTC/Z+gTFNxmODzNKh0BUY32faQgWbKivQ2dmWMzDlAHEf9kz/a/bO3xtNAsePpE8TOStut5Fw27JErodTPVY48lTEvm50iwZh513g1tNOvvwPbhhdeiPPQ+6SEWeyW4NtLezsAV2sTGAdp8nIsv46a5uk+WNLArVv0a9rYDY9QMI6qje1ozYb+h0wCAWZCgwpxeP97Efm6M+cDNZxJviGHiaVrGxq3Hmr3xMO2MMNQlADKhTxu3tpcudxLFHi+QQfnMBA19w49tUq9K9sGoYLYpC57kCfOALbSLeHolpUkZ5CDqd3GxQuPs/LXqQ+W2HyqLGEUrHP2/cnoxUemcKcc6eYK0SRuhAgqiZ5WtyvtqWtLcRJVuKC9KxygAWrxdPjUFWfo3TnomOCROJ591yoLcBVv4TeNEXPtUmC5kQAXLygBCPJVp+YKsqSJTkiITGLztAvYYFQDgCOdVAMA8CpuavJmqeUhGNQm3P6hmvvYTIipEvGm1pvteL0ValwhBGnqibXU3C15cOMViWn+jBTIp2afgeSjEXwtkSWtlSKg5R8LyGMaVsFbn9Y= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR11MB4885.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(396003)(366004)(346002)(136003)(39860400002)(19627235002)(83380400001)(107886003)(66556008)(478600001)(122000001)(2906002)(38100700002)(966005)(71200400001)(4326008)(52536014)(7696005)(64756008)(76116006)(53546011)(66446008)(6506007)(66476007)(66946007)(86362001)(8676002)(110136005)(55016002)(33656002)(8936002)(9686003)(5660300002)(26005)(54906003)(316002)(186003)(38070700004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?g74PFPhIkCTgBEPLETnMVHpO4Oqm6RFh6Js9FCYb2GI6SWfCU2er4i5FJpVI?= =?us-ascii?Q?vIhZ+EWNiWutRm35EvdWlF+RIPMWxRr3xxfGJ0XJ5UEHuQOz0COqmwcXGpFF?= =?us-ascii?Q?kWm/9/4MWkfebkuGTWjVH2erURp5MR9t6wghchLyah90RvkXUDbHh8qS+K9D?= =?us-ascii?Q?2Q6a2z8zbC4WT0J/gE006hZEEYYpQdXooSYe7K4+ZUfokFZLcsIByEEajKen?= =?us-ascii?Q?Yg3apy31jtgVKoKWK2Xsx0v0HFhUk1IAEbDp8C8AtN3QiWsoVNgVQmHNm0Ur?= =?us-ascii?Q?paLNcIPx83DdNwZ5U6yfIujljxcLsW86LgkjTuNK6bhdzCKzjDGUTyrlt1eL?= =?us-ascii?Q?iXExjqIinqKkiaDnkLR8Hu4dqsqWbNN3uIS2KyQ7GkrEralNLNgRCNeCLvmH?= =?us-ascii?Q?dBOvNUQHM/5Qc0WwhChfcVvUFjUHwtSZ8KOYDFFwN1y9IrSXqS5vHiQO7MV4?= =?us-ascii?Q?QU2SEEjInIdysNawsY/BrXSKbxCtBuutW8EdCrMsofto7tPauuC5/Xgava0T?= =?us-ascii?Q?KkbtoO+Rx8qTQ+MmBRVzmbd0hxXVXaUsEXx9UEI5y00lw4WaQsrGaS2ola9o?= =?us-ascii?Q?A4mwfkmDZME0NUIHN5XZb1gakwDZnNwqXPohKG/f/GOwmCmKN3+fJYOOpV72?= =?us-ascii?Q?DWdJdn5vmiJOWYzTsotpKgboyMG2xzfilaSAP/7fFzsnGAwM1XrfNJfbTklh?= =?us-ascii?Q?Nbp21umjN8lz9ck41mmiy4Y8J6rheHw8b8zWi6d7jzgYrxPPcRqqsZaiIL6Y?= =?us-ascii?Q?dMs22IcLpTnbES8ockXkp1+aPsO6hXocyVkDhi10/mXK+ADu4abjDietnUc7?= =?us-ascii?Q?WJtqjegtfDxC01t5+IfGVTKY6eiRrHlf1qbNZQPZql4EAhm2iVBL9hVXEjVw?= =?us-ascii?Q?TMSAg0avuqEFPetW8jtnv+8udSQghObEevYnZ6baY4yxIoMqRio81Wvc/Pon?= =?us-ascii?Q?AQ/1t7MVcEUW4NzXazsu+VWnRPSLtG2bEVEFGpz3EMqcIpgnOAE90tW1Gp6d?= =?us-ascii?Q?FdjsM+b9GXG25YhLnefuvvtCppsjtf1hebuKXs6QoKBVFvqioD4+Hu0V7uy2?= =?us-ascii?Q?EE3pTibrF0F7FzPzDxl8x5ZjxwvL4evI+u9EEmTQKNL3jJBNHWWHrlRfKEU0?= =?us-ascii?Q?W18RLjMXgU+vGj3W0l3iYj2JDL8xQStdIM+wa464uyHePXWVCXWh7u8Agolr?= =?us-ascii?Q?2E8Yq6tWNMD5rOsK9WYBCnZv1JLUyxj6JEC07GDy+XbPw4EpAmksV815QtJ0?= =?us-ascii?Q?v7cAcr39QqsyO5y7c1ZOMuKH5PEwb8dY0/WYqU+wC0hchabRMrb4S6K9dgV/?= =?us-ascii?Q?swZtk/kCHmhLnJ6Xb6nBFWWS?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB4885.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aeccad99-8096-478e-b347-08d94f3fe829 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jul 2021 07:43:34.4564 (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: evbl1ufAlBuKP3O8BaZrQGRFTBZM0NoGP+4rTr+JeFwN8erqQgDEW8lmfAGIWcCKX4bP/GJZz6k0bYVtGX7csQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5127 Return-Path: jiewen.yao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Yes, if that can avoid the UefiCpuPkg change. > -----Original Message----- > From: Xu, Min M > Sent: Sunday, July 25, 2021 3:42 PM > To: Yao, Jiewen ; devel@edk2.groups.io > Cc: Dong, Eric ; Ni, Ray > Subject: RE: [PATCH V2 3/4] UefiCpuPkg/ResetVector: Add Main32 entry poin= t in > Main.asm >=20 > On July 25, 2021 2:08 PM, Yao, Jiewen wrote: > > Current OvmfPkg Reser vector is a mess (see my previous email). > > I also compared the ResetVector code in UefiCpuPkg and OvmfPkg. There > > are already duplication/override. > > > > I suggest we just drop UefiCpuPkg change, and focus on improving OvmfPk= g. > > If we need add something in UefiCpuPkg, let's copy the file to OvmfPkg = and > > update there. > > > Do you mean we create the Main.asm in OvmfPkg/ResetVector/ and update > the changes in this Main.asm? > > > > I really don't want to mess up UefiCpuPkg at this moment. > > We can make a better architecture to share reset vector in virtual BIOS= and > > physical BIOS later. But at this moment, let's finish the virtual BIOS > > architecture at first. > > > > Thank you > > Yao Jiewen > > > > > -----Original Message----- > > > From: Xu, Min M > > > Sent: Thursday, July 22, 2021 1:52 PM > > > To: devel@edk2.groups.io > > > Cc: Xu, Min M ; Dong, Eric ; > > > Ni, Ray ; Yao, Jiewen > > > Subject: [PATCH V2 3/4] UefiCpuPkg/ResetVector: Add Main32 entry poin= t > > > in Main.asm > > > > > > RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3429 > > > > > > In Tdx all CPUs "reset" to run on 32-bit protected mode with flat > > > descriptor (paging disabled). Main32 entry point is added in > > > UefiCpuPkg/ResetVector/Vtf0/Main.asm so that Main.asm can support the > > > 32-bit protected mode. > > > > > > Init32.asm is the 32-bit initialization code. It is a null stub in > > > UefiCpuPkg. The actual initialization can be implemented in the > > > platform (OvmfPkg/ResetVector/Ia32/Init32.asm is the example.) > > > > > > Cc: Eric Dong > > > Cc: Ray Ni > > > Cc: Jiewen Yao > > > Signed-off-by: Min Xu > > > --- > > > UefiCpuPkg/ResetVector/Vtf0/Ia32/Init32.asm | 13 +++++++++++++ > > > UefiCpuPkg/ResetVector/Vtf0/Main.asm | 14 ++++++++++++++ > > > UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb | 2 +- > > > 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 > > > UefiCpuPkg/ResetVector/Vtf0/Ia32/Init32.asm > > > > > > diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/Init32.asm > > > b/UefiCpuPkg/ResetVector/Vtf0/Ia32/Init32.asm > > > new file mode 100644 > > > index 000000000000..0cdae4a4a84a > > > --- /dev/null > > > +++ b/UefiCpuPkg/ResetVector/Vtf0/Ia32/Init32.asm > > > @@ -0,0 +1,13 @@ > > > +;-------------------------------------------------------------------= - > > > +---------- > > > +; @file > > > +; 32-bit initialization code. > > > +; Copyright (c) 2021, Intel Corporation. All rights reserved.
; > > > +SPDX-License-Identifier: BSD-2-Clause-Patent ; > > > +;-------------------------------------------------------------------= - > > > +---------- > > > + > > > +BITS 32 > > > + > > > +Init32: > > > + nop > > > + OneTimeCallRet Init32 > > > diff --git a/UefiCpuPkg/ResetVector/Vtf0/Main.asm > > > b/UefiCpuPkg/ResetVector/Vtf0/Main.asm > > > index 19d08482f831..4920c6937e1b 100644 > > > --- a/UefiCpuPkg/ResetVector/Vtf0/Main.asm > > > +++ b/UefiCpuPkg/ResetVector/Vtf0/Main.asm > > > @@ -36,6 +36,20 @@ Main16: > > > > > > BITS 32 > > > > > > +%ifdef ARCH_X64 > > > + > > > + jmp SearchBfv > > > + > > > +; > > > +; Entry point of Main32 > > > +; > > > +Main32: > > > + > > > + OneTimeCall Init32 > > > + > > > +%endif > > > + > > > +SearchBfv: > > > ; > > > ; Search for the Boot Firmware Volume (BFV) > > > ; > > > diff --git a/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb > > > b/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb > > > index 493738c79c1c..6493b9863c48 100644 > > > --- a/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb > > > +++ b/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb > > > @@ -51,7 +51,7 @@ > > > %include "Ia32/SearchForSecEntry.asm" > > > > > > %ifdef ARCH_X64 > > > -%include "Ia32/Flat32ToFlat64.asm" > > > +%include "Ia32/Init32.asm" > > > %include "Ia32/PageTables64.asm" > > > %endif > > > > > > -- > > > 2.29.2.windows.2