From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from foss.arm.com (foss.arm.com [217.140.110.172])
 by mx.groups.io with SMTP id smtpd.web12.14489.1597337905111214943
 for <devel@edk2.groups.io>;
 Thu, 13 Aug 2020 09:58:25 -0700
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ard.biesheuvel@arm.com)
Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14])
	by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 59F2A31B;
	Thu, 13 Aug 2020 09:58:24 -0700 (PDT)
Received: from [192.168.178.54] (unknown [172.31.20.19])
	by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 521163F70D;
	Thu, 13 Aug 2020 09:58:23 -0700 (PDT)
Subject: Re: [edk2-platform][PATCH v1 1/1] Platforms/RaspberryPi: Fix DBG2 UART namespace reference
To: Pete Batard <pete@akeo.ie>,
 Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>, devel@edk2.groups.io
Cc: Leif Lindholm <leif@nuviainc.com>,
 Andrei Warkentin <awarkentin@vmware.com>
References: <20200813142733.8727-1-Samer.El-Haj-Mahmoud@arm.com>
 <ea48c402-93a9-6d23-c742-fc2da11e0f87@akeo.ie>
From: "Ard Biesheuvel" <ard.biesheuvel@arm.com>
Message-ID: <d122ac61-d1f1-7604-0cf8-d99500bdf60f@arm.com>
Date: Thu, 13 Aug 2020 18:58:21 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.7.0
MIME-Version: 1.0
In-Reply-To: <ea48c402-93a9-6d23-c742-fc2da11e0f87@akeo.ie>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable

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>
>> ---
>> =C2=A0 Platform/RaspberryPi/AcpiTables/Dbg2.aslc | 8 ++++----
>> =C2=A0 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/Platform/RaspberryPi/AcpiTables/Dbg2.aslc=20
>> 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 @@
>> =C2=A0=C2=A0 *=C2=A0 Debug Port Table (DBG2)
>> =C2=A0=C2=A0 *
>> =C2=A0=C2=A0 *=C2=A0 Copyright (c) 2019, Pete Batard <pete@akeo.ie>
>> - *=C2=A0 Copyright (c) 2012-2016, ARM Limited. All rights reserved.
>> + *=C2=A0 Copyright (c) 2012-2020, ARM Limited. All rights reserved.
>> =C2=A0=C2=A0 *
>> =C2=A0=C2=A0 *=C2=A0 SPDX-License-Identifier: BSD-2-Clause-Patent
>> =C2=A0=C2=A0 *
>> @@ -21,13 +21,13 @@
>> =C2=A0 #define RPI_DBG2_NUM_DEBUG_PORTS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 1
>> =C2=A0 #define RPI_DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS=C2=A0=C2=A0=
=C2=A0 1
>> -#define RPI_DBG2_NAMESPACESTRING_FIELD_SIZE=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 10
>> +#define RPI_DBG2_NAMESPACESTRING_FIELD_SIZE=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 15
>> =C2=A0 #if (RPI_MODEL =3D=3D 4)
>> =C2=A0 #define RPI_UART_INTERFACE_TYPE                        =20
>> EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_ARM_PL011_UART
>> =C2=A0 #define RPI_UART_BASE_ADDRESS                          =20
>> BCM2836_PL011_UART_BASE_ADDRESS
>> =C2=A0 #define RPI_UART_LENGTH                                =20
>> BCM2836_PL011_UART_LENGTH
>> -#define RPI_UART_STR=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0 { '\\', '_',=20
>> 'S', 'B', '.', 'U', 'R', 'T', '0', 0x00 }
>> +#define RPI_UART_STR=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0 { '\\', '_',=20
>> 'S', 'B', '.', 'G', 'D', 'V', '0', '.', 'U', 'R', 'T', '0', 0x00 }
>> =C2=A0 #else
>> =C2=A0 #define RPI_UART_INTERFACE_TYPE                        =20
>> EFI_ACPI_DBG2_PORT_SUBTYPE_SERIAL_BCM2835_UART
>> =C2=A0 #define RPI_UART_BASE_ADDRESS                          =20
>> BCM2836_MINI_UART_BASE_ADDRESS
>> @@ -35,7 +35,7 @@
>> =C2=A0 //
>> =C2=A0 // RPI_UART_STR should match the value used Uart.asl
>> =C2=A0 //
>> -#define RPI_UART_STR=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0 { '\\', '_',=20
>> 'S', 'B', '.', 'U', 'R', 'T', 'M', 0x00 }
>> +#define RPI_UART_STR=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0 { '\\', '_',=20
>> 'S', 'B', '.', 'G', 'D', 'V', '0', '.', 'U', 'R', 'T', 'M', 0x00 }
>> =C2=A0 #endif
>> =C2=A0 typedef struct {
>>
>=20
> Reviewed-by: Pete Batard <pete@akeo.ie>
>=20

Thanks

Pushed as cec6bb18ae97..fe34d84a73cf