This patch is missing the Cc. Please make sure to check it in the future. Reviewed-by: Michael Kubacki <michael.a.kuba...@intel.com>
> -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of > Agyeman, Prince > Sent: Tuesday, November 5, 2019 5:26 PM > To: devel@edk2.groups.io > Subject: [edk2-devel] [edk2-platforms] [Patch v2 7/9] > KabylakeOpenBoardPkg: Add Ps2 Keyboard Support > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2228 > > What was done: > > * Added BDS Ps2 keyboard DXE driver. > > * Added Super I/O DXE driver to publish the SIO protocol needed by the Ps2 > keyboard DXE driver. > > * Included a Ps2 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. > > * Removed duplicate Ps2 enable PCDs > > * Updated libraries to use Ps2 enable PCD defined in BoardModulePkg > > Signed-off-by: Prince Agyeman <prince.agye...@intel.com> > --- > .../Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf | 3 ++- > .../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf | 3 ++- > .../Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc | 7 > +++++++ .../Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf | > 2 ++ > .../KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc | 6 ++++++ > .../Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf | 3 ++- > .../Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf | 3 ++- > .../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc | 6 ++++++ > .../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf | 2 ++ > .../KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc | 7 > +++++++ > Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec | 2 -- > 11 files changed, 38 insertions(+), 6 deletions(-) > > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/ > DxeBoardAcpiTableLib.inf > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/ > DxeBoardAcpiTableLib.inf > index a79bdcdbc6..35cd5c8fdb 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/ > DxeBoardAcpiTableLib.inf > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLi > +++ b/DxeBoardAcpiTableLib.inf > @@ -33,9 +33,10 @@ > MinPlatformPkg/MinPlatformPkg.dec > KabylakeOpenBoardPkg/OpenBoardPkg.dec > KabylakeSiliconPkg/SiPkg.dec > + BoardModulePkg/BoardModulePkg.dec > > [Pcd] > - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable > + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable > gMinPlatformPkgTokenSpaceGuid.PcdPciExpNative > gMinPlatformPkgTokenSpaceGuid.PcdNativeAspmEnable > gMinPlatformPkgTokenSpaceGuid.PcdLowPowerS0Idle > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/ > DxeMultiBoardAcpiSupportLib.inf > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/ > DxeMultiBoardAcpiSupportLib.inf > index db8ba7a822..9fe27f9fda 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/ > DxeMultiBoardAcpiSupportLib.inf > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLi > +++ b/DxeMultiBoardAcpiSupportLib.inf > @@ -34,9 +34,10 @@ > MinPlatformPkg/MinPlatformPkg.dec > KabylakeOpenBoardPkg/OpenBoardPkg.dec > KabylakeSiliconPkg/SiPkg.dec > + BoardModulePkg/BoardModulePkg.dec > > [Pcd] > - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable > + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > index f59248bba4..55edc1a2f8 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/GraphicsOutputDx > e.inf > + MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > + MdeModulePkg/Universal/BdsDxe/BdsDxe.inf{ > + <LibraryClasses> > + NULL|BoardModulePkg/Library/BdsPs2KbcLib/BdsPs2KbcLib.inf > + } > UefiCpuPkg/CpuDxe/CpuDxe.inf > > ShellPkg/Application/Shell/Shell.inf { @@ -408,3 +413,5 @@ > !endif > } > !endif > + BoardModulePkg/LegacySioDxe/LegacySioDxe.inf > + > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf > 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/GraphicsOutputDx > e.inf > INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf > +INF BoardModulePkg/LegacySioDxe/LegacySioDxe.inf > +INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > INF ShellPkg/Application/Shell/Shell.inf > > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.ds > c > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.ds > c > index c68b8a49cf..c6f5ae7534 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.ds > c > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.ds > c > @@ -308,6 +308,12 @@ > gMinPlatformPkgTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x03, > 0x0F, 0x07, 0x1F, 0x1F, 0x0F, 0x0F, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, > 0x00, 0x00} !endif > > + ###################################### > + # Board Configuration > + ###################################### > + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable|1 > + gBoardModulePkgTokenSpaceGuid.PcdSuperIoPciIsaBridgeDevice|{0x00, > + 0x00, 0x1F, 0x00} > + > [PcdsFixedAtBuild.IA32] > ###################################### > # Edk2 Configuration > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi > b/DxeBoardAcpiTableLib.inf > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi > b/DxeBoardAcpiTableLib.inf > index bfb58e868f..e0bf5823d8 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi > b/DxeBoardAcpiTableLib.inf > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpi > +++ Lib/DxeBoardAcpiTableLib.inf > @@ -33,9 +33,10 @@ > MinPlatformPkg/MinPlatformPkg.dec > KabylakeOpenBoardPkg/OpenBoardPkg.dec > KabylakeSiliconPkg/SiPkg.dec > + BoardModulePkg/BoardModulePkg.dec > > [Pcd] > - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable > + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi > b/DxeMultiBoardAcpiSupportLib.inf > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi > b/DxeMultiBoardAcpiSupportLib.inf > index 00cdbe80ce..e5de9268e7 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi > b/DxeMultiBoardAcpiSupportLib.inf > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpi > +++ Lib/DxeMultiBoardAcpiSupportLib.inf > @@ -34,9 +34,10 @@ > MinPlatformPkg/MinPlatformPkg.dec > KabylakeOpenBoardPkg/OpenBoardPkg.dec > KabylakeSiliconPkg/SiPkg.dec > + BoardModulePkg/BoardModulePkg.dec > > [Pcd] > - gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable > + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > index 7e65eeda6f..e7f5ed39d2 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc > @@ -381,6 +381,11 @@ > MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf > MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf > > MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDx > e.inf > + MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > + MdeModulePkg/Universal/BdsDxe/BdsDxe.inf{ > + <LibraryClasses> > + NULL|BoardModulePkg/Library/BdsPs2KbcLib/BdsPs2KbcLib.inf > + } > UefiCpuPkg/CpuDxe/CpuDxe.inf > > !if gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection == 1 @@ - > 485,3 +490,4 @@ > !endif > } > !endif > + BoardModulePkg/LegacySioDxe/LegacySioDxe.inf > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > index dbd6f2aa10..98eb7dcb5a 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf > @@ -336,6 +336,8 @@ INF > MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf > INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf > INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf > INF > MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutputDx > e.inf > +INF BoardModulePkg/LegacySioDxe/LegacySioDxe.inf > +INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > INF ShellPkg/Application/Shell/Shell.inf > > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd. > dsc > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd. > dsc > index 34cc731313..580504cbc1 100644 > --- > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd. > dsc > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd. > d > +++ sc > @@ -324,6 +324,13 @@ > gMinPlatformPkgTokenSpaceGuid.PcdTestPointIbvPlatformFeature|{0x03, > 0x0F, 0x07, 0x1F, 0x1F, 0x0F, 0x0F, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, > 0x00, 0x00} !endif > > + > + ###################################### > + # Board Configuration > + ###################################### > + gBoardModulePkgTokenSpaceGuid.PcdPs2KbMsEnable|1 > + gBoardModulePkgTokenSpaceGuid.PcdSuperIoPciIsaBridgeDevice|{0x00, > + 0x00, 0x1F, 0x00} > + > [PcdsFixedAtBuild.IA32] > ###################################### > # Edk2 Configuration > diff --git a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec > b/Platform/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.PcdBoardUcmcGpioTableSize|0|U > INT16|0x0000001 > # Misc > > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent|FALSE|BO > OLEAN|0x000000EC > > - > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable|1|UINT8|0x4 > 0000009 > - > > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiSleepState|1|UINT8|0x40 > 000002 > > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHibernate|1|UINT8|0x40 > 000003 > > gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|0x > 40000004 > -- > 2.19.1.windows.1 > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#50113): https://edk2.groups.io/g/devel/message/50113 Mute This Topic: https://groups.io/mt/42928988/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-