Browse Source

Platform/Sgi: Route logs to different sets of consoles

Route secure (from secure partition) and non-secure console messages
to different sets of UART console ports. This aligns with the security
state the PE is in when logs are put out. In addition, this allows
consolidation of UART related macros across all the variants of
Neoverse reference design platforms.

Signed-off-by: Rohit Mathew <rohit.mathew@arm.com>
Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>
Rohit Mathew 1 year ago
parent
commit
433b5b1b0f

+ 1 - 3
Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

@@ -2,7 +2,7 @@
 #  StandaloneMM platform description file for SGI-575, RD-N1-Edge, RD-E1-Edge
 #  and RD-V1 platforms.
 #
-#  Copyright (c) 2021, ARM Limited. All rights reserved.
+#  Copyright (c) 2021 - 2022, ARM Limited. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -37,8 +37,6 @@
 #
 ################################################################################
 [PcdsFixedAtBuild]
-  ## PL011 - Serial Terminal
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF70000
 
 !if $(SECURE_STORAGE_ENABLE) == TRUE
   ##Secure NOR Flash 2

+ 1 - 3
Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc

@@ -1,7 +1,7 @@
 ## @file
 #  StandaloneMM platform description file for RD-N2 platforms.
 #
-#  Copyright (c) 2021, ARM Limited. All rights reserved.
+#  Copyright (c) 2021 - 2022, ARM Limited. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -36,8 +36,6 @@
 #
 ################################################################################
 [PcdsFixedAtBuild]
-  ## PL011 - Serial Terminal
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x0EF80000
 
 !if $(SECURE_STORAGE_ENABLE) == TRUE
   ##Secure NOR Flash 2

+ 4 - 4
Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2020, ARM Limited. All rights reserved.
+#  Copyright (c) 2020 - 2022, ARM Limited. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -17,14 +17,14 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0E800000
 
   # PL011 - Serial Terminal
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF80000
+  gArmPlatformTokenSpaceGuid.PL011UartInterrupt|95
 
   # PL370 - HDLCD1
   gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x7FF60000
 
   # PL011 - Serial Debug UART
-  gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x7FF80000
-  gArmPlatformTokenSpaceGuid.PL011UartInterrupt|147
+  gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x7FF70000
+  gArmPlatformTokenSpaceGuid.PcdSerialDbgInterrupt|147
 
   # PL031 RealTimeClock
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000

+ 3 - 3
Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2020, ARM Limited. All rights reserved.
+#  Copyright (c) 2020 - 2022, ARM Limited. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -17,14 +17,14 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x1052800000
 
   # PL011 - Serial Terminal
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x0EF70000
+  gArmPlatformTokenSpaceGuid.PL011UartInterrupt|112
 
   # PL370 - HDLCD1
   gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x0EF60000
 
   # PL011 - Serial Debug UART
   gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x0EF70000
-  gArmPlatformTokenSpaceGuid.PL011UartInterrupt|403
+  gArmPlatformTokenSpaceGuid.PcdSerialDbgInterrupt|403
 
   # PL031 RealTimeClock
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0C170000

+ 2 - 1
Platform/ARM/SgiPkg/SgiPlatform.dsc.inc

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2018-2021, ARM Limited. All rights reserved.
+#  Copyright (c) 2018 - 2022, ARM Limited. All rights reserved.
 #  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -157,6 +157,7 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
 
   ## PL011 - Serial Terminal
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x2A400000
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0
   gArmPlatformTokenSpaceGuid.PL011UartInteger|4

+ 2 - 1
Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc

@@ -1,7 +1,7 @@
 ## @file
 #  StandaloneMM platform description include file for all supported platforms.
 #
-#  Copyright (c) 2021, ARM Limited. All rights reserved.
+#  Copyright (c) 2021 - 2022, ARM Limited. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -84,6 +84,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0f
 
   ## PL011 - Serial Terminal
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x2A410000
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
 
   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2