From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.506.1572645331176522144 for ; Fri, 01 Nov 2019 14:55:31 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Nov 2019 14:55:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,257,1569308400"; d="scan'208";a="206515932" Received: from orsmsx107.amr.corp.intel.com ([10.22.240.5]) by FMSMGA003.fm.intel.com with ESMTP; 01 Nov 2019 14:55:29 -0700 Received: from orsmsx159.amr.corp.intel.com (10.22.240.24) by ORSMSX107.amr.corp.intel.com (10.22.240.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 1 Nov 2019 14:55:29 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.28]) by ORSMSX159.amr.corp.intel.com ([169.254.11.61]) with mapi id 14.03.0439.000; Fri, 1 Nov 2019 14:55:29 -0700 From: "Nate DeSimone" To: "Agyeman, Prince" , "devel@edk2.groups.io" CC: "Kubacki, Michael A" , "Chiu, Chasel" Subject: Re: [edk2-platforms] [PATCH 2/5] Platform/Intel: Move Sio Dxe Driver Thread-Topic: [edk2-platforms] [PATCH 2/5] Platform/Intel: Move Sio Dxe Driver Thread-Index: AQHVkO3CiEizsman+EiQnHGU3r6tead23EUQ Date: Fri, 1 Nov 2019 21:55:29 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AB5B97659@ORSMSX113.amr.corp.intel.com> References: <20191101195116.23212-1-prince.agyeman@intel.com> <20191101195116.23212-3-prince.agyeman@intel.com> In-Reply-To: <20191101195116.23212-3-prince.agyeman@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZmNhOWUwM2EtNWI4OC00MTdmLWFmOTctYzRmMDEwMjk2M2YzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiazJyaGxtenRHbTE1bHRYZHhnWjBGK2QwRHpTdE9sSWdSS3h1Sk02WlNMaW1CV3ZJRVNQMXhFTXRodkJ5dGlZaCJ9 x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Return-Path: nathaniel.l.desimone@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: Agyeman, Prince =20 Sent: Friday, November 1, 2019 12:51 PM To: devel@edk2.groups.io Cc: Kubacki, Michael A ; Chiu, Chasel ; Desimone, Nathaniel L Subject: [edk2-platforms] [PATCH 2/5] Platform/Intel: Move Sio Dxe Driver Moved LegacySioDxe from SimicsOpenBoardPkg to BoardModulePkg as LegacySioDx= e is generic and can be shared between open board packages Removed unused libraries and functions in LegacySioDxe Pointed BoardX58Ich10 to the current LegacySioDxe location Cc: Michael Kubacki Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Prince Agyeman --- Platform/Intel/BoardModulePkg/BoardModulePkg.dsc | 1 + .../LegacySioDxe/ComponentName.c | 0 .../LegacySioDxe/ComponentName.h | 0 .../LegacySioDxe/LegacySioDxe.inf | 3 --- .../LegacySioDxe/Register.h | 0 .../LegacySioDxe/SioChip.c | 2 -- .../LegacySioDxe/SioChip.h | 10 ---------- .../LegacySioDxe/SioDriver.c | 0 .../LegacySioDxe/SioDriver.h | 1 - .../LegacySioDxe/SioService.c | 0 .../LegacySioDxe/SioService.h | 0 .../SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc | 2 +- .../Simics= OpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf | 2 +- 13 files changed, 3 insertions(+), 18 deletions(-) rename Platform/Intel/= {SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDxe/ComponentName.c (100%= ) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySio= Dxe/ComponentName.h (100%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> = BoardModulePkg}/LegacySioDxe/LegacySioDxe.inf (92%) rename Platform/Intel/= {SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDxe/Register.h (100%) re= name Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDxe/S= ioChip.c (94%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModuleP= kg}/LegacySioDxe/SioChip.h (93%) rename Platform/Intel/{SimicsOpenBoardPkg= =3D> BoardModulePkg}/LegacySioDxe/SioDriver.c (100%) rename Platform/Inte= l/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDxe/SioDriver.h (95%) = rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDxe= /SioService.c (100%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardM= odulePkg}/LegacySioDxe/SioService.h (100%) diff --git a/Platform/Intel/BoardModulePkg/BoardModulePkg.dsc b/Platform/In= tel/BoardModulePkg/BoardModulePkg.dsc index 5ec68ceebf..fffc135d75 100644 --- a/Platform/Intel/BoardModulePkg/BoardModulePkg.dsc +++ b/Platform/Intel/BoardModulePkg/BoardModulePkg.dsc @@ -76,6 +76,7 @@ =20 [Components] BoardModulePkg/FirmwareBootMediaInfo/FirmwareBootMediaInfoPei.inf + BoardModulePkg/LegacySioDxe/LegacySioDxe.inf BoardModulePkg/Library/CmosAccessLib/CmosAccessLib.inf BoardModulePkg/Library/PlatformCmosAccessLibNull/PlatformCmosAccessLibNu= ll.inf =20 diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/ComponentName.c= b/Platform/Intel/BoardModulePkg/LegacySioDxe/ComponentName.c similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/ComponentName.c rename to Platform/Intel/BoardModulePkg/LegacySioDxe/ComponentName.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/ComponentName.h= b/Platform/Intel/BoardModulePkg/LegacySioDxe/ComponentName.h similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/ComponentName.h rename to Platform/Intel/BoardModulePkg/LegacySioDxe/ComponentName.h diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/LegacySioDxe.in= f b/Platform/Intel/BoardModulePkg/LegacySioDxe/LegacySioDxe.inf similarity index 92% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/LegacySioDxe.inf rename to Platform/Intel/BoardModulePkg/LegacySioDxe/LegacySioDxe.inf index 275f36ca47..d606ba43dc 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/LegacySioDxe.inf +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/LegacySioDxe.inf @@ -28,11 +28,8 @@ MemoryAllocationLib PcdLib DevicePathLib - IoLib UefiDriverEntryPoint UefiBootServicesTableLib - S3BootScriptLib - S3IoLib =20 [Packages] MdePkg/MdePkg.dec diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/Register.h b/Pl= atform/Intel/BoardModulePkg/LegacySioDxe/Register.h similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/Register.h rename to Platform/Intel/BoardModulePkg/LegacySioDxe/Register.h diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.c b/Pla= tform/Intel/BoardModulePkg/LegacySioDxe/SioChip.c similarity index 94% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.c rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.c index b9a7b9cd24..81efe3c38b 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.c +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.c @@ -7,9 +7,7 @@ **/ =20 #include "SioDriver.h" -#include =20 -LOCAL_IO_WRITE8 mIoWrite8 =3D IoWrite8; // // System configuration (setup) information // diff --git a/Platform/Inte= l/SimicsOpenBoardPkg/LegacySioDxe/SioChip.h b/Platform/Intel/BoardModulePkg= /LegacySioDxe/SioChip.h similarity index 93% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.h rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.h index 48e28c44b0..9322365923 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.h +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.h @@ -46,16 +46,6 @@ typedef struct { ACPI_RESOURCE_HEADER_PTR PossibleResources; } DEVICE_INFO; =20 - -/** - Initialize the SIO chip for S3. -**/ -VOID -SioInitForS3 ( - VOID - ); - - /** Return the supported devices. =20 diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioDriver.c b/P= latform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.c similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioDriver.c rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioDriver.h b/P= latform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.h similarity index 95% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioDriver.h rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.h index 2e75871f7f..8817019fbf 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioDriver.h +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioService.c b/= Platform/Intel/BoardModulePkg/LegacySioDxe/SioService.c similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioService.c rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioService.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioService.h b/= Platform/Intel/BoardModulePkg/LegacySioDxe/SioService.h similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioService.h rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioService.h diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.d= sc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc index 78f1e80990..f91f71e246 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc @@ -280,7 +280,7 @@ ####################################### $(BOARD_PKG)/AcpiTables/AcpiTables.inf $(BOARD_PKG)/AcpiTables/MinPlatformAcpiTables/AcpiPlatform.inf - $(BOARD_PKG)/LegacySioDxe/LegacySioDxe.inf + BoardModulePkg/LegacySioDxe/LegacySioDxe.inf $(BOARD_PKG)/SimicsDxe/SimicsDxe.inf $(BOARD_PKG)/SimicsVideoDxe/SimicsVideoDxe.inf $(BOARD_PKG)/SmbiosPlatformDxe/SmbiosPlatformDxe.inf diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.f= df b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf index 39226251a7..590e01a14e 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf @@ -213,7 +213,7 @@ INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf INF MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf =20 -INF $(BOARD_PKG)/LegacySioDxe/LegacySioDxe.inf +INF BoardModulePkg/LegacySioDxe/LegacySioDxe.inf INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf =20 INF $(BOARD_PKG)/SmbiosPlatformDxe/SmbiosPlatformDxe.inf -- 2.19.1.windows.1