From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8778521DF9665 for ; Thu, 27 Jul 2017 08:06:47 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP; 27 Jul 2017 08:08:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,419,1496127600"; d="scan'208";a="883428706" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by FMSMGA003.fm.intel.com with ESMTP; 27 Jul 2017 08:08:51 -0700 Received: from fmsmsx102.amr.corp.intel.com (10.18.124.200) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 27 Jul 2017 08:08:50 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX102.amr.corp.intel.com (10.18.124.200) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 27 Jul 2017 08:08:50 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.146]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.122]) with mapi id 14.03.0319.002; Thu, 27 Jul 2017 23:08:48 +0800 From: "Gao, Liming" To: "Marvin.Haeuser@outlook.com" , "edk2-devel@lists.01.org" CC: "Kinney, Michael D" , "Fan, Jeff" Thread-Topic: [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume UefiCpuPkg LAPIC code. Thread-Index: AQHTA5wlcfBDCD5qrEmhamQ76DeIzKJhMXOQgAH8Z8CAAAWKQIACMpSggABlhpCAAeLicIAAB7cwgAAW2PA= Date: Thu, 27 Jul 2017 15:08:47 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14D75CBDC@shsmsx102.ccr.corp.intel.com> References: <542CF652F8836A4AB8DBFAAD40ED192A4C62E463@shsmsx102.ccr.corp.intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A14D75CAE9@shsmsx102.ccr.corp.intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 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: Thu, 27 Jul 2017 15:06:47 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Marvin: I build this library on IA32 with VS2013x86 and VS2015x86. They can pass = build. Could you let me know how to reproduce the compiler issue? Then, we = can further provide the patch to fix it.=20 Thanks Liming > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ma= rvin H?user > Sent: Thursday, July 27, 2017 9:49 PM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D ; Fan, Jeff ; Gao, Liming > Subject: Re: [edk2] [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume UefiCpuP= kg LAPIC code. >=20 > Hey Liming, >=20 > Old and new because sizeof (UINTN) is what matters. >=20 > Thanks, > Marvin. >=20 > > -----Original Message----- > > From: Gao, Liming [mailto:liming.gao@intel.com] > > Sent: Thursday, July 27, 2017 3:19 PM > > To: Marvin.Haeuser@outlook.com; edk2-devel@lists.01.org > > Cc: Kinney, Michael D ; Fan, Jeff > > > > Subject: RE: [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume UefiCpuPkg > > LAPIC code. > > > > Marvin: > > Do you meet with the compiler issue on the old VS tool chain? > > > > Thanks > > Liming > > > -----Original Message----- > > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf O= f > > > Marvin H?user > > > Sent: Wednesday, July 26, 2017 4:34 PM > > > To: edk2-devel@lists.01.org > > > Cc: Kinney, Michael D ; Fan, Jeff > > > > > > Subject: Re: [edk2] [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume > > UefiCpuPkg LAPIC code. > > > > > > Hey Jeff, > > > > > > That would definitely fix the compilation issue. > > > Do I see it right that for 32-bit platforms, it's just ApicBase and f= or 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. > > > > > > > > Marvin, > > > > > > > > Could the following updating fix your issue? > > > > > > > > ApicBase =3D MsrValue & ~0xfff; > > > > > > > > Thanks! > > > > Jeff > > > > > > > > -----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. > > > > > > > > Hi Michael, > > > > > > > > Sorry, I did not notice that UefiCpuPkg already has a similiar libr= ary. > > > > 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), resulting in the appropiate data loss warning. > > > > > > > > Thanks for your answer! > > > > > > > > Regards, > > > > Marvin. > > > > > > > > > -----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 i= s > > > > > > 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|0x0ffffc000 > > > > > > 0 > > > > > > 00 > > > > > > > > > > > > > > +[LibraryClasses] > > > > > > > + > > > > > > > > > > > > > > > +LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2A > > > > > > +LocalApicLib|p > > > > > > 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 > > > _______________________________________________ > > > 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