From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.77]) by mx.groups.io with SMTP id smtpd.web11.9496.1597324074177703452 for ; Thu, 13 Aug 2020 06:07:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=G58BKm3M; spf=pass (domain: arm.com, ip: 40.107.21.77, 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=gvg0DF7ScFSYQYFtWdCtImrp+0LvektdexvUYgDqZVg=; b=G58BKm3M0HA7lHKfgeKGt5uWJq2iVn6f4v4yA3yBrx6+AAagW1LTi0ze517ZcgJs+vWpQyQ4hPcJSGc+rGdNkUHNzEUqGlDlKSANK+1XNFvUVAnitMrADcWZk99Sn0enVA7b2DqfoWOanEMViVuUkOcrIWVX5S9OEEDICg5mgmI= Received: from DB6PR07CA0065.eurprd07.prod.outlook.com (2603:10a6:6:2a::27) by DB7PR08MB3356.eurprd08.prod.outlook.com (2603:10a6:5:1c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.20; Thu, 13 Aug 2020 13:07:51 +0000 Received: from DB5EUR03FT033.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:2a:cafe::a) by DB6PR07CA0065.outlook.office365.com (2603:10a6:6:2a::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3305.10 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 DB5EUR03FT033.mail.protection.outlook.com (10.152.20.76) 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 bac899b43a54:v64"); Thu, 13 Aug 2020 13:07:50 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 236bdb4910a11f0b X-CR-MTA-TID: 64aa7808 Received: from 9a56d487f6e4.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 1E4DEF0C-6C90-4561-AB06-21A0D3503F45.1; Thu, 13 Aug 2020 13:07:23 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 9a56d487f6e4.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 13 Aug 2020 13:07:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PkjLCy9Jjd6y+tla5daiOl3ab0jA0xCLEqzhQ1nB0spsXXXGIBnamIovLo1V/7oL44HftP066Uohy3xb0OQMbK3IP4S/yZa5AytHA8dZ1lgX0SM0a5KMbSp0a+tstVFN8UH3bvms4pkYI2zKUaWz0VyAMdbFG31o4GyWL2RtJeJAG4/Vbux9l9Y+PDQLEM3mTTrI3StP+3oxxZWDT8u6kC5uJIaNd/thN+iqzNrWrsyFgaaTiuHD9rONdfvh5k4BTCAg1zOonh1GlKsBIq/sGXGEYxjeek5E0df8wXvekWDdBgI7biSupWUZPC0nclTw9EOTO2yyB3fo8OiMJTGG3g== 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=gvg0DF7ScFSYQYFtWdCtImrp+0LvektdexvUYgDqZVg=; b=fInhjD68ouH5GH6hkjq3nKZm6VUu55ipcWievxjTApDB/pUbEEHG/qap9cyQbRh/4lgMSjcOj0Xb/nIV1B76piL9fLc5aPDLHThfkeo4LGlMzoDeYMfpb85Nx7mUk3KSTWEdi/BKZozKDvWtZ+eQSv6X+ME6iDRExQM6eRU7CgjKBWVONMexvuBAaLJ0duoIe4hPpEq+/Z1Z3fGm/jAiBEx4+Lo5zjs2fm+bNBQaPllVM7wWcifnvFRsBeu+66ApoSXGdA3ji2hDgY0ax5SghStt5e6k3YRk2aCyxmalr8oF0mIh1BPI0Ip4TNrAyLoDaL9j+GgAtAvTM/T5vq+pKw== 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=gvg0DF7ScFSYQYFtWdCtImrp+0LvektdexvUYgDqZVg=; b=G58BKm3M0HA7lHKfgeKGt5uWJq2iVn6f4v4yA3yBrx6+AAagW1LTi0ze517ZcgJs+vWpQyQ4hPcJSGc+rGdNkUHNzEUqGlDlKSANK+1XNFvUVAnitMrADcWZk99Sn0enVA7b2DqfoWOanEMViVuUkOcrIWVX5S9OEEDICg5mgmI= Received: from AM0PR02CA0105.eurprd02.prod.outlook.com (2603:10a6:208:154::46) by AM0PR08MB3619.eurprd08.prod.outlook.com (2603:10a6:208:e3::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.22; Thu, 13 Aug 2020 13:07:22 +0000 Received: from AM5EUR03FT004.eop-EUR03.prod.protection.outlook.com (2603:10a6:208:154:cafe::94) by AM0PR02CA0105.outlook.office365.com (2603:10a6:208:154::46) 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:22 +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 AM5EUR03FT004.mail.protection.outlook.com (10.152.16.163) 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:21 +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:55 +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:55 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , Subject: [PATCH edk2-platforms v1-resend 3/7] Platform/ARM: FVP: Fix serial port interrupt Date: Thu, 13 Aug 2020 14:06:48 +0100 Message-ID: <20200813130652.43144-4-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: 7e7cde85-f042-4b14-d8b0-08d83f89e21f X-MS-TrafficTypeDiagnostic: AM0PR08MB3619:|DB7PR08MB3356: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:8273;OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: B/NnBBqlx5nE1ezoguZZ50yc3oNi2+nQa38Iwp005XNktakmXOogKamzvc8lFnJXo5be11AF8EMv0Pxkp86b3YghAnCfPNGCUX8fQ1APsvs/wrI+njjrMQ0fZ+6PC/XNfg1KKUORHch+uThDW7nurG0MRvNXxlu/4DZAfMy30duHi7Ti8mSvl0pD3nK8XdgdE6yJ7ZpadSnGmZ+Pv8xNbdiltCz3neTMuZe3ZkRuGddhF4wH9DWt+DR3CJdyneUxw0qhYf+wxDDLJwVYCZo91ZPLSH6GVlVqu/BaHNI0HL9Jzpih8OcjMjvv6EsSCJNZ0dtmvR7EjzA67gr7f2HrAUQlcYxQhschWiyGADOuo+1gG9A9TnG645ob/FdmrwCYptB39Xwlj8I2LsqFqJuOAxlsDzEtJ40K1DEGe7DzKX3znDHWU85vCW4wxEjxEaJtjfji/+MdxtKGiFB5fpciaRzAmph+fA/oVR/UTRA5bpg= 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)(376002)(136003)(396003)(39860400002)(346002)(46966005)(47076004)(44832011)(4326008)(7696005)(86362001)(316002)(82740400003)(6916009)(70586007)(70206006)(36756003)(54906003)(1076003)(336012)(478600001)(2616005)(5660300002)(82310400002)(81166007)(8936002)(6666004)(26005)(426003)(2906002)(8676002)(186003)(83380400001)(356005)(966005);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3619 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT033.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: ca0121bd-34c8-480c-8d3a-08d83f89d0c6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tNC0/7gi+DKdLW4gw1fwH12QqLhLbacIS5B1lfXcQGVpk9+4eboXZIA0D1T2SFQXBKr6ARMKCm65S9c9d7Sc7/VoseM1nHP8VfEF0eC+928Lzje3V6SMD3emYm7r9jonvgFB87kdRs4r0y/iUZuj1k6VMPsIetZ2RDmgr4x/AZFukVfy2iaMIDFxBcMVaDo7dXBtePldHYwLZeCZma3qANn7NhEfAO4NZDsjdIRObBJYHzC15B8IwnKulIqcPVsIeTrVmH7FSt0iXz+XSy+4FwsX9E6FE7r6YWw6E4WCR9Qtpnf6PlKbeV8r04okIQpxsVbOR9G6J+SZ8BDPvH98IpdCqa1qimu8hGKIRKfYbQsRkUQqMCIS8KRsAJrYttK/9ps6YtrrYuJEIKkTawku+Qr2MT0aqlyzKPr+xXHt9eWT9QM27E91y93B5FN1G8HUe+WcjB2OuyxPVwiKtWr2QmWecToNNMAowPbIXXyrwEo= 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;SFTY:;SFS:(4636009)(39860400002)(346002)(376002)(396003)(136003)(46966005)(1076003)(8936002)(2616005)(70206006)(478600001)(316002)(6666004)(426003)(2906002)(186003)(36756003)(966005)(336012)(7696005)(26005)(54906003)(44832011)(70586007)(8676002)(81166007)(4326008)(82740400003)(5660300002)(82310400002)(47076004)(6916009)(86362001)(83380400001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2020 13:07:50.9657 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e7cde85-f042-4b14-d8b0-08d83f89e21f 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: DB5EUR03FT033.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3356 Content-Type: text/plain The UART base address and IRQ assignment for FVP platform is as below: UART BASE ADDRESS IRQ ID UART0 0x1C09_0000 37 UART1 0x1C0A_0000 38 UART2 0x1C0B_0000 39 UART3 0x1C0C_0000 40 Reference: https://developer.arm.com/documentation/100964/1111/Base-Platform Fix the IRQ IDs assignment in the firmware for UART1 and UART2. Signed-off-by: Sami Mujawar Acked-by: Ard Biesheuvel --- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 4 ++-- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index a6f536a332281a624403dac2e4bf18aa9ba96d0b..dc4735c025e969e17d24184abf77e6dbb28ef581 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-2020, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -126,7 +126,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 diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c index a48eb0285c60177078324bdbcd8fa29c308e6a13..48559cb6af46309b13e2f8746f883875c3c0cc8b 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c @@ -204,7 +204,7 @@ EDKII_PLATFORM_REPOSITORY_INFO VExpressPlatRepositoryInfo = { // Debug Serial Port { FixedPcdGet64 (PcdSerialDbgRegisterBase), // BaseAddress - 38, // Interrupt + 39, // Interrupt FixedPcdGet64 (PcdSerialDbgUartBaudRate), // BaudRate FixedPcdGet32 (PcdSerialDbgUartClkInHz), // Clock EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_ARM_SBSA_GENERIC_UART // Port subtype -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'