* [edk2-platform][PATCH v1 1/1] Platforms/RaspberryPi: Fix DBG2 UART namespace reference
@ 2020-08-13 14:27 Samer El-Haj-Mahmoud
2020-08-13 15:13 ` Pete Batard
0 siblings, 1 reply; 3+ messages in thread
From: Samer El-Haj-Mahmoud @ 2020-08-13 14:27 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Pete Batard, Andrei Warkentin, Ard Biesheuvel
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 <leif@nuviainc.com>
Cc: Pete Batard <pete@akeo.ie>
Cc: Andrei Warkentin <awarkentin@vmware.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@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 <pete@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 {
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-platform][PATCH v1 1/1] Platforms/RaspberryPi: Fix DBG2 UART namespace reference
2020-08-13 14:27 [edk2-platform][PATCH v1 1/1] Platforms/RaspberryPi: Fix DBG2 UART namespace reference Samer El-Haj-Mahmoud
@ 2020-08-13 15:13 ` Pete Batard
2020-08-13 16:58 ` Ard Biesheuvel
0 siblings, 1 reply; 3+ messages in thread
From: Pete Batard @ 2020-08-13 15:13 UTC (permalink / raw)
To: Samer El-Haj-Mahmoud, devel
Cc: Leif Lindholm, Andrei Warkentin, Ard Biesheuvel
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 <leif@nuviainc.com>
> Cc: Pete Batard <pete@akeo.ie>
> Cc: Andrei Warkentin <awarkentin@vmware.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@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 <pete@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 <pete@akeo.ie>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-platform][PATCH v1 1/1] Platforms/RaspberryPi: Fix DBG2 UART namespace reference
2020-08-13 15:13 ` Pete Batard
@ 2020-08-13 16:58 ` Ard Biesheuvel
0 siblings, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2020-08-13 16:58 UTC (permalink / raw)
To: Pete Batard, Samer El-Haj-Mahmoud, devel; +Cc: Leif Lindholm, Andrei Warkentin
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 <leif@nuviainc.com>
>> Cc: Pete Batard <pete@akeo.ie>
>> Cc: Andrei Warkentin <awarkentin@vmware.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
>> Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@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 <pete@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 <pete@akeo.ie>
>
Thanks
Pushed as cec6bb18ae97..fe34d84a73cf
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-13 16:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-13 14:27 [edk2-platform][PATCH v1 1/1] Platforms/RaspberryPi: Fix DBG2 UART namespace reference Samer El-Haj-Mahmoud
2020-08-13 15:13 ` Pete Batard
2020-08-13 16:58 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox