From nobody Sat Apr 27 08:16:04 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+90629+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+90629+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1655738737; cv=none; d=zohomail.com; s=zohoarc; b=iX2OesCz2XuK0Uld8Yv1XOWnIKJ/DBA4OxSGs0kNwuEaPcWAptr5hFYXcNGZCEiz2S/YsRqzbkIlyLVZGkOU6rhhEbHfDhS7PxcjqW0Sua2nsv8CF5olFfx8Vg4MGJrxp2ST6HDAgfQsD8YEYEczgl42/4Wc8rRKfnWct3tZTyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655738737; 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=Q2JxAqYhn2F/YFDPYkMC6+rgnmHWJD3kkPGuLpeD7W8=; b=NNeWOjfbHW7foHl7nMEZpD30y+DlE9ERfDqmGQL7i+s8Hu5Jk5Mul6CTQMMWNts6qX5cQ4bSt9ltE63NuuVU6AZ86auQhwiBZ3wGYDkc/s+5Qj7dycUU0HSCgZamOjZOeCdhzpYrMTApOEX3Pelqf7Lyqog2RcOjext7SoW7i0Y= 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+90629+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 165573873719287.30154471876153; Mon, 20 Jun 2022 08:25:37 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id x4sVYY1788612xVhdYw1RKEZ; Mon, 20 Jun 2022 08:25:36 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.31810.1655738735533453928 for ; Mon, 20 Jun 2022 08:25:36 -0700 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 2FD461596; Mon, 20 Jun 2022 08:25:35 -0700 (PDT) X-Received: from usa.arm.com (unknown [10.57.70.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5C93F3F534; Mon, 20 Jun 2022 08:25:34 -0700 (PDT) From: "Rohit Mathew" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V2 1/2] Platform/Sgi: Remove redundant platform description from DSDT Date: Mon, 20 Jun 2022 16:25:23 +0100 Message-Id: <20220620152524.5745-2-rohit.mathew@arm.com> In-Reply-To: <20220620152524.5745-1-rohit.mathew@arm.com> References: <20220620152524.5745-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: nAfGBdFYpVulFqn82R0WJGr3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1655738736; bh=t+G8GiH2kfxK/dTISanYwODtejLn4zcRRdsT4hIsWZ4=; h=Cc:Date:From:Reply-To:Subject:To; b=aJBjMqzFIC8Zvv8AdaurRvywcbQN0VqtQT/mH2FzCov9wYfjlDf96ViOEaCkJY17/Am QFUhaFItZhlJhsJXRQ9Z20VwkP/ljyyDDro8ogrE02MWuZ7HnhpxH1vmWYJAZPB0em9HI xnKN/eGpEyFWgIlAR6+AEVSD3jIV3VRWZ+Q= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1655738738126100002 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 | 66 +------------------- 1 file changed, 1 insertion(+), 65 deletions(-) diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl b/Platform/ARM/= SgiPkg/AcpiTables/Sgi575/Dsdt.asl index a292d20d8afb..80075ee1238b 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl @@ -1,7 +1,7 @@ /** @file * Differentiated System Description Table Fields (DSDT) * -* Copyright (c) 2018 - 2021, ARM Ltd. All rights reserved. +* Copyright (c) 2018 - 2022, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -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 (#90629): https://edk2.groups.io/g/devel/message/90629 Mute This Topic: https://groups.io/mt/91879465/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 Sat Apr 27 08:16:04 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+90630+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+90630+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1655738737; cv=none; d=zohomail.com; s=zohoarc; b=baDu4bwZ0oI5ut+Ms7tqPSqNl1vWJaMoAGL1ojyzqWbuo+gOwxZf0VKbUIOOUIaSpXYXpSqM2ZuA+r9eAQP3nwMccpWxLZXkQobAsJ2A+QazEXjUCvkLtgZsrGsayqnWwZTiER5TduTUeJqpCAUzvEjA2IT3ibTqp1T5cSufU5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655738737; 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=+HRBTXwbNMjrq4QKQdtlAtnqMFFwxZDUw71L+3Tvmro=; b=U5aHvau2kocyqFkMXAm42ZDXpP06UyWi0BL+nVxDEvzIeKYiz9mag4tMfp2hgkmrhIE2KIN/cQ8Y4BCFy3mtEutfbOjVTKYjGbz0ZYhmzR4Eh17ReIdkYau5Nld2reK0O6PVRbSKc0Jz+DudOwhgSdas64KoCz050zWBJ7aDd3w= 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+90630+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 1655738737539306.3837060405085; Mon, 20 Jun 2022 08:25:37 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id E7XGYY1788612xLXQM3KE0dz; Mon, 20 Jun 2022 08:25:37 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.31811.1655738736200362995 for ; Mon, 20 Jun 2022 08:25:36 -0700 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 1522F1655; Mon, 20 Jun 2022 08:25:36 -0700 (PDT) X-Received: from usa.arm.com (unknown [10.57.70.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4A0D13F534; Mon, 20 Jun 2022 08:25:35 -0700 (PDT) From: "Rohit Mathew" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V2 2/2] Platform/Sgi: Route logs to different sets of consoles Date: Mon, 20 Jun 2022 16:25:24 +0100 Message-Id: <20220620152524.5745-3-rohit.mathew@arm.com> In-Reply-To: <20220620152524.5745-1-rohit.mathew@arm.com> References: <20220620152524.5745-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: uIGSb5D2uAQ69MLVxtowdIEOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1655738737; bh=vDpaL9dBS4c/NkbdCq10shPE1O567Ic2i3I4JXcPEfc=; h=Cc:Date:From:Reply-To:Subject:To; b=csUcYjXqygjr70tWRogHMBuxqnK7K0RT9uaVM5e+/ahMxmepQwBYQ6uC/PHGCnp7MJ2 pIjrTwStQ38pzqmnDj6m63FRtrs2IWBmL7MCfn09Y+gGm5QH+F32816JE6rbeBWcK/M+T vhtHIMpns4/+MwieNgK4a71gwdfFyjdyIRs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1655738738149100003 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..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|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..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|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..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
+# 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..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 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..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-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..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 =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 (#90630): https://edk2.groups.io/g/devel/message/90630 Mute This Topic: https://groups.io/mt/91879467/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-