[PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming

[PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming

[Chris Jones]

Bugzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3565)

This patch series updates the Acpiview GTDT parser and DynamicTables
GTDT generator to support ACPI 6.4. This involves the use of Acpi64.h
which requires the "SBSA Generic Watchdog" structure to be renamed to the
"Arm Generic Watchdog" strucutre.

The changes can be seen at: https://github.com/chris-jones-arm/edk2/tree/1822_64_acpi_generic_watchdog_v1

Chris Jones (2):
  DynamicTablesPkg: Rename SBSA generic watchdog
  ShellPkg: Update Acpiview GTDT parser to ACPI 6.4

 .../Include/ArmNameSpaceObjects.h             |  8 +--
 .../Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c   | 60 +++++++++----------
 .../Parsers/Gtdt/GtdtParser.c                 | 14 ++---
 .../UefiShellAcpiViewCommandLib.c             |  2 +-
 4 files changed, 42 insertions(+), 42 deletions(-)

-- 
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")

[PATCH v1 1/2] DynamicTablesPkg: Rename SBSA generic watchdog

[Chris Jones]

Buzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3565)

As part of the updates to ACPI 6.4 the "SBSA Generic Watchdog" was
renamed to the "Arm Generic Watchdog". This patch implements that
change by updating the GTDT generator to use Acpi64.h and renames
any occurence of "SBSA Generic Watchdog" to "Arm Generic Watchdog".

Signed-off-by: Chris Jones <christopher.jones@arm.com>
---
 DynamicTablesPkg/Include/ArmNameSpaceObjects.h                   |  8 +--
 DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c | 60 ++++++++++----------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
index 19dcae13b2191e5f0b03ea85edec1191d2a406bf..2244eafaf00939ba36a3fdf021515fcb1e152764 100644
--- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
@@ -395,21 +395,21 @@ typedef struct CmArmGTBlockInfo {
 } CM_ARM_GTBLOCK_INFO;
 
 /** A structure that describes the
-    SBSA Generic Watchdog information for the Platform.
+    Arm Generic Watchdog information for the Platform.
 
     ID: EArmObjPlatformGenericWatchdogInfo
 */
 typedef struct CmArmGenericWatchdogInfo {
-  /// The physical base address of the SBSA Watchdog control frame
+  /// The physical base address of the Arm Watchdog control frame
   UINT64  ControlFrameAddress;
 
-  /// The physical base address of the SBSA Watchdog refresh frame
+  /// The physical base address of the Arm Watchdog refresh frame
   UINT64  RefreshFrameAddress;
 
   /// The watchdog interrupt
   UINT32  TimerGSIV;
 
-  /** The flags for the watchdog as described by the SBSA watchdog
+  /** The flags for the watchdog as described by the Arm watchdog
       structure in the ACPI specification.
   */
   UINT32  Flags;
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c
index c109f2ac207311646e5a4ad3aa465b1c2883e465..06a23876aea8e55d6e4c8be4471ff5aca2514f66 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c
@@ -1,11 +1,11 @@
 /** @file
   GTDT Table Generator
 
-  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
+  Copyright (c) 2017 - 2021, ARM Limited. All rights reserved.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Reference(s):
-  - ACPI 6.3 Specification - January 2019
+  - ACPI 6.4 Specification - January 2021
 
 **/
 
@@ -41,7 +41,7 @@ GET_OBJECT_LIST (
   CM_ARM_GENERIC_TIMER_INFO
   );
 
-/** This macro expands to a function that retrieves the SBSA Generic
+/** This macro expands to a function that retrieves the Arm Generic
     Watchdog Timer Information from the Configuration Manager.
 */
 GET_OBJECT_LIST (
@@ -91,7 +91,7 @@ EFI_STATUS
 EFIAPI
 AddGenericTimerInfo (
   IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL         * CONST CfgMgrProtocol,
-  IN        EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE * CONST Gtdt,
+  IN        EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE * CONST Gtdt,
   IN  CONST UINT32                                               PlatformTimerCount,
   IN  CONST UINT32                                               AcpiTableRevision
 )
@@ -133,7 +133,7 @@ AddGenericTimerInfo (
     GenericTimerInfo->CounterReadBaseAddress;
   Gtdt->PlatformTimerCount = PlatformTimerCount;
   Gtdt->PlatformTimerOffset = (PlatformTimerCount == 0) ? 0 :
-    sizeof (EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE);
+    sizeof (EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE);
 
   if (AcpiTableRevision > EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION) {
     Gtdt->VirtualPL2TimerGSIV = GenericTimerInfo->VirtualPL2TimerGSIV;
@@ -143,7 +143,7 @@ AddGenericTimerInfo (
   return Status;
 }
 
-/** Add the SBSA Generic Watchdog Timers to the GTDT table.
+/** Add the Arm Generic Watchdog Timers to the GTDT table.
 
   @param [in]  Gtdt             Pointer to the GTDT Table.
   @param [in]  WatchdogOffset   Offset to the watchdog information in the
@@ -154,26 +154,26 @@ AddGenericTimerInfo (
 STATIC
 VOID
 AddGenericWatchdogList (
-  IN EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE  * CONST Gtdt,
+  IN EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE  * CONST Gtdt,
   IN CONST UINT32                                          WatchdogOffset,
   IN CONST CM_ARM_GENERIC_WATCHDOG_INFO            *       WatchdogInfoList,
   IN       UINT32                                          WatchdogCount
   )
 {
-  EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE  * Watchdog;
+  EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE  * Watchdog;
 
   ASSERT (Gtdt != NULL);
   ASSERT (WatchdogInfoList != NULL);
 
-  Watchdog = (EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE *)
+  Watchdog = (EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE *)
              ((UINT8*)Gtdt + WatchdogOffset);
 
   while (WatchdogCount-- != 0) {
     // Add watchdog entry
     DEBUG ((DEBUG_INFO, "GTDT: Watchdog = 0x%p\n", Watchdog));
-    Watchdog->Type = EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG;
+    Watchdog->Type = EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG;
     Watchdog->Length =
-      sizeof (EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE);
+      sizeof (EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE);
     Watchdog->Reserved = EFI_ACPI_RESERVED_BYTE;
     Watchdog->RefreshFramePhysicalAddress =
       WatchdogInfoList->RefreshFrameAddress;
@@ -249,7 +249,7 @@ IsGtFrameNumberEqual (
 STATIC
 EFI_STATUS
 AddGTBlockTimerFrames (
-  IN       EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE *       GtBlockFrame,
+  IN       EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE *       GtBlockFrame,
   IN CONST CM_ARM_GTBLOCK_TIMER_FRAME_INFO            *       GTBlockTimerFrameList,
   IN       UINT32                                             GTBlockFrameCount
 )
@@ -329,15 +329,15 @@ STATIC
 EFI_STATUS
 AddGTBlockList (
   IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL     * CONST CfgMgrProtocol,
-  IN EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE    * CONST Gtdt,
+  IN EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE    * CONST Gtdt,
   IN CONST UINT32                                            GTBlockOffset,
   IN CONST CM_ARM_GTBLOCK_INFO                       *       GTBlockInfo,
   IN       UINT32                                            BlockTimerCount
 )
 {
   EFI_STATUS                                    Status;
-  EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE        * GTBlock;
-  EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE  * GtBlockFrame;
+  EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE        * GTBlock;
+  EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE  * GtBlockFrame;
   CM_ARM_GTBLOCK_TIMER_FRAME_INFO             * GTBlockTimerFrameList;
   UINT32                                        GTBlockTimerFrameCount;
   UINTN                                         Length;
@@ -345,7 +345,7 @@ AddGTBlockList (
   ASSERT (Gtdt != NULL);
   ASSERT (GTBlockInfo != NULL);
 
-  GTBlock = (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)Gtdt +
+  GTBlock = (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)Gtdt +
               GTBlockOffset);
 
   while (BlockTimerCount-- != 0) {
@@ -367,8 +367,8 @@ AddGTBlockList (
       return Status;
     }
 
-    Length = sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE) +
-               (sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
+    Length = sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE) +
+               (sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
                 GTBlockInfo->GTBlockTimerFrameCount);
 
     // Check that the length of the GT block does not
@@ -386,15 +386,15 @@ AddGTBlockList (
       return Status;
     }
 
-    GTBlock->Type = EFI_ACPI_6_3_GTDT_GT_BLOCK;
+    GTBlock->Type = EFI_ACPI_6_4_GTDT_GT_BLOCK;
     GTBlock->Length = (UINT16)Length;
     GTBlock->Reserved = EFI_ACPI_RESERVED_BYTE;
     GTBlock->CntCtlBase = GTBlockInfo->GTBlockPhysicalAddress;
     GTBlock->GTBlockTimerCount = GTBlockInfo->GTBlockTimerFrameCount;
     GTBlock->GTBlockTimerOffset =
-      sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE);
+      sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE);
 
-    GtBlockFrame = (EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE*)
+    GtBlockFrame = (EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE*)
       ((UINT8*)GTBlock + GTBlock->GTBlockTimerOffset);
 
     // Add GT Block Timer frames
@@ -413,7 +413,7 @@ AddGTBlockList (
     }
 
     // Next GTBlock
-    GTBlock = (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)GTBlock +
+    GTBlock = (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)GTBlock +
                GTBlock->Length);
     GTBlockInfo++;
   }// for
@@ -460,7 +460,7 @@ BuildGtdtTable (
   UINT32                                          BlockTimerCount;
   CM_ARM_GENERIC_WATCHDOG_INFO                  * WatchdogInfoList;
   CM_ARM_GTBLOCK_INFO                           * GTBlockInfo;
-  EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE  * Gtdt;
+  EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE  * Gtdt;
   UINT32                                          Idx;
   UINT32                                          GTBlockOffset;
   UINT32                                          WatchdogOffset;
@@ -527,11 +527,11 @@ BuildGtdtTable (
 
   // Calculate the GTDT Table Size
   PlatformTimerCount = 0;
-  TableSize = sizeof (EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE);
+  TableSize = sizeof (EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE);
   if (BlockTimerCount != 0) {
     GTBlockOffset = TableSize;
     PlatformTimerCount += BlockTimerCount;
-    TableSize += (sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE) *
+    TableSize += (sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE) *
                   BlockTimerCount);
 
     for (Idx = 0; Idx < BlockTimerCount; Idx++) {
@@ -546,7 +546,7 @@ BuildGtdtTable (
           ));
         goto error_handler;
       }
-      TableSize += (sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
+      TableSize += (sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
         GTBlockInfo[Idx].GTBlockTimerFrameCount);
     }
 
@@ -562,7 +562,7 @@ BuildGtdtTable (
   if (WatchdogCount != 0) {
     WatchdogOffset = TableSize;
     PlatformTimerCount += WatchdogCount;
-    TableSize += (sizeof (EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE) *
+    TableSize += (sizeof (EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE) *
                   WatchdogCount);
     DEBUG ((
       DEBUG_INFO,
@@ -585,7 +585,7 @@ BuildGtdtTable (
     goto error_handler;
   }
 
-  Gtdt = (EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE*)*Table;
+  Gtdt = (EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE*)*Table;
   DEBUG ((
     DEBUG_INFO,
     "GTDT: Gtdt = 0x%p TableSize = 0x%x\n",
@@ -712,9 +712,9 @@ ACPI_TABLE_GENERATOR GtdtGenerator = {
   // Generator Description
   L"ACPI.STD.GTDT.GENERATOR",
   // ACPI Table Signature
-  EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
+  EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
   // ACPI Table Revision supported by this Generator
-  EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION,
+  EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION,
   // Minimum ACPI Table Revision supported by this Generator
   EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION,
   // Creator ID
-- 
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")

[PATCH v1 2/2] ShellPkg: Update Acpiview GTDT parser to ACPI 6.4

[Chris Jones]

Bugzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3565)

Update the Acpiview GTDT parser to use Acpi64.h and as such rename all
occurences of "SBSA Generic Watchdog" to "Arm Generic Watchdog".

Signed-off-by: Chris Jones <christopher.jones@arm.com>
---
 ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c     | 14 +++++++-------
 ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
index d02fc4929d6fa5e04672276810b19d3f4c62efd2..d00eaafe60a5beba7ca8b833766fdfda98760cf7 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
@@ -1,11 +1,11 @@
 /** @file
   GTDT table parser
 
-  Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
+  Copyright (c) 2016 - 2021, ARM Limited. All rights reserved.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Reference(s):
-    - ACPI 6.3 Specification - January 2019
+    - ACPI 6.4 Specification - January 2021
   **/
 
 #include <IndustryStandard/Acpi.h>
@@ -155,7 +155,7 @@ STATIC CONST ACPI_PARSER GtBlockTimerParser[] = {
 /**
   An ACPI_PARSER array describing the Platform Watchdog.
 **/
-STATIC CONST ACPI_PARSER SBSAGenericWatchdogParser[] = {
+STATIC CONST ACPI_PARSER ArmGenericWatchdogParser[] = {
   {L"Type", 1, 0, L"%d", NULL, NULL, NULL, NULL},
   {L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL},
   {L"Reserved", 1, 3, L"%x", NULL, NULL, NULL, NULL},
@@ -236,10 +236,10 @@ DumpWatchdogTimer (
   ParseAcpi (
     TRUE,
     2,
-    "SBSA Generic Watchdog",
+    "Arm Generic Watchdog",
     Ptr,
     Length,
-    PARSER_PARAMS (SBSAGenericWatchdogParser)
+    PARSER_PARAMS (ArmGenericWatchdogParser)
     );
 }
 
@@ -343,10 +343,10 @@ ParseAcpiGtdt (
     }
 
     switch (*PlatformTimerType) {
-      case EFI_ACPI_6_3_GTDT_GT_BLOCK:
+      case EFI_ACPI_6_4_GTDT_GT_BLOCK:
         DumpGTBlock (TimerPtr, *PlatformTimerLength);
         break;
-      case EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG:
+      case EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG:
         DumpWatchdogTimer (TimerPtr, *PlatformTimerLength);
         break;
       default:
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
index b30ed3fc8597b229dd15b6ad4f2aab2e3d0ca583..dcc98f1f1345cdf2d085060f0967eecf7342a7c7 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
@@ -54,7 +54,7 @@ ACPI_TABLE_PARSER ParserList[] = {
    ParseAcpiDsdt},
   {EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, ParseAcpiFacs},
   {EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiFadt},
-  {EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt},
+  {EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt},
   {EFI_ACPI_6_3_HETEROGENEOUS_MEMORY_ATTRIBUTE_TABLE_SIGNATURE, ParseAcpiHmat},
   {EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE, ParseAcpiIort},
   {EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMadt},
-- 
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")

Re: [PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming

[Sami Mujawar]

This patch series looks good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

On 16/08/2021, 15:52, "Chris Jones" <christopher.jones@arm.com> wrote:

    Bugzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3565)

    This patch series updates the Acpiview GTDT parser and DynamicTables
    GTDT generator to support ACPI 6.4. This involves the use of Acpi64.h
    which requires the "SBSA Generic Watchdog" structure to be renamed to the
    "Arm Generic Watchdog" strucutre.

    The changes can be seen at: https://github.com/chris-jones-arm/edk2/tree/1822_64_acpi_generic_watchdog_v1

    Chris Jones (2):
      DynamicTablesPkg: Rename SBSA generic watchdog
      ShellPkg: Update Acpiview GTDT parser to ACPI 6.4

     .../Include/ArmNameSpaceObjects.h             |  8 +--
     .../Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c   | 60 +++++++++----------
     .../Parsers/Gtdt/GtdtParser.c                 | 14 ++---
     .../UefiShellAcpiViewCommandLib.c             |  2 +-
     4 files changed, 42 insertions(+), 42 deletions(-)

    -- 
    Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")

Re: [PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming

[Chris Jones]

[-- Attachment #1: Type: text/plain, Size: 1914 bytes --]

I believe this patch series is just waiting for approval from the ShellPkg maintainers. As this has been waiting for several weeks, please could this get reviewed soon.


Thanks,
Chris

________________________________
From: Sami Mujawar <Sami.Mujawar@arm.com>
Sent: Wednesday, August 18, 2021 10:57 AM
To: Christopher Jones <Christopher.Jones@arm.com>; devel@edk2.groups.io <devel@edk2.groups.io>
Cc: ray.ni@intel.com <ray.ni@intel.com>; zhichao.gao@intel.com <zhichao.gao@intel.com>; Alexei Fedorov <Alexei.Fedorov@arm.com>; Ben Adderson <Ben.Adderson@arm.com>; Akanksha Jain <Akanksha.Jain2@arm.com>; Matteo Carlini <Matteo.Carlini@arm.com>; nd <nd@arm.com>
Subject: Re: [PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming

This patch series looks good to me.

Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

Regards,

Sami Mujawar

On 16/08/2021, 15:52, "Chris Jones" <christopher.jones@arm.com> wrote:

    Bugzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3565)

    This patch series updates the Acpiview GTDT parser and DynamicTables
    GTDT generator to support ACPI 6.4. This involves the use of Acpi64.h
    which requires the "SBSA Generic Watchdog" structure to be renamed to the
    "Arm Generic Watchdog" strucutre.

    The changes can be seen at: https://github.com/chris-jones-arm/edk2/tree/1822_64_acpi_generic_watchdog_v1

    Chris Jones (2):
      DynamicTablesPkg: Rename SBSA generic watchdog
      ShellPkg: Update Acpiview GTDT parser to ACPI 6.4

     .../Include/ArmNameSpaceObjects.h             |  8 +--
     .../Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c   | 60 +++++++++----------
     .../Parsers/Gtdt/GtdtParser.c                 | 14 ++---
     .../UefiShellAcpiViewCommandLib.c             |  2 +-
     4 files changed, 42 insertions(+), 42 deletions(-)

    --
    Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")



[-- Attachment #2: Type: text/html, Size: 4385 bytes --]

Re: [PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming

[Gao, Zhichao]

Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>

Thanks,
Zhichao

> -----Original Message-----
> From: Sami Mujawar <Sami.Mujawar@arm.com>
> Sent: Wednesday, August 18, 2021 5:57 PM
> To: Christopher Jones <Christopher.Jones@arm.com>;
> devel@edk2.groups.io
> Cc: Ni, Ray <ray.ni@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>;
> Alexei Fedorov <Alexei.Fedorov@arm.com>; Ben Adderson
> <Ben.Adderson@arm.com>; Akanksha Jain <Akanksha.Jain2@arm.com>;
> Matteo Carlini <Matteo.Carlini@arm.com>; nd <nd@arm.com>
> Subject: Re: [PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming
> 
> This patch series looks good to me.
> 
> Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
> 
> Regards,
> 
> Sami Mujawar
> 
> On 16/08/2021, 15:52, "Chris Jones" <christopher.jones@arm.com> wrote:
> 
>     Bugzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3565)
> 
>     This patch series updates the Acpiview GTDT parser and DynamicTables
>     GTDT generator to support ACPI 6.4. This involves the use of Acpi64.h
>     which requires the "SBSA Generic Watchdog" structure to be renamed to
> the
>     "Arm Generic Watchdog" strucutre.
> 
>     The changes can be seen at: https://github.com/chris-jones-
> arm/edk2/tree/1822_64_acpi_generic_watchdog_v1
> 
>     Chris Jones (2):
>       DynamicTablesPkg: Rename SBSA generic watchdog
>       ShellPkg: Update Acpiview GTDT parser to ACPI 6.4
> 
>      .../Include/ArmNameSpaceObjects.h             |  8 +--
>      .../Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c   | 60 +++++++++----------
>      .../Parsers/Gtdt/GtdtParser.c                 | 14 ++---
>      .../UefiShellAcpiViewCommandLib.c             |  2 +-
>      4 files changed, 42 insertions(+), 42 deletions(-)
> 
>     --
>     Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
> 

Re: [edk2-devel] [PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming

[Sami Mujawar]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

Hi Zhichao,

The following patch series have been reviewed and have received r-b from the maintainers.

· https://edk2.groups.io/g/devel/topic/84925099#79362 (ShellPkg & DynamicTablesPkg)

· https://edk2.groups.io/g/devel/topic/84868164#79285 (ShellPkg)

· https://edk2.groups.io/g/devel/topic/84968868#79489 (ShellPkg)

Some of the patch series have DynamicTablesPkg patches as well.
If you agree I can merge the 3 patch series listed above in edk2 master. Kindly let me know.

Regards,

Sami Mujawar

[-- Attachment #2: Type: text/html, Size: 2687 bytes --]

Re: [edk2-devel] [PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming

[Gao, Zhichao]

[-- Attachment #1: Type: text/plain, Size: 846 bytes --]

You can create the PR by yourself.

Thanks,
Zhichao

From: Sami Mujawar <sami.mujawar@arm.com>
Sent: Thursday, September 23, 2021 4:37 PM
To: Gao; Gao, Zhichao <zhichao.gao@intel.com>; devel@edk2.groups.io
Subject: Re: [edk2-devel] [PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming

Hi Zhichao,

The following patch series have been reviewed and have received r-b from the maintainers.

•         https://edk2.groups.io/g/devel/topic/84925099#79362 (ShellPkg & DynamicTablesPkg)

•         https://edk2.groups.io/g/devel/topic/84868164#79285 (ShellPkg)

•         https://edk2.groups.io/g/devel/topic/84968868#79489 (ShellPkg)

Some of the patch series have DynamicTablesPkg patches as well.
If you agree I can merge the 3 patch series listed above in edk2 master. Kindly let me know.

Regards,

Sami Mujawar

[-- Attachment #2: Type: text/html, Size: 4609 bytes --]

Re: [PATCH v1 0/2] ACPI 6.4 SBSA generic watchdog renaming

[Sami Mujawar]

Merged as 06a326caf125..942c9bd357d8

Thanks.

Regards,

Sami Mujawar


On 16/08/2021 03:52 PM, Chris Jones wrote:
> Bugzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3565)
>
> This patch series updates the Acpiview GTDT parser and DynamicTables
> GTDT generator to support ACPI 6.4. This involves the use of Acpi64.h
> which requires the "SBSA Generic Watchdog" structure to be renamed to the
> "Arm Generic Watchdog" strucutre.
>
> The changes can be seen at: https://github.com/chris-jones-arm/edk2/tree/1822_64_acpi_generic_watchdog_v1
>
> Chris Jones (2):
>    DynamicTablesPkg: Rename SBSA generic watchdog
>    ShellPkg: Update Acpiview GTDT parser to ACPI 6.4
>
>   .../Include/ArmNameSpaceObjects.h             |  8 +--
>   .../Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c   | 60 +++++++++----------
>   .../Parsers/Gtdt/GtdtParser.c                 | 14 ++---
>   .../UefiShellAcpiViewCommandLib.c             |  2 +-
>   4 files changed, 42 insertions(+), 42 deletions(-)
>