From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.6273.1655898999187058444 for ; Wed, 22 Jun 2022 04:56:39 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: rohit.mathew@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EB2C1150C; Wed, 22 Jun 2022 04:56:38 -0700 (PDT) Received: from usa.arm.com (unknown [10.57.70.250]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 241893F534; Wed, 22 Jun 2022 04:56:38 -0700 (PDT) From: "Rohit Mathew" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-platforms][PATCH V3 2/2] Platform/Sgi: Route logs to different sets of consoles Date: Wed, 22 Jun 2022 12:56:32 +0100 Message-Id: <20220622115632.20490-3-rohit.mathew@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220622115632.20490-1-rohit.mathew@arm.com> References: <20220622115632.20490-1-rohit.mathew@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 --- Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc | 8 ++++---- Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc | 6 +++--- Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 3 ++- Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 3 ++- Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 4 +--- Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc | 4 +--- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc b/Platform/ARM/SgiP= kg/SgiMemoryMap.dsc.inc index 76707be73d7b..5d4b6ae726f6 100644 --- a/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +++ b/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|0x0E800= 000 =20 # PL011 - Serial Terminal - gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF80000 + gArmPlatformTokenSpaceGuid.PL011UartInterrupt|95 =20 # PL370 - HDLCD1 gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x7FF60000 =20 # PL011 - Serial Debug UART - gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x7FF80000 - gArmPlatformTokenSpaceGuid.PL011UartInterrupt|147 + gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x7FF70000 + gArmPlatformTokenSpaceGuid.PcdSerialDbgInterrupt|147 =20 # PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000 diff --git a/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc b/Platform/ARM/Sgi= Pkg/SgiMemoryMap2.dsc.inc index 2d612f9b9674..1e9cd0982f5c 100644 --- a/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc +++ b/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|0x10528= 00000 =20 # PL011 - Serial Terminal - gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x0EF70000 + gArmPlatformTokenSpaceGuid.PL011UartInterrupt|112 =20 # PL370 - HDLCD1 gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x0EF60000 =20 # PL011 - Serial Debug UART gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x0EF70000 - gArmPlatformTokenSpaceGuid.PL011UartInterrupt|403 + gArmPlatformTokenSpaceGuid.PcdSerialDbgInterrupt|403 =20 # PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0C170000 diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPk= g/SgiPlatform.dsc.inc index 582efb0114c6..b0c5c7ddc9a9 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc +++ b/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
# # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -157,6 +157,7 @@ gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24 =20 ## PL011 - Serial Terminal + gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x2A400000 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0 gArmPlatformTokenSpaceGuid.PL011UartInteger|4 diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/Sgi= Pkg/SgiPlatformMm.dsc.inc index 5287e1f8e568..68fc3ad93a5f 100644 --- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc @@ -1,7 +1,7 @@ ## @file # StandaloneMM platform description include file for all supported plat= forms. # -# 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 =20 ## PL011 - Serial Terminal + gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x2A410000 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 =20 gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2 diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/= SgiPkg/PlatformStandaloneMm.dsc index 2cb4895cfcff..4b624a11c6d8 100644 --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc +++ b/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 =20 !if $(SECURE_STORAGE_ENABLE) =3D=3D TRUE ##Secure NOR Flash 2 diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc b/Platform/ARM= /SgiPkg/PlatformStandaloneMm2.dsc index 46c2ae3529d1..134daf7f20fb 100644 --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc +++ b/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 =20 !if $(SECURE_STORAGE_ENABLE) =3D=3D TRUE ##Secure NOR Flash 2 --=20 2.25.1