From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.1753.1637550286409816935 for ; Sun, 21 Nov 2021 19:04:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=MlF/Bzd7; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: ray.ni@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10175"; a="295521819" X-IronPort-AV: E=Sophos;i="5.87,253,1631602800"; d="scan'208";a="295521819" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2021 19:04:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,253,1631602800"; d="scan'208";a="537733661" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga001.jf.intel.com with ESMTP; 21 Nov 2021 19:04:45 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Sun, 21 Nov 2021 19:04:44 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Sun, 21 Nov 2021 19:04:44 -0800 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.107) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Sun, 21 Nov 2021 19:04:44 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EJfDpaCvTfygM4ffmZGkHru+JY9WNY+uDKa5rOroq/F++7V0sNKUnlsQ+j293lbCWBTTfvePw1+tmH7gQP0GumXtC9PMD+YvX7n/Wn9Zkp58K1v1DzEeJyF4e2miLuZfrkna1V5eHMlg+4/lqbu7OitL70+b13dJS8Eck7mKwFkii9LKdBj0ZbywFMF7TBDW4R9GbgzqNU3/A4KR5YNGlMb3y3qK+oOEPARjpyl/aqumXKLmp/4Xk4+UT29WAWYM8PkF38E2KqJkhCCWWE7hERX//m1f+qhlIaPNQacBkxET22SleVD1BYwUYi7I1py0r9TetnTl7vCbTUHQ/yAS5w== 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=TsgV6N3IqBq+zapz2P83tT0q5Oph9NBOm3zBPXlYwvY=; b=CZFmkCmLq0VT2LJQI1QQ2gql5EPQ/DYqxIOKjuVcjlj3LTdzP/G0PglyNYrcG3NOr8W/UtZYDVybOr++L/pLB6MAq+2p8fyO+ccVXw+uYqQHCcMSAJohu3X+tbPenOEl8cHpv2agXKXam+Qc53fVgRAU2UTcquvJeFvLNC+Tc44D4R8OeAFumH/KRwwZbCB+fV+kI03VDT8BOhsjzf10uMIkhRPcKEvywHys31rUt1drV2WfX+01tpnBH/YaciNEK9GeHIcUmeCKRi3kFAZ64aLjdcOOwgmecFokzTM6oIUfu+TLbfhyEIgtStnvoFTMjN+PbLl14ywX7QRIB6nssQ== 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=TsgV6N3IqBq+zapz2P83tT0q5Oph9NBOm3zBPXlYwvY=; b=MlF/Bzd70VGN/P9tfwaUnZ7PKqQH45X/0tpRv1LDKC4oxlJJrqScSpQrTZiQkELs/ArYrpjxBqpwdMcgSE40XCEPJD6ZuhGryxgjTRqT/bWOK2I6/7B5WQkHPn/5fAJKwrs1M7/TzIfR7CvQKp1+qH3rm1A2zyVgv4Im2RkWa+0= Received: from BN0PR11MB5696.namprd11.prod.outlook.com (2603:10b6:408:14b::11) by BN8PR11MB3747.namprd11.prod.outlook.com (2603:10b6:408:82::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Mon, 22 Nov 2021 03:04:43 +0000 Received: from BN0PR11MB5696.namprd11.prod.outlook.com ([fe80::49dc:7490:201e:9fc9]) by BN0PR11MB5696.namprd11.prod.outlook.com ([fe80::49dc:7490:201e:9fc9%7]) with mapi id 15.20.4690.029; Mon, 22 Nov 2021 03:04:43 +0000 From: "Ni, Ray" To: "Xu, Min M" , "devel@edk2.groups.io" CC: "Yao, Jiewen" , Gerd Hoffmann , Anthony Perard , Julien Grall , "Dong, Eric" Subject: Re: [PATCH V3 3/3] OvmfPkg: Move LocalApicTimerDxe to UefiCpuPkg Thread-Topic: [PATCH V3 3/3] OvmfPkg: Move LocalApicTimerDxe to UefiCpuPkg Thread-Index: AQHX1GcS96pv5wtWT0mWUTDcD0fcaawO79Ng Date: Mon, 22 Nov 2021 03:04:43 +0000 Message-ID: References: <69c2eeac1fb327acc92626886477755b6b12e044.1636350203.git.min.m.xu@intel.com> In-Reply-To: <69c2eeac1fb327acc92626886477755b6b12e044.1636350203.git.min.m.xu@intel.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-office365-filtering-correlation-id: 8ea10821-679f-4d04-196a-08d9ad64d51d x-ms-traffictypediagnostic: BN8PR11MB3747: 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: Tt4G3YmX3KeoOx2S2yTM5kCVFQJPGssUAUVFej3D4Su24bc8FptYGk0yZBwkwlXFg1UibRZdu9HitZDXlO5gegQQKGfyn3H2j8AbkNEmQu8WQdvSzt2z4xXJREAtbwiPRNRalhekwPwoJZg1glLAEzTvkXDBEzzqOzex7Iyg0qnhTpsdGHYqbjqgztnWmTwdywdXsQbYgS8fx5fjX0BFTtt3cZtrNVfVZOjjGfaFWz/JoJa+bvKz2iCTMgkTDk4VVH82IiZk6tTVewYBwIGws9+CiQ7TO3bWitbPSBh/eLys9VwDm72WYuISMnzBZbnJfVuong2LZi0tsec0ChYxCaA8J0/J2SxsRJNcdUmRBEk8F148LekZqcIbAnYYAq/N9tROF4BoR90xXkTVMwbueSq3DIoej8+gPThzWLr5yc96HLp8fgE06c0vUYORA2LQfy1LyGhzOKOFakmU4qSr3xBy1sYzbEC9MCYv3kIRStHqGRzxPimWg+dFuCwsh8H0XpQgvw6Yi6XrmKin9J++lNSNDwNKfsVR/tOJ/uj1VHF9cAZ+wpB7W3Lg+7ticxMkASFmVOB+PAxWZQ/IUAXg86nm0dx1XOXr0tgAnUVbWm+jwJ7bVpqigXa0lwKDUkMEpyQmnkLvYOqTcRpw3oLUFO2KJif+wGe66oAzdsCLeFly2WKtChnJaAoBTDKZa9BbL0Fx3kP604TpcyvkZq/xRogj3v5m+vswTafT2fbrZP7B3cfq1Od/XMZxWgsul7cBzrMZQLeA0mvDywzkC9JAofUrvDNBsMf2bjTycr+Kgo5BGuYD7L64T6YvyV9V8YnA x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN0PR11MB5696.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(186003)(9686003)(83380400001)(107886003)(30864003)(55016002)(7696005)(52536014)(33656002)(26005)(2906002)(66476007)(8936002)(38070700005)(82960400001)(38100700002)(66556008)(316002)(64756008)(66446008)(66946007)(110136005)(71200400001)(86362001)(54906003)(4326008)(6506007)(53546011)(76116006)(122000001)(5660300002)(508600001)(966005)(8676002)(19627235002)(14943795004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?2IWn6v/3FgVvNBmb92KqJKWKBlFBxGeLhJWoZVN7BmTpGYPQ9rEwVlTy7lU1?= =?us-ascii?Q?amLmnmpO1FKnASxtSeu0PHAj/rAVNKK5D0ECK8qAsjAVZyY0QrzOUW2df2BP?= =?us-ascii?Q?PgvNEmPy8D1J1FYsARDTxKJWau7x2nc7bn0CcZ2cOnKQLSNpqTNxtbQd7orO?= =?us-ascii?Q?EKJ7GpeqEjjLM+2Pd0ZhAHTpGWRqWCkeOY6UExMVw9luEVFuhCt0eSO/xYT3?= =?us-ascii?Q?N84mRI0lJHtMMufsSA9Ek1jyQ1m+/8nSqhTfM+v/Jxv/KNEcAgLIt4Uz5igE?= =?us-ascii?Q?j/CwAZqzQqdItWcMNFzym/xsB61yNiI9Lqzw9ejef02dcm4QI+i3aE9/CBLj?= =?us-ascii?Q?fgFnm9C88NPp3miFu9GZbopuDdejISWObBByTTvHm/W+5WotuUnnu+m84M7C?= =?us-ascii?Q?BqiVdJGtsBBDXRoYqyFoU5yvnIJMyhjswHJLp/eh/f7wl3l+Ujql5LHxOH5F?= =?us-ascii?Q?C3NFLr4s1ONcRHfy7K0keScaOUatqLISFjkdAQCpDbJTxAGDWTUkSjrdMmJ6?= =?us-ascii?Q?9wZ2fPOh+KqJ6i+igErXbBd5KTUDKRFtPYw/iNyn2aqpR4H3gO2F36NMtIro?= =?us-ascii?Q?WJnL6JcMDmIhIDECC8teZm6tc2Wk2id2lNZozyR2wuKcF5DpwUo0X7afyi8E?= =?us-ascii?Q?yT14S06T6pAO1SUT8yn6Kjo+jSv9YkBUQJJ9uK6djb84y/il0MUHu3qAQQkE?= =?us-ascii?Q?QJWmRGwVHzXkJWBXnQ/i+MIB2X1ujXXS9Cw985JF1iVCDHXEGKeLtk1a4Y6k?= =?us-ascii?Q?XhnLjxyg5PxyHdxWly761OgIIqtU3HwResLuOV/QSOVze/zX48n6qpZcrs0T?= =?us-ascii?Q?ti4WTA/Z6vrZedtw12R1V2aFNDDc7g5KN5Uc+s7llvlHWEHTr73Up6EXIFhR?= =?us-ascii?Q?bFB+ZVhTdodq+HVrhsxHsNz2aYjpQXbGD1RgtK17T1Qsuyw6n+Lb2nelMxiO?= =?us-ascii?Q?HzUVy19TtFAF6+xK+zE8NomilW2JFjgDJe3pwLS5QBLzWxUDqDSgotc7xTJv?= =?us-ascii?Q?+q+qj5a0U1FyxcV+LdJjWEVo1hpewqEa+EpE3T1BTd6csjHkq6WbjcS4H/FW?= =?us-ascii?Q?ToCEfdHDoeiyBt5LJvWeWYCRcTPS1sVJwcfaka18CSNNjJGwynguQLW6edJe?= =?us-ascii?Q?qzpZVLznhJGuqiEQg2omGbpLhvugF1vP2oFWAUgadN3yky9m4uGWw9f3rw9g?= =?us-ascii?Q?d42CGIcDTAbwt25P8uyPgbHVnywHOkIXbaWn7CV6Knf2ct/A3M9zadje8Qu8?= =?us-ascii?Q?BfSoFTi9Ot/HKBd1cqMNXF6jqPHOcbntlGa+tAXFSWwsAwxUNQGJ3tv5EwG/?= =?us-ascii?Q?Mc23mygp21rznfXzbsw1+B2qv5+ilZzl2MJ6DG7Gzm+0JMEXCemc7U2kdHkr?= =?us-ascii?Q?ml5KP76TuDTV/vSld+ICKDLi5T0iziCcsh4BjItTk6Zo0k0tkrg3XNdNKc1q?= =?us-ascii?Q?c/GV987yWt0xeMk0PoLHM0Kuu592MxU6tdpGo4omnK2HgeOori8v1VJFbSoO?= =?us-ascii?Q?SjDHy7GnOGbeU0xvR4Hzbu9OPgEtY7DHA8WlQHQ53hvAK8MO85EtDECbn336?= =?us-ascii?Q?uV8qAml9OA3HqWVJAbrBNDlsNw7KqrMqW61m0TElcx2DslRgKpoZgiiXE0V5?= =?us-ascii?Q?6vVAvycTbNBnrJKG7jwP+0Y=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN0PR11MB5696.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ea10821-679f-4d04-196a-08d9ad64d51d X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Nov 2021 03:04:43.2030 (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: R2lP/KUH7bH2qa1Ukc7h1CbwqC28bpIl+2EU3qV4v9hJODM2ukhZWbHynrZMridhMfaY/3NYGzOXkQgFN7iT5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR11MB3747 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Min, What's the reason of moving this driver to UefiCpuPkg? When the LocalApicTimerDxe is in OvmfPkg, it's clear that this driver is on= ly used by OVMF/QEMU platform. Now since the patch moves the driver to UefiCpuPkg, it's possible that othe= r platforms may choose this driver as the timer driver in DXE phase. So, we need to make sure the quality of this driver is good enough for a br= oad scope of platforms. 1. What's the issue when this driver still stays in OvmfPkg? If it's a must= that this driver stays in UefiCpuPkg, please help to address following que= stions: 2. Can SourceLevelDebug (rely on Local APIC timer) work if this driver is c= hosen as DXE timer driver? 3. Can detailed comments be added for " @bug : This does not handle missed = timer interrupts" in TimerInterruptHandler()? 4. Can detailed comments be added for " DisableInterrupts ();" in TimerInte= rruptHandler()? 5. In general what kinds of platforms are capable of using this driver as T= imer driver? Thanks, Ray -----Original Message----- From: Xu, Min M =20 Sent: Monday, November 8, 2021 2:08 PM To: devel@edk2.groups.io Cc: Xu, Min M ; Yao, Jiewen ; Ger= d Hoffmann ; Anthony Perard ;= Julien Grall ; Dong, Eric ; Ni, Ray <= ray.ni@intel.com> Subject: [PATCH V3 3/3] OvmfPkg: Move LocalApicTimerDxe to UefiCpuPkg BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3711 OvmfPkg.dec is removed from [Packages] because it doesn't depend on OvmfPkg. LocalApicTimerDxe is moved to UefiCpuPkg. Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Anthony Perard Cc: Julien Grall Cc: Eric Dong Cc: Ray Ni Signed-off-by: Min Xu --- OvmfPkg/AmdSev/AmdSevX64.dsc | 2 +- OvmfPkg/AmdSev/AmdSevX64.fdf | 2 +- OvmfPkg/Microvm/MicrovmX64.dsc | 2 +- OvmfPkg/Microvm/MicrovmX64.fdf | 2 +- OvmfPkg/OvmfPkgIa32.dsc | 2 +- OvmfPkg/OvmfPkgIa32.fdf | 2 +- OvmfPkg/OvmfPkgIa32X64.dsc | 2 +- OvmfPkg/OvmfPkgIa32X64.fdf | 2 +- OvmfPkg/OvmfPkgX64.dsc | 2 +- OvmfPkg/OvmfPkgX64.fdf | 2 +- OvmfPkg/OvmfXen.dsc | 2 +- OvmfPkg/OvmfXen.fdf | 2 +- .../LocalApicTimerDxe/LocalApicTimerDxe.c | 0 .../LocalApicTimerDxe/LocalApicTimerDxe.h | 0 .../LocalApicTimerDxe/LocalApicTimerDxe.inf | 6 ++++-- 15 files changed, 16 insertions(+), 14 deletions(-) rename {OvmfPkg =3D> UefiCpuPkg}/LocalApicTimerDxe/LocalApicTimerDxe.c (10= 0%) rename {OvmfPkg =3D> UefiCpuPkg}/LocalApicTimerDxe/LocalApicTimerDxe.h (10= 0%) rename {OvmfPkg =3D> UefiCpuPkg}/LocalApicTimerDxe/LocalApicTimerDxe.inf (= 79%) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 88c51dfe8337..888fc24f1b58 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -674,7 +674,7 @@ MdeModulePkg/Universal/EbcDxe/EbcDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf - OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index 7489b04198fe..659810f96bec 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -208,7 +208,7 @@ INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStu= bDxe.inf INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf -INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf +INF UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.= inf INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.ds= c index 1a0e848f8356..fcb8b571a041 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -656,7 +656,7 @@ =20 MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fd= f index ac9efba26811..d02e88e2a48e 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -215,7 +215,7 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf -INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf +INF UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.= inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index d0e9f3ca05f6..f8c8ef1e58be 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -763,7 +763,7 @@ OvmfPkg/8259InterruptControllerDxe/8259.inf OvmfPkg/8254TimerDxe/8254Timer.inf !else - OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf !endif OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index b7b35a3a490a..321d4a871afa 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -218,7 +218,7 @@ INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/8259InterruptControllerDxe/8259.inf INF OvmfPkg/8254TimerDxe/8254Timer.inf !else - INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + INF UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf !endif INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.= inf INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index d3531d388e24..4de4ed21a5ca 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -777,7 +777,7 @@ OvmfPkg/8259InterruptControllerDxe/8259.inf OvmfPkg/8254TimerDxe/8254Timer.inf !else - OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf !endif OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 986228a44c78..10e97c35001f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -222,7 +222,7 @@ INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/8259InterruptControllerDxe/8259.inf INF OvmfPkg/8254TimerDxe/8254Timer.inf !else - INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + INF UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf !endif INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.= inf INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index c6ee624fc738..57b0c3c10826 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -775,7 +775,7 @@ OvmfPkg/8259InterruptControllerDxe/8259.inf OvmfPkg/8254TimerDxe/8254Timer.inf !else - OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf !endif OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 99339e73bb51..b52c43127845 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -238,7 +238,7 @@ INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/8259InterruptControllerDxe/8259.inf INF OvmfPkg/8254TimerDxe/8254Timer.inf !else - INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + INF UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf !endif INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.= inf INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 7c4c5412d102..d4a9e8f87def 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -551,7 +551,7 @@ MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf =20 MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 196853740753..76934d354fa6 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -298,7 +298,7 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf -INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf +INF UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.c b/UefiCpuPkg/Loc= alApicTimerDxe/LocalApicTimerDxe.c similarity index 100% rename from OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.c rename to UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.c diff --git a/OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.h b/UefiCpuPkg/Loc= alApicTimerDxe/LocalApicTimerDxe.h similarity index 100% rename from OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.h rename to UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.h diff --git a/OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf b/UefiCpuPkg/L= ocalApicTimerDxe/LocalApicTimerDxe.inf similarity index 79% rename from OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf rename to UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf index 3ad28a148c5b..4f2b4db9e5dc 100644 --- a/OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf +++ b/UefiCpuPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf @@ -1,6 +1,9 @@ ## @file # Local APIC timer driver that provides Timer Arch protocol. -# PcdFSBClock is defined in MdePkg and it should be set by the consumer. +# +# This driver is to support fixed frequency. If a real platform happens +# to have fixed frequency, then it can be used. In this case the consumer +# should set PcdFSBClock which is defined in MdePkg. # # Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.
# Copyright (c) 2019, Citrix Systems, Inc. @@ -21,7 +24,6 @@ [Packages] MdePkg/MdePkg.dec UefiCpuPkg/UefiCpuPkg.dec - OvmfPkg/OvmfPkg.dec =20 [LibraryClasses] UefiBootServicesTableLib --=20 2.29.2.windows.2