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.82]) by mx.groups.io with SMTP id smtpd.web12.8861.1611322196487602466 for ; Fri, 22 Jan 2021 05:29:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=tx4u/6V7; spf=pass (domain: arm.com, ip: 40.107.15.82, 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=I4xb7j32SQgqiVfKCDIRcwW5IUaUQsxSFWOIm8kGHcg=; b=tx4u/6V7mgHskZ1oxhny9yzh7ZvmUpNP5hBLhseMzEER43ET7XYb2wOsWhOkC/bVVUmuobPKdPIyL1HM/0vsMi928yRl50XyF6oSXfi+pC/rEv45z2I7+8HIw8MVmgvN9DDS0peRyV3zz8atHJK6eJC7htBj2fUnb4STnxYNskE= Received: from DB6P192CA0004.EURP192.PROD.OUTLOOK.COM (2603:10a6:4:b8::14) by VI1PR08MB2640.eurprd08.prod.outlook.com (2603:10a6:802:1a::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Fri, 22 Jan 2021 13:29:50 +0000 Received: from DB5EUR03FT008.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:b8:cafe::52) by DB6P192CA0004.outlook.office365.com (2603:10a6:4:b8::14) 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: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=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 DB5EUR03FT008.mail.protection.outlook.com (10.152.20.98) 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:50 +0000 Received: ("Tessian outbound af289585f0f4:v71"); Fri, 22 Jan 2021 13:29:50 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: a93e7740484154a2 X-CR-MTA-TID: 64aa7808 Received: from 329c75b8d889.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 74E1FC93-57BD-4CEC-BF55-2A9E62069313.1; Fri, 22 Jan 2021 13:29:44 +0000 Received: from EUR03-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 329c75b8d889.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 22 Jan 2021 13:29:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j86I7Vi1hF+Jmzr9UChTaFkssTHNtanB6rfhBPbGS09tU94oqi3g8NX6b7p9vIFj/gsTfloxfwN9M7FwImOLwVnRx23LH4MRuE54OZuU9GNchsEhUHloSe4d07q6lWsTFxbJREVsFr9GVvOWc47qUb7q3BH1HsDai+/qVBh3wgVqMD8azaTMYX6+9nRqFvhySaGHWlTa278uXN3ruYjffcfqUa7aok/fTo5swiAy07LiYPaCYXERY6XKDO7prcPDwgQN2CZorLdVVJxvVPtHmsXMsCkTzKeHuDOeT9qE9rUu3pKJ5gzF5nc+y2/OzgF9MTgPWel7mok5XrQrJfxJyw== 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=I4xb7j32SQgqiVfKCDIRcwW5IUaUQsxSFWOIm8kGHcg=; b=aR+4P2tQxiZkEr3MngiiZJRsl7edyX/R3URIYCKmI9iSGPhO7uMovHPb74dbWLtMxG8cj0FWqC6NSVeyl8DnPUtCfXPNYdd4jQotCJgNKfyYZ9RADxsZQ+fXntvt4sgKRbkggdB/0cGzMU+WtstdEpBAa0bt5WEVToPtIdY2Q5V4i+7jxXbjC8rYzG2WpjJWEFPHJeJQd6uecOwNY/CowOOzvlSNT3BiRcWp7S5m66Z9VPC05VhIYOrJv2YMeBN04pUjMAM/fJSBFhUx+QsX1k221X4tr9tuu+LwbDZp4o00zkyMYyLuJWYUX3gmHXgSZ2F40+r2fc2X4MOI1QBGkQ== 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=I4xb7j32SQgqiVfKCDIRcwW5IUaUQsxSFWOIm8kGHcg=; b=tx4u/6V7mgHskZ1oxhny9yzh7ZvmUpNP5hBLhseMzEER43ET7XYb2wOsWhOkC/bVVUmuobPKdPIyL1HM/0vsMi928yRl50XyF6oSXfi+pC/rEv45z2I7+8HIw8MVmgvN9DDS0peRyV3zz8atHJK6eJC7htBj2fUnb4STnxYNskE= Received: from DB6PR0202CA0001.eurprd02.prod.outlook.com (2603:10a6:4:29::11) by HE1PR0802MB2347.eurprd08.prod.outlook.com (2603:10a6:3:c8::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.15; Fri, 22 Jan 2021 13:29:41 +0000 Received: from DB5EUR03FT005.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:29:cafe::df) by DB6PR0202CA0001.outlook.office365.com (2603:10a6:4:29::11) 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:41 +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 DB5EUR03FT005.mail.protection.outlook.com (10.152.20.122) 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:41 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) 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:39 +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:39 +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:38 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [PATCH edk2-platforms v1 3/6] Platform/ARM: FVP: Fix serial port usage Date: Fri, 22 Jan 2021 13:29:32 +0000 Message-ID: <20210122132935.22484-4-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: 01d81973-4360-414f-49f6-08d8bed9cb65 X-MS-TrafficTypeDiagnostic: HE1PR0802MB2347:|VI1PR08MB2640: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: E2dyjKQT3a2Yt+MjPcKbyuNPAYfL/F/eFQuXqmlo2CFCEAQA7xDwsZiejRDAOzrv9/RqFR+2gv2L5jGtLCa5ubZgWkMOHrs06hZm6a1DYzNPQUhPbdMyGHN+kpjo0Vh6E1QGHlVEbm6MTB2rmlf9CqYwFME7uxVBRT3kP+k+ie8LNi1ciBZTwbNWWOPhfk0+Va50YxEMvxqayGOzTguoY5VLWtOWZcx6Sh53QnNIAjIaHoYUwd04ae9y4UL1mi7Wr4mdZS/51y2LXz45inEnP0C7OkNdNryFHTPsmgNaMqL9iI8GaWbhfr4mVHAdJl4g2TJoH3M4Plz+00QBu0CoQjRndAtq2pz3l3tDFyU6uh3D6gt6pjxmYPzULMpi1JqNxFs1FsfKgeW++oSxpiiBANiWUZ31YZoDk/mioER+y/fwDrh1+Ty0j1P9Wz4btIpnRIxdPZy3Ek7N7vLwCCoD3N4EYlZfWbK5zEJm9EBQfENwxGudoK3oKS6sV5N2mkOQmJw5954RnG3oWkqLG/+Ok27glwJs3U5F3p1oSFvvw8LkmbAkLp4vbjykF1HGq+4BtbLas7DNaCxjO3zrv6Pry9BMZPhwjXaiITfb1GCiglf2UccCbVFgmzojlByxe5JQiS19bpvfrUDKmM1cvMTZow9B1nn6OBGW+7B0+FkaqPn4n60vJwCrYMQuUqcATQS68EIjwK00mgWMds1RI7HHRQ== 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)(39840400004)(346002)(136003)(376002)(396003)(46966006)(6666004)(4326008)(86362001)(81166007)(82310400003)(356005)(6916009)(8676002)(44832011)(47076005)(336012)(36756003)(2616005)(426003)(966005)(83380400001)(186003)(26005)(2906002)(8936002)(316002)(478600001)(70206006)(70586007)(5660300002)(1076003)(7696005)(54906003)(36610700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2347 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT008.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 2ce35412-5b39-4d48-c600-08d8bed9c60f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w2oZnpqZxWgu+dmFNNINKJoyv+539nChGQ6XrM86MEZvMxVm7VQRjzQgbi4h1o9pq28leUpy1Or3Sg5hzWtmZYfMdmley41mr64e3zJlkKEinI1HQGkYNaAMgdSWnSDPBksYjdxgta2Yg2pzE4bhMLgn+LlPAsqFj5EZgZWXtNeTebSF+H5MMXJMPuFWD+io0saSf8Q16fERPuCXatsHTcB2s6vBto/DLi2o4vlcWT+bzsEG1xmk3sRLERttMp9aUG2JrOjw6TkOQBxU6399h+pnZlbOlzJL5aK8+bxkeaE3yagMhkgDYpC5JDqoxJEKPpNGutxXYWOZ+4sD96jTJNoCcoazhyad/IsZ3S9FeSIvF+JzWBodBgkdnX8SvD0b380C9mH63UpKCupUrz5U0nYbYqCfy390a01G/eZkXLxS5PLrxgo6MPYeHwRDIgtGWfpROkVvKDieseZSz45+h9zMq3C94RisEfi5qmrB2ZCKQy9qpLdjb8rRha36YdXgCxm2HjLJqg6/u4ZwdjLhAH/XqdWIrzBIJT/GfPkATaQ= 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)(376002)(346002)(39840400004)(136003)(46966006)(70206006)(8676002)(36756003)(6666004)(26005)(316002)(7696005)(186003)(70586007)(6916009)(86362001)(82310400003)(44832011)(5660300002)(2616005)(4326008)(426003)(966005)(81166007)(83380400001)(1076003)(54906003)(2906002)(47076005)(8936002)(478600001)(336012);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2021 13:29:50.2368 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01d81973-4360-414f-49f6-08d8bed9cb65 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: DB5EUR03FT008.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB2640 Content-Type: text/plain The serial ports on FVP are follows: UART# Address Interrupt No. ----- ------- ------------- UART0 0x1c090000 0x25 UART1 0x1c0a0000 0x26 UART2 0x1c0b0000 0x27 UART3 0x1c0c0000 0x28 See Fast Model Reference Manual at: https://developer.arm.com/documentation/100964/1113/ The FVP firmware configures the debug log output on UART1 and the UEFI shell is configured to use UART0. The Serial Port Console Redirector (SPCR) table is configured such that the UEFI shell is migrated to the OS serial console. When Dynamic Tables Framework is enabled, the FVP Configuration Manager uses the PCDs PcdSerialRegisterBase and PL011UartInterrupt to populate the SPCR table. The current firmware implementation has two problems: 1. The PL011UartInterrupt was not set to the correct interrupt number. Therefore, the OS serial console was not fully functional (serial output was printed but input could not be provided). 2. The OS serial console was setup on UART1, while it should have been UART0. Therefore, when Dynamic Tables Framework is enabled fix the UART base address and interrupt number such that UART0 is configured in the SPCR table. Also remove ConfigurationManager.dsc.inc as this is now redundant. Signed-off-by: Sami Mujawar --- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 11 ++++++++--- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc | 19 ------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index a6f536a332281a624403dac2e4bf18aa9ba96d0b..f8c703c4b22b2a26028ba0562e0eae5948c3292d 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -1,5 +1,5 @@ # -# Copyright (c) 2011-2018, ARM Limited. All rights reserved. +# Copyright (c) 2011-2021, ARM Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -34,7 +34,6 @@ [Defines] !include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc !ifdef DYNAMIC_TABLES_FRAMEWORK !include DynamicTablesPkg/DynamicTables.dsc.inc - !include Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc !endif [LibraryClasses.common] @@ -126,7 +125,7 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x1c0a0000 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0 - gArmPlatformTokenSpaceGuid.PL011UartInterrupt|0x25 + gArmPlatformTokenSpaceGuid.PL011UartInterrupt|0x26 ## PL011 Serial Debug UART (DBG2) gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x1c0b0000 @@ -267,6 +266,12 @@ [Components.common] !ifndef DYNAMIC_TABLES_FRAMEWORK MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf +!else + Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf { + + gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x1c090000 + gArmPlatformTokenSpaceGuid.PL011UartInterrupt|0x25 + } !endif ArmPkg/Drivers/ArmGic/ArmGicDxe.inf diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc deleted file mode 100644 index 0915c154cce6b0686f67a383dc69231ed3ed6f36..0000000000000000000000000000000000000000 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc +++ /dev/null @@ -1,19 +0,0 @@ -## @file -# dsc include file for Configuration Manager -# -# Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -## - -[Defines] - -[BuildOptions] -# Required for pre-processing ASL files that include ArmPlatform.h - *_*_*_ASLPP_FLAGS = $(PLATFORM_FLAGS) - -[LibraryClasses.common] - -[Components.common] - # Configuration Manager - Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'