public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Sami Mujawar" <sami.mujawar@arm.com>
To: <devel@edk2.groups.io>
Cc: Sami Mujawar <sami.mujawar@arm.com>, <ard.biesheuvel@arm.com>,
	<leif@nuviainc.com>, <Alexei.Fedorov@arm.com>,
	<Pierre.Gondois@arm.com>, <Matteo.Carlini@arm.com>,
	<Ben.Adderson@arm.com>, <thomas.abraham@arm.com>, <nd@arm.com>
Subject: [PATCH edk2-platforms v1-resend 3/7] Platform/ARM: FVP: Fix serial port interrupt
Date: Thu, 13 Aug 2020 14:06:48 +0100	[thread overview]
Message-ID: <20200813130652.43144-4-sami.mujawar@arm.com> (raw)
In-Reply-To: <20200813130652.43144-1-sami.mujawar@arm.com>

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 <sami.mujawar@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
---
 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.<BR>
 #
 #  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)'


  parent reply	other threads:[~2020-08-13 13:07 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-13 13:06 [PATCH edk2-platforms v1-resend 0/7] Updates to support Dynamic AML Sami Mujawar
2020-08-13 13:06 ` [PATCH edk2-platforms v1-resend 1/7] Platform/ARM/Juno: Remove SSDT UART table Sami Mujawar
2020-08-13 13:06 ` [PATCH edk2-platforms v1-resend 2/7] ArmPlatformPkg: Juno: Increase FD size Sami Mujawar
2020-08-13 13:06 ` Sami Mujawar [this message]
2020-08-13 13:06 ` [PATCH edk2-platforms v1-resend 4/7] Platform/ARM: FVP: Add UART base address length Sami Mujawar
2020-08-13 13:06 ` [PATCH edk2-platforms v1-resend 5/7] Platform/ARM: FVP: Enable SSDT Serial generation Sami Mujawar
2020-08-13 13:06 ` [PATCH edk2-platforms v1-resend 6/7] Platform/ARM: Juno: Configuration Mgr lib linkage Sami Mujawar
2020-08-13 13:06 ` [PATCH edk2-platforms v1-resend 7/7] Platform/ARM: FVP: " Sami Mujawar
2020-08-13 15:39 ` [edk2-devel] [PATCH edk2-platforms v1-resend 0/7] Updates to support Dynamic AML Alexei Fedorov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200813130652.43144-4-sami.mujawar@arm.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox