[edk2,edk2-platforms] Silicon/AMD/Styx/Drivers/AcpiPlatformDxe: use correct object ref in DBG2

Message ID 20190220142741.28232-1-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • [edk2,edk2-platforms] Silicon/AMD/Styx/Drivers/AcpiPlatformDxe: use correct object ref in DBG2
Related show

Commit Message

Ard Biesheuvel Feb. 20, 2019, 2:27 p.m.
The NamespaceString[] field in the DBG2 table should contain a fully
qualified ACPI namespace object reference. This was found by fwts.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Leif Lindholm Feb. 20, 2019, 2:38 p.m. | #1
On Wed, Feb 20, 2019 at 03:27:41PM +0100, Ard Biesheuvel wrote:
> The NamespaceString[] field in the DBG2 table should contain a fully

> qualified ACPI namespace object reference. This was found by fwts.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>


> ---

>  Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc

> index 07635aa9dd8e..e55119258bac 100644

> --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc

> +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc

> @@ -25,7 +25,7 @@

>  #define EFI_ACPI_DBG2_REVISION                     0

>  #define DBG2_NUM_DEBUG_PORTS                       1

>  #define DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS   1

> -#define DBG2_NAMESPACESTRING_FIELD_SIZE            8

> +#define DBG2_NAMESPACESTRING_FIELD_SIZE            9

>  #define DBG2_OEM_DATA_FIELD_SIZE                   0

>  #define DBG2_OEM_DATA_FIELD_OFFSET                 0

>  

> @@ -33,7 +33,7 @@

>  #define DBG2_DEBUG_PORT_SUBTYPE_UEFI               0x0007        // Sub type for UEFI Debug Port

>  #define PL011_UART_LENGTH                          0x1000

>  

> -#define NAME_STR_UART1     {'C', 'O', 'M', '1', '\0', '\0', '\0', '\0'}

> +#define NAME_STR_UART1     "\\SB.COM1"

>  #define NAME_STR_UEFI      {'U', 'E', 'F', 'I', '\0', '\0', '\0', '\0'}

>  

>  

> -- 

> 2.20.1

> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Feb. 20, 2019, 2:48 p.m. | #2
On Wed, 20 Feb 2019 at 15:38, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>

> On Wed, Feb 20, 2019 at 03:27:41PM +0100, Ard Biesheuvel wrote:

> > The NamespaceString[] field in the DBG2 table should contain a fully

> > qualified ACPI namespace object reference. This was found by fwts.

> >

> > Contributed-under: TianoCore Contribution Agreement 1.1

> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

>

> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

>


Thanks.

Pushed as 76d9e9a5da9e..54f98cb1789a

> > ---

> >  Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc | 4 ++--

> >  1 file changed, 2 insertions(+), 2 deletions(-)

> >

> > diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc

> > index 07635aa9dd8e..e55119258bac 100644

> > --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc

> > +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc

> > @@ -25,7 +25,7 @@

> >  #define EFI_ACPI_DBG2_REVISION                     0

> >  #define DBG2_NUM_DEBUG_PORTS                       1

> >  #define DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS   1

> > -#define DBG2_NAMESPACESTRING_FIELD_SIZE            8

> > +#define DBG2_NAMESPACESTRING_FIELD_SIZE            9

> >  #define DBG2_OEM_DATA_FIELD_SIZE                   0

> >  #define DBG2_OEM_DATA_FIELD_OFFSET                 0

> >

> > @@ -33,7 +33,7 @@

> >  #define DBG2_DEBUG_PORT_SUBTYPE_UEFI               0x0007        // Sub type for UEFI Debug Port

> >  #define PL011_UART_LENGTH                          0x1000

> >

> > -#define NAME_STR_UART1     {'C', 'O', 'M', '1', '\0', '\0', '\0', '\0'}

> > +#define NAME_STR_UART1     "\\SB.COM1"

> >  #define NAME_STR_UEFI      {'U', 'E', 'F', 'I', '\0', '\0', '\0', '\0'}

> >

> >

> > --

> > 2.20.1

> >

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc
index 07635aa9dd8e..e55119258bac 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Dbg2.aslc
@@ -25,7 +25,7 @@ 
 #define EFI_ACPI_DBG2_REVISION                     0
 #define DBG2_NUM_DEBUG_PORTS                       1
 #define DBG2_NUMBER_OF_GENERIC_ADDRESS_REGISTERS   1
-#define DBG2_NAMESPACESTRING_FIELD_SIZE            8
+#define DBG2_NAMESPACESTRING_FIELD_SIZE            9
 #define DBG2_OEM_DATA_FIELD_SIZE                   0
 #define DBG2_OEM_DATA_FIELD_OFFSET                 0
 
@@ -33,7 +33,7 @@ 
 #define DBG2_DEBUG_PORT_SUBTYPE_UEFI               0x0007        // Sub type for UEFI Debug Port
 #define PL011_UART_LENGTH                          0x1000
 
-#define NAME_STR_UART1     {'C', 'O', 'M', '1', '\0', '\0', '\0', '\0'}
+#define NAME_STR_UART1     "\\SB.COM1"
 #define NAME_STR_UEFI      {'U', 'E', 'F', 'I', '\0', '\0', '\0', '\0'}