tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Sami Mujawar 2020-06-26 18:20:36 +01:00 committed by mergify[bot]
parent 9565ab67c2
commit e3f8605a23
10 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DynamicTablesPkg/DynamicTables.dsc.inc
View File

@ -16,6 +16,20 @@
TableHelperLib|DynamicTablesPkg/Library/Common/TableHelperLib/TableHelperLib.inf TableHelperLib|DynamicTablesPkg/Library/Common/TableHelperLib/TableHelperLib.inf
[Components.common] [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 # Dynamic Table Factory Dxe
# #

7
DynamicTablesPkg/DynamicTablesPkg.dec
View File

@ -1,7 +1,7 @@
## @file ## @file
# dec file for Dynamic Tables Framework. # 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 # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
@ -16,8 +16,11 @@
[Includes] [Includes]
Include Include
[Protocols] [LibraryClasses]
## @libraryclass Defines a set of helper methods.
TableHelperLib|Include/Library/TableHelperLib.h
[Protocols]
# Configuration Manager Protocol GUID # Configuration Manager Protocol GUID
gEdkiiConfigurationManagerProtocolGuid = { 0xd85a4835, 0x5a82, 0x4894, { 0xac, 0x2, 0x70, 0x6f, 0x43, 0xd5, 0x97, 0x8e } } gEdkiiConfigurationManagerProtocolGuid = { 0xd85a4835, 0x5a82, 0x4894, { 0xac, 0x2, 0x70, 0x6f, 0x43, 0xd5, 0x97, 0x8e } }

4
DynamicTablesPkg/DynamicTablesPkg.dsc
View File

@ -2,7 +2,7 @@
# Dsc file for Dynamic Tables Framework. # Dsc file for Dynamic Tables Framework.
# #
# Copyright (c) 2019, Linaro Limited. All rights reserved.<BR> # 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 # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
@ -39,7 +39,7 @@
DynamicTablesPkg/Library/Common/TableHelperLib/TableHelperLib.inf DynamicTablesPkg/Library/Common/TableHelperLib/TableHelperLib.inf
[BuildOptions] [BuildOptions]
*_*_*_CC_FLAGS = -DDISABLE_NEW_DEPRECATED_INTERFACES *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
!ifdef STATIC_ANALYSIS !ifdef STATIC_ANALYSIS
# Check all rules # Check all rules

6
DynamicTablesPkg/Include/ArmNameSpaceObjects.h
View File

@ -1,6 +1,6 @@
/** @file /** @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 SPDX-License-Identifier: BSD-2-Clause-Patent
@ -682,7 +682,7 @@ typedef struct CmArmProcHierarchyInfo {
UINT32 NoOfPrivateResources; UINT32 NoOfPrivateResources;
/// Token of the array which contains references to the resources private to /// Token of the array which contains references to the resources private to
/// this CM_ARM_PROC_HIERARCHY_INFO instance. This field is ignored if /// 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. /// this field to CM_NULL_TOKEN.
CM_OBJECT_TOKEN PrivateResourcesArrayToken; CM_OBJECT_TOKEN PrivateResourcesArrayToken;
} CM_ARM_PROC_HIERARCHY_INFO; } CM_ARM_PROC_HIERARCHY_INFO;
@ -795,7 +795,7 @@ typedef struct CmArmDeviceHandlePci {
/// PCI Bus Number - Max 256 busses (Bits 15:8 of BDF) /// PCI Bus Number - Max 256 busses (Bits 15:8 of BDF)
UINT8 BusNumber; 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; UINT8 DeviceNumber;
/// PCI Function Number - Max 8 functions (Bits 2:0 of BDF) /// PCI Function Number - Max 8 functions (Bits 2:0 of BDF)

4
DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
DBG2 Table Generator 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 SPDX-License-Identifier: BSD-2-Clause-Patent
@par Reference(s): @par Reference(s):
@ -323,7 +323,7 @@ BuildDbg2Table (
Status = EFI_INVALID_PARAMETER; Status = EFI_INVALID_PARAMETER;
DEBUG (( DEBUG ((
DEBUG_ERROR, 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 SerialPortInfo->PortSubtype
)); ));
goto error_handler; goto error_handler;

8
DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
IORT Table Generator 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 SPDX-License-Identifier: BSD-2-Clause-Patent
@par Reference(s): @par Reference(s):
@ -1053,7 +1053,7 @@ AddRootComplexNodes (
**/ **/
STATIC STATIC
EFI_STATUS EFI_STATUS
AddSmmuInterrruptArray ( AddSmmuInterruptArray (
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol,
IN OUT EFI_ACPI_6_0_IO_REMAPPING_SMMU_INT * InterruptArray, IN OUT EFI_ACPI_6_0_IO_REMAPPING_SMMU_INT * InterruptArray,
IN UINT32 InterruptCount, IN UINT32 InterruptCount,
@ -1199,7 +1199,7 @@ AddSmmuV1V2Nodes (
SmmuNode->SMMU_NSgCfgIrptFlags = NodeList->SMMU_NSgCfgIrptFlags; SmmuNode->SMMU_NSgCfgIrptFlags = NodeList->SMMU_NSgCfgIrptFlags;
// Add Context Interrupt Array // Add Context Interrupt Array
Status = AddSmmuInterrruptArray ( Status = AddSmmuInterruptArray (
CfgMgrProtocol, CfgMgrProtocol,
ContextInterruptArray, ContextInterruptArray,
SmmuNode->NumContextInterrupts, SmmuNode->NumContextInterrupts,
@ -1217,7 +1217,7 @@ AddSmmuV1V2Nodes (
// Add PMU Interrupt Array // Add PMU Interrupt Array
if ((SmmuNode->NumPmuInterrupts > 0) && if ((SmmuNode->NumPmuInterrupts > 0) &&
(NodeList->PmuInterruptToken != CM_NULL_TOKEN)) { (NodeList->PmuInterruptToken != CM_NULL_TOKEN)) {
Status = AddSmmuInterrruptArray ( Status = AddSmmuInterruptArray (
CfgMgrProtocol, CfgMgrProtocol,
PmuInterruptArray, PmuInterruptArray,
SmmuNode->NumPmuInterrupts, SmmuNode->NumPmuInterrupts,

12
DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
MADT Table Generator 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 SPDX-License-Identifier: BSD-2-Clause-Patent
@par Reference(s): @par Reference(s):
@ -332,24 +332,24 @@ AddGICMsiFrameInfoList (
/** Update the GIC Redistributor Information. /** Update the GIC Redistributor Information.
@param [in] Gicr Pointer to GIC Redistributor structure. @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 STATIC
VOID VOID
AddGICRedistributor ( AddGICRedistributor (
IN EFI_ACPI_6_3_GICR_STRUCTURE * CONST Gicr, 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 (Gicr != NULL);
ASSERT (GicRedisributorInfo != NULL); ASSERT (GicRedistributorInfo != NULL);
Gicr->Type = EFI_ACPI_6_3_GICR; Gicr->Type = EFI_ACPI_6_3_GICR;
Gicr->Length = sizeof (EFI_ACPI_6_3_GICR_STRUCTURE); Gicr->Length = sizeof (EFI_ACPI_6_3_GICR_STRUCTURE);
Gicr->Reserved = EFI_ACPI_RESERVED_WORD; Gicr->Reserved = EFI_ACPI_RESERVED_WORD;
Gicr->DiscoveryRangeBaseAddress = Gicr->DiscoveryRangeBaseAddress =
GicRedisributorInfo->DiscoveryRangeBaseAddress; GicRedistributorInfo->DiscoveryRangeBaseAddress;
Gicr->DiscoveryRangeLength = GicRedisributorInfo->DiscoveryRangeLength; Gicr->DiscoveryRangeLength = GicRedistributorInfo->DiscoveryRangeLength;
} }
/** Add the GIC Redistributor Information to the MADT Table. /** Add the GIC Redistributor Information to the MADT Table.

6
DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
SPCR Table Generator 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 SPDX-License-Identifier: BSD-2-Clause-Patent
@par Reference(s): @par Reference(s):
@ -189,7 +189,7 @@ BuildSpcrTable (
Status = EFI_INVALID_PARAMETER; Status = EFI_INVALID_PARAMETER;
DEBUG (( DEBUG ((
DEBUG_ERROR, 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 SerialPortInfo->PortSubtype
)); ));
goto error_handler; goto error_handler;
@ -224,7 +224,7 @@ BuildSpcrTable (
Status = EFI_INVALID_PARAMETER; Status = EFI_INVALID_PARAMETER;
DEBUG (( DEBUG ((
DEBUG_ERROR, 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 Status
)); ));
goto error_handler; goto error_handler;

4
DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
SRAT Table Generator 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 SPDX-License-Identifier: BSD-2-Clause-Patent
@par Reference(s): @par Reference(s):
@ -101,7 +101,7 @@ GET_OBJECT_LIST (
/** Return the PCI Device information in BDF format /** Return the PCI Device information in BDF format
PCI Bus Number - Max 256 busses (Bits 15:8 of BDF) 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) PCI Function Number - Max 8 functions (Bits 2:0 of BDF)
@param [in] DeviceHandlePci Pointer to the PCI Device Handle. @param [in] DeviceHandlePci Pointer to the PCI Device Handle.

2
DynamicTablesPkg/Readme.md
View File

@ -136,4 +136,4 @@ Documentation
Refer to the following presentation from *UEFI Plugfest Seattle 2018*: 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)