From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: yi.qian@intel.com) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Wed, 17 Apr 2019 01:09:47 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Apr 2019 01:09:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,361,1549958400"; d="scan'208";a="316666799" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga005.jf.intel.com with ESMTP; 17 Apr 2019 01:09:44 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 17 Apr 2019 01:09:44 -0700 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 17 Apr 2019 01:09:43 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.206]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.147]) with mapi id 14.03.0415.000; Wed, 17 Apr 2019 16:09:41 +0800 From: "Qian, Yi" To: "Sun, Zailiang" , "devel@edk2.groups.io" CC: "Wei, David" Subject: Re: [PATCH] Vlv2TbltDevicePkg: Retire 8254 timer and 8259 module Thread-Topic: [PATCH] Vlv2TbltDevicePkg: Retire 8254 timer and 8259 module Thread-Index: AQHU9O6dwkFppG2uNECPZ8Yu1uGC1aY//9Bg Date: Wed, 17 Apr 2019 08:09:41 +0000 Message-ID: References: <20190417072401.11028-1-zailiang.sun@intel.com> In-Reply-To: <20190417072401.11028-1-zailiang.sun@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: yi.qian@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed by Qian YI Thanks Qian Yi -----Original Message----- From: Sun, Zailiang=20 Sent: Wednesday, April 17, 2019 3:24 PM To: devel@edk2.groups.io Cc: Wei, David ; Qian, Yi Subject: [PATCH] Vlv2TbltDevicePkg: Retire 8254 timer and 8259 module Use HpetTimerDxe instead of SmartTimer protocol. Retire 8259 as well. Tested boot to Win10x64 successfully. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zailiang Sun Cc: David Wei Cc: Yi Qian --- Vlv2TbltDevicePkg/PlatformPkg.fdf | 4 ---- Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 16 ++++++++-------- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 7 ++----- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 -- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 2 -- 6 files changed, 11 insertions(+), 22 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/Platfor= mPkg.fdf index fc09618ef4..1bdf0e3f44 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -685,10 +685,6 @@ INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.i= nf =20 INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf =20 - # - # Legacy Modules - # -INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf =20 # # FAT file system diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/P= latformPkgConfig.dsc index c8e9dd3a53..6d556c1be2 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc @@ -36,7 +36,7 @@ DEFINE CLKGEN_CONFIG_EXTRA_ENABLE=3DTRUE # TRUE - HPET= timer is used. # FALSE - 8254 timer is used. # -DEFINE USE_HPET_TIMER =3D FALSE +DEFINE USE_HPET_TIMER =3D TRUE =20 =20 # diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/Plat= formPkgGcc.fdf index 25141eb44b..102ba46c5b 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -133,7 +133,7 @@ FILE =3D $(WORKSPACE)/Vlv2TbltDevicePkg/Stitch/Gcc/NvS= torageFtwSpare.bin =20 $(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE) gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.P= cdFlashFvFspSize - FILE =3D Vlv2MiscBinariesPkg/FspBinary/FvFsp.bin + FILE =3D Vlv2SocBinPkg/FspBinary/FvFsp.bin =20 =20 $(FLASH_REGION_AZALIABIN_OFFSET)|$(FLASH_REGION_AZALIABIN_SIZE) @@ -417,7 +417,11 @@ INF MdeModulePkg/Universal/SecurityStubDxe/SecuritySt= ubDxe.inf INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf +!if $(ARCH) =3D=3D IA32 +INF USE=3DIA32 MdeModulePkg/Logo/Logo.inf !else INF USE=3DX64 MdeModulePkg/Logo/Logo.inf +!endif INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.in= f @@ -521,7 +525,7 @@ INF $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramS= aveInfoHandlerSmm.inf INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf FILE DRIVER =3D FF0C8745-3270-4439-B74F-3E45F8C77064 { SECTION DXE_DEPEX_EXP =3D {gPlatformGOPPolicyGuid} - SECTION PE32 =3D Vlv2MiscBinariesPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(D= XE_ARCHITECTURE)/IntelGopDriver.efi + SECTION PE32 =3D=20 + Vlv2SocBinPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(DXE_ARCHITECTURE)/Intel + GopDriver.efi SECTION UI =3D "IntelGopDriver" } !endif @@ -636,10 +640,6 @@ INF $(PLATFORM_PACKAGE)/SmBiosMiscDxe/SmBiosMiscDxe.i= nf =20 INF RuleOverride =3D BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE= )$(TARGET)/$(DXE_ARCHITECTURE)/SmbiosMemory.inf =20 - # - # Legacy Modules - # -INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf =20 # # FAT file system @@ -660,7 +660,7 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamic= Command.inf =20 !if $(GOP_DRIVER_ENABLE) =3D=3D TRUE FILE FREEFORM =3D 878AC2CC-5343-46F2-B563-51F89DAF56BA { - SECTION RAW =3D Vlv2MiscBinariesPkg/GOP/7.2.1011/VBT/MNW2/Vbt.bin + SECTION RAW =3D Vlv2SocBinPkg/GOP/7.2.1011/VBT/MNW2/Vbt.bin SECTION UI =3D "IntelGopVbt" } !endif @@ -670,7 +670,7 @@ FILE FREEFORM =3D 878AC2CC-5343-46F2-B563-51F89DAF56BA= { # !if $(NETWORK_ENABLE) =3D=3D TRUE FILE DRIVER =3D 22DE1691-D65D-456a-993E-A253DD1F308C { - SECTION PE32 =3D Vlv2MiscBinariesPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTU= RE)/RtkUndiDxe.efi + SECTION PE32 =3D=20 + Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi SECTION UI =3D "UNDI" } INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/P= latformPkgGccX64.dsc index cd5aff4669..b3642c5c7a 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -26,7 +26,7 @@ # DEFINE PLATFORM_PACKAGE =3D Vlv2TbltDevicePkg DEFINE PLATFORM_RC_PACKAGE =3D Vlv2DeviceRefCodePkg - DEFINE PLATFORM_BINARY_PACKAGE =3D Vlv2BinaryPkg + DEFINE PLATFORM_BINARY_PACKAGE =3D Vlv2SocBinPkg OUTPUT_DIRECTORY =3D Build/$(PLATFORM_PACKAGE) SUPPORTED_ARCHITECTURES =3D IA32|X64 BUILD_TARGETS =3D DEBUG|RELEASE @@ -1424,15 +1424,12 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TA= RGET)/IA32/fTPMInitPeim.inf # # CPU/FW Microde # - Vlv2MiscBinariesPkg/Microcode/MicrocodeUpdates.inf { + Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf { *_*_*_GENFW_FLAGS =3D -a 0x800 -p 0xFF } =20 =20 - PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf - - !if $(NETWORK_ENABLE) =3D=3D TRUE !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE NetworkPkg/IScsiDxe/IScsiDxe.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/Pla= tformPkgIA32.dsc index 5735bcb9a9..28e6f5a181 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -1420,8 +1420,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARG= ET)/IA32/fTPMInitPeim.inf } =20 =20 - PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf - =20 !if $(NETWORK_ENABLE) =3D=3D TRUE !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/Plat= formPkgX64.dsc index 45675e1d57..f9ba56ef4b 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -1432,8 +1432,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARG= ET)/IA32/fTPMInitPeim.inf } =20 =20 - PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf - =20 !if $(NETWORK_ENABLE) =3D=3D TRUE !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE -- 2.19.1.windows.1 --=20 Qian Yi