From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.53]) by mx.groups.io with SMTP id smtpd.web12.9365.1597324076314911558 for ; Thu, 13 Aug 2020 06:07:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=g088nOZF; spf=pass (domain: arm.com, ip: 40.107.7.53, 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=wm237v7WmsQ+MUhV6f6nXFwSNd6z1YttIFzMy08pCG8=; b=g088nOZF4tt6Ia9rq8qvkpPXxsMKXnL57wQBlYvTQSLzLDNrNdMSbX/oLwoPOsrSNoy90Ff9RrR5b6leofzpnFUK9DFm2P3XjkFN9LVqmMpwcQGIUA0qlBlIxn46zKGibC8qax+K9AAhtlXz5dP6an7jWbrzphE/NWQFYuKuspA= Received: from DB3PR06CA0031.eurprd06.prod.outlook.com (2603:10a6:8:1::44) by AM0PR08MB5138.eurprd08.prod.outlook.com (2603:10a6:208:15a::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.15; Thu, 13 Aug 2020 13:07:51 +0000 Received: from DB5EUR03FT049.eop-EUR03.prod.protection.outlook.com (2603:10a6:8:1:cafe::e0) by DB3PR06CA0031.outlook.office365.com (2603:10a6:8:1::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.16 via Frontend Transport; Thu, 13 Aug 2020 13:07:50 +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=bestguesspass 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 DB5EUR03FT049.mail.protection.outlook.com (10.152.20.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.16 via Frontend Transport; Thu, 13 Aug 2020 13:07:50 +0000 Received: ("Tessian outbound a0bffebca527:v64"); Thu, 13 Aug 2020 13:07:50 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 826ca630f8df4fa4 X-CR-MTA-TID: 64aa7808 Received: from beb88d77f865.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 2CD54334-7A66-40E5-B8C3-DC7A626BD0EF.1; Thu, 13 Aug 2020 13:07:22 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id beb88d77f865.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 13 Aug 2020 13:07:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T21EuZKd7hG+6LbxDjMa68V3FN6op6pB7Pt21u9wLWjw4PuKEwSNOGR3XBYSogI1Iuoi0OrYSANSk0Pel5GaHEPmB0dvlUsm94tQDBb7ioCIaIp8xRdQerw5PbMKDVhlDB5Elcrj43SN87Ettb6xyv/DF26px3sQR6NdDQ4swJPYyFFTXFpewCb21mPEX+Hy3JsEgK6cI0Hhw0YaD8KCXP6tXv9ZJDhup+zjdfs0Yy06EP2xFIAYZyRgxfQnzoPmZZNvuPjsTLf/fmMUN+16YS5VMJQ/PaB0HXtkqXOVTK49Fvu6CZSzpOH0fd0yeIJUpC44INV+RwmD8Yi7xtg/5Q== 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=wm237v7WmsQ+MUhV6f6nXFwSNd6z1YttIFzMy08pCG8=; b=Mx4ougvSJ7rancxToWsCCnRfORnofQYJtxMIiYvZ3klXUllc4R8/noY1tLO/UJbc0IDvepjdBRLAXQaowNcx4cDaHV1HyAwUVfUabQlMz/5IoItMIIZJMcYz5MWIctgNJ+EuodBZsn4a2YZcb/dSaOQ+UeauRFUuMpz0y35C0jR0sfNJzJyFaZb4Vc3nGfh8hHTIbWwSmg7ypqozDUamtUfa5RlrXgQ9+VbdSTEGk3Ned/6VwDsQ0t4O67v0+GIITfl6T4XqCvEmT/ZfXBoYGGiMlX+ZGWoH9ZtCign8gVPg1aBc9IPJ5JCTr8aRDgtdY1ihF1jpoIEGnRgYrigWPQ== 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=bestguesspass 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=wm237v7WmsQ+MUhV6f6nXFwSNd6z1YttIFzMy08pCG8=; b=g088nOZF4tt6Ia9rq8qvkpPXxsMKXnL57wQBlYvTQSLzLDNrNdMSbX/oLwoPOsrSNoy90Ff9RrR5b6leofzpnFUK9DFm2P3XjkFN9LVqmMpwcQGIUA0qlBlIxn46zKGibC8qax+K9AAhtlXz5dP6an7jWbrzphE/NWQFYuKuspA= Received: from AM6P193CA0102.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:88::43) by AM6PR08MB4101.eurprd08.prod.outlook.com (2603:10a6:20b:a1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.19; Thu, 13 Aug 2020 13:07:20 +0000 Received: from AM5EUR03FT008.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:88:cafe::64) by AM6P193CA0102.outlook.office365.com (2603:10a6:209:88::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.15 via Frontend Transport; Thu, 13 Aug 2020 13:07:20 +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=bestguesspass 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 AM5EUR03FT008.mail.protection.outlook.com (10.152.16.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3283.16 via Frontend Transport; Thu, 13 Aug 2020 13:07:20 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2044.4; Thu, 13 Aug 2020 13:06:53 +0000 Received: from E107187.Arm.com (10.57.42.181) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Thu, 13 Aug 2020 13:06:53 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , Subject: [PATCH edk2-platforms v1-resend 1/7] Platform/ARM/Juno: Remove SSDT UART table Date: Thu, 13 Aug 2020 14:06:46 +0100 Message-ID: <20200813130652.43144-2-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20200813130652.43144-1-sami.mujawar@arm.com> References: <20200813130652.43144-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: eaf05a03-549e-4461-8f74-08d83f89e19e X-MS-TrafficTypeDiagnostic: AM6PR08MB4101:|AM0PR08MB5138: 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: sf6zvyLKvkKXb0sMpI8Ht04mDnFnivtpixzEF0wOGW5aUOXCmSPoFZBDCKXZzOQ4Xq5QlUJfuwIuFe4VcPrarLsu2xAHjWyRTg1RRduy1NnNVWIuD57l3vDpFJ8ZexzMOwS1uDocBjR5KnszGqXeWxn0/0RNguJoyj+Ox4MX5NtGTNRxMYal9vlhQoJ7dua45J9aNKwRtVHsMq+FX8g9rYfgZ3u3I1oMT0hK2ZMdifSLOEKu80hzFH3nmkxWdipB6+GJhV7+wLMt7MF/MNgY4yrOfItb/11B5cvK4S2nnA5SevlDPcYRmJgBvzQKwHhDphX7ljcCNBYrl6UjDSxfviUnuUH3SW9sz2sQFWEoMLWUgq0tM5gFTRFpRb7/Biy4RCkB13LPOIvtPVKYVWPFwQ== 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;SFTY:;SFS:(4636009)(136003)(396003)(376002)(346002)(39860400002)(46966005)(316002)(81166007)(70586007)(70206006)(54906003)(336012)(2616005)(426003)(478600001)(26005)(44832011)(4326008)(6916009)(82310400002)(8676002)(356005)(8936002)(186003)(7696005)(5660300002)(6666004)(47076004)(83380400001)(86362001)(36756003)(1076003)(82740400003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4101 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: eb325393-0a76-41c4-8eb7-08d83f89cff9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E+dkSNQ8Zs1MdVd2T8GUSXG5brRDVz0Ukazsy3FxAmi4JZLIr6FQQWHOZLzR1xUC8DJEfNyLbpy7M1LEWcvEEuFuGu6vIw9OrSfBnUOc86dCB7TWW1mSWhZK+7vhFuFumIogAlryCf37L0b6DiYAooM/Ti1E3KCwfj0nXlrehF3xd1OIb631oc6mK/5NxCM4SESvJ0AACfWY2JZfK9rrYaPIfa3A+lSW8Cgk+7kuZGEufmtcqBA0O3cYTN3TIUQxJY74qKJL1hEtmXNUHmcdEETjVevxf+XXZyh16JD+wA2gpFCtAyfimpa7aMX7ga//h8dhUm+MSK6h+LsAlwrdnOxD3221OuenavG2p+YDb3cF31oViI+HpviEaqg3Z5v8l2uUJlkI9gnFaGMxbp7+sQ== 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)(346002)(376002)(396003)(39860400002)(136003)(46966005)(8676002)(8936002)(83380400001)(5660300002)(54906003)(70206006)(2906002)(6666004)(70586007)(316002)(478600001)(6916009)(26005)(1076003)(86362001)(7696005)(47076004)(82740400003)(36756003)(336012)(426003)(81166007)(82310400002)(44832011)(186003)(4326008)(2616005);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2020 13:07:50.1179 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eaf05a03-549e-4461-8f74-08d83f89e19e 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: DB5EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB5138 Content-Type: text/plain With the introduction of Dynamic AML the DBG2 and SPCR port generators have been updates to generate the AML code for describing the Serial ports. This makes the UART description in the SSDT table redundant. This patch removes the SsdtUart.asl and makes the corresponding changes to the configuration manager. Signed-off-by: Sami Mujawar Acked-by: Ard Biesheuvel --- 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 | 1 - 4 files changed, 1 insertion(+), 52 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 913cffc9b994319065b5292b0d28970a0a0d8320..1d0bcc20b325911d4f1079e8394b20bfb4492507 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 2073ae4902e540de869612353bfaf0ebacaea50d..b6e15015b6edd65a53ea842ac05b5a2e63186b95 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 */ @@ -186,7 +185,7 @@ extern CHAR8 ssdtuart_aml_code[]; /** 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..59e2410d255d71067319204575e9050b6e452427 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf @@ -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)'