[PATCH 00/11] Cello/Overdrive fixes and cleanups

List overview All Threads
Download

newer

older

[PATCH 1/5] Platforms/AMD/Styx:...

[PATCH] Platforms/ARM: Juno:...

Ard Biesheuvel

11 May 2016 11 May '16

4 p.m.

The primary change is the BDS change, which i sent out separately, but which i included for completeness. The whole series is pushed to my dev-FDK-102-ard branch again.

Platforms/AMD/Styx/AmdStyxPciHostBridgeLib: set unused regions base to MAX_UINT64

This prepares our code for upcoming changes in the core PCI root bridge driver

Platforms/AMD/Styx/FdtDxe: remove explicit BEFORE xxx Depex

FdtDxe does not need to be dispatched after the PCI driver, since it does not do anything before the ready-to-boot event is signalled

Platforms/AMD/Styx/AmdStyx.dec: remove cross-package includes Platforms/AMD/Styx: remove references to gArmMpCoreInfoGuid

Code cleanup

Platforms/AMD/Styx/CelloBoard: remove BdsLib library class resolution Platforms/AMD/Styx/OverdriveBoard: make BdsLib reference local to FdtDxe

Get rid of deprecated ARM BDS BdsLib references as much as we can

Platforms/AMD/Styx: switch Cello and Overdrive to generic BDS

BDS switch

Platforms/AMD/Styx: remove StatusCode PEI module Platforms/AMD/Styx: DSC spring cleaning

Cleanup

Platforms/AMD/SataControllerDxe: use different segment# from actual PCI root

Small 'fix' but no real bug here

Platforms/AMD/Styx/OverdriveBoard: make MnpDxe less noisy

Debug patch

Platforms/AMD/Styx/AmdStyx.dec | 14 +-- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 104 ++++-------------- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 4 +- Platforms/AMD/Styx/Drivers/SataControllerDxe/PciEmulation.c | 2 +- Platforms/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf | 1 - Platforms/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c | 4 +- Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf | 5 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 115 ++++++-------------- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 4 +- 9 files changed, 63 insertions(+), 190 deletions(-)

-- 2.7.4

Show replies by date

Ard Biesheuvel

11 May 11 May

4 p.m.

New subject: [PATCH 01/11] Platforms/AMD/Styx/AmdStyxPciHostBridgeLib: set unused regions base to MAX_UINT64

An upcoming fix to the generic PciHostBridgeDxe driver code requires that the limit of an unused region does not exceed the base, since they describe a 1 byte region if base equals limit.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platforms/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c b/Platforms/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c index 432e4230a59b..8d8c76a0f7f6 100644 --- a/Platforms/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c +++ b/Platforms/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c @@ -106,9 +106,9 @@ PciHostBridgeGetRootBridges ( // // No separate ranges for prefetchable and non-prefetchable BARs // - RootBridge->PMem.Base = 0; + RootBridge->PMem.Base = MAX_UINT64; RootBridge->PMem.Limit = 0; - RootBridge->PMemAbove4G.Base = 0; + RootBridge->PMemAbove4G.Base = MAX_UINT64; RootBridge->PMemAbove4G.Limit = 0;

ASSERT (FixedPcdGet64 (PcdPciMmio32Translation) == 0);

-- 2.7.4

Ard Biesheuvel

4 p.m.

New subject: [PATCH 02/11] Platforms/AMD/Styx/FdtDxe: remove explicit BEFORE xxx Depex

As Leo pointed out, dispatching the FdtDxe driver does not need to be ordered manually, since it will not come into action until the 'ready to boot' event is signalled. So revert that part of the patch that moved the creation of the secondary pens to the ACPI driver.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/AmdStyx.dec | 3 --- Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Platforms/AMD/Styx/AmdStyx.dec b/Platforms/AMD/Styx/AmdStyx.dec index d409c7b74397..a01384f2421c 100644 --- a/Platforms/AMD/Styx/AmdStyx.dec +++ b/Platforms/AMD/Styx/AmdStyx.dec @@ -42,9 +42,6 @@ gAmdStyxTokenSpaceGuid = { 0x220d9653, 0x4a0e, 0x40bc, { 0xb3, 0x65, 0x2f, 0xbb, 0xa2, 0xd9, 0x03, 0x45 } } gAmdStyxMpCoreInfoGuid = { 0x68efeabd, 0xcb77, 0x4aa5, { 0xbf, 0x0c, 0xa3, 0x31, 0xfc, 0xcf, 0x76, 0x66 } }

- # used to manually order the dispatch of FdtDxe after AcpiPlatformDxe - gAmdStyxAcpiPlatformDxeFileGuid = { 0xf229c831, 0x6a35, 0x440b, { 0x9c, 0x84, 0xdd, 0x3b, 0xc7, 0x1e, 0x38, 0x65 } } - [PcdsDynamic] gAmdStyxTokenSpaceGuid.PcdSocCoreCount|1|UINT32|0x00000100 gAmdStyxTokenSpaceGuid.PcdSocCpuId|1|UINT32|0x00000101 diff --git a/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf b/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf index 813324f6d308..be446a5a5d71 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf +++ b/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf @@ -76,4 +76,4 @@ gAmdStyxTokenSpaceGuid.PcdTrustedFWSupport

[Depex] - AFTER gAmdStyxAcpiPlatformDxeFileGuid + TRUE

-- 2.7.4

Ard Biesheuvel

4 p.m.

New subject: [PATCH 03/11] Platforms/AMD/Styx/AmdStyx.dec: remove cross-package includes

Package .DEC files should only describe include directories that belong to the package, otherwise including one package will pull in headers from another, obfuscating the dependencies between them.

For instance, as this patch shows, FdtDxe depends on ShellPkg and MdeModulePkg, so these dependencies should be made explicit rather than pulling them in via another package.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/AmdStyx.dec | 11 +---------- Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf | 2 ++ 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Platforms/AMD/Styx/AmdStyx.dec b/Platforms/AMD/Styx/AmdStyx.dec index a01384f2421c..bba91dda6977 100644 --- a/Platforms/AMD/Styx/AmdStyx.dec +++ b/Platforms/AMD/Styx/AmdStyx.dec @@ -20,16 +20,7 @@ PACKAGE_VERSION = 0.1

[Includes] - Common - ../../../../AmdModulePkg/Common - ../../../../AmdModulePkg/Include - ../../../../ArmPkg/Include - ../../../../ArmPkg/Library - ../../../../EmbeddedPkg/Include - ../../../../IntelFrameworkPkg/Include - ../../../../MdeModulePkg/Include - ../../../../MdePkg/Include - ../../../../ShellPkg/Include + Common

[LibraryClasses]

diff --git a/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf b/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf index be446a5a5d71..a0b00b3c5dc8 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf +++ b/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf @@ -36,8 +36,10 @@ ArmPkg/ArmPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec AmdModulePkg/AmdModulePkg.dec OpenPlatformPkg/Platforms/AMD/Styx/AmdStyx.dec + ShellPkg/ShellPkg.dec

[LibraryClasses] UefiDriverEntryPoint

-- 2.7.4

Ard Biesheuvel

4 p.m.

New subject: [PATCH 04/11] Platforms/AMD/Styx: remove references to gArmMpCoreInfoGuid

We no longer use the legacy ARM MP-boot implementation that boots all the cores into UEFI before parking them in an OS accessible pen. So remove the references to gArmMpCoreInfoGuid

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf | 1 - Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf | 1 - 2 files changed, 2 deletions(-)

diff --git a/Platforms/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf b/Platforms/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf index 540ecfcc6399..d65626622903 100644 --- a/Platforms/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf +++ b/Platforms/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf @@ -40,5 +40,4 @@ OpenPlatformPkg/Platforms/AMD/Styx/AmdStyx.dec

[Guids] - gArmMpCoreInfoGuid gAmdStyxMpCoreInfoGuid diff --git a/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf b/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf index a0b00b3c5dc8..234df06588e2 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf +++ b/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf @@ -57,7 +57,6 @@ [Guids] gEfiEventReadyToBootGuid ##CONSUMED gEfiDxeServicesTableGuid ##CONSUMED - gArmMpCoreInfoGuid ##CONSUMED gFdtTableGuid ##CONSUMED

[Protocols]

-- 2.7.4

Ard Biesheuvel

4 p.m.

New subject: [PATCH 05/11] Platforms/AMD/Styx/CelloBoard: remove BdsLib library class resolution

BdsLib is part of the old ARM BDS implementation, and should not be used. So remove it from the .DSC

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 3 --- 1 file changed, 3 deletions(-)

diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index 167ed90a1bdc..8e448c7e3d39 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -149,9 +149,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf

- # BDS Libraries - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf - [LibraryClasses.common.SEC] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

-- 2.7.4

Ard Biesheuvel

4 p.m.

New subject: [PATCH 06/11] Platforms/AMD/Styx/OverdriveBoard: make BdsLib reference local to FdtDxe

The ARM BDS is long gone, but its utility library BdsLib is still used in some places, like FdtDxe. So make the BdsLib local to the FdtDxe.inf reference in the Overdrive .DSC to prevent new references from other modules creeping in.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index aa64be59a204..6eac8e4d64d5 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -152,9 +152,9 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf

- # BDS Libraries - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf - FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf + DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf + SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf + FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

[LibraryClasses.common.SEC] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf @@ -640,7 +640,12 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # # FDT support # - OpenPlatformPkg/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf + OpenPlatformPkg/Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf { + <LibraryClasses> + # deprecated BdsLib from the ARM BDS + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf + }

# # PCI support

-- 2.7.4

Ard Biesheuvel

4 p.m.

New subject: [PATCH 07/11] Platforms/AMD/Styx: switch Cello and Overdrive to generic BDS

The 'Intel' BDS is deprecated and superseded by a new generic BDS implementation that lives under MdeModulePkg.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 42 ++++++++++---------- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 3 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 39 +++++++++--------- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 3 +- 4 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index 8e448c7e3d39..3519bbec733c 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -132,8 +132,8 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) RealTimeClockLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf

CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf - GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf - PlatformBdsLib|ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf + UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf + PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

# @@ -149,6 +149,10 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf

+ DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf + SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf + FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + [LibraryClasses.common.SEC] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf @@ -207,12 +211,10 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf - DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf

[LibraryClasses.common.DXE_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf @@ -228,13 +230,13 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf + ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

[LibraryClasses.common.UEFI_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf - DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

[LibraryClasses.ARM] @@ -384,6 +386,7 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000

gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }

gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"AMD Seattle" @@ -440,7 +443,8 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0 # serial port is clocked at 100MHz gArmPlatformTokenSpaceGuid.PL011UartClkInHz|100000000 - + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4 + gAmdStyxTokenSpaceGuid.PcdSerialDbgRegisterBase|0x0E1010000 gAmdStyxTokenSpaceGuid.PcdUartDbgBaudRate|115200

@@ -450,20 +454,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gArmTokenSpaceGuid.PcdGicDistributorBase|0xE1110000 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xE112F000

- - # - # ARM OS Loader - # -# gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2 -# gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|1 - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux" - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"PciRoot(0x0)/Pci(0x0,0x0)/Sata(0x1,0x0,0x0)/HD(1,MBR,0xDA835D19,0x80,0xBF780)/Image" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=ttySBSA0,115200 earlyprintk=pl011,0xe1010000,115200 show_styx_info nosmp root=/dev/sda2 rootwait" - - # Use the serial console (ConIn & ConOut) - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" - # # ARM Architectual Timer Frequency # @@ -525,6 +515,9 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0x0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0

+[PcdsDynamicExHii.common.DEFAULT] + gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 + ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform @@ -678,7 +671,13 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf + MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + MdeModulePkg/Application/UiApp/UiApp.inf { + <LibraryClasses> + NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf + NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf + NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf + }

# # Crypto Accelerator support (RNG only) @@ -704,7 +703,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf

FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf - SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

<PcdsFixedAtBuild> diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index b47a13c2601f..90a97875d8ad 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -207,7 +207,8 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Application/UiApp/UiApp.inf

# # Crypto Accelerator support (RNG only) diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 6eac8e4d64d5..1cf18e1b974a 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -135,8 +135,8 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) RealTimeClockLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf

# @@ -156,6 +156,10 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+ DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf + SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf + FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + [LibraryClasses.common.SEC] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf @@ -214,12 +218,10 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf - DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf

[LibraryClasses.common.DXE_DRIVER] ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf - DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf @@ -235,13 +237,13 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf + ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

[LibraryClasses.ARM] @@ -391,6 +393,7 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000

gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"AMD Seattle" @@ -447,6 +450,7 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0 # serial port is clocked at 100MHz gArmPlatformTokenSpaceGuid.PL011UartClkInHz|100000000 + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4

gAmdStyxTokenSpaceGuid.PcdSerialDbgRegisterBase|0x0E1010000 gAmdStyxTokenSpaceGuid.PcdUartDbgBaudRate|115200 @@ -457,20 +461,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gArmTokenSpaceGuid.PcdGicDistributorBase|0xE1110000 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xE112F000

- - # - # ARM OS Loader - # -# gArmPlatformTokenSpaceGuid.PcdDefaultBootType|2 -# gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|1 - gArmPlatformTokenSpaceGuid.PcdDefaultBootDescription|L"Linux" - gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"PciRoot(0x0)/Pci(0x0,0x0)/Sata(0x1,0x0,0x0)/HD(1,MBR,0xDA835D19,0x80,0xBF780)/Image" - gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=ttySBSA0,115200 earlyprintk=pl011,0xe1010000,115200 show_styx_info nosmp root=/dev/sda2 rootwait" - - # Use the serial console (ConIn & ConOut) - gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" - gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" - # # ARM Architectual Timer Frequency # @@ -553,6 +543,8 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0x0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0

+[PcdsDynamicExHii.common.DEFAULT] + gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5

################################################################################ # @@ -726,7 +718,13 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf + MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + MdeModulePkg/Application/UiApp/UiApp.inf { + <LibraryClasses> + NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf + NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf + NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf + }

# # Crypto Accelerator support (RNG only) @@ -752,7 +750,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf

FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf - SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

<PcdsFixedAtBuild> diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index f06bebc094e5..44a7cbe55c14 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -225,7 +225,8 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Application/UiApp/UiApp.inf

# # Crypto Accelerator support (RNG only)

-- 2.7.4

Ard Biesheuvel

4 p.m.

New subject: [PATCH 08/11] Platforms/AMD/Styx: remove StatusCode PEI module

The 'PROGRESS CODE: V03021001 I0' lines in the RELEASE build output are not very useful to us, so remove the module that generates them.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 1 - Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 1 - Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 1 - Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 1 - 4 files changed, 4 deletions(-)

diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index 3519bbec733c..13ddbabe2a11 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -539,7 +539,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) OpenPlatformPkg/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf ArmPkg/Drivers/CpuPei/CpuPei.inf - IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf Nt32Pkg/BootModePei/BootModePei.inf MdeModulePkg/Universal/Variable/Pei/VariablePei.inf MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index 90a97875d8ad..fe8e8137fef1 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -242,7 +242,6 @@ READ_LOCK_STATUS = TRUE INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf INF ArmPkg/Drivers/CpuPei/CpuPei.inf INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf - INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 1cf18e1b974a..5a6f74f48162 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -567,7 +567,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) OpenPlatformPkg/Platforms/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.inf ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf ArmPkg/Drivers/CpuPei/CpuPei.inf - IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf Nt32Pkg/BootModePei/BootModePei.inf MdeModulePkg/Universal/Variable/Pei/VariablePei.inf MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index 44a7cbe55c14..56590ce6ac24 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -259,7 +259,6 @@ READ_LOCK_STATUS = TRUE INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf INF ArmPkg/Drivers/CpuPei/CpuPei.inf INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf - INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

