From nobody Sat Apr 27 03:18:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49838+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49838+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572637879; cv=none; d=zoho.com; s=zohoarc; b=O2bScyqQq+EmpZHvF5Rj2xQhl4JdmPfGuuF4edB0SaKtiuBIforKnMZ8Vaoy6XRdaZRPOym1sV9n4fzK2OXiWK82AO5PfeOrg5IzDS3TjYTzZ5470fp1Eyr0WEY1oM1+9ExU+LtUZgQWlJiwyHkZzekJ987DhJfwV3Nkhtf4vqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572637879; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=+cfQnR0Eheak7HnZJzgT0qKZtnL3B/QRPfceFIlLNxk=; b=m7dlsjS+GLx4wl9LOawhAujUAroxLzYDBT6rV2sBmYyCjfF/eE6c5Ccr7atlmV4ccd4e7W5tR6rKLb7zFYjfHfFpJILW6Eo4R9pUzNZLrWQlD1OcSFfdcqqwJz+t+1YhYla0zuq6tztPZheoKcX2HnPLihReb6b8BttlnlUbdT8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49838+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572637879817307.74594337130895; Fri, 1 Nov 2019 12:51:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id TiTjYY1788612xDGPYAEbG3s; Fri, 01 Nov 2019 12:51:19 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web10.356.1572637877758667182 for ; Fri, 01 Nov 2019 12:51:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Nov 2019 12:51:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,256,1569308400"; d="scan'208";a="203952094" X-Received: from paagyema-desk2.amr.corp.intel.com ([10.24.15.58]) by orsmga003.jf.intel.com with ESMTP; 01 Nov 2019 12:51:16 -0700 From: "Agyeman, Prince" To: devel@edk2.groups.io Cc: Michael Kubacki , Chasel Chiu , Nate DeSimone Subject: [edk2-devel] [edk2-platforms] [PATCH 1/5] Platform/Intel: Add gBoardModulePkgTokenSpaceGuid Date: Fri, 1 Nov 2019 12:51:12 -0700 Message-Id: <20191101195116.23212-2-prince.agyeman@intel.com> In-Reply-To: <20191101195116.23212-1-prince.agyeman@intel.com> References: <20191101195116.23212-1-prince.agyeman@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,prince.agyeman@intel.com X-Gm-Message-State: BAbCRa9lJ5F0YlE1VvxIGb3hx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572637879; bh=loL3/JS+L8o6vJEHI4HVi5U6L1ePGJQc7Eg2K20tOPA=; h=Cc:Date:From:Reply-To:Subject:To; b=X7iredHlhrBSTDqygHqqIjWIHDkkuFDzazQe8ySLXnMnNFq3vgxQ6rVr8ByMteE4GHZ YKNwGinuDHXnFEBBU5SqI0/ffaVXHNXzuBNC9po1CcSCbJMFOWNGl3gqVaLebiqzkt1+k wniqPvZsQ+taZbtxZ5xQoGyZ5NE8rViqjZY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Added gBoardModulePkgTokenSpaceGuid to BoardModulePkg Added ps2 keyboard and Uart enable PCDs. Added PCDs to define IO ports for Uart1 and Uart2 Enabled KabylakeOpenBoardPkg and WhiskeylakeOpenBoardPkg boards to use the ps2 keyboard enable PCD. Cc: Michael Kubacki Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Prince Agyeman Reviewed-by: Nate DeSimone --- .../Intel/BoardModulePkg/BoardModulePkg.dec | 25 +++++++++++++++++++ .../BoardAcpiLib/DxeBoardAcpiTableLib.inf | 3 ++- .../DxeMultiBoardAcpiSupportLib.inf | 3 ++- .../GalagoPro3/OpenBoardPkgPcd.dsc | 5 ++++ .../BoardAcpiLib/DxeBoardAcpiTableLib.inf | 3 ++- .../DxeMultiBoardAcpiSupportLib.inf | 3 ++- .../KabylakeRvp3/OpenBoardPkgPcd.dsc | 5 ++++ .../KabylakeOpenBoardPkg/OpenBoardPkg.dec | 2 -- .../WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec | 1 - .../WhiskeylakeURvp/OpenBoardPkgPcd.dsc | 5 ++++ 10 files changed, 48 insertions(+), 7 deletions(-) diff --git a/Platform/Intel/BoardModulePkg/BoardModulePkg.dec b/Platform/In= tel/BoardModulePkg/BoardModulePkg.dec index f461cc7cab..26e662f711 100644 --- a/Platform/Intel/BoardModulePkg/BoardModulePkg.dec +++ b/Platform/Intel/BoardModulePkg/BoardModulePkg.dec @@ -42,3 +42,28 @@ =20 ## GUID to publish BIOS information HOB gBiosInfoGuid =3D { 0x09d0d15c, 0xe9f0, 0x4dfc, {0x9e, 0x0b, 0x39, 0x33,= 0x1f, 0xca, 0x66, 0x85} } + + ## {7F4EE1A3-C1F3-43E4-BA1A-39DCDE46C343} + gBoardModulePkgTokenSpaceGuid =3D { 0x7f4ee1a3, 0xc1f3, 0x43e4, { 0xba, = 0x1a, 0x39, 0xdc, 0xde, 0x46, 0xc3, 0x43 } } + +[PcdsFixedAtBuild] + ## PcdPs2KbMsEnable 0x0:Disable, 0x1:Enable + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable|0x00|UINT8|0x00000001 + + ## SuperIo Pci ISA Bridge info. It is an array that contains the Segment= , Bus, Device and Function + # information describing the PCI Device Info. The first byte is the seg= ment number, + # the second is the bus number, third byte is the device number, the fo= urth byte + # is the Function. + gBoardModulePkgTokenSpaceGuid.PcdSuperIoPciIsaBridgeDevice|{0xFF, 0xFF, = 0xFF, 0xFF}|VOID*|0x00000002 + + ## PcdUart1Enable 0x0:Disable, 0x1:Enable + gBoardModulePkgTokenSpaceGuid.PcdUart1Enable|0x00|UINT8|0x00000003 + gBoardModulePkgTokenSpaceGuid.PcdUart1IrqMask|0x0010|UINT16|0x00000004 + gBoardModulePkgTokenSpaceGuid.PcdUart1IoPort|0x03F8|UINT16|0x00000005 + gBoardModulePkgTokenSpaceGuid.PcdUart1Length|0x08|UINT8|0x00000006 + + ## PcdUart2Enable 0x0:Disable, 0x1:Enable + gBoardModulePkgTokenSpaceGuid.PcdUart2Enable|0x00|UINT8|0x00000007 + gBoardModulePkgTokenSpaceGuid.PcdUart2IrqMask|0x0008|UINT16|0x00000008 + gBoardModulePkgTokenSpaceGuid.PcdUart2IoPort|0x02F8|UINT16|0x00000009 + gBoardModulePkgTokenSpaceGuid.PcdUart2Length|0x08|UINT8|0x0000000A diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAc= piLib/DxeBoardAcpiTableLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/Galago= Pro3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf index a79bdcdbc6..35cd5c8fdb 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/D= xeBoardAcpiTableLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/D= xeBoardAcpiTableLib.inf @@ -33,9 +33,10 @@ MinPlatformPkg/MinPlatformPkg.dec KabylakeOpenBoardPkg/OpenBoardPkg.dec KabylakeSiliconPkg/SiPkg.dec + BoardModulePkg/BoardModulePkg.dec =20 [Pcd] - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable gMinPlatformPkgTokenSpaceGuid.PcdPciExpNative gMinPlatformPkgTokenSpaceGuid.PcdNativeAspmEnable gMinPlatformPkgTokenSpaceGuid.PcdLowPowerS0Idle diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAc= piLib/DxeMultiBoardAcpiSupportLib.inf b/Platform/Intel/KabylakeOpenBoardPkg= /GalagoPro3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf index db8ba7a822..9fe27f9fda 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/D= xeMultiBoardAcpiSupportLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/D= xeMultiBoardAcpiSupportLib.inf @@ -34,9 +34,10 @@ MinPlatformPkg/MinPlatformPkg.dec KabylakeOpenBoardPkg/OpenBoardPkg.dec KabylakeSiliconPkg/SiPkg.dec + BoardModulePkg/BoardModulePkg.dec =20 [Pcd] - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd= .dsc b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc index c68b8a49cf..4550a4e0b5 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc @@ -308,6 +308,11 @@ gMinPlatformPkgTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x03, 0x0F= , 0x07, 0x1F, 0x1F, 0x0F, 0x0F, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00} !endif =20 + ###################################### + # Board Configuration + ###################################### + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable|1 + [PcdsFixedAtBuild.IA32] ###################################### # Edk2 Configuration diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/Board= AcpiLib/DxeBoardAcpiTableLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/Kaby= lakeRvp3/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf index bfb58e868f..e0bf5823d8 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib= /DxeBoardAcpiTableLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib= /DxeBoardAcpiTableLib.inf @@ -33,9 +33,10 @@ MinPlatformPkg/MinPlatformPkg.dec KabylakeOpenBoardPkg/OpenBoardPkg.dec KabylakeSiliconPkg/SiPkg.dec + BoardModulePkg/BoardModulePkg.dec =20 [Pcd] - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/Board= AcpiLib/DxeMultiBoardAcpiSupportLib.inf b/Platform/Intel/KabylakeOpenBoardP= kg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf index 00cdbe80ce..e5de9268e7 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib= /DxeMultiBoardAcpiSupportLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib= /DxeMultiBoardAcpiSupportLib.inf @@ -34,9 +34,10 @@ MinPlatformPkg/MinPlatformPkg.dec KabylakeOpenBoardPkg/OpenBoardPkg.dec KabylakeSiliconPkg/SiPkg.dec + BoardModulePkg/BoardModulePkg.dec =20 [Pcd] - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgP= cd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d= sc index 34cc731313..8728586bfd 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc @@ -324,6 +324,11 @@ gMinPlatformPkgTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x03, 0x0F= , 0x07, 0x1F, 0x1F, 0x0F, 0x0F, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00} !endif =20 + ###################################### + # Board Configuration + ###################################### + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable|0 + [PcdsFixedAtBuild.IA32] ###################################### # Edk2 Configuration diff --git a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec b/Platfor= m/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec index 9680e63bad..01d6116616 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec +++ b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec @@ -288,8 +288,6 @@ gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTab= leSize|0|UINT16|0x0000001 # Misc gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent|FALSE|BOOLEAN|0x0= 00000EC =20 - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable|1|UINT8|0x40000009 - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiSleepState|1|UINT8|0x40000002 gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHibernate|1|UINT8|0x40000003 gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|0x40000004 diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec b/Plat= form/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec index 34494d0168..fbb9549e44 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec @@ -271,7 +271,6 @@ gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHibernate= |1|UINT8|0x40000003 gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|0x40000004 gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative|0|UINT8|0x40000005 gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable|1|UINT8|0x40000= 006 -gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable|0|UINT8|0x40000009 gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisableActiveTripPoints|1|UINT8|= 0x4000000A gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisablePassiveTripPoints|0|UINT8= |0x4000000B gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisableCriticalTripPoints|1|UINT= 8|0x4000000C diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoa= rdPkgPcd.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenB= oardPkgPcd.dsc index adbd48f6d7..805013429e 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPc= d.dsc +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPc= d.dsc @@ -296,6 +296,11 @@ gMinPlatformPkgTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x03, 0x0F= , 0x07, 0x1F, 0x1F, 0x0F, 0x0F, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00} !endif =20 + ###################################### + # Board Configuration + ###################################### + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable|0 + [PcdsFixedAtBuild.IA32] ###################################### # Edk2 Configuration --=20 2.19.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49838): https://edk2.groups.io/g/devel/message/49838 Mute This Topic: https://groups.io/mt/40479681/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 03:18:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49839+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49839+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572637879; cv=none; d=zoho.com; s=zohoarc; b=a6xc5XLvByZBRMmxkoy0hFrqytngIC9J9bjK/1mzbPPehTPVNB6cEkJiGLhg1llxyoe63FxOS0ySfCMGJldPjxaekJpvLhI0nyIIj4EwrZirMKDYFMJGGxTXqt09rFCfsjjc17rlusQMcLA2cJbUZF/HyDAaqYM+PN3uWQ6OpLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572637879; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=cTR1X22gaSIlwYcvXlw8DWbJ+DeXUyoqC2HxBnJtrOs=; b=X2qm2t1RrifgE3gdcKasMq8zVuqBCVNS+Fg2/ra8LgkJYsuFzrwPL33tmim4NU8D3Qqm7kfugOMAg1XrWIPcoT4FCW0QI4epEf7nxBEr7g6fZ/PYPgFebJ1sTqy3MQTh4xsQX3rXlGSxmndruu2jA1C/Q4YNhicnHNcMVhlgrCo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49839+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572637879819954.6006172511303; Fri, 1 Nov 2019 12:51:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZNaqYY1788612xQZKwZjWBgU; Fri, 01 Nov 2019 12:51:19 -0700 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web09.350.1572637878422956207 for ; Fri, 01 Nov 2019 12:51:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Nov 2019 12:51:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,256,1569308400"; d="scan'208";a="203952097" X-Received: from paagyema-desk2.amr.corp.intel.com ([10.24.15.58]) by orsmga003.jf.intel.com with ESMTP; 01 Nov 2019 12:51:16 -0700 From: "Agyeman, Prince" To: devel@edk2.groups.io Cc: Michael Kubacki , Chasel Chiu , Nate DeSimone Subject: [edk2-devel] [edk2-platforms] [PATCH 2/5] Platform/Intel: Move Sio Dxe Driver Date: Fri, 1 Nov 2019 12:51:13 -0700 Message-Id: <20191101195116.23212-3-prince.agyeman@intel.com> In-Reply-To: <20191101195116.23212-1-prince.agyeman@intel.com> References: <20191101195116.23212-1-prince.agyeman@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,prince.agyeman@intel.com X-Gm-Message-State: lt7wLnWk1cqCC6t9wA51SXKBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572637879; bh=UI0hM+5MbQXILTUcAe/BXzIdK9A0IMspKmw9+QOc9g8=; h=Cc:Date:From:Reply-To:Subject:To; b=M/VcqnhN/qaFl54VfIMEhnRkXLujObRgAOe8DU3GZ/rqicZnin/v8f8Dz+eurEn5KUk Eine7aPgKh6MOzUz/tt3hqHta1w7izmh/8eVUUDRh2foptFk4Z/fslb5KMRnZa6GITAGr u8cFrq726wZH/ecYCY8XxZpNsbyNqsRV/TQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Moved LegacySioDxe from SimicsOpenBoardPkg to BoardModulePkg as LegacySioDxe 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 Reviewed-by: Nate DeSimone --- 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 +- .../SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf | 2 +- 13 files changed, 3 insertions(+), 18 deletions(-) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDx= e/ComponentName.c (100%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDx= e/ComponentName.h (100%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDx= e/LegacySioDxe.inf (92%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDx= e/Register.h (100%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDx= e/SioChip.c (94%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDx= e/SioChip.h (93%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDx= e/SioDriver.c (100%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDx= e/SioDriver.h (95%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDx= e/SioService.c (100%) rename Platform/Intel/{SimicsOpenBoardPkg =3D> BoardModulePkg}/LegacySioDx= e/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/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.h b/Pla= tform/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 --=20 2.19.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49839): https://edk2.groups.io/g/devel/message/49839 Mute This Topic: https://groups.io/mt/40479682/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 03:18:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49840+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49840+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572637880; cv=none; d=zoho.com; s=zohoarc; b=LBTpz1SbL/9pj+CIOtMHNgihJu4QstvMp4BhLlu/HM/5ZRlRjZtXRz81PAttQ4Esfg0s67jLXpvb2K7xXRxla5GlyBlr1VSfwRxdiExrD8euLjSEx2o5bJUKqY+FPuw/cgjdZRrQtHxTRrkE/K8oyQAxrp++ZXH3GI1iLxfOtUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572637880; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ZQenSySGb4rWmZhhcPjWiyA7yQJkGoBI1K39q6KjGkg=; b=GkNKxN2nrfhqA/Mz4n89rtrhid2TkDgxAK2NpgE/UqL/ZbhPiTXFYG6Ds5eA/7JaNDZi+3jf3/yBsp1xVlTFfsUXuwf9cXfA9yq9z5awM6Gxpw4NBLzhV3fAVQ1tMUAMldYb+lJDPV5LVRTzdD1a1G11ScBvCWKhZzefoq+wLA0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49840+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572637880531106.63910423171308; Fri, 1 Nov 2019 12:51:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Ey5uYY1788612xig3b1XTQvf; Fri, 01 Nov 2019 12:51:19 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web10.356.1572637877758667182 for ; Fri, 01 Nov 2019 12:51:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Nov 2019 12:51:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,256,1569308400"; d="scan'208";a="203952100" X-Received: from paagyema-desk2.amr.corp.intel.com ([10.24.15.58]) by orsmga003.jf.intel.com with ESMTP; 01 Nov 2019 12:51:17 -0700 From: "Agyeman, Prince" To: devel@edk2.groups.io Cc: Michael Kubacki , Chasel Chiu , Nate DeSimone Subject: [edk2-devel] [edk2-platforms] [PATCH 3/5] BoardModulePkg: Added Pcds Sio Driver Date: Fri, 1 Nov 2019 12:51:14 -0700 Message-Id: <20191101195116.23212-4-prince.agyeman@intel.com> In-Reply-To: <20191101195116.23212-1-prince.agyeman@intel.com> References: <20191101195116.23212-1-prince.agyeman@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,prince.agyeman@intel.com X-Gm-Message-State: m2uRuox4WSzQPsRDPJ2X2lHjx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572637879; bh=B6TMyFuq2RyA0062LwCY3ZgVSLKLru92JesQAq524d8=; h=Cc:Date:From:Reply-To:Subject:To; b=qE8nnB4I2504Umb2dG2T4GfZb5/C2R9OyElL4pPKlhRB+lzRFPStUKpD/Da5D6BccVz dnN1uRZ414cp3YcEROT41GKoC9/i0c6m43ODcB/mPS+zPNW57ua+6LjwLrwwcfxJ3CqQa tw3Av/XY0mf0m84f2XMaKP7KZLLpYMuXulc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Included PCDs to the Sio dxe driver, to allow the enable/disable of Ps2 keyboard/mouse, UART1 and UART2 com ports. Renamed the Sio driver's base name Cc: Michael Kubacki Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Prince Agyeman Reviewed-by: Nate DeSimone --- .../LegacySioDxe/LegacySioDxe.inf | 15 +++- .../BoardModulePkg/LegacySioDxe/SioChip.c | 69 +++++++++++++++++-- .../BoardModulePkg/LegacySioDxe/SioChip.h | 10 +++ .../BoardModulePkg/LegacySioDxe/SioDriver.c | 42 ++++++++++- .../BoardX58Ich10/OpenBoardPkgPcd.dsc | 6 ++ 5 files changed, 133 insertions(+), 9 deletions(-) diff --git a/Platform/Intel/BoardModulePkg/LegacySioDxe/LegacySioDxe.inf b/= Platform/Intel/BoardModulePkg/LegacySioDxe/LegacySioDxe.inf index d606ba43dc..4ab01a6098 100644 --- a/Platform/Intel/BoardModulePkg/LegacySioDxe/LegacySioDxe.inf +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/LegacySioDxe.inf @@ -10,7 +10,7 @@ =20 [Defines] INF_VERSION =3D 0x00010017 - BASE_NAME =3D HitachiH8s2113Dxe + BASE_NAME =3D LegacySioDxe FILE_GUID =3D 7807E404-8281-4FF1-8457-0B54BABE263F VERSION_STRING =3D 1.0 MODULE_TYPE =3D UEFI_DRIVER @@ -34,6 +34,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + BoardModulePkg/BoardModulePkg.dec =20 [Sources] SioChip.c @@ -44,6 +45,18 @@ SioDriver.h ComponentName.c =20 +[Pcd] + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable + gBoardModulePkgTokenSpaceGuid.PcdUart1Enable + gBoardModulePkgTokenSpaceGuid.PcdUart1IrqMask + gBoardModulePkgTokenSpaceGuid.PcdUart1IoPort + gBoardModulePkgTokenSpaceGuid.PcdUart1Length + gBoardModulePkgTokenSpaceGuid.PcdUart2Enable + gBoardModulePkgTokenSpaceGuid.PcdUart2IrqMask + gBoardModulePkgTokenSpaceGuid.PcdUart2IoPort + gBoardModulePkgTokenSpaceGuid.PcdUart2Length + gBoardModulePkgTokenSpaceGuid.PcdSuperIoPciIsaBridgeDevice + [Protocols] gEfiPciIoProtocolGuid ## CONSUMES gEfiDevicePathProtocolGuid ## PRODUCES diff --git a/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.c b/Platfor= m/Intel/BoardModulePkg/LegacySioDxe/SioChip.c index 81efe3c38b..09403a7354 100644 --- a/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.c +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.c @@ -19,12 +19,31 @@ ACPI_SIO_RESOURCES_IO_IRQ mCom1Resources =3D { { { ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR }, - 0x3f8, - 8 + FixedPcdGet16 (PcdUart1IoPort), + FixedPcdGet8 (PcdUart1Length) + }, + { + { ACPI_IRQ_NOFLAG_DESCRIPTOR }, + FixedPcdGet16 (PcdUart1IrqMask) + }, + { + ACPI_END_TAG_DESCRIPTOR, + 0 + } +}; + +// +// COM 2 UART Controller +// +ACPI_SIO_RESOURCES_IO_IRQ mCom2Resources =3D { + { + { ACPI_FIXED_LOCATION_IO_PORT_DESCRIPTOR }, + FixedPcdGet16 (PcdUart2IoPort), + FixedPcdGet8 (PcdUart2Length) }, { { ACPI_IRQ_NOFLAG_DESCRIPTOR }, - BIT4 // IRQ4 + FixedPcdGet16 (PcdUart2IrqMask), }, { ACPI_END_TAG_DESCRIPTOR, @@ -70,10 +89,12 @@ ACPI_SIO_RESOURCES_IO_IRQ mMouseResources =3D { } }; =20 + // // Table of SIO Controllers // DEVICE_INFO mDeviceInfo[] =3D { +#if FixedPcdGet8 (PcdUart1Enable) =3D=3D DEVICE_ENABLED { { EISA_PNP_ID(0x501), @@ -84,6 +105,20 @@ DEVICE_INFO mDeviceInfo[] =3D { { (ACPI_SMALL_RESOURCE_HEADER *) &mCom1Resources }, { (ACPI_SMALL_RESOURCE_HEADER *) &mCom1Resources } }, // COM 1 UART Controller +#endif +#if FixedPcdGet8 (PcdUart2Enable) =3D=3D DEVICE_ENABLED + { + { + EISA_PNP_ID(0x501), + 0 + }, + 0, + RESOURCE_IO | RESOURCE_IRQ, + { (ACPI_SMALL_RESOURCE_HEADER *) &mCom2Resources }, + { (ACPI_SMALL_RESOURCE_HEADER *) &mCom2Resources } + }, // COM 2 UART Controller +#endif +#if FixedPcdGet8 (PcdPs2KbMsEnable) =3D=3D DEVICE_ENABLED { { EISA_PNP_ID(0x303), @@ -103,10 +138,28 @@ DEVICE_INFO mDeviceInfo[] =3D { 0, // Cannot change resource { (ACPI_SMALL_RESOURCE_HEADER *) &mMouseResources }, { (ACPI_SMALL_RESOURCE_HEADER *) &mMouseResources } - } // PS/2 Mouse Controller + }, // PS/2 Mouse Controller +#endif + DEVICE_INFO_END }; =20 =20 + +/** + Gets the number of devices in Table of SIO Controllers mDeviceInfo + + @retval Number of enabled devices in Table of SIO Controllers. +**/ +UINTN +EFIAPI +GetDeviceCount( + VOID +){ + UINTN Count; + Count =3D ARRAY_SIZE(mDeviceInfo) - 1; // -1 to account for for the end= device info + return Count; +} + /** Return the supported devices. =20 @@ -128,7 +181,7 @@ DeviceGetList ( // // Allocate enough memory for simplicity // - DeviceCount =3D sizeof (mDeviceInfo) / sizeof (mDeviceInfo[0]); + DeviceCount =3D GetDeviceCount(); LocalDevices =3D AllocatePool (sizeof (EFI_SIO_ACPI_DEVICE_ID) * DeviceC= ount); ASSERT (LocalDevices !=3D NULL); if (LocalDevices =3D=3D NULL) { @@ -157,7 +210,6 @@ SioInit ( VOID ) { - return EFI_SUCCESS; } =20 @@ -175,8 +227,11 @@ DeviceSearch ( ) { UINTN Index; + UINTN DeviceCount; + + DeviceCount =3D GetDeviceCount(); =20 - for (Index =3D 0; Index < sizeof (mDeviceInfo) / sizeof (mDeviceInfo[0])= ; Index++) { + for (Index =3D 0; Index < DeviceCount; Index++) { if (CompareMem (Device, &mDeviceInfo[Index].Device, sizeof (*Device)) = =3D=3D 0) { return &mDeviceInfo[Index]; } diff --git a/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.h b/Platfor= m/Intel/BoardModulePkg/LegacySioDxe/SioChip.h index 9322365923..8bd53ccdd6 100644 --- a/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.h +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.h @@ -24,6 +24,9 @@ UINT8 #define RESOURCE_DMA BIT2 #define RESOURCE_MEM BIT3 =20 +#define DEVICE_ENABLED 0x01 +#define DEVICE_INFO_END { { 0xFFFFFFFF, 0xFFFFFFFF } } + #pragma pack(1) =20 typedef struct { @@ -46,6 +49,13 @@ typedef struct { ACPI_RESOURCE_HEADER_PTR PossibleResources; } DEVICE_INFO; =20 +typedef struct { + UINT8 Segment; + UINT8 Bus; + UINT8 Device; + UINT8 Funtion; +} SIO_PCI_ISA_BRIDGE_DEVICE_INFO; + /** Return the supported devices. =20 diff --git a/Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.c b/Platf= orm/Intel/BoardModulePkg/LegacySioDxe/SioDriver.c index 408c6ff301..5ab9109ad9 100644 --- a/Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.c +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.c @@ -8,7 +8,6 @@ =20 #include "SioDriver.h" =20 - // // This driver is for ACPI(PNP0A03,0)/PCI(0x1f,0) // @@ -106,6 +105,27 @@ SioDriverEntryPoint ( } =20 =20 +/** + Compares a PCI to ISA bridge device segment, bus, device and function to= the + PcdSuperIoPciIsaBridgeDevice values. + + @param[in] CurrentDevice The device to be compared with the PcdSu= perIoPciIsaBridgeDevice information + @retval TRUE This device matches PcdSuperIoPciIsaBrid= geDevice values + @retval FALSE This device does not match the PcdSuperI= oPciIsaBridgeDevice values +**/ +BOOLEAN +EFIAPI +SioDeviceEnabled ( + IN SIO_PCI_ISA_BRIDGE_DEVICE_INFO *CurrentDevice +){ + SIO_PCI_ISA_BRIDGE_DEVICE_INFO *Device =3D \ + (SIO_PCI_ISA_BRIDGE_DEVICE_INFO *) FixedPcdGetPtr (PcdSuperIoPciIsaB= ridgeDevice); + if(CompareMem (Device, CurrentDevice, sizeof (SIO_PCI_ISA_BRIDGE_DEVIC= E_INFO)) =3D=3D 0) { + return TRUE; + } + return FALSE; +} + /** Test to see if this driver supports Controller Handle. =20 @@ -138,6 +158,7 @@ SioDriverSupported ( UINTN BusNumber; UINTN DeviceNumber; UINTN FunctionNumber; + SIO_PCI_ISA_BRIDGE_DEVICE_INFO SioDevice; =20 // // If RemainingDevicePath is not NULL, it should verify that the first d= evice @@ -250,6 +271,25 @@ SioDriverSupported ( Status =3D EFI_UNSUPPORTED; } } + + if(!EFI_ERROR (Status)) { + Status =3D PciIo->GetLocation ( + PciIo, + &SegmentNumber, + &BusNumber, + &DeviceNumber, + &FunctionNumber + ); + if(!EFI_ERROR (Status)) { + SioDevice.Segment =3D (UINT8) SegmentNumber; + SioDevice.Bus =3D (UINT8) BusNumber; + SioDevice.Device =3D (UINT8) DeviceNumber; + SioDevice.Funtion =3D (UINT8) FunctionNumber; + if(!SioDeviceEnabled (&SioDevice)) { + Status =3D EFI_UNSUPPORTED; + } + } + } } } =20 diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPc= d.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc index 0298e4b12d..b85991b772 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc @@ -196,6 +196,12 @@ gMinPlatformPkgTokenSpaceGuid.PcdMaxCpuThreadCount|4 gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicAddressBase|0xFEC01000 =20 + ###################################### + # Board Configuration + ###################################### + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable|1 + gBoardModulePkgTokenSpaceGuid.PcdSuperIoPciIsaBridgeDevice|{0x00,0x00,0x= 1F,0x00} + [PcdsFixedAtBuild.X64] ###################################### # Edk2 Configuration --=20 2.19.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49840): https://edk2.groups.io/g/devel/message/49840 Mute This Topic: https://groups.io/mt/40479683/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 03:18:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49841+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49841+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572637880; cv=none; d=zoho.com; s=zohoarc; b=Xpo14D2TDnuP3Fan2rvPp1FzSIlfoUZ/Onk+hoaAzSCs1zGaMKrUJp6Vn6qXOLEEOnKONhhGdUlilRgOkaRdWusCKfUT9eoLxe7Ve12DwJ1JwtbU6+cmSkxsBhaLlno0gUXIF+uyfwccC/qudbUf9NEyXZWuH4ot0nTxt/A72XM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572637880; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=kDbSNd/RDhHAjSxyAy1RK368yih5NEi9yRHk3PXMCeo=; b=UfTNTREIwS6pMn2+2JWQOadoiT8my62LHp5RhQp6YEX0XBrfs//ToWO4mSFyWCxzjI57YXpHc2mZudXFxi3QPmBBAFXeG2ZQcjcm3HeJN+aMPtBSRrXVG1QQviQqJFsCzT+zMqUGZyRFCwWVEvXuVqu27DdYkSfYKmDGpTTi5Wk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49841+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572637880912681.4489088113319; Fri, 1 Nov 2019 12:51:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id MJkjYY1788612xB76QORa06Z; Fri, 01 Nov 2019 12:51:19 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web09.350.1572637878422956207 for ; Fri, 01 Nov 2019 12:51:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Nov 2019 12:51:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,256,1569308400"; d="scan'208";a="203952104" X-Received: from paagyema-desk2.amr.corp.intel.com ([10.24.15.58]) by orsmga003.jf.intel.com with ESMTP; 01 Nov 2019 12:51:17 -0700 From: "Agyeman, Prince" To: devel@edk2.groups.io Cc: Michael Kubacki , Chasel Chiu , Nate DeSimone Subject: [edk2-devel] [edk2-platforms] [PATCH 4/5] KabylakeOpenBoardPkg: Add Ps2 keyboard Null Library Date: Fri, 1 Nov 2019 12:51:15 -0700 Message-Id: <20191101195116.23212-5-prince.agyeman@intel.com> In-Reply-To: <20191101195116.23212-1-prince.agyeman@intel.com> References: <20191101195116.23212-1-prince.agyeman@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,prince.agyeman@intel.com X-Gm-Message-State: iUq4LqgYEkIhtDO9ybH6lDt0x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572637879; bh=XrDLz/RR1PcIyZah7RnptkAM5T118Sqq19lvvZ77JuY=; h=Cc:Date:From:Reply-To:Subject:To; b=J4thf4rLKb58bGRF4Dtc3AzrGSGhXpC4l37aUkqFCS7AqzNhr116fGjvi6DWWR9Ieb+ AW55/S6UuWP9x3qnvLhthsrXVJTk9BYhDTrAX+KrwH8dQyeAYRkDsTMFeZGC724L0DQzI y6dNHixoME5RWoV/MOn2WQ/fvw2r+webLEU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Added GalagoPro3 board ps2 keyboard library that adds ps2 device path to ConIn and ConInDev Uefi variables Cc: Michael Kubacki Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Prince Agyeman --- .../GalagoPro3/Library/Ps2KbcLib/Ps2KbcLib.c | 202 ++++++++++++++++++ .../GalagoPro3/Library/Ps2KbcLib/Ps2KbcLib.h | 65 ++++++ .../Library/Ps2KbcLib/Ps2KbcLib.inf | 39 ++++ 3 files changed, 306 insertions(+) create mode 100644 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/= Ps2KbcLib/Ps2KbcLib.c create mode 100644 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/= Ps2KbcLib/Ps2KbcLib.h create mode 100644 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/= Ps2KbcLib/Ps2KbcLib.inf diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/Ps2KbcL= ib/Ps2KbcLib.c b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/Ps2= KbcLib/Ps2KbcLib.c new file mode 100644 index 0000000000..ac1563d3cd --- /dev/null +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/Ps2KbcLib/Ps2K= bcLib.c @@ -0,0 +1,202 @@ +/** @file + Main file for NULL named library for Ps2 keyboard controller librarr. + + Copyright (c) 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include "Ps2KbcLib.h" + +GLOBAL_REMOVE_IF_UNREFERENCED PLATFORM_KEYBOARD_DEVICE_PATH gKeyboardDevi= cePath =3D { + gPciRootBridge, + { + { + HARDWARE_DEVICE_PATH, + HW_PCI_DP, + { + (UINT8) (sizeof (PCI_DEVICE_PATH)), + (UINT8) ((sizeof (PCI_DEVICE_PATH)) >> 8) + } + }, + 0, // Function, patched in EnumPs2Keyboard + 0 // Device, patched in EnumPs2Keyboard + }, + { + { + ACPI_DEVICE_PATH, + ACPI_DP, + { + (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), + (UINT8) ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8) + } + }, + EISA_PNP_ID(0x0303), + 0 + }, + gEndEntire +}; + +/** + Check if PS2 keyboard is conntected, by sending ECHO command. + @retval TRUE if connected FALSE otherwise +**/ +BOOLEAN +DetectPs2Keyboard ( + VOID + ) +{ + UINT32 TimeOut; + UINT32 RegEmptied; + UINT8 Data; + UINT32 SumTimeOut; + BOOLEAN FoundPs2Kbc; + + TimeOut =3D 0; + RegEmptied =3D 0; + FoundPs2Kbc =3D FALSE; + + // + // Wait for input buffer empty + // + for (TimeOut =3D 0; TimeOut < PS2_KEYBOARD_TIMEOUT; TimeOut +=3D 30) { + if ((IoRead8 (KEYBOARD_8042_STATUS_REGISTER) & 0x02) =3D=3D 0) { + FoundPs2Kbc =3D TRUE; + break; + } + MicroSecondDelay (30); + } + + if (FoundPs2Kbc =3D=3D FALSE) { + return FALSE; + } + + // + // Send echo command + // + IoWrite8 (KEYBOARD_8042_DATA_REGISTER, KBC_INPBUF_VIA60_KBECHO); + + // + // Init variables + // + FoundPs2Kbc =3D FALSE; + TimeOut =3D 0; + SumTimeOut =3D 0; + Data =3D 0; + + // + // Read from 8042 (multiple times if needed) + // until the expected value appears + // use SumTimeOut to control the iteration + // + while (1) { + // + // Perform a read + // + for (TimeOut =3D 0; TimeOut < PS2_KEYBOARD_TIMEOUT; TimeOut +=3D 30) { + if (IoRead8 (KEYBOARD_8042_STATUS_REGISTER) & 0x01) { + Data =3D IoRead8 (KEYBOARD_8042_DATA_REGISTER); + break; + } + MicroSecondDelay (30); + } + + SumTimeOut +=3D TimeOut; + + if (Data =3D=3D KBC_INPBUF_VIA60_KBECHO) { + FoundPs2Kbc =3D TRUE; + break; + } + + if (SumTimeOut >=3D PS2_KEYBOARD_WAITFORVALUE_TIMEOUT) { + break; + } + } + return FoundPs2Kbc; +} + +/** + Check if PS2 keyboard is conntected. If the result of first time is + error, it will retry again. + @retval TRUE if connected FALSE otherwise +**/ +BOOLEAN +IsPs2KeyboardConnected ( + VOID + ) +{ + BOOLEAN Result; + Result =3D DetectPs2Keyboard (); + + if (Result =3D=3D FALSE) { + // + // If there is no ps2 keyboard detected for the 1st time, retry again. + // + Result =3D DetectPs2Keyboard (); + } + return Result; +} + + +/** + Updates the ConIn variable with Ps2 Keyboard device path, + if it doesn't already exists in ConIn and ConInDev +**/ +VOID +AddPs2Keyboard ( + VOID + ) +{ + SIO_PCI_ISA_BRIDGE_DEVICE_INFO *SioIsaInfo; + + DEBUG ((DEBUG_INFO, "[AddPs2Keyboard]\n")); + + SioIsaInfo =3D (SIO_PCI_ISA_BRIDGE_DEVICE_INFO*) FixedPcdGetPtr (PcdSupe= rIoPciIsaBridgeDevice); + + // + // patch IsaBridge device and and function + // + gKeyboardDevicePath.IsaBridge.Device =3D SioIsaInfo->Device; + gKeyboardDevicePath.IsaBridge.Function =3D SioIsaInfo->Funtion; + + // + // Append Ps2 Keyboard into "ConIn" + // + EfiBootManagerUpdateConsoleVariable (ConIn, (EFI_DEVICE_PATH_PROTOCOL *)= &gKeyboardDevicePath, NULL); + + // + // Append Ps2 Keyboard into "ConInDev" + // + EfiBootManagerUpdateConsoleVariable (ConInDev, (EFI_DEVICE_PATH_PROTOCOL= *) &gKeyboardDevicePath, NULL); +} + + +/** + Constructor for the Ps2 keyboard controller library. + + @param ImageHandle the image handle of the process + @param SystemTable the EFI System Table pointer + + @retval EFI_SUCCESS the shell command handlers were installed suc= essfully + @retval EFI_UNSUPPORTED the shell level required was not found. +**/ +EFI_STATUS +EFIAPI +Ps2KbcLibConstructor ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + UINT8 Ps2KbMsEnable; + + Ps2KbMsEnable =3D PcdGet8 (PcdPs2KbMsEnable); + + if (Ps2KbMsEnable =3D=3D 0x1 + && IsPs2KeyboardConnected()) + { + // add ps2 device path to ConIn and ConInDev + AddPs2Keyboard (); + } + + return EFI_SUCCESS; +} diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/Ps2KbcL= ib/Ps2KbcLib.h b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/Ps2= KbcLib/Ps2KbcLib.h new file mode 100644 index 0000000000..60bba122d6 --- /dev/null +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/Ps2KbcLib/Ps2K= bcLib.h @@ -0,0 +1,65 @@ +/** @file + Header file for NULL named library for Ps2 keyboard controller library. + + Copyright (c) 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef _PS2_KBC_LIB_H +#define _PS2_KBC_LIB_H + +#include +#include +#include +#include +#include +#include +#include + +// +// Below is the platform console device path +// +typedef struct { + ACPI_HID_DEVICE_PATH PciRootBridge; + PCI_DEVICE_PATH IsaBridge; + ACPI_HID_DEVICE_PATH Keyboard; + EFI_DEVICE_PATH_PROTOCOL End; +} PLATFORM_KEYBOARD_DEVICE_PATH; + +typedef struct { + UINT8 Segment; + UINT8 Bus; + UINT8 Device; + UINT8 Funtion; +} SIO_PCI_ISA_BRIDGE_DEVICE_INFO; + +#define gPciRootBridge \ + { \ + { \ + ACPI_DEVICE_PATH, \ + ACPI_DP, \ + { \ + (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), \ + (UINT8) ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8) \ + }, \ + }, \ + EISA_PNP_ID (0x0A03), \ + 0 \ + } + +#define gEndEntire \ + { \ + END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { END_DEVICE_PAT= H_LENGTH, 0 } \ + } + +#define KBC_INPBUF_VIA60_KBECHO 0xEE +#define KEYBOARD_8042_DATA_REGISTER 0x60 +#define KEYBOARD_8042_STATUS_REGISTER 0x64 + +#define PS2_KEYBOARD_TIMEOUT 65536 // 0.07s +#define PS2_KEYBOARD_WAITFORVALUE_TIMEOUT 1000000 // 1s +#define PS2_KEYBOARD_KBEN 0xF4 +#define PS2_KEYBOARD_CMDECHO_ACK 0xFA + +#endif diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/Ps2KbcL= ib/Ps2KbcLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/P= s2KbcLib/Ps2KbcLib.inf new file mode 100644 index 0000000000..7ab1b628e3 --- /dev/null +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/Ps2KbcLib/Ps2K= bcLib.inf @@ -0,0 +1,39 @@ +## @file +# Component information file for PEI GalagoPro3 Board Init Pre-Mem Library +# +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## +[Defines] + INF_VERSION =3D 0x00010006 + BASE_NAME =3D Ps2KbcLib + FILE_GUID =3D E94EA52E-E84C-42E7-B863-EA1327EFA265 + MODULE_TYPE =3D UEFI_DRIVER + VERSION_STRING =3D 1.2 + LIBRARY_CLASS =3D NULL|UEFI_DRIVER + CONSTRUCTOR =3D Ps2KbcLibConstructor + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + KabylakeOpenBoardPkg/OpenBoardPkg.dec + BoardModulePkg/BoardModulePkg.dec + +[Sources] + Ps2KbcLib.c + Ps2KbcLib.h + +[LibraryClasses] + DevicePathLib + DebugLib + IoLib + UefiDriverEntryPoint + UefiBootManagerLib + UefiLib + TimerLib + +[Pcd] + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable + gBoardModulePkgTokenSpaceGuid.PcdSuperIoPciIsaBridgeDevice --=20 2.19.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49841): https://edk2.groups.io/g/devel/message/49841 Mute This Topic: https://groups.io/mt/40479685/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat Apr 27 03:18:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49842+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49842+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572637880; cv=none; d=zoho.com; s=zohoarc; b=B16l0zFw2yEi/g8dA3TjG24qyIpGLCfadE31lhMftW9N9LEpTP6PuJQJwKAzq1jgNpBLhz9pqlmwngU+sa+iJoeE/YONH/0WQv8Sz5axq4WJQlzn7EV4LhzkhbXjGqKfzLbw8uJcS0EcsCPquTVLOhkBOUxNW1Kmza0bKvb64co= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572637880; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=uwOJd3j0DlXYESvFDqvrxCF9srb7cZS76IHha6V8SNA=; b=nAn7lNQbPEaJgvltQK5HG4XBf4wDBqoEcatucE4ElwstHaMVA0iWFlk9WnVOlv/PmTqvRGruA4FXbhX0f4K4WPoXOpdVWTnkms5GpMqcI5OGs7cCGC6BVUaisS0a1A+Myq7aTgrvrk5CFOSd6ejdt1m+dL13uUXANA+3kD3oHtM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49842+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572637880383778.3255242464613; Fri, 1 Nov 2019 12:51:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6SODYY1788612xcjxP7mBGXh; Fri, 01 Nov 2019 12:51:19 -0700 X-Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web10.356.1572637877758667182 for ; Fri, 01 Nov 2019 12:51:19 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Nov 2019 12:51:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,256,1569308400"; d="scan'208";a="203952103" X-Received: from paagyema-desk2.amr.corp.intel.com ([10.24.15.58]) by orsmga003.jf.intel.com with ESMTP; 01 Nov 2019 12:51:17 -0700 From: "Agyeman, Prince" To: devel@edk2.groups.io Subject: [edk2-devel] [edk2-platforms] [PATCH 5/5] KabylakeOpenBoardPkg: Add Ps2 Keyboard Support Date: Fri, 1 Nov 2019 12:51:16 -0700 Message-Id: <20191101195116.23212-6-prince.agyeman@intel.com> In-Reply-To: <20191101195116.23212-1-prince.agyeman@intel.com> References: <20191101195116.23212-1-prince.agyeman@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,prince.agyeman@intel.com X-Gm-Message-State: rxoGwefZw3nqTG7BdalZw9Ssx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572637879; bh=B3GIt6ZHXkSjCE68dv/7kZ0ZVGLL4uXQVwD9eJHMDec=; h=Date:From:Reply-To:Subject:To; b=LpWTYrCINwJNM0Sqg6nN/0lsUIFTcI82ympuG3kXt5nhgV5yqhya9zy/aHOs54D2H4h vLdiTWqIXXbf9+aXvp39/TwfmTwzc7t5jpwxuCnrFn9aS+4VtethXj4ICN2WBbQsbnw4h S4bXjhi3P9Xr/6C1Xln7i2IuVebgMNcj08Y= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2228 Added Ps2Keyboard DXE driver. Added Sio dxe driver to publish the SIO protocol needed by the Ps2Keyboard DXE driver. Included a Ps2 null Library to BdsDxe driver to add the Ps2 device path to ConIn and ConInDev variables Configured the Super I/O Pci to Isa bridge bus, device, function device info PCD. This will help the Super I/O driver identify which bridge the Super I/O is connected to. Signed-off-by: Prince Agyeman --- .../Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc | 7 +++++++ .../Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf | 2 ++ .../KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc | 1 + 3 files changed, 10 insertions(+) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.ds= c b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc index f59248bba4..c6a0749458 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc @@ -311,6 +311,11 @@ MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf + MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf + MdeModulePkg/Universal/BdsDxe/BdsDxe.inf{ + + NULL|$(PROJECT)/Library/Ps2KbcLib/Ps2KbcLib.inf + } UefiCpuPkg/CpuDxe/CpuDxe.inf =20 ShellPkg/Application/Shell/Shell.inf { @@ -408,3 +413,5 @@ !endif } !endif + + BoardModulePkg/LegacySioDxe/LegacySioDxe.inf diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fd= f b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf index 80efab1aad..d58466d390 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf @@ -335,6 +335,8 @@ INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf INF MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf +INF BoardModulePkg/LegacySioDxe/LegacySioDxe.inf +INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf =20 INF ShellPkg/Application/Shell/Shell.inf =20 diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd= .dsc b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc index 4550a4e0b5..c6f5ae7534 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc @@ -312,6 +312,7 @@ # Board Configuration ###################################### gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable|1 + gBoardModulePkgTokenSpaceGuid.PcdSuperIoPciIsaBridgeDevice|{0x00, 0x00, = 0x1F, 0x00} =20 [PcdsFixedAtBuild.IA32] ###################################### --=20 2.19.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49842): https://edk2.groups.io/g/devel/message/49842 Mute This Topic: https://groups.io/mt/40479687/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-