From nobody Sun May 19 17:42:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87388+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87388+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1646827235814813.5046359866848; Wed, 9 Mar 2022 04:00:35 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ELNyYY1788612xRb8cSGzOch; Wed, 09 Mar 2022 04:00:36 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.4697.1646827234953623725 for ; Wed, 09 Mar 2022 04:00:35 -0800 X-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 9ED12168F; Wed, 9 Mar 2022 04:00:34 -0800 (PST) X-Received: from usa.arm.com (R9115T5X.arm.com [10.1.197.38]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 12B343FA4D; Wed, 9 Mar 2022 04:00:33 -0800 (PST) From: "Rohit Mathew" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V1 1/2] Platform/Sgi: Remove redundant platform description from DSDT Date: Wed, 9 Mar 2022 12:00:24 +0000 Message-Id: <20220309120025.10754-2-rohit.mathew@arm.com> In-Reply-To: <20220309120025.10754-1-rohit.mathew@arm.com> References: <20220309120025.10754-1-rohit.mathew@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rohit.mathew@arm.com X-Gm-Message-State: lmeRjDy7SfspO3Y7hlIhGTFAx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1646827236; bh=r9puewQw7JAlW/9dlYRNTjh8Qa2wQWsOQjez3FBiB2c=; h=Cc:Date:From:Reply-To:Subject:To; b=B5Wgf1gdePhiUq9N7hvtgY2oo+JHIcQ1OPJLK0O/MhsyFCKdugkxLzPtE22F3lZ3GCA RbT53SMUIyKp8rErPNJ07JkNRPCrg6ZiirQwLoRkyOWjt51Nza9bxpQ6I+3vzSV4XCmIF 2xgwIeH8s6j3P0m5WB7SpDBQ3OEhi0FTA9w= X-ZohoMail-DKIM: fail (Signature date is -1 seconds in the future.) X-ZM-MESSAGEID: 1646827237968100001 Content-Type: text/plain; charset="utf-8" Remove redundant platform descriptions (descriptions which are already part of SSDT) from DSDT for SGI-575 platform. Signed-off-by: Rohit Mathew --- Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl | 64 -------------------- 1 file changed, 64 deletions(-) diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl b/Platform/ARM/= SgiPkg/AcpiTables/Sgi575/Dsdt.asl index a292d20d8afb..99655c591545 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl @@ -210,69 +210,5 @@ DefinitionBlock("DsdtTable.aml", "DSDT", 2, "ARMLTD", = "ARMSGI", EFI_ACPI_ARM_OEM } } =20 - // UART PL011 - Device(COM0) { - Name(_HID, "ARMH0011") - Name(_CID, "ARMH0011") - Name(_UID, Zero) - Name(_STA, 0xF) - Name(_CRS, ResourceTemplate() { - Memory32Fixed(ReadWrite, 0x7FF80000, 0x1000) - Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 147 } - }) - } - - // SMSC 91C111 - Device(ETH0) { - Name(_HID, "LNRO0003") - Name(_UID, Zero) - Name(_STA, 0xF) - Name(_CRS, ResourceTemplate() { - Memory32Fixed(ReadWrite, 0x18000000, 0x1000) - Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 11= 1 } - }) - Name(_DSD, Package() { - ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package() { - Package(2) {"reg-io-width", 4 }, - } - }) - } } // Scope(_SB) - - // VIRTIO DISK - Device (VR00) { - Name (_HID, "LNRO0005") - Name (_UID, 0) - Name (_CCA, 1) // mark the device coherent - - Name (_CRS, ResourceTemplate() { - Memory32Fixed ( - ReadWrite, - FixedPcdGet32 (PcdVirtioBlkBaseAddress), - FixedPcdGet32 (PcdVirtioBlkSize) - ) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { - FixedPcdGet32 (PcdVirtioBlkInterrupt) - } - }) - } - - // VIRTIO NET - Device (VR01) { - Name (_HID, "LNRO0005") - Name (_UID, 1) - Name (_CCA, 1) // mark the device coherent - - Name (_CRS, ResourceTemplate() { - Memory32Fixed ( - ReadWrite, - FixedPcdGet32 (PcdVirtioNetBaseAddress), - FixedPcdGet32 (PcdVirtioNetSize) - ) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { - FixedPcdGet32 (PcdVirtioNetInterrupt) - } - }) - } } --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#87388): https://edk2.groups.io/g/devel/message/87388 Mute This Topic: https://groups.io/mt/89660191/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 17:42:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87389+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87389+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1646827237; cv=none; d=zohomail.com; s=zohoarc; b=Nj/Ie0aE8wbCSJFHSGMcWyBjwJu2T0UOD3dlpwZbWJHDtBdqREc687vj2+dOo8c6inUZWKxE95WwWLikPyxEhLGg7iOYua5keIUdRAr/OnJ8L4hk+9cpjSSESQQIWSIyBYGHl77J0PqdypDTgN+G3Ak440MVTzBgjDus5N++zNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646827237; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Y40eHtSJmvr+4cKHdJYeOUT/wWCmM64V312qn0yaRHU=; b=MRFutelTYNpoPRLCRWXSaRgDc3UPrfusml4KShkTRsYs/LU3RzlceFxbMkePukJotRFCTbG5tIkfNgPHVXciIeMPzu2vxMpcHSm4SXZQFreGhXZgI0RBySJ5gogWVWHOdzLLRIuh7PLEJJ+JybcmREoCcRS6sdMb2pyIT8154wQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87389+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1646827237152478.1738160508355; Wed, 9 Mar 2022 04:00:37 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id QUHdYY1788612xSuE7ux2Xpu; Wed, 09 Mar 2022 04:00:36 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.4685.1646827235758209034 for ; Wed, 09 Mar 2022 04:00:36 -0800 X-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 682411691; Wed, 9 Mar 2022 04:00:35 -0800 (PST) X-Received: from usa.arm.com (R9115T5X.arm.com [10.1.197.38]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D345A3FA4D; Wed, 9 Mar 2022 04:00:34 -0800 (PST) From: "Rohit Mathew" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V1 2/2] Platform/Sgi: Route logs to different sets of consoles Date: Wed, 9 Mar 2022 12:00:25 +0000 Message-Id: <20220309120025.10754-3-rohit.mathew@arm.com> In-Reply-To: <20220309120025.10754-1-rohit.mathew@arm.com> References: <20220309120025.10754-1-rohit.mathew@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rohit.mathew@arm.com X-Gm-Message-State: q2ODTVGyUE1ULnwkoxUdm2M3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1646827236; bh=EM0pXQIhGDaDUG8oxABAmVWJ6LFOZluy2CGwBmcPeR0=; h=Cc:Date:From:Reply-To:Subject:To; b=HhS9HeAGEWu11UKWcMnIosoWpSHfZvOE90ueVIhwZZyoKKKSPhTrpXTkVJeq68TsqBR fiLt67JkOu/hkEvmxzJNYpqPU/fhF2Cf9hm6c0RjXzWMnxMpEcCF3hDJOMYGoy5xFqenx TVhcKnyrCbSX54OGX6jnV2l3qaNFa0/m2UY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1646827238460100009 Content-Type: text/plain; charset="utf-8" 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 | 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..639d061510b1 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|0x0D400= 000 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0E800000 =20 - # PL011 - Serial Terminal - gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF80000 - # PL370 - HDLCD1 gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x7FF60000 =20 # PL011 - Serial Debug UART - gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x7FF80000 - gArmPlatformTokenSpaceGuid.PL011UartInterrupt|147 + gArmPlatformTokenSpaceGuid.PL011UartInterrupt|95 =20 # PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000 diff --git a/Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc b/Platform/ARM/SgiPk= g/SgiMemoryMap2.dsc.inc index 2d612f9b9674..299a03f49acb 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|0x10514= 00000 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x1052800= 000 =20 - # PL011 - Serial Terminal - gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x0EF70000 - # PL370 - HDLCD1 gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x0EF60000 =20 # PL011 - Serial Debug UART - gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x0EF70000 - gArmPlatformTokenSpaceGuid.PL011UartInterrupt|403 + gArmPlatformTokenSpaceGuid.PL011UartInterrupt|112 =20 # PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0C170000 diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/= SgiPlatform.dsc.inc index 582efb0114c6..b8a67b7bddeb 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
+# Copyright (c) 2018-2022, ARM Limited. All rights reserved. +# (C) Copyright 2021-2022 Hewlett Packard Enterprise Development LP
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -157,6 +157,8 @@ gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24 =20 ## PL011 - Serial Terminal + gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x2A400000 + gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x2A400000 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0 gArmPlatformTokenSpaceGuid.PL011UartInteger|4 diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPk= g/SgiPlatformMm.dsc.inc index 5287e1f8e568..bbbcc7de83ec 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 platfo= rms. # -# 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/Sg= iPkg/PlatformStandaloneMm.dsc index 2cb4895cfcff..306edbf3d1a6 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-E= dge # 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/S= giPkg/PlatformStandaloneMm2.dsc index 46c2ae3529d1..7e2cf6c4bd9d 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 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#87389): https://edk2.groups.io/g/devel/message/87389 Mute This Topic: https://groups.io/mt/89660192/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-