-- 2.7.4

Ard Biesheuvel

4 p.m.

New subject: [PATCH 09/11] Platforms/AMD/Styx: DSC spring cleaning

Remove options that are no longer used. Note that the vendor string is now set via a different PCD, making it visible to the OS via the system table.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 60 +------------------- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 57 +------------------ 2 files changed, 2 insertions(+), 115 deletions(-)

diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index 13ddbabe2a11..345f04a25e3e 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -21,10 +21,6 @@ DEFINE NUM_CORES = 8 DEFINE DO_KCS = 0 DEFINE DO_RTK = 0

-DEFINE EL3_TO_EL1 = 0x3C5 -DEFINE EL3_TO_EL2 = 0x3C9 -DEFINE TRANS_CODE = $(EL3_TO_EL2) - PLATFORM_NAME = Cello PLATFORM_GUID = 77861b3e-74b0-4ff3-8d18-c5ba5803e1bf PLATFORM_VERSION = 0.1 @@ -94,7 +90,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf -# CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf @@ -284,20 +279,7 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE - gArmPlatformTokenSpaceGuid.PcdBdsLinuxSupport|FALSE

- # - # Control what commands are supported from the UI - # Turn these on and off to add features or save size - # - gEmbeddedTokenSpaceGuid.PcdEmbeddedMacBoot|TRUE - gEmbeddedTokenSpaceGuid.PcdEmbeddedDirCmd|TRUE - gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE - gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE - gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE - gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE - gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE - # All pages are cached by default gEmbeddedTokenSpaceGuid.PcdCacheEnable|TRUE

@@ -356,10 +338,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2)

gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07

- gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|"" - gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07 - gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000 - # # Optional feature to help prevent EFI memory map fragments # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob @@ -380,38 +358,20 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

- # - # ARM Pcds - # - gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000000000000 - gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }

- gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"AMD Seattle" - gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"Seattle" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"AMD Seattle"

# Number of configured cores gArmPlatformTokenSpaceGuid.PcdCoreCount|$(NUM_CORES)

- # Enable floating point - gArmTokenSpaceGuid.PcdVFPEnabled|1 - # Stacks for MPCores in Normal World gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x8001680000 gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x10000 gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize|0x800

- # Stacks for MPCores in Monitor Mode - gArmPlatformTokenSpaceGuid.PcdCPUCoresSecMonStackBase|0x8001688000 - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize|0x100 - - # Stacks for MPCores in Secure World - gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x8001689000 - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecPrimaryStackSize|0x1000 - gArmPlatformTokenSpaceGuid.PcdCPUCoreSecSecondaryStackSize|0x800 - # Declare system memory base gArmTokenSpaceGuid.PcdSystemMemoryBase|0x8000000000

@@ -419,21 +379,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

# - # ARM Pcds - # - gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000 - - # Trustzone enable - # (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec) - gArmTokenSpaceGuid.PcdTrustzoneSupport|TRUE - - # Secure Configuration Register - gArmTokenSpaceGuid.PcdArmScr|0x531 - - # EL Transition Code - gArmTokenSpaceGuid.PcdArmNonSecModeTransition|$(TRANS_CODE) - - # # ARM PrimeCell #

@@ -484,9 +429,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gArmTokenSpaceGuid.PcdPciMmio64Size|0x7F00000000 gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0

- ## Use PCI emulation for ATA PassThru - # gEfiMdeModulePkgTokenSpaceGuid.PcdAtaPassThruPciEmulation|TRUE - ## ACPI (no tables < 4GB) gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20

diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 5a6f74f48162..b5069b073d45 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -24,10 +24,6 @@ DEFINE DO_ISCP = 1 DEFINE DO_KCS = 1 DEFINE DO_RTK = 0

-DEFINE EL3_TO_EL1 = 0x3C5 -DEFINE EL3_TO_EL2 = 0x3C9 -DEFINE TRANS_CODE = $(EL3_TO_EL2) - PLATFORM_NAME = Overdrive PLATFORM_GUID = B2296C02-9DA1-4CD1-BD48-4D4F0F1276EB PLATFORM_VERSION = 0.1 @@ -97,7 +93,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf -# CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf @@ -291,20 +286,7 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE - gArmPlatformTokenSpaceGuid.PcdBdsLinuxSupport|FALSE

@@ -363,10 +345,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2)

gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07

- gEmbeddedTokenSpaceGuid.PcdEmbeddedAutomaticBootCommand|"" - gEmbeddedTokenSpaceGuid.PcdEmbeddedDefaultTextColor|0x07 - gEmbeddedTokenSpaceGuid.PcdEmbeddedMemVariableStoreSize|0x10000 - # # Optional feature to help prevent EFI memory map fragments # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob @@ -387,38 +365,20 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

- gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"AMD Seattle" - gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"Seattle" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"AMD Seattle"

# Number of configured cores gArmPlatformTokenSpaceGuid.PcdCoreCount|$(NUM_CORES)

@@ -426,21 +386,6 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

-- 2.7.4

Ard Biesheuvel

4 p.m.

New subject: [PATCH 10/11] Platforms/AMD/SataControllerDxe: use different segment# from actual PCI root

The PCI emulation code uses the same PCI segment number as the actual PCIe root bridge. Since it does not expose any actual protocols related to root bridges, this is harmless but let's use segment# 1 regardless, to prevent any confusion.

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/Drivers/SataControllerDxe/PciEmulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platforms/AMD/Styx/Drivers/SataControllerDxe/PciEmulation.c b/Platforms/AMD/Styx/Drivers/SataControllerDxe/PciEmulation.c index 1ba358dc0a15..f8bba7fc904a 100644 --- a/Platforms/AMD/Styx/Drivers/SataControllerDxe/PciEmulation.c +++ b/Platforms/AMD/Styx/Drivers/SataControllerDxe/PciEmulation.c @@ -424,7 +424,7 @@ PciEmulationEntryPoint (

// Unique device path. CopyMem(&Private->DevicePath, &PciIoDevicePathTemplate, sizeof(PciIoDevicePathTemplate)); - Private->DevicePath.AcpiDevicePath.UID = 0; + Private->DevicePath.AcpiDevicePath.UID = 1;

// Copy protocol structure CopyMem(&Private->PciIoProtocol, &PciIoTemplate, sizeof(PciIoTemplate));

-- 2.7.4

Ard Biesheuvel

4 p.m.

New subject: [PATCH 11/11] Platforms/AMD/Styx/OverdriveBoard: make MnpDxe less noisy

This is a temporary debug patch to make MnpDxe less noisy, since it makes it difficult to use the console. Fixing the root cause it of course preferable, but hey ...

Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel ard.biesheuvel@linaro.org --- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index b5069b073d45..7d879197946a 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -626,7 +626,10 @@ DEFINE DO_RTK = 0 MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf # MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf + MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf { + <PcdsFixedAtBuild> + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21 + } MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

-- 2.7.4

Ricardo Salveti

10 p.m.

On Wed, May 11, 2016 at 1:00 PM, Ard Biesheuvel ard.biesheuvel@linaro.org wrote:

...

The primary change is the BDS change, which i sent out separately, but which i included for completeness. The whole series is pushed to my dev-FDK-102-ard branch again.

Platforms/AMD/Styx/AmdStyxPciHostBridgeLib: set unused regions base to MAX_UINT64

This prepares our code for upcoming changes in the core PCI root bridge driver

Platforms/AMD/Styx/FdtDxe: remove explicit BEFORE xxx Depex

FdtDxe does not need to be dispatched after the PCI driver, since it does not do anything before the ready-to-boot event is signalled

Platforms/AMD/Styx/AmdStyx.dec: remove cross-package includes Platforms/AMD/Styx: remove references to gArmMpCoreInfoGuid

Code cleanup

Platforms/AMD/Styx/CelloBoard: remove BdsLib library class resolution Platforms/AMD/Styx/OverdriveBoard: make BdsLib reference local to FdtDxe

Get rid of deprecated ARM BDS BdsLib references as much as we can

Platforms/AMD/Styx: switch Cello and Overdrive to generic BDS

BDS switch

Platforms/AMD/Styx: remove StatusCode PEI module Platforms/AMD/Styx: DSC spring cleaning

Cleanup

Platforms/AMD/SataControllerDxe: use different segment# from actual PCI root

Small 'fix' but no real bug here

Platforms/AMD/Styx/OverdriveBoard: make MnpDxe less noisy

Debug patch

Platforms/AMD/Styx/AmdStyx.dec | 14 +-- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 104 ++++-------------- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 4 +- Platforms/AMD/Styx/Drivers/SataControllerDxe/PciEmulation.c | 2 +- Platforms/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf | 1 - Platforms/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c | 4 +- Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf | 5 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 115 ++++++-------------- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 4 +- 9 files changed, 63 insertions(+), 190 deletions(-)

-- 2.7.4

Tested the series and it worked fine on both Overdrive and Cello. The only issue is what I already reported in the IRC, which is the lack of a timeout message when booting EDK2.

Since this series depends on an extra patch in EDK2, will wait to see if that gets merged tomorrow, otherwise will push that to the internal dev branch.

Thanks,

-- Ricardo Salveti

Ard Biesheuvel

10:08 p.m.

On 12 May 2016 at 00:00, Ricardo Salveti ricardo.salveti@linaro.org wrote:

...

On Wed, May 11, 2016 at 1:00 PM, Ard Biesheuvel ard.biesheuvel@linaro.org wrote:

...
The primary change is the BDS change, which i sent out separately, but which i included for completeness. The whole series is pushed to my dev-FDK-102-ard branch again.

Platforms/AMD/Styx/AmdStyxPciHostBridgeLib: set unused regions base to MAX_UINT64

This prepares our code for upcoming changes in the core PCI root bridge driver

Platforms/AMD/Styx/FdtDxe: remove explicit BEFORE xxx Depex

FdtDxe does not need to be dispatched after the PCI driver, since it does not do anything before the ready-to-boot event is signalled

Platforms/AMD/Styx/AmdStyx.dec: remove cross-package includes Platforms/AMD/Styx: remove references to gArmMpCoreInfoGuid

Code cleanup

Platforms/AMD/Styx/CelloBoard: remove BdsLib library class resolution Platforms/AMD/Styx/OverdriveBoard: make BdsLib reference local to FdtDxe

Get rid of deprecated ARM BDS BdsLib references as much as we can

Platforms/AMD/Styx: switch Cello and Overdrive to generic BDS

BDS switch

Platforms/AMD/Styx: remove StatusCode PEI module Platforms/AMD/Styx: DSC spring cleaning

Cleanup

Platforms/AMD/SataControllerDxe: use different segment# from actual PCI root

Small 'fix' but no real bug here

Platforms/AMD/Styx/OverdriveBoard: make MnpDxe less noisy

Debug patch

Platforms/AMD/Styx/AmdStyx.dec | 14 +-- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 104 ++++-------------- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 4 +- Platforms/AMD/Styx/Drivers/SataControllerDxe/PciEmulation.c | 2 +- Platforms/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf | 1 - Platforms/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c | 4 +- Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf | 5 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 115 ++++++-------------- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 4 +- 9 files changed, 63 insertions(+), 190 deletions(-)

-- 2.7.4

Tested the series and it worked fine on both Overdrive and Cello. The only issue is what I already reported in the IRC, which is the lack of a timeout message when booting EDK2.

Since this series depends on an extra patch in EDK2, will wait to see if that gets merged tomorrow, otherwise will push that to the internal dev branch.

I should be able to merge that tomorrow if Leif is ok with it? I need to respin it to remove some commented out code, but I can do that when committing

Ricardo Salveti

12 May 12 May

5:43 p.m.

On Wed, May 11, 2016 at 7:08 PM, Ard Biesheuvel ard.biesheuvel@linaro.org wrote:

...

On 12 May 2016 at 00:00, Ricardo Salveti ricardo.salveti@linaro.org wrote:

...
On Wed, May 11, 2016 at 1:00 PM, Ard Biesheuvel ard.biesheuvel@linaro.org wrote:

...
The primary change is the BDS change, which i sent out separately, but which i included for completeness. The whole series is pushed to my dev-FDK-102-ard branch again.

Platforms/AMD/Styx/AmdStyxPciHostBridgeLib: set unused regions base to MAX_UINT64

This prepares our code for upcoming changes in the core PCI root bridge driver

Platforms/AMD/Styx/FdtDxe: remove explicit BEFORE xxx Depex

FdtDxe does not need to be dispatched after the PCI driver, since it does not do anything before the ready-to-boot event is signalled

Platforms/AMD/Styx/AmdStyx.dec: remove cross-package includes Platforms/AMD/Styx: remove references to gArmMpCoreInfoGuid

Code cleanup

Platforms/AMD/Styx/CelloBoard: remove BdsLib library class resolution Platforms/AMD/Styx/OverdriveBoard: make BdsLib reference local to FdtDxe

Get rid of deprecated ARM BDS BdsLib references as much as we can

Platforms/AMD/Styx: switch Cello and Overdrive to generic BDS

BDS switch

Platforms/AMD/Styx: remove StatusCode PEI module Platforms/AMD/Styx: DSC spring cleaning

Cleanup

Platforms/AMD/SataControllerDxe: use different segment# from actual PCI root

Small 'fix' but no real bug here

Platforms/AMD/Styx/OverdriveBoard: make MnpDxe less noisy

Debug patch

Platforms/AMD/Styx/AmdStyx.dec | 14 +-- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 104 ++++-------------- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 4 +- Platforms/AMD/Styx/Drivers/SataControllerDxe/PciEmulation.c | 2 +- Platforms/AMD/Styx/Library/AmdStyxHelperLib/AmdStyxHelperLib.inf | 1 - Platforms/AMD/Styx/Library/AmdStyxPciHostBridgeLib/AmdStyxPciHostBridgeLib.c | 4 +- Platforms/AMD/Styx/OverdriveBoard/FdtDxe/FdtDxe.inf | 5 +- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 115 ++++++-------------- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 4 +- 9 files changed, 63 insertions(+), 190 deletions(-)

-- 2.7.4

Tested the series and it worked fine on both Overdrive and Cello. The only issue is what I already reported in the IRC, which is the lack of a timeout message when booting EDK2.

Since this series depends on an extra patch in EDK2, will wait to see if that gets merged tomorrow, otherwise will push that to the internal dev branch.

I should be able to merge that tomorrow if Leif is ok with it? I need to respin it to remove some commented out code, but I can do that when committing

Thanks, tested latest EDK2 + this patch series on both Overdrive and Cello, working as expected.

Pushed to the development branches.

Cheers,

-- Ricardo Salveti

3146

days inactive

3147

days old

linaro-uefi@lists.linaro.org

14 comments

participants

tags (0)

participants (2)

Ard Biesheuvel
Ricardo Salveti