DynamicTablesPkg: Fix issues reported by EDKII CI

The TianoCore EDKII project has introduced a Core CI infrastructure
using TianoCore EDKII Tools PIP modules:
* https://pypi.org/project/edk2-pytool-library/
* https://pypi.org/project/edk2-pytool-extensions/

More information on configuring the environment and running the
builds can be found in edk2\.pytool\Readme.md

This patch fixes the issues reported by the CI system mainly around
fixing typo errors and package dec and dsc files. A subsequent patch
enables the CI builds for the DynamicTablesPkg.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Alexei Fedorov <Alexei.Fedorov@arm.com>

10 files changed, 42 insertions, 25 deletions

diff --git a/DynamicTablesPkg/DynamicTables.dsc.inc b/DynamicTablesPkg/DynamicTables.dsc.inc
index 0bf7a77..48ad883 100644
--- a/DynamicTablesPkg/DynamicTables.dsc.inc
+++ b/DynamicTablesPkg/DynamicTables.dsc.inc
@@ -17,6 +17,20 @@
 

 [Components.common]

   #

+  # Generators

+  #

+  DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/AcpiDbg2LibArm.inf

+  DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/AcpiFadtLibArm.inf

+  DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/AcpiGtdtLibArm.inf

+  DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/AcpiIortLibArm.inf

+  DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/AcpiMadtLibArm.inf

+  DynamicTablesPkg/Library/Acpi/Arm/AcpiMcfgLibArm/AcpiMcfgLibArm.inf

+  DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/AcpiPpttLibArm.inf

+  DynamicTablesPkg/Library/Acpi/Arm/AcpiRawLibArm/AcpiRawLibArm.inf

+  DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/AcpiSpcrLibArm.inf

+  DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/AcpiSratLibArm.inf

+

+  #

   # Dynamic Table Factory Dxe

   #

   DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.inf {

diff --git a/DynamicTablesPkg/DynamicTablesPkg.dec b/DynamicTablesPkg/DynamicTablesPkg.dec
index cf453fa..6cb8a0b 100644
--- a/DynamicTablesPkg/DynamicTablesPkg.dec
+++ b/DynamicTablesPkg/DynamicTablesPkg.dec
@@ -1,7 +1,7 @@
 ## @file

 # dec file for Dynamic Tables Framework.

 #

-# Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.<BR>

+# Copyright (c) 2017 - 2020, ARM Limited. All rights reserved.<BR>

 #

 # SPDX-License-Identifier: BSD-2-Clause-Patent

 #

@@ -16,8 +16,11 @@
 [Includes]

   Include

 

-[Protocols]

+[LibraryClasses]

+  ##  @libraryclass  Defines a set of helper methods.

+  TableHelperLib|Include/Library/TableHelperLib.h

 

+[Protocols]

   # Configuration Manager Protocol GUID

   gEdkiiConfigurationManagerProtocolGuid = { 0xd85a4835, 0x5a82, 0x4894, { 0xac, 0x2, 0x70, 0x6f, 0x43, 0xd5, 0x97, 0x8e } }

 

diff --git a/DynamicTablesPkg/DynamicTablesPkg.dsc b/DynamicTablesPkg/DynamicTablesPkg.dsc
index 02f0444..5fb30a9 100644
--- a/DynamicTablesPkg/DynamicTablesPkg.dsc
+++ b/DynamicTablesPkg/DynamicTablesPkg.dsc
@@ -2,7 +2,7 @@
 #  Dsc file for Dynamic Tables Framework.

 #

 #  Copyright (c) 2019, Linaro Limited. All rights reserved.<BR>

-#  Copyright (c) 2019, ARM Limited. All rights reserved.<BR>

+#  Copyright (c) 2019 - 2020, ARM Limited. All rights reserved.<BR>

 #

 #  SPDX-License-Identifier: BSD-2-Clause-Patent

 #

@@ -39,7 +39,7 @@
   DynamicTablesPkg/Library/Common/TableHelperLib/TableHelperLib.inf

 

 [BuildOptions]

-  *_*_*_CC_FLAGS = -DDISABLE_NEW_DEPRECATED_INTERFACES

+  *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES

 

 !ifdef STATIC_ANALYSIS

   # Check all rules

diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
index 2f32696..57a282d 100644
--- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
@@ -1,6 +1,6 @@
 /** @file

 

-  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.

+  Copyright (c) 2017 - 2020, ARM Limited. All rights reserved.

 

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

@@ -682,7 +682,7 @@ typedef struct CmArmProcHierarchyInfo {
   UINT32            NoOfPrivateResources;

   /// Token of the array which contains references to the resources private to

   /// this CM_ARM_PROC_HIERARCHY_INFO instance. This field is ignored if

-  /// the NoOfPrivateResources is 0, in which case it is recomended to set

+  /// the NoOfPrivateResources is 0, in which case it is recommended to set

   /// this field to CM_NULL_TOKEN.

   CM_OBJECT_TOKEN   PrivateResourcesArrayToken;

 } CM_ARM_PROC_HIERARCHY_INFO;

@@ -795,7 +795,7 @@ typedef struct CmArmDeviceHandlePci {
   /// PCI Bus Number - Max 256 busses (Bits 15:8 of BDF)

   UINT8  BusNumber;

 

-  /// PCI Device Mumber - Max 32 devices (Bits 7:3 of BDF)

+  /// PCI Device Number - Max 32 devices (Bits 7:3 of BDF)

   UINT8   DeviceNumber;

 

   /// PCI Function Number - Max 8 functions (Bits 2:0 of BDF)

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c
index 51c843d..172d99f 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c
@@ -1,7 +1,7 @@
 /** @file

   DBG2 Table Generator

 

-  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.

+  Copyright (c) 2017 - 2020, ARM Limited. All rights reserved.

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

   @par Reference(s):

@@ -323,7 +323,7 @@ BuildDbg2Table (
     Status = EFI_INVALID_PARAMETER;

     DEBUG ((

       DEBUG_ERROR,

-      "ERROR: DBG2: Uart port sybtype is invalid. PortSubtype = 0x%x\n",

+      "ERROR: DBG2: Uart port subtype is invalid. PortSubtype = 0x%x\n",

       SerialPortInfo->PortSubtype

       ));

     goto error_handler;

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
index 65d006c..349caa8 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
@@ -1,7 +1,7 @@
 /** @file

   IORT Table Generator

 

-  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.

+  Copyright (c) 2017 - 2020, ARM Limited. All rights reserved.

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

   @par Reference(s):

@@ -1053,7 +1053,7 @@ AddRootComplexNodes (
 **/

 STATIC

 EFI_STATUS

-AddSmmuInterrruptArray (

+AddSmmuInterruptArray (

   IN      CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  * CONST CfgMgrProtocol,

   IN OUT        EFI_ACPI_6_0_IO_REMAPPING_SMMU_INT    *       InterruptArray,

   IN            UINT32                                        InterruptCount,

@@ -1199,7 +1199,7 @@ AddSmmuV1V2Nodes (
     SmmuNode->SMMU_NSgCfgIrptFlags = NodeList->SMMU_NSgCfgIrptFlags;

 

     // Add Context Interrupt Array

-    Status = AddSmmuInterrruptArray (

+    Status = AddSmmuInterruptArray (

                CfgMgrProtocol,

                ContextInterruptArray,

                SmmuNode->NumContextInterrupts,

@@ -1217,7 +1217,7 @@ AddSmmuV1V2Nodes (
     // Add PMU Interrupt Array

     if ((SmmuNode->NumPmuInterrupts > 0) &&

         (NodeList->PmuInterruptToken != CM_NULL_TOKEN)) {

-      Status = AddSmmuInterrruptArray (

+      Status = AddSmmuInterruptArray (

                  CfgMgrProtocol,

                  PmuInterruptArray,

                  SmmuNode->NumPmuInterrupts,

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c
index 2651ca1..7ec800f 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c
@@ -1,7 +1,7 @@
 /** @file

   MADT Table Generator

 

-  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.

+  Copyright (c) 2017 - 2020, ARM Limited. All rights reserved.

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

   @par Reference(s):

@@ -332,24 +332,24 @@ AddGICMsiFrameInfoList (
 /** Update the GIC Redistributor Information.

 

   @param [in]  Gicr                 Pointer to GIC Redistributor structure.

-  @param [in]  GicRedisributorInfo  Pointer to the GIC Redistributor Info.

+  @param [in]  GicRedistributorInfo  Pointer to the GIC Redistributor Info.

 **/

 STATIC

 VOID

 AddGICRedistributor (

   IN  EFI_ACPI_6_3_GICR_STRUCTURE   * CONST Gicr,

-  IN  CONST CM_ARM_GIC_REDIST_INFO  * CONST GicRedisributorInfo

+  IN  CONST CM_ARM_GIC_REDIST_INFO  * CONST GicRedistributorInfo

   )

 {

   ASSERT (Gicr != NULL);

-  ASSERT (GicRedisributorInfo != NULL);

+  ASSERT (GicRedistributorInfo != NULL);

 

   Gicr->Type = EFI_ACPI_6_3_GICR;

   Gicr->Length = sizeof (EFI_ACPI_6_3_GICR_STRUCTURE);

   Gicr->Reserved = EFI_ACPI_RESERVED_WORD;

   Gicr->DiscoveryRangeBaseAddress =

-    GicRedisributorInfo->DiscoveryRangeBaseAddress;

-  Gicr->DiscoveryRangeLength = GicRedisributorInfo->DiscoveryRangeLength;

+    GicRedistributorInfo->DiscoveryRangeBaseAddress;

+  Gicr->DiscoveryRangeLength = GicRedistributorInfo->DiscoveryRangeLength;

 }

 

 /** Add the GIC Redistributor Information to the MADT Table.

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c
index 4b2580d..b80e98e 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c
@@ -1,7 +1,7 @@
 /** @file

   SPCR Table Generator

 

-  Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.

+  Copyright (c) 2017 - 2020, ARM Limited. All rights reserved.

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

   @par Reference(s):

@@ -189,7 +189,7 @@ BuildSpcrTable (
     Status = EFI_INVALID_PARAMETER;

     DEBUG ((

       DEBUG_ERROR,

-      "ERROR: SPCR: Uart port sybtype is invalid. PortSubtype = 0x%x\n",

+      "ERROR: SPCR: Uart port subtype is invalid. PortSubtype = 0x%x\n",

       SerialPortInfo->PortSubtype

       ));

     goto error_handler;

@@ -224,7 +224,7 @@ BuildSpcrTable (
     Status = EFI_INVALID_PARAMETER;

     DEBUG ((

       DEBUG_ERROR,

-      "ERROR: SPCR: Invalid Port Sybtype (must be < 256). Status = %r\n",

+      "ERROR: SPCR: Invalid Port subtype (must be < 256). Status = %r\n",

       Status

       ));

     goto error_handler;

diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
index 620e292..6844bb4 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
@@ -1,7 +1,7 @@
 /** @file

   SRAT Table Generator

 

-  Copyright (c) 2019, ARM Limited. All rights reserved.

+  Copyright (c) 2019 - 2020, ARM Limited. All rights reserved.

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

   @par Reference(s):

@@ -101,7 +101,7 @@ GET_OBJECT_LIST (
 /** Return the PCI Device information in BDF format

 

     PCI Bus Number - Max 256 busses (Bits 15:8 of BDF)

-    PCI Device Mumber - Max 32 devices (Bits 7:3 of BDF)

+    PCI Device Number - Max 32 devices (Bits 7:3 of BDF)

     PCI Function Number - Max 8 functions (Bits 2:0 of BDF)

 

     @param [in]  DeviceHandlePci   Pointer to the PCI Device Handle.

diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md
index 93fd1f3..bcaae6d 100644
--- a/DynamicTablesPkg/Readme.md
+++ b/DynamicTablesPkg/Readme.md
@@ -136,4 +136,4 @@ Documentation
 

 Refer to the following presentation from *UEFI Plugfest Seattle 2018*:

 

-[Dynamic Tables Framework: A Step Towards Automatic Generation of Advanced Configuration and Power Interface (ACPI) & System Management BIOS (SMBIOS) Tables – Sami Mujawar (Arm).](http://www.uefi.org/sites/default/files/resources/Arm_Dynamic%20Tables%20Framework%20A%20Step%20Towards%20Automatic%20Generation%20of%20Advanced%20Configuration%20and%20Power%20Interface%20%28ACPI%29%20%26%20System%20Management%20BIOS%20%28SMBIOS%29%20Tables%20_0.pdf)

+[Dynamic Tables Framework: A Step Towards Automatic Generation of Advanced Configuration and Power Interface (ACPI) & System Management BIOS (SMBIOS) Tables](http://www.uefi.org/sites/default/files/resources/Arm_Dynamic%20Tables%20Framework%20A%20Step%20Towards%20Automatic%20Generation%20of%20Advanced%20Configuration%20and%20Power%20Interface%20%28ACPI%29%20%26%20System%20Management%20BIOS%20%28SMBIOS%29%20Tables%20_0.pdf)