[edk2-devel] [edk2-platforms][PATCH V2 2/2] Platform/Sgi: Route logs to different sets of consoles

Wed Jun 22 11:58:50 UTC 2022

Hi Thomas,

I have addressed the comments in V3.

On Mon, Jun 20, 2022 at 06:29 PM, Thomas Abraham wrote:

> 
> Hi Rohit,
> 
> On 20/06/2022 16:25, Rohit Mathew via groups.io wrote:
> 
>> 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 at arm.com>
>> ---
>> Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc | 8 ++------
>> Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc | 8 ++------
>> Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 6 ++++--
>> Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 3 ++-
>> Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 4 +---
>> Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc | 4 +---
>> 6 files changed, 12 insertions(+), 21 deletions(-)
>> 
>> diff --git a/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc
>> b/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc
>> index 76707be73d7b..f2372ebd7662 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
>> #
>> @@ -16,15 +16,11 @@
>> gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0x0D400000
>> 
>> gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0E800000
>> 
>> - # PL011 - Serial Terminal
>> - gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF80000
>> -
>> # PL370 - HDLCD1
>> gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x7FF60000
>> 
>> # PL011 - Serial Debug UART
>> - gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x7FF80000
>> - gArmPlatformTokenSpaceGuid.PL011UartInterrupt|147
>> + gArmPlatformTokenSpaceGuid.PL011UartInterrupt|95
>> 
>> # PL031 RealTimeClock
>> gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000
>> diff --git a/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc
>> b/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc
>> index 2d612f9b9674..6a37a6e79154 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
>> #
>> @@ -16,15 +16,11 @@
>> gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0x1051400000
>> 
>> gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x1052800000
>> 
>> 
>> - # PL011 - Serial Terminal
>> - gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x0EF70000
>> -
>> # PL370 - HDLCD1
>> gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x0EF60000
>> 
>> # PL011 - Serial Debug UART
>> - gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x0EF70000
>> - gArmPlatformTokenSpaceGuid.PL011UartInterrupt|403
>> + gArmPlatformTokenSpaceGuid.PL011UartInterrupt|112
>> 
>> # PL031 RealTimeClock
>> gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0C170000
>> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
>> b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
>> index 582efb0114c6..248d95ddaf3a 100644
>> --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
>> +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
>> @@ -1,6 +1,6 @@
>> #
>> -# Copyright (c) 2018-2021, ARM Limited. All rights reserved.
>> -# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>> +# Copyright (c) 2018 - 2022, Arm Limited. All rights reserved.
>> +# (C) Copyright 2021 - 2022 Hewlett Packard Enterprise Development LP<BR>
> 
> 
> Only the Arm copyright line has to be updated.
> 
> 
>> #
>> # SPDX-License-Identifier: BSD-2-Clause-Patent
>> #
>> @@ -157,6 +157,8 @@
>> gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
>> 
>> ## PL011 - Serial Terminal
>> + gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x2A400000
>> + gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x2A400000
> 
> The debug uart should be the RoS UART port at address 0x0EF70000 for
> RD-N2 variants and 0x7FF80000 for the rest of the platforms.
> 
> Thomas.
> 
> 
>> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
>> gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0
>> gArmPlatformTokenSpaceGuid.PL011UartInteger|4
>> diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
>> b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc
>> index 5287e1f8e568..a5f11699c0b1 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
>> 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
>> diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
>> b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
>> index 2cb4895cfcff..a8b56cbcf921 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
>> 
>> !if $(SECURE_STORAGE_ENABLE) == TRUE
>> ##Secure NOR Flash 2
>> diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc
>> b/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc
>> index 46c2ae3529d1..374dbc14cff9 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
>> 
>> !if $(SECURE_STORAGE_ENABLE) == TRUE
>> ##Secure NOR Flash 2
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#90679): https://edk2.groups.io/g/devel/message/90679
Mute This Topic: https://groups.io/mt/91879467/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20220622/4165396d/attachment-0001.htm>