From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.87]) by mx.groups.io with SMTP id smtpd.web08.8873.1611322195183273497 for ; Fri, 22 Jan 2021 05:29:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=DkAvHr8L; spf=pass (domain: arm.com, ip: 40.107.15.87, mailfrom: sami.mujawar@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1q99Xos4ldBimUGRd441XOTGDi+/HNgrn0Lr7kl9ZHk=; b=DkAvHr8LHsWdJUs3wZJlMNNi7Ue3VwF6uYiNXFo1pEwhn+M1PZj8NkQDkzRgOqYuhwoeNtow0yf0UCxfrJw0P5A0TSIDehItva9joeDIJ6b52p9/fczg0An1jjvOiasnpO58FjxU98PmjqOoWN3n3AwivFTwdJqPnBHblYZUZC4= Received: from AM5PR0201CA0023.eurprd02.prod.outlook.com (2603:10a6:203:3d::33) by VE1PR08MB5247.eurprd08.prod.outlook.com (2603:10a6:803:10d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Fri, 22 Jan 2021 13:29:52 +0000 Received: from VE1EUR03FT039.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:3d:cafe::28) by AM5PR0201CA0023.outlook.office365.com (2603:10a6:203:3d::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Fri, 22 Jan 2021 13:29:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT039.mail.protection.outlook.com (10.152.19.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:52 +0000 Received: ("Tessian outbound 587c3d093005:v71"); Fri, 22 Jan 2021 13:29:51 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 892b8120792c9d4d X-CR-MTA-TID: 64aa7808 Received: from 62c0f0959067.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id FF617CC0-6621-4037-A4A9-9F5E56E23B7A.1; Fri, 22 Jan 2021 13:29:45 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 62c0f0959067.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 22 Jan 2021 13:29:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bagMDmUJAnXAatkBW3ZpXbBaxMOxok6RmbYmRjoLPZrFWk7YUIdbHz9mvXNR5u3FSSen9CNHJucIkKyE9pcRVi7mYuz0FiOTM0nv3AT/6cuBfpYIBHWqXnJn3NfeBax5w2/kmkT+mjZzO9y1hdzmPdaDXwzpp6L9hrx+FqmcO09G9NaL8LxIej+qym7iJwzFk8vcxII4pL4FoL5BFZqFNLo75DfdzN2xT/ctFmkcPer6edmWHz6ZN2UjQc+LDcVBnVCbMFEXpVUmDs+YIau4RLDPYt1CO7Q0U029Rq7TuwVQSi1F/zYUBuqVSUR/aq1a1B0Rv4v44kYUw1PeleKG4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1q99Xos4ldBimUGRd441XOTGDi+/HNgrn0Lr7kl9ZHk=; b=lJ7TpQkqSNNpl1AOiIM18wHk47NCQnoZgMt3R32Jtq56aAG1kmOeaMt6YLJwafyPY80VO+zDYkJ1MG+qPmc3I0dI4JT9hgmJKKQuL7wICSF5QS2QfF9MmiiI9vRTIOl6D513gZoVriC+V+UzP4dAHGQ+2FV97M0mBq1mwq5ypZEFdSdfo9vazo5RcA3WHXCQvK9dLKNH+xjaupGJY8B5frRYtL/2ttOIB9a354BKxOPBgtxbxfCLtqDS+YYHZgAGqnl+qrd2lj/Wt6jDCr/iQmOiPTxZtkc3T2sswJH3m+p2X/WsADW0GN6V807I1khozt4n+U0eTZNXATN3POBSkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1q99Xos4ldBimUGRd441XOTGDi+/HNgrn0Lr7kl9ZHk=; b=DkAvHr8LHsWdJUs3wZJlMNNi7Ue3VwF6uYiNXFo1pEwhn+M1PZj8NkQDkzRgOqYuhwoeNtow0yf0UCxfrJw0P5A0TSIDehItva9joeDIJ6b52p9/fczg0An1jjvOiasnpO58FjxU98PmjqOoWN3n3AwivFTwdJqPnBHblYZUZC4= Received: from AM6PR0202CA0067.eurprd02.prod.outlook.com (2603:10a6:20b:3a::44) by DBBPR08MB4458.eurprd08.prod.outlook.com (2603:10a6:10:c8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10; Fri, 22 Jan 2021 13:29:43 +0000 Received: from VE1EUR03FT057.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:3a:cafe::69) by AM6PR0202CA0067.outlook.office365.com (2603:10a6:20b:3a::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Fri, 22 Jan 2021 13:29:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT057.mail.protection.outlook.com (10.152.19.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:42 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2044.4; Fri, 22 Jan 2021 13:29:40 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1779.2; Fri, 22 Jan 2021 13:29:40 +0000 Received: from E107187.Arm.com (10.57.3.168) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Fri, 22 Jan 2021 13:29:39 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [PATCH edk2-platforms v1 5/6] Platform/ARM: Juno: Remove Serial port SSDT Date: Fri, 22 Jan 2021 13:29:34 +0000 Message-ID: <20210122132935.22484-6-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20210122132935.22484-1-sami.mujawar@arm.com> References: <20210122132935.22484-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6604c52-adc3-422c-0add-08d8bed9cca7 X-MS-TrafficTypeDiagnostic: DBBPR08MB4458:|VE1PR08MB5247: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:8882;OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Ud8uYK61Ysspd5VftWy7kOwEdPbpJ/BOab8SrmAWYYroFQjdQ6+AT+PLVjd9DWeJcyoyeDBD4V19lOqQKX/znpPewlERSZts148qHHQ9U7Dlwh9BfwbdflXDH2X2Gxbxf1cimu7K+TFPEc0m065F1TZyNL+8usGFa5FvQ97XkPfMmCimzNHCZtkoSFeDMRX/P9KD3IP7ckHPafGJpGVSxXa1Vau4yBh3WH9Envk3/B7w+wdO7/1wM0t6DMQ6S8E5Gj3wiaV+QUhU7FPgl0Tji8AxjeExNHJZp1Mrr0mnf6N/SMGwLNLLmFBfrUksnmFGYzvtwmSFuqGSU4CJKA1BZHu41uwFkfNuVjBe3zsj5FTWm2hWhgM9tnbIpFgDtSfIM+aJm0B6JdXHJTiVray7q48eXE/erYLs0Sy4DhudKHlkuWtAHRDeUkAxPGVCHbmQS3vRx67k3aWIMjoQuuX397NRyH4cXtiiVmM9C3m32fhB6t3ZyQL6T6nzA+59afV6 X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(396003)(376002)(39850400004)(346002)(136003)(46966006)(2906002)(82310400003)(83380400001)(336012)(8676002)(86362001)(186003)(356005)(26005)(478600001)(82740400003)(8936002)(81166007)(54906003)(5660300002)(70206006)(47076005)(1076003)(6666004)(7696005)(36756003)(70586007)(426003)(316002)(6916009)(2616005)(4326008)(44832011)(36610700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4458 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT039.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 2e9bd59a-6987-449e-b553-08d8bed9c6b4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M0HEx6tis+GZQS6N4QDfRnOXr0ooTWrV/ZShJwd8FohDwLIKu4Wz/bQPCXSIvW40hnI08O610bbxWq+ZxslRJgrA8eYZJpDo+dMrvbwhJiUuTd32vrYqfuFelf2PVtnFC/66ZEZMXjMDuGuXfrBM6PterQxbzA1JDOSiCzTRT+62NVgosbwvO/4m74/BkYywpCD1sxs4EQ3D8iGgqefqsm6EKlg6f3wr36WVzkZpwFwmVM/dwwvhTw2RsW2aRUFt2fgIQMgVSE6WFlOUHvBKVulJFNcGveNVscqLq7fcIw/39x8GkqNngFZI5fkKpnCf5sOUUXOIeLyX+HtK6flPqFLR/t5nP0K0QCebZNyiVvN7IBMdYCmqcoHcYBRSX/ZdZv2EUCPG7FE6z6c1EDaLCkUe8Ayiedzo6lkRTuzKX7hEBiy/Fickl0023tfXINEup+PYT2OAKWQKdEJbACUmHA== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(396003)(39850400004)(346002)(376002)(136003)(46966006)(1076003)(8936002)(5660300002)(186003)(47076005)(26005)(82740400003)(83380400001)(70586007)(36756003)(81166007)(2906002)(6916009)(70206006)(478600001)(316002)(54906003)(6666004)(336012)(44832011)(426003)(7696005)(4326008)(8676002)(2616005)(86362001)(82310400003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2021 13:29:52.2245 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e6604c52-adc3-422c-0add-08d8bed9cca7 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT039.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5247 Content-Type: text/plain Dynamic Tables Framework has been updated to add support for Dynamic AML. The SPCR and DBG generators have also been updated to dynamically generate the AML description for the Serial Ports. Therefore, the SSDT serial port description is redundant when Dynamic Tables Framework is enabled, so remove it. Signed-off-by: Sami Mujawar --- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtUart.asl | 42 -------------------- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 7 ---- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h | 3 +- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf | 3 +- 4 files changed, 2 insertions(+), 53 deletions(-) diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtUart.asl b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtUart.asl deleted file mode 100644 index 55a7ffc83fd6bb44ed9b9ca8b0a53e757aa2dd58..0000000000000000000000000000000000000000 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtUart.asl +++ /dev/null @@ -1,42 +0,0 @@ -/** @file - SSDT for UART - - Copyright (c) 2014 - 2019, ARM Ltd. All rights reserved.
- SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ -#include "ArmPlatform.h" - -DefinitionBlock("SsdtUart.aml", "SSDT", 1, "ARMLTD", "ARM-JUNO", EFI_ACPI_ARM_OEM_REVISION) { - Scope(_SB) { - // UART PL011 - Device(COM2) { - Name(_HID, "ARMH0011") - Name(_CID, "PL011") - Name(_UID, Zero) - - Method(_STA) { - Return (0xF) - } - - Method(_CRS, 0x0, NotSerialized) { - Name(RBUF, ResourceTemplate() { - Memory32Fixed( - ReadWrite, - FixedPcdGet64 (PcdSerialRegisterBase), - 0x1000 - ) - Interrupt( - ResourceConsumer, - Level, - ActiveHigh, - Exclusive - ) { - FixedPcdGet32 (PL011UartInterrupt) - } - }) - Return (RBUF) - } - } - } -} diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c index 8d92a8a666af4c5555343a929cb2d5063e54ffd5..80a98a10d869d48fc768db7bf5bfccb41f483fc3 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c @@ -83,13 +83,6 @@ EDKII_PLATFORM_REPOSITORY_INFO ArmJunoPlatformRepositoryInfo = { CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdSsdt), (EFI_ACPI_DESCRIPTION_HEADER*)ssdtjunousb_aml_code }, - // SSDT table describing the PL011 UART - { - EFI_ACPI_6_2_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE, - 0, // Unused - CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdSsdt), - (EFI_ACPI_DESCRIPTION_HEADER*)ssdtuart_aml_code - }, // PPTT Table { EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h index f382c7f967420c4fa8f272f3fee5c8f191999b23..771b00c31b9e168d2b416a87b8743d2e063f1744 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h @@ -19,7 +19,6 @@ extern CHAR8 dsdt_aml_code[]; extern CHAR8 ssdtjunousb_aml_code[]; extern CHAR8 ssdtpci_aml_code[]; -extern CHAR8 ssdtuart_aml_code[]; /** The configuration manager version */ @@ -116,7 +115,7 @@ typedef EFI_STATUS (*CM_OBJECT_HANDLER_PROC) ( /** The number of ACPI tables to install */ -#define PLAT_ACPI_TABLE_COUNT 11 +#define PLAT_ACPI_TABLE_COUNT 10 /** The number of platform generic timer blocks */ diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf index a3e7db12f8c913f7111b5ff4ad724a5bdcc35956..00be2c435bd6eefe4b26017608b62f085bb2d7f7 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf @@ -1,7 +1,7 @@ ## @file # Configuration Manager Dxe # -# Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -25,7 +25,6 @@ [Sources] AslTables/Dsdt.asl AslTables/SsdtJunoUsb.asl AslTables/SsdtPci.asl - AslTables/SsdtUart.asl [Packages] ArmPkg/ArmPkg.dec -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'