On 8/13/20 5:13 PM, Pete Batard wrote:
On 2020.08.13 15:27, Samer El-Haj-Mahmoud wrote:
The UART namespace reference in DBG2 is incorrect. Fix to point to the
correct name.
This fixes the certification failure reported by FWTS tests at:
https://github.com/pftf/RPi4/issues/69
Cc: Leif Lindholm <l...@nuviainc.com>
Cc: Pete Batard <p...@akeo.ie>
Cc: Andrei Warkentin <awarken...@vmware.com>
Cc: Ard Biesheuvel <ard.biesheu...@arm.com>
Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahm...@arm.com>
---
Platform/RaspberryPi/AcpiTables/Dbg2.aslc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Platform/RaspberryPi/AcpiTables/Dbg2.aslc
b/Platform/RaspberryPi/AcpiTables/Dbg2.aslc
index c35b15693f5a..e3f2adae7e21 100644
--- a/Platform/RaspberryPi/AcpiTables/Dbg2.aslc
+++ b/Platform/RaspberryPi/AcpiTables/Dbg2.aslc
@@ -3,7 +3,7 @@
* Debug Port Table (DBG2)
*
* Copyright (c) 2019, Pete Batard <p...@akeo.ie>
- * Copyright (c) 2012-2016, ARM Limited. All rights reserved.
+ * Copyright (c) 2012-2020, ARM Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*
@@ -21,13 +21,13 @@
#define RPI_DBG2_NUM_DEBUG_PORTS 1
#define RPI_DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS 1
-#define RPI_DBG2_NAMESPACESTRING_FIELD_SIZE 10
+#define RPI_DBG2_NAMESPACESTRING_FIELD_SIZE 15
#if (RPI_MODEL == 4)
#define RPI_UART_INTERFACE_TYPE
EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_ARM_PL011_UART
#define RPI_UART_BASE_ADDRESS
BCM2836_PL011_UART_BASE_ADDRESS
#define RPI_UART_LENGTH
BCM2836_PL011_UART_LENGTH
-#define RPI_UART_STR { '\\', '_',
'S', 'B', '.', 'U', 'R', 'T', '0', 0x00 }
+#define RPI_UART_STR { '\\', '_',
'S', 'B', '.', 'G', 'D', 'V', '0', '.', 'U', 'R', 'T', '0', 0x00 }
#else
#define RPI_UART_INTERFACE_TYPE
EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_BCM2835_UART
#define RPI_UART_BASE_ADDRESS
BCM2836_MINI_UART_BASE_ADDRESS
@@ -35,7 +35,7 @@
//
// RPI_UART_STR should match the value used Uart.asl
//
-#define RPI_UART_STR { '\\', '_',
'S', 'B', '.', 'U', 'R', 'T', 'M', 0x00 }
+#define RPI_UART_STR { '\\', '_',
'S', 'B', '.', 'G', 'D', 'V', '0', '.', 'U', 'R', 'T', 'M', 0x00 }
#endif
typedef struct {
Reviewed-by: Pete Batard <p...@akeo.ie>
Thanks
Pushed as cec6bb18ae97..fe34d84a73cf
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#64242): https://edk2.groups.io/g/devel/message/64242
Mute This Topic: https://groups.io/mt/76168434/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
