From nobody Mon Apr 29 07:38:42 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+90677+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+90677+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1655898999; cv=none; d=zohomail.com; s=zohoarc; b=cxT2PIA070qTAv8zRixb3f1PdYNREp+DezYjpgeJScmjem1T1LcmRrWDH7Yf5rvtZmohzt0gQwhG9sGOZ2TBHMRhO2vehA/VdBeujfYAZTAF07emkJVuE1bEyhqI/FqA6IqrqNs4NtMM0zuD1l2UIcTnghP9MhOEwtXAuk2hfzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655898999; 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=JjfaCdwu3oyw6Mgpf7CLP+LevjJx86/G+e31ii1ZmCA=; b=L+rmTsSNy5O4Rfl5SqRG1e839f9nwghOE4JGqzr1ZQFKY4rXcnEerWTbfX8nt8V5neasWqgHw9IDH+KS1Q8uWFde4wTQg3Zu189vDs0Y6CWFb5fkA2HD8+4qv2k7nHM9TFgXFZRp+lmkeFVfKLcdvo126lR/zONJGVes6M2d3uM= 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+90677+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 1655898999855861.1927233979251; Wed, 22 Jun 2022 04:56:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Y4zMYY1788612xhpa9OEXrzq; Wed, 22 Jun 2022 04:56:39 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.6212.1655898998414376645 for ; Wed, 22 Jun 2022 04:56:38 -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 116F01477; Wed, 22 Jun 2022 04:56:38 -0700 (PDT) X-Received: from usa.arm.com (unknown [10.57.70.250]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 415953F534; Wed, 22 Jun 2022 04:56:37 -0700 (PDT) From: "Rohit Mathew" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [edk2-platforms][PATCH V3 1/2] Platform/Sgi: Remove redundant platform description from DSDT Date: Wed, 22 Jun 2022 12:56:31 +0100 Message-Id: <20220622115632.20490-2-rohit.mathew@arm.com> In-Reply-To: <20220622115632.20490-1-rohit.mathew@arm.com> References: <20220622115632.20490-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: pzbdcouTWxmpTidwFMfFVsf1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1655898999; bh=oCSF1TE0jI4go/++h5BAASwoVdpveEfB0OrcX86IixQ=; h=Cc:Date:From:Reply-To:Subject:To; b=ePMA+tWGmZEkrAU1ZKHgtCMZSmVJ9B6Ghf3GH4BawmQ04HdpTZ6gv/9YUv6gBoHpQYT Ls8/fnrRx2Sp8QxCbBshTElUWLvXoS8N1NtvTWnPr+kI/SnO3Tt5sev8zqQ4rQCSDh4MX PpmfhNJ61jeqJKx9VkKi5QLGdDQ7OnXibYg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1655899000404100002 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 Reviewed-by: Thomas Abraham --- 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 (#90677): https://edk2.groups.io/g/devel/message/90677 Mute This Topic: https://groups.io/mt/91920026/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 Mon Apr 29 07:38:42 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+90678+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+90678+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1655899000; cv=none; d=zohomail.com; s=zohoarc; b=HkVfjKi3MqCYYH8L98eygmyKmthRMo3aEzIAtBVa3+8U6SH5TsS3SbRT3CDp8Hlwf3jfQ1ghlDLyBEOahKQIWAy8sdMzmJ+hPYmKYCrfdCyHC4vHXgUDXduven39K5kHdPJwALcNEOvG8xGGSnpEpK1D8UJqlBod0LiS8/hrVa0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655899000; 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=er5Q6XeJQl2fVbIrsI8jvosUABgWnphU9CBX3oQ83Kk=; b=FNhLk0E0R5cyA1AQSqKNkC6Re0Vxt5wLDZda7cLE0D80IuDDrNWgkL/FPwWkkenidhsbg98sX8DyuIpEqI4bG6yD0oXOaHv1P0egrL2CYUyHXK288kIbPMZKOX5Wj2tdZLFc6KDRJeS4anCmmPxzc58iRnhGfl3jno7UG0hOVJM= 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+90678+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 1655899000362949.2073889845354; Wed, 22 Jun 2022 04:56:40 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 46HpYY1788612xblzWg5GRd1; Wed, 22 Jun 2022 04:56:39 -0700 X-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 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 EB2C1150C; Wed, 22 Jun 2022 04:56:38 -0700 (PDT) X-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-devel] [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> In-Reply-To: <20220622115632.20490-1-rohit.mathew@arm.com> References: <20220622115632.20490-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: A98vHEOosF2Zrb5dtkkIR0Eox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1655898999; bh=zp5ArnmGo2wMLTD2+7+f3aGIh5oTwV7lqE/1lEuzSi8=; h=Cc:Date:From:Reply-To:Subject:To; b=IkE7PO60YrhFObZ/gOMw++mYjcWYBvrXs8HqkJJIMsPe2V96MYbAYTdagiemS+anjOk QxyVE+ecGHZsoRfmhpTMY0OIghOKKbnAIIqlSAJEo5Rl90ISCawEauCiQgUZ1LdfQYe1c l5Uocl3TJn/HjJMlDLCCy+l7S1j97gE7pQs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1655899002432100011 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 Reviewed-by: Thomas Abraham --- 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/SgiPkg= /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|0x0E800000 =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/SgiPk= g/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|0x1052800= 000 =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/SgiPkg/= 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/SgiPk= g/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 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..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-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..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 -=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 (#90678): https://edk2.groups.io/g/devel/message/90678 Mute This Topic: https://groups.io/mt/91920028/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-