From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070105.outbound.protection.outlook.com [40.92.70.105]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C83272095D9E7 for ; Mon, 24 Jul 2017 09:55:27 -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=hh8dsIIjc+i/SC9c0EZgWNq0WDNWetvua2U5BNHwfL8=; b=vUZ8lOY/MOQNqi4ggFd+sLQK8KWEqU4wt3NHvrE0RVaS6g4RzXF9CRL/xWRmMkpaaV22oRw8GC8q9Gnjh0syPEySpkzJHFril1GThYZRTCRvCTuf2ECE3O15DqlUqAlsCUmTGl3kTPnve/Qwq1x+WlIGJdLPVOKOZNH7t66+/dT4hqnV5TYU9JiMX9tqjUNLGwXqvAUHXysauEbdtcqbrwz95I+HcHmHIMowURTfza1ScyNj0hUVH1GOxUyD7obUXKk7Lnp9CtlE8xBWd1knLZAtlyLccyBaVwuUWsHLbu+W3fmUDnBfzxPZlA1qzEBputVgt+nL/mTNyGXyUsUfgw== Received: from AM5EUR03FT031.eop-EUR03.prod.protection.outlook.com (10.152.16.55) by AM5EUR03HT176.eop-EUR03.prod.protection.outlook.com (10.152.17.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1240.9; Mon, 24 Jul 2017 16:57:24 +0000 Received: from AM4PR06MB1491.eurprd06.prod.outlook.com (10.152.16.59) by AM5EUR03FT031.mail.protection.outlook.com (10.152.16.111) 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; Mon, 24 Jul 2017 16:57:24 +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.017; Mon, 24 Jul 2017 16:57:24 +0000 From: =?iso-8859-1?Q?Marvin_H=E4user?= To: "edk2-devel@lists.01.org" CC: "Kinney, Michael D" Thread-Topic: [PATCH] MdePkg/SecPeiDxeTimerLibCpu: Consume UefiCpuPkg LAPIC code. Thread-Index: AQHTA5wlcfBDCD5qrEmhamQ76DeIzKJhMXOQgAH8Z8CAAAWKQA== Date: Mon, 24 Jul 2017 16:57:24 +0000 Message-ID: References: In-Reply-To: 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:3B7C1DA8F88038B4CACF6C7072AB621435C105DC2F547A6B501157C471949BBF; UpperCasedChecksum:4FD1AE1A51B5916777D3E0E3093CA87499F6821BFC54FF1D4D00E10FBCC1CCC2; SizeAsReceived:7572; Count:45 x-tmn: [BXsUdgdNe1NxLXaPaDRIcg52+qwwXducPzKrfDGrfMglfp3v2RveNSDFoJYbHYm/] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM5EUR03HT176; 7:2dRechlvOAY6LU6dP+knYXsJ2UYpNvJ34V00jjZ8HQx6dP2Zvf1FoV+ONYUKGd1u6Ce2dp48dONUx+0Pf+aSpm7ngX+GyzxU0B9L7oY2g/1wwL9rBDxumaWMHcacA8GynA7+NEmnn1txXLyIJJOddcUmBprtonb0swkILp3tfx/Hij2E1/CSLTP8rK70pkJz+v6rNZDULcZ9mHTw3PU+Oz/PFg9QdKyYiiKc2tRKVLSRxE619WLVX+PZg4NB1IOtKXlc/hyREGodhqzKZxDdImfJejBcLLGCFYkcCiikvxpHX21xAMrh/pM9L7LD1VFma2bWbEJT7LQePnqcUC+iUa6jnz9vw3S2LMG4LY4c7Iky1trxPaxv1RpICake1He2pv0K33PxuT9zDmu+Y5XiRcAShBIfz+o83AtATuaXqBEBNx47luoJrudOee4OBoeev3B8EkvB01bVAOkkg0Vhs8eeQOQgRTEPuBCwaD2GrLYqNQJS2RodPKM0DhHm01P/xRU3+zNcdswXz7gpUaW7w5bDZ3uYdJBRnZtOf5krxwQB1LknsU8ufDKR1ZniBGg6m7ZCTvkFIR2UK7GLyO6MQRMa3ttdZTV6ne6+VTlxegeKvO2YGFCBm43uDTyvsBInEhybd3O9BGmUYlIPS4vh6f4c5MkP/RLSBaUnP4MDjgigWKz/QJJkvpuJ7djv0JErKuEuvS7RiFka5OBPncijNGJ7KSc2E+rmw4tGwovQhvplWqw27CEGAWmBLugSo6WCgZMVgwrj3EFbgoV+IUyCBw== x-incomingheadercount: 45 x-eopattributedmessage: 0 x-forefront-antispam-report: EFV:NLI; SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:AM5EUR03HT176; H:AM4PR06MB1491.eurprd06.prod.outlook.com; FPR:; SPF:None; LANG:en; x-ms-office365-filtering-correlation-id: 6becb0e9-aeb0-4ab5-5e8e-08d4d2b50ebc 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)(1601125374)(1603101448)(1701031045)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:AM5EUR03HT176; x-ms-traffictypediagnostic: AM5EUR03HT176: 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:AM5EUR03HT176; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM5EUR03HT176; x-forefront-prvs: 0378F1E47A spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jul 2017 16:57:24.2810 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR03HT176 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: Mon, 24 Jul 2017 16:55:28 -0000 Content-Language: de-DE Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Hi Michael, Sorry, I did not notice that UefiCpuPkg already has a similiar library. Could you please answer my question regarding the mask value which I consid= ered 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.=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. >=20 > Hi Marvin, >=20 > 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. >=20 > The TimeLib in the MdePkg was created before the UefiCpuPkg was created, > which explains the current state of the MdePkg. >=20 > The MdePkg version has other limitations noted in the INF and recommends > the UefiCpuPkg version be used. >=20 > Thanks, >=20 > Mike >=20 > > -----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