| Message ID | 1478021115-22781-6-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Tue, Nov 01, 2016 at 05:25:12PM +0000, Ard Biesheuvel wrote: > Switch to the new Styx platform SATA driver, which allows the generic > platform PCI I/O emulation driver and the generic AHCI driver to be used. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Would like a comment from Alan, but from my point of view: Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> (All of these obviously pending finalised path names to the core protocol and stuff.) > --- > Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc | 12 +++++------- > Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf | 4 +++- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc > index 5fd6d841072d..71b60e2789c4 100644 > --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc > +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc > @@ -216,6 +216,7 @@ DEFINE DO_KCS = 1 > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > + PlatformPciIoDeviceRegistrationLib|EmbeddedPkg/Library/PlatformPciIoDeviceRegistrationLib/PlatformPciIoDeviceRegistrationLib.inf > > [LibraryClasses.common.DXE_RUNTIME_DRIVER] > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > @@ -407,13 +408,8 @@ DEFINE DO_KCS = 1 > gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|187500000 > > # > - # Bitmask for ports implemented on the SATA controller > - # (2 ports active on Overdrive 1000: 0b00000011 = 0x03) > + # 2 ports active on Overdrive 1000 > # > - gAmdStyxTokenSpaceGuid.PcdSataPi|0x03 > - > - # Only PcdSataPortCount or PcdSata1PortCount are used. The selection is > - # made by #define in Drivers/SataControllerDxe/InitController.c > gAmdStyxTokenSpaceGuid.PcdSataPortCount|2 > gAmdStyxTokenSpaceGuid.PcdSata1PortCount|0 > > @@ -592,7 +588,9 @@ DEFINE DO_KCS = 1 > MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf > MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf > MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > - OpenPlatformPkg/Platforms/AMD/Styx/Drivers/SataControllerDxe/SataControllerDxe.inf > + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf > + EmbeddedPkg/Drivers/PlatformPciIoDxe/PlatformPciIoDxe.inf > + OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf > > # > # USB Support > diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf > index 95fd8356cbe2..774d69ce6ea9 100644 > --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf > +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf > @@ -162,7 +162,9 @@ READ_LOCK_STATUS = TRUE > INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf > INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf > INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > - INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/SataControllerDxe/SataControllerDxe.inf > + INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf > + INF EmbeddedPkg/Drivers/PlatformPciIoDxe/PlatformPciIoDxe.inf > + INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf > > # > # USB Support > -- > 2.7.4 >
diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc index 5fd6d841072d..71b60e2789c4 100644 --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc @@ -216,6 +216,7 @@ DEFINE DO_KCS = 1 SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf + PlatformPciIoDeviceRegistrationLib|EmbeddedPkg/Library/PlatformPciIoDeviceRegistrationLib/PlatformPciIoDeviceRegistrationLib.inf [LibraryClasses.common.DXE_RUNTIME_DRIVER] HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf @@ -407,13 +408,8 @@ DEFINE DO_KCS = 1 gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|187500000 # - # Bitmask for ports implemented on the SATA controller - # (2 ports active on Overdrive 1000: 0b00000011 = 0x03) + # 2 ports active on Overdrive 1000 # - gAmdStyxTokenSpaceGuid.PcdSataPi|0x03 - - # Only PcdSataPortCount or PcdSata1PortCount are used. The selection is - # made by #define in Drivers/SataControllerDxe/InitController.c gAmdStyxTokenSpaceGuid.PcdSataPortCount|2 gAmdStyxTokenSpaceGuid.PcdSata1PortCount|0 @@ -592,7 +588,9 @@ DEFINE DO_KCS = 1 MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - OpenPlatformPkg/Platforms/AMD/Styx/Drivers/SataControllerDxe/SataControllerDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + EmbeddedPkg/Drivers/PlatformPciIoDxe/PlatformPciIoDxe.inf + OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf # # USB Support diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf index 95fd8356cbe2..774d69ce6ea9 100644 --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf @@ -162,7 +162,9 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/SataControllerDxe/SataControllerDxe.inf + INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + INF EmbeddedPkg/Drivers/PlatformPciIoDxe/PlatformPciIoDxe.inf + INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf # # USB Support
Switch to the new Styx platform SATA driver, which allows the generic platform PCI I/O emulation driver and the generic AHCI driver to be used. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc | 12 +++++------- Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.fdf | 4 +++- 2 files changed, 8 insertions(+), 8 deletions(-)