Re: [edk2] [PATCH edk2-platforms] sgi575/acpi: Use ACPI 6.2 specification

2018-08-30 Thread chandni cherukuri 
On Thu, Aug 30, 2018 at 6:33 PM Ard Biesheuvel
 wrote:
>
> On 30 August 2018 at 13:23, Leif Lindholm  wrote:
> > On Wed, Aug 29, 2018 at 04:14:16PM +0530, Chandni Cherukuri wrote:
> >> Switched from using ACPI 6.1 to 6.2 specification for
> >> SGI575 since SBBR 1.1 requires ACPI 6.2 tables or later.
> >
> > Just to clarify - this has no impact at all on the actual generated
> > tables, right?
> >
> > We really should have a better way of dealing with this.
> > (But we don't, at the moment.)
> >

Thanks for the review Leif.
There is no impact on the generated tables with this change.
>
> I don't see the point of these changes. The whole point of ACPI's
> forward compatibility guarantees is that a ACPI 6.1 system
> automatically complies with ACPI 6.2, and so these changes are not
> necessary for compliance with SBBR 1.1 either.

Thanks for the review Ard. I will abandon this patch.

>
> >> Contributed-under: TianoCore Contribution Agreement 1.1
> >> Cc: Ard Biesheuvel 
> >> Cc: Leif Lindholm 
> >> Signed-off-by: Chandni Cherukuri 
> >> ---
> >>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc |  8 ++--
> >>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc | 48 ++--
> >>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Mcfg.aslc |  4 +-
> >>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Spcr.aslc |  6 +--
> >>  4 files changed, 33 insertions(+), 33 deletions(-)
> >>
> >> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc 
> >> b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
> >> index ed671f3..0183685 100644
> >> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
> >> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
> >> @@ -15,7 +15,7 @@
> >>
> >>  #include "SgiAcpiHeader.h"
> >>  #include 
> >> -#include 
> >> +#include 
> >>  #include 
> >>
> >>  #define SGI_DBG2_NUM_DEBUG_PORTS   1
> >> @@ -29,7 +29,7 @@
> >>
> >>  typedef struct {
> >>EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT Dbg2Device;
> >> -  EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTUREBaseAddressRegister;
> >> +  EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTUREBaseAddressRegister;
> >>UINT32AddressSize;
> >>UINT8 
> >> NameSpaceString[SGI_DBG2_NS_STR_LENGTH];
> >>  } DBG2_DEBUG_DEVICE_INFORMATION;
> >> @@ -56,7 +56,7 @@ typedef struct {
> >>  OFFSET_OF (DBG2_DEBUG_DEVICE_INFORMATION, BaseAddressRegister), /* 
> >> UINT16BaseAddressRegister Offset */  \
> >>  OFFSET_OF (DBG2_DEBUG_DEVICE_INFORMATION, AddressSize)  /* 
> >> UINT16AddressSize Offset */  \
> >>},  
> >>   \
> >> -  ARM_GAS32 (UartBase),/* 
> >> EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister */ \
> >> +  ARM_GAS32 (UartBase),/* 
> >> EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister */ \
> >>UartAddrLen, /* UINT32  AddressSize 
> >> */\
> >>UartNameStr  /* UINT8   
> >> NameSpaceString[MAX_DBG2_NAME_LEN] */ \
> >>  }
> >> @@ -64,7 +64,7 @@ typedef struct {
> >>  STATIC DBG2_TABLE Dbg2 = {
> >>{
> >>  ARM_ACPI_HEADER (
> >> -  EFI_ACPI_6_1_DEBUG_PORT_2_TABLE_SIGNATURE,
> >> +  EFI_ACPI_6_2_DEBUG_PORT_2_TABLE_SIGNATURE,
> >>DBG2_TABLE,
> >>EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT_REVISION
> >>  ),
> >> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc 
> >> b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
> >> index 46d811e..39e3f02 100644
> >> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
> >> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
> >> @@ -16,7 +16,7 @@
> >>  #include "SgiAcpiHeader.h"
> >>  #include 
> >>  #include 
> >> -#include 
> >> +#include 
> >>
> >>  #define SGI_PLATFORM_WATCHDOG_COUNT   2
> >>  #define SGI_PLATFORM_TIMER_COUNT  (SGI_PLATFORM_WATCHDOG_COUNT + 
> >> 1)
> >> @@ -24,7 +24,7 @@
> >>
> >>  #define SYSTEM_TIMER_BASE_ADDRESS 0x
> >>  #define GTDT_GLOBAL_FLAGS 0
> >> -#define GTDT_GTIMER_FLAGS 
> >> EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> >> +#define GTDT_GTIMER_FLAGS 
> >> EFI_ACPI_6_2_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> >>
> >>  #define SGI_GT_BLOCK_CTL_BASE 0x2A81
> >>  #define SGI_GT_BLOCK_FRAME1_CTL_BASE  0x2A82
> >> @@ -36,18 +36,18 @@
> >>  #define SGI_GT_BLOCK_FRAME0_GSIV  0x5C
> >>
> >>  #define SGI_GTX_TIMER_FLAGS   0
> >> -#define GTX_TIMER_SECURE  
> >> EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
> >> +#define GTX_TIMER_SECURE  
> >> EFI_ACPI_6_2_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
> >>  #define

Re: [edk2] [PATCH edk2-platforms] sgi575/acpi: Use ACPI 6.2 specification

2018-08-30 Thread Ard Biesheuvel 
On 30 August 2018 at 13:23, Leif Lindholm  wrote:
> On Wed, Aug 29, 2018 at 04:14:16PM +0530, Chandni Cherukuri wrote:
>> Switched from using ACPI 6.1 to 6.2 specification for
>> SGI575 since SBBR 1.1 requires ACPI 6.2 tables or later.
>
> Just to clarify - this has no impact at all on the actual generated
> tables, right?
>
> We really should have a better way of dealing with this.
> (But we don't, at the moment.)
>

I don't see the point of these changes. The whole point of ACPI's
forward compatibility guarantees is that a ACPI 6.1 system
automatically complies with ACPI 6.2, and so these changes are not
necessary for compliance with SBBR 1.1 either.

>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Cc: Ard Biesheuvel 
>> Cc: Leif Lindholm 
>> Signed-off-by: Chandni Cherukuri 
>> ---
>>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc |  8 ++--
>>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc | 48 ++--
>>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Mcfg.aslc |  4 +-
>>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Spcr.aslc |  6 +--
>>  4 files changed, 33 insertions(+), 33 deletions(-)
>>
>> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc 
>> b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
>> index ed671f3..0183685 100644
>> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
>> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
>> @@ -15,7 +15,7 @@
>>
>>  #include "SgiAcpiHeader.h"
>>  #include 
>> -#include 
>> +#include 
>>  #include 
>>
>>  #define SGI_DBG2_NUM_DEBUG_PORTS   1
>> @@ -29,7 +29,7 @@
>>
>>  typedef struct {
>>EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT Dbg2Device;
>> -  EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTUREBaseAddressRegister;
>> +  EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTUREBaseAddressRegister;
>>UINT32AddressSize;
>>UINT8 
>> NameSpaceString[SGI_DBG2_NS_STR_LENGTH];
>>  } DBG2_DEBUG_DEVICE_INFORMATION;
>> @@ -56,7 +56,7 @@ typedef struct {
>>  OFFSET_OF (DBG2_DEBUG_DEVICE_INFORMATION, BaseAddressRegister), /* 
>> UINT16BaseAddressRegister Offset */  \
>>  OFFSET_OF (DBG2_DEBUG_DEVICE_INFORMATION, AddressSize)  /* 
>> UINT16AddressSize Offset */  \
>>},
>> \
>> -  ARM_GAS32 (UartBase),/* 
>> EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister */ \
>> +  ARM_GAS32 (UartBase),/* 
>> EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister */ \
>>UartAddrLen, /* UINT32  AddressSize 
>> */\
>>UartNameStr  /* UINT8   
>> NameSpaceString[MAX_DBG2_NAME_LEN] */ \
>>  }
>> @@ -64,7 +64,7 @@ typedef struct {
>>  STATIC DBG2_TABLE Dbg2 = {
>>{
>>  ARM_ACPI_HEADER (
>> -  EFI_ACPI_6_1_DEBUG_PORT_2_TABLE_SIGNATURE,
>> +  EFI_ACPI_6_2_DEBUG_PORT_2_TABLE_SIGNATURE,
>>DBG2_TABLE,
>>EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT_REVISION
>>  ),
>> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc 
>> b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
>> index 46d811e..39e3f02 100644
>> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
>> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
>> @@ -16,7 +16,7 @@
>>  #include "SgiAcpiHeader.h"
>>  #include 
>>  #include 
>> -#include 
>> +#include 
>>
>>  #define SGI_PLATFORM_WATCHDOG_COUNT   2
>>  #define SGI_PLATFORM_TIMER_COUNT  (SGI_PLATFORM_WATCHDOG_COUNT + 1)
>> @@ -24,7 +24,7 @@
>>
>>  #define SYSTEM_TIMER_BASE_ADDRESS 0x
>>  #define GTDT_GLOBAL_FLAGS 0
>> -#define GTDT_GTIMER_FLAGS 
>> EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>> +#define GTDT_GTIMER_FLAGS 
>> EFI_ACPI_6_2_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>>
>>  #define SGI_GT_BLOCK_CTL_BASE 0x2A81
>>  #define SGI_GT_BLOCK_FRAME1_CTL_BASE  0x2A82
>> @@ -36,18 +36,18 @@
>>  #define SGI_GT_BLOCK_FRAME0_GSIV  0x5C
>>
>>  #define SGI_GTX_TIMER_FLAGS   0
>> -#define GTX_TIMER_SECURE  
>> EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
>> +#define GTX_TIMER_SECURE  
>> EFI_ACPI_6_2_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
>>  #define GTX_TIMER_NON_SECURE  0
>> -#define GTX_TIMER_SAVE_CONTEXT
>> EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
>> +#define GTX_TIMER_SAVE_CONTEXT
>> EFI_ACPI_6_2_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
>>  #define SGI_GTX_COMMON_FLAGS_S(GTX_TIMER_SAVE_CONTEXT | 
>> GTX_TIMER_SECURE)
>>  #define SGI_GTX_COMMON_FLAGS_NS   (GTX_TIMER_SAVE_CONTEXT | 
>> GTX_TIMER_NON_SECURE)

Re: [edk2] [PATCH edk2-platforms] sgi575/acpi: Use ACPI 6.2 specification

2018-08-30 Thread Leif Lindholm 
On Wed, Aug 29, 2018 at 04:14:16PM +0530, Chandni Cherukuri wrote:
> Switched from using ACPI 6.1 to 6.2 specification for
> SGI575 since SBBR 1.1 requires ACPI 6.2 tables or later.

Just to clarify - this has no impact at all on the actual generated
tables, right?

We really should have a better way of dealing with this.
(But we don't, at the moment.)

/
Leif

> Contributed-under: TianoCore Contribution Agreement 1.1
> Cc: Ard Biesheuvel 
> Cc: Leif Lindholm 
> Signed-off-by: Chandni Cherukuri 
> ---
>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc |  8 ++--
>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc | 48 ++--
>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Mcfg.aslc |  4 +-
>  Platform/ARM/SgiPkg/AcpiTables/Sgi575/Spcr.aslc |  6 +--
>  4 files changed, 33 insertions(+), 33 deletions(-)
> 
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc 
> b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
> index ed671f3..0183685 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
> @@ -15,7 +15,7 @@
>  
>  #include "SgiAcpiHeader.h"
>  #include 
> -#include 
> +#include 
>  #include 
>  
>  #define SGI_DBG2_NUM_DEBUG_PORTS   1
> @@ -29,7 +29,7 @@
>  
>  typedef struct {
>EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT Dbg2Device;
> -  EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTUREBaseAddressRegister;
> +  EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTUREBaseAddressRegister;
>UINT32AddressSize;
>UINT8 
> NameSpaceString[SGI_DBG2_NS_STR_LENGTH];
>  } DBG2_DEBUG_DEVICE_INFORMATION;
> @@ -56,7 +56,7 @@ typedef struct {
>  OFFSET_OF (DBG2_DEBUG_DEVICE_INFORMATION, BaseAddressRegister), /* 
> UINT16BaseAddressRegister Offset */  \
>  OFFSET_OF (DBG2_DEBUG_DEVICE_INFORMATION, AddressSize)  /* 
> UINT16AddressSize Offset */  \
>}, 
>\
> -  ARM_GAS32 (UartBase),/* 
> EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister */ \
> +  ARM_GAS32 (UartBase),/* 
> EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister */ \
>UartAddrLen, /* UINT32  AddressSize */ 
>\
>UartNameStr  /* UINT8   
> NameSpaceString[MAX_DBG2_NAME_LEN] */ \
>  }
> @@ -64,7 +64,7 @@ typedef struct {
>  STATIC DBG2_TABLE Dbg2 = {
>{
>  ARM_ACPI_HEADER (
> -  EFI_ACPI_6_1_DEBUG_PORT_2_TABLE_SIGNATURE,
> +  EFI_ACPI_6_2_DEBUG_PORT_2_TABLE_SIGNATURE,
>DBG2_TABLE,
>EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT_REVISION
>  ),
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc 
> b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
> index 46d811e..39e3f02 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
> @@ -16,7 +16,7 @@
>  #include "SgiAcpiHeader.h"
>  #include 
>  #include 
> -#include 
> +#include 
>  
>  #define SGI_PLATFORM_WATCHDOG_COUNT   2
>  #define SGI_PLATFORM_TIMER_COUNT  (SGI_PLATFORM_WATCHDOG_COUNT + 1)
> @@ -24,7 +24,7 @@
>  
>  #define SYSTEM_TIMER_BASE_ADDRESS 0x
>  #define GTDT_GLOBAL_FLAGS 0
> -#define GTDT_GTIMER_FLAGS 
> EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> +#define GTDT_GTIMER_FLAGS 
> EFI_ACPI_6_2_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>  
>  #define SGI_GT_BLOCK_CTL_BASE 0x2A81
>  #define SGI_GT_BLOCK_FRAME1_CTL_BASE  0x2A82
> @@ -36,18 +36,18 @@
>  #define SGI_GT_BLOCK_FRAME0_GSIV  0x5C
>  
>  #define SGI_GTX_TIMER_FLAGS   0
> -#define GTX_TIMER_SECURE  
> EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
> +#define GTX_TIMER_SECURE  
> EFI_ACPI_6_2_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
>  #define GTX_TIMER_NON_SECURE  0
> -#define GTX_TIMER_SAVE_CONTEXT
> EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
> +#define GTX_TIMER_SAVE_CONTEXT
> EFI_ACPI_6_2_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
>  #define SGI_GTX_COMMON_FLAGS_S(GTX_TIMER_SAVE_CONTEXT | 
> GTX_TIMER_SECURE)
>  #define SGI_GTX_COMMON_FLAGS_NS   (GTX_TIMER_SAVE_CONTEXT | 
> GTX_TIMER_NON_SECURE)
>  
> -#define EFI_ACPI_6_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(\
> +#define EFI_ACPI_6_2_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(\
>RefreshFramePhysicalAddress, ControlFramePhysicalAddress,   \
>WatchdogTimerGSIV, WatchdogTimerFlags)  \
>{   \
> -

[edk2] [PATCH edk2-platforms] sgi575/acpi: Use ACPI 6.2 specification

2018-08-29 Thread Chandni Cherukuri 
Switched from using ACPI 6.1 to 6.2 specification for
SGI575 since SBBR 1.1 requires ACPI 6.2 tables or later.

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Ard Biesheuvel 
Cc: Leif Lindholm 
Signed-off-by: Chandni Cherukuri 
---
 Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc |  8 ++--
 Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc | 48 ++--
 Platform/ARM/SgiPkg/AcpiTables/Sgi575/Mcfg.aslc |  4 +-
 Platform/ARM/SgiPkg/AcpiTables/Sgi575/Spcr.aslc |  6 +--
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc 
b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
index ed671f3..0183685 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dbg2.aslc
@@ -15,7 +15,7 @@
 
 #include "SgiAcpiHeader.h"
 #include 
-#include 
+#include 
 #include 
 
 #define SGI_DBG2_NUM_DEBUG_PORTS   1
@@ -29,7 +29,7 @@
 
 typedef struct {
   EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT Dbg2Device;
-  EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTUREBaseAddressRegister;
+  EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTUREBaseAddressRegister;
   UINT32AddressSize;
   UINT8 
NameSpaceString[SGI_DBG2_NS_STR_LENGTH];
 } DBG2_DEBUG_DEVICE_INFORMATION;
@@ -56,7 +56,7 @@ typedef struct {
 OFFSET_OF (DBG2_DEBUG_DEVICE_INFORMATION, BaseAddressRegister), /* UINT16  
  BaseAddressRegister Offset */  \
 OFFSET_OF (DBG2_DEBUG_DEVICE_INFORMATION, AddressSize)  /* UINT16  
  AddressSize Offset */  \
   },   
 \
-  ARM_GAS32 (UartBase),/* 
EFI_ACPI_6_1_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister */ \
+  ARM_GAS32 (UartBase),/* 
EFI_ACPI_6_2_GENERIC_ADDRESS_STRUCTURE BaseAddressRegister */ \
   UartAddrLen, /* UINT32  AddressSize */   
 \
   UartNameStr  /* UINT8   
NameSpaceString[MAX_DBG2_NAME_LEN] */ \
 }
@@ -64,7 +64,7 @@ typedef struct {
 STATIC DBG2_TABLE Dbg2 = {
   {
 ARM_ACPI_HEADER (
-  EFI_ACPI_6_1_DEBUG_PORT_2_TABLE_SIGNATURE,
+  EFI_ACPI_6_2_DEBUG_PORT_2_TABLE_SIGNATURE,
   DBG2_TABLE,
   EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT_REVISION
 ),
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc 
b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
index 46d811e..39e3f02 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Gtdt.aslc
@@ -16,7 +16,7 @@
 #include "SgiAcpiHeader.h"
 #include 
 #include 
-#include 
+#include 
 
 #define SGI_PLATFORM_WATCHDOG_COUNT   2
 #define SGI_PLATFORM_TIMER_COUNT  (SGI_PLATFORM_WATCHDOG_COUNT + 1)
@@ -24,7 +24,7 @@
 
 #define SYSTEM_TIMER_BASE_ADDRESS 0x
 #define GTDT_GLOBAL_FLAGS 0
-#define GTDT_GTIMER_FLAGS 
EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
+#define GTDT_GTIMER_FLAGS 
EFI_ACPI_6_2_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
 
 #define SGI_GT_BLOCK_CTL_BASE 0x2A81
 #define SGI_GT_BLOCK_FRAME1_CTL_BASE  0x2A82
@@ -36,18 +36,18 @@
 #define SGI_GT_BLOCK_FRAME0_GSIV  0x5C
 
 #define SGI_GTX_TIMER_FLAGS   0
-#define GTX_TIMER_SECURE  
EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
+#define GTX_TIMER_SECURE  
EFI_ACPI_6_2_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
 #define GTX_TIMER_NON_SECURE  0
-#define GTX_TIMER_SAVE_CONTEXT
EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
+#define GTX_TIMER_SAVE_CONTEXT
EFI_ACPI_6_2_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
 #define SGI_GTX_COMMON_FLAGS_S(GTX_TIMER_SAVE_CONTEXT | 
GTX_TIMER_SECURE)
 #define SGI_GTX_COMMON_FLAGS_NS   (GTX_TIMER_SAVE_CONTEXT | 
GTX_TIMER_NON_SECURE)
 
-#define EFI_ACPI_6_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(\
+#define EFI_ACPI_6_2_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(\
   RefreshFramePhysicalAddress, ControlFramePhysicalAddress,   \
   WatchdogTimerGSIV, WatchdogTimerFlags)  \
   {   \
-EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG,  \
-sizeof (EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE),   \
+EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG,  \
+sizeof (EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE),   \
 EFI_ACPI_RESERVED_WORD,   \
 RefreshFramePhysicalAddress,  \
 ControlFramePhysicalAddress,  \
@@ -58,20