From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068014.outbound.protection.outlook.com [40.92.68.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 992EF21D0DE46 for ; Wed, 26 Jul 2017 01:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=tknWpY/sDVu3aO6hzj7uinn8W9LTHq522yZlHg0ghL0=; b=EkfnC0SYWv3a/M5lsQMg1o6Oua+4oKOAXLgqregYpjmFzNDsW1gJOuoXfMwRO0WQmdM6SWRrs38P5tigbTGhVf1RlZ0PvN0TPNsx8y89WsiTnzSQ+Xlut3E9goZBrJgtN7gVkkU2kyqq9dTq7aGwlWzpRj86F1UJhS6E0P98lLLeqh37mJ0sLJkYai1whgu72F4VFPws1n3ZfT6Zw8JzhBfWGX/gEdp7biLU2Q96IbSloI4eW4N4Srv/oLrIo2KmM0s1sV5ib7ZWz74qEEyQVXU6Tt6107QhY4Y3mTsvLp5VzL/HdmHJLi41Sy3nZDa2ydB43zdIqCHUeMr9EXcLtw== Received: from VE1EUR02FT033.eop-EUR02.prod.protection.outlook.com (10.152.12.55) by VE1EUR02HT061.eop-EUR02.prod.protection.outlook.com (10.152.13.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1240.9; Wed, 26 Jul 2017 08:33:31 +0000 Received: from AM4PR06MB1491.eurprd06.prod.outlook.com (10.152.12.54) by VE1EUR02FT033.mail.protection.outlook.com (10.152.12.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.9 via Frontend Transport; Wed, 26 Jul 2017 08:33:30 +0000 Received: from AM4PR06MB1491.eurprd06.prod.outlook.com ([fe80::dcd0:60e6:90e0:871b]) by AM4PR06MB1491.eurprd06.prod.outlook.com ([fe80::dcd0:60e6:90e0:871b%13]) with mapi id 15.01.1282.020; Wed, 26 Jul 2017 08:33:30 +0000 From: =?iso-8859-1?Q?Marvin_H=E4user?= To: "edk2-devel@lists.01.org" CC: "Fan, Jeff" , "Kinney, Michael D" Thread-Topic: [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume UefiCpuPkg LAPIC code. Thread-Index: AQHTA5wlcfBDCD5qrEmhamQ76DeIzKJhMXOQgAH8Z8CAAAWKQIACMpSggABlhpA= Date: Wed, 26 Jul 2017 08:33:30 +0000 Message-ID: References: <542CF652F8836A4AB8DBFAAD40ED192A4C62E463@shsmsx102.ccr.corp.intel.com> In-Reply-To: <542CF652F8836A4AB8DBFAAD40ED192A4C62E463@shsmsx102.ccr.corp.intel.com> Accept-Language: de-DE, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=outlook.com; x-incomingtopheadermarker: OriginalChecksum:8755981AFB75BC3264937C693E12A3937BF0944B011A70E8AF43D3EF5C13CF73; UpperCasedChecksum:F6C562AEF8BF960823FEAB5D9219893F5B371B2BEBEE79E5C2DAC8BA29D737D6; SizeAsReceived:7770; Count:45 x-tmn: [GOjuIu58Z3Pl9UiE7TqlR8MVxPq+Y3XJ4oysY0M7B79VcAsp3uat5ITHIFaaNM1L] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VE1EUR02HT061; 7:9hXYy/ScDP+ed4RAK3fcyAYtTh+/RJ1vwsekYz1eDnVlDQVIUgLJPA92neC3uM5pzS5S1uXpqG/q4Cq97tv347TeChvEy15Bk7oJ2FiyE17hifUksFclw2ihlXF1n5ztrY0DCAvNJd1o3OmVTsO/isGmQMuj34Zh5nJv8IwmBgNXC9o7GjhFr7Olk4RHE3H1f2INf2va5aDw/JBMmmIG1p9dW3u5ur/R/eQpPJymBHEcsaBnqsLEP+e/RwEYGtavLewQYWAGDSD7x56dmlJmxHK4nvtwQ+aHdlDlcXuNIqRZjl8dshpWp8l3VDCcrRZGvfnKUkrms5N0ezBllCt41iiNvw9E0QvxCKl7OH+mX3onbvQsdh/hx2Ms7xcO4asfLBQyamDP5p5/VqLzonhQvwK0b0G9uZDsXpC8fvKotX32Exd4gVix2qfzODwUnvbTePrcCRb1Qs0jqFQpAd1hpYfRIZ78Ys/ZNv/cs49ISmg6fAzfqHIXkEtLDwz1MzCTdow3GGvUq0W2ANDrZlsBS066Nm1ne4a4P2EGsJ+le1lM9DpIIUt5Jem4vA6Pzaf7FaTfjJZCNIpRjrWylAWx+qDacQhZwV3jTcK2MgD2gUvyuQ1mKtkoo6jgkKe1HIIPfq39QRV8pCVbK0Ea217yZFuHO8/4pYqVta3hSABSiIaJ3tqhEuwrAavHQ2pvFttxG17tGUq6fwaxl57JBpcKt9I/rbWc1nKWBPvVQr4QZ2HZ4nruQmxI8aCR9c4k5BfIO//aH4PHeGw1Edasi1oilA== x-incomingheadercount: 45 x-eopattributedmessage: 0 x-forefront-antispam-report: EFV:NLI; SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:VE1EUR02HT061; H:AM4PR06MB1491.eurprd06.prod.outlook.com; FPR:; SPF:None; LANG:en; x-ms-office365-filtering-correlation-id: 2352bad8-d60d-4866-1300-08d4d400fecc x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322350)(1603101448)(1601125374)(1701031045)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:VE1EUR02HT061; x-ms-traffictypediagnostic: VE1EUR02HT061: x-exchange-antispam-report-test: UriScan:(189930954265078)(162533806227266)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:VE1EUR02HT061; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VE1EUR02HT061; x-forefront-prvs: 038002787A spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Jul 2017 08:33:30.5037 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR02HT061 Subject: Re: [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume UefiCpuPkg LAPIC code. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2017 08:31:31 -0000 Content-Language: de-DE Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Hey Jeff, That would definitely fix the compilation issue. Do I see it right that for 32-bit platforms, it's just ApicBase and for 64-= bit platforms, it's ApicBase and ApicBaseHi? If yes, maybe ~(UINTN)0xFFF should be used to play safe? Thanks, Marvin. > -----Original Message----- > From: Fan, Jeff [mailto:jeff.fan@intel.com] > Sent: Wednesday, July 26, 2017 4:28 AM > To: Marvin H=E4user ; edk2- > devel@lists.01.org > Cc: Kinney, Michael D > Subject: RE: [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume UefiCpuPkg > LAPIC code. >=20 > Marvin, >=20 > Could the following updating fix your issue? >=20 > ApicBase =3D MsrValue & ~0xfff; >=20 > Thanks! > Jeff >=20 > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Marvin H=E4user > Sent: Tuesday, July 25, 2017 12:57 AM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D > Subject: Re: [edk2] [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume > UefiCpuPkg LAPIC code. >=20 > Hi Michael, >=20 > Sorry, I did not notice that UefiCpuPkg already has a similiar library. > Could you please answer my question regarding the mask value which I > considered incorrect nevertheless? > I am getting compile-time errors as the mask promotes the value to UINT64= , > which is, on 32-bit platforms, implicitely casted to UINT32 (UINTN), resu= lting > in the appropiate data loss warning. >=20 > Thanks for your answer! >=20 > Regards, > Marvin. >=20 > > -----Original Message----- > > From: Kinney, Michael D [mailto:michael.d.kinney@intel.com] > > Sent: Monday, July 24, 2017 6:40 PM > > To: Marvin H=E4user ; edk2- > > devel@lists.01.org; Kinney, Michael D > > Cc: Gao, Liming > > Subject: RE: [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume > UefiCpuPkg > > LAPIC code. > > > > Hi Marvin, > > > > We should not add a dependency on the UefiCpuPkg to the MdePkg. I > > agree that a better location of the local APIC based timer lib would > > be the UefiCpuPkg, and there is already one there called > > SecPeiDxeTimerLibUefiCpu. > > > > The TimeLib in the MdePkg was created before the UefiCpuPkg was > > created, which explains the current state of the MdePkg. > > > > The MdePkg version has other limitations noted in the INF and > > recommends the UefiCpuPkg version be used. > > > > Thanks, > > > > Mike > > > > > -----Original Message----- > > > From: Marvin H=E4user [mailto:Marvin.Haeuser@outlook.com] > > > Sent: Sunday, July 23, 2017 3:19 AM > > > To: edk2-devel@lists.01.org > > > Cc: Kinney, Michael D ; Gao, Liming > > > > > > Subject: RE: [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume > > UefiCpuPkg > > > LAPIC code. > > > > > > Dear Michael and Liming, > > > > > > I submited the patch as the changes need to be done anyway, though I > > > think the library might be better moved to UefiCpuPkg. > > > Also, is my understanding of the mask value being incorrect right? I > > > was confused by the 'ULL' suffix, which makes it look like it was > > > intended. Is it? > > > > > > Regards, > > > Marvin. > > > > > > > -----Original Message----- > > > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On > > > Behalf Of > > > > Marvin H=E4user > > > > Sent: Sunday, July 23, 2017 12:12 PM > > > > To: edk2-devel@lists.01.org > > > > Cc: michael.d.kinney@intel.com; liming.gao@intel.com > > > > Subject: [edk2] [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume > > > > UefiCpuPkg LAPIC code. > > > > > > > > X86TimerLib is changed to use UefiCpuPkg LAPIC register > > > definitions and > > > > LocalApicLib to remove duplicated code. An implicite change is > > > the value > > > > returned by InternalX86GetApicBase() as it now returns the > > > result of > > > > GetLocalApicBaseAddress(), which is the full LAPIC address. > > > This also > > > > implicitely fixes the incorrect mask value used previously, > > > which did not only > > > > mask AcpiBase, but also the first nibble of AcpiBaseHi. This > > > does not apply to > > > > 32-bit platforms. > > > > > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > > Signed-off-by: Marvin Haeuser > > > > --- > > > > MdePkg/Library/SecPeiDxeTimerLibCpu/X86TimerLib.c | > > > 35 +++++++-- > > > > ----------- > > > > MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf | > > > 4 ++- > > > > MdePkg/MdePkg.dsc | > > > 3 ++ > > > > 3 files changed, 18 insertions(+), 24 deletions(-) > > > > > > > > diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/X86TimerLib.c > > > > b/MdePkg/Library/SecPeiDxeTimerLibCpu/X86TimerLib.c > > > > index 76c66fbce6fb..fa6e6f213029 100644 > > > > --- a/MdePkg/Library/SecPeiDxeTimerLibCpu/X86TimerLib.c > > > > +++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/X86TimerLib.c > > > > @@ -1,7 +1,7 @@ > > > > /** @file > > > > Timer Library functions built upon local APIC on IA32/x64. > > > > > > > > - Copyright (c) 2006 - 2015, Intel Corporation. All rights > > > reserved.
> > > > + Copyright (c) 2006 - 2017, Intel Corporation. All rights > > > > + reserved.
> > > > This program and the accompanying materials > > > > are licensed and made available under the terms and > > > conditions of the BSD > > > > License > > > > which accompanies this distribution. The full text of the > > > license may be > > > > found at @@ -13,18 +13,14 @@ **/ > > > > > > > > #include > > > > +#include > > > > +#include > > > > #include > > > > #include > > > > #include > > > > #include > > > > #include > > > > > > > > -#define APIC_SVR 0x0f0 > > > > -#define APIC_LVTERR 0x370 > > > > -#define APIC_TMICT 0x380 > > > > -#define APIC_TMCCT 0x390 > > > > -#define APIC_TDCR 0x3e0 > > > > - > > > > // > > > > // The following array is used in calculating the frequency of > > > local APIC // > > > > timer. Refer to IA-32 developers' manual for more details. > > > > @@ -54,30 +50,21 @@ InternalX86GetApicBase ( > > > > VOID > > > > ) > > > > { > > > > - UINTN MsrValue; > > > > UINTN ApicBase; > > > > > > > > - MsrValue =3D (UINTN) AsmReadMsr64 (27); > > > > - ApicBase =3D MsrValue & 0xffffff000ULL; > > > > - > > > > // > > > > - // Check the APIC Global Enable bit (bit 11) in > > > IA32_APIC_BASE MSR. > > > > - // This bit will be 1, if local APIC is globally enabled. > > > > + // Verify local APIC is under XAPIC mode. > > > > // > > > > - ASSERT ((MsrValue & BIT11) !=3D 0); > > > > + ASSERT (GetApicMode () =3D=3D LOCAL_APIC_MODE_XAPIC); > > > > > > > > - // > > > > - // Check the APIC Extended Mode bit (bit 10) in > > > IA32_APIC_BASE MSR. > > > > - // This bit will be 0, if local APIC is under XAPIC mode. > > > > - // > > > > - ASSERT ((MsrValue & BIT10) =3D=3D 0); > > > > + ApicBase =3D GetLocalApicBaseAddress (); > > > > > > > > // > > > > // Check the APIC Software Enable/Disable bit (bit 8) in > > > Spurious-Interrupt > > > > // Vector Register. > > > > // This bit will be 1, if local APIC is software enabled. > > > > // > > > > - ASSERT ((MmioRead32 (ApicBase + APIC_SVR) & BIT8) !=3D 0); > > > > + ASSERT ((MmioRead32 (ApicBase + > > > XAPIC_SPURIOUS_VECTOR_OFFSET) & > > > > BIT8) > > > > + !=3D 0); > > > > > > > > return ApicBase; > > > > } > > > > @@ -98,7 +85,9 @@ InternalX86GetTimerFrequency ( { > > > > return > > > > PcdGet32(PcdFSBClock) / > > > > - mTimerLibLocalApicDivisor[MmioBitFieldRead32 (ApicBase + > > > APIC_TDCR, > > > > 0, 3)]; > > > > + mTimerLibLocalApicDivisor[ > > > > + MmioBitFieldRead32 (ApicBase + > > > > XAPIC_TIMER_DIVIDE_CONFIGURATION_OFFSET, 0, 3) > > > > + ]; > > > > } > > > > > > > > /** > > > > @@ -115,7 +104,7 @@ InternalX86GetTimerTick ( > > > > IN UINTN ApicBase > > > > ) > > > > { > > > > - return MmioRead32 (ApicBase + APIC_TMCCT); > > > > + return MmioRead32 (ApicBase + > > > > XAPIC_TIMER_CURRENT_COUNT_OFFSET); > > > > } > > > > > > > > /** > > > > @@ -131,7 +120,7 @@ InternalX86GetInitTimerCount ( > > > > IN UINTN ApicBase > > > > ) > > > > { > > > > - return MmioRead32 (ApicBase + APIC_TMICT); > > > > + return MmioRead32 (ApicBase + > > > XAPIC_TIMER_INIT_COUNT_OFFSET); > > > > } > > > > > > > > /** > > > > diff --git > > > > a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf > > > > b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf > > > > index a00ebb0eeb64..286da09db174 100644 > > > > --- > > > a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf > > > > +++ > > > b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf > > > > @@ -13,7 +13,7 @@ > > > > # Note that for IA-32 and x64, this library only supports > > > xAPIC mode. If > > > > x2APIC # support is desired, the SecPeiDxeTimerLibUefiCpu > > > library can be > > > > used. > > > > # > > > > -# Copyright (c) 2007 - 2014, Intel Corporation. All rights > > > reserved.
> > > > +# Copyright (c) 2007 - 2017, Intel Corporation. All rights > > > > +reserved.
> > > > # > > > > # This program and the accompanying materials # are > > > licensed and made > > > > available under the terms and conditions of the BSD License @@ > > > -48,6 +48,7 > > > > @@ [Sources.IPF] > > > > > > > > [Packages] > > > > MdePkg/MdePkg.dec > > > > + UefiCpuPkg/UefiCpuPkg.dec > > > > > > > > > > > > [LibraryClasses] > > > > @@ -57,6 +58,7 @@ [LibraryClasses.IA32, LibraryClasses.X64] > > > > PcdLib > > > > IoLib > > > > DebugLib > > > > + LocalApicLib > > > > > > > > [LibraryClasses.IPF] > > > > PalLib > > > > diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index > > > > 010ce533d7ea..8988d1947566 100644 > > > > --- a/MdePkg/MdePkg.dsc > > > > +++ b/MdePkg/MdePkg.dsc > > > > @@ -35,6 +35,9 @@ [PcdsFixedAtBuild] [PcdsFixedAtBuild.IPF] > > > > > > > gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc0000 > > > 00 > > > > > > > > +[LibraryClasses] > > > > + > > > > > > > +LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2Ap > > > icLib.i > > > > +nf > > > > + > > > > > > > > > > > ########################################################## > > > > ######################################### > > > > # > > > > # Components Section - list of the modules and components that > > > will be > > > > processed by compilation > > > > -- > > > > 2.12.2.windows.2 > > > > > > > > _______________________________________________ > > > > edk2-devel mailing list > > > > edk2-devel@lists.01.org > > > > https://lists.01.org/mailman/listinfo/edk2-devel > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel