tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-04-08 17:05:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

DynamicTablesPkg: FdtHwInfoParserLib: Make Pci parser arch neutral

Browse Source 
To allow other architectures to potentially re-use the serial port
parser and make the code arch neutral, remove the Arm prefixes.
Also remove the check searching for a GIC version.

Suggested-by: Sunil V L <sunilvl@ventanamicro.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
This commit is contained in:
Pierre Gondois 2024-06-10 14:00:00 +02:00 committed by mergify[bot]
parent 4bb08e8863
commit f16817ec84
4 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/ArmFdtHwInfoParser.c
View File

@ -9,7 +9,7 @@
#include "Arm/BootArch/ArmBootArchParser.h" #include "Arm/BootArch/ArmBootArchParser.h"
#include "Arm/GenericTimer/ArmGenericTimerParser.h" #include "Arm/GenericTimer/ArmGenericTimerParser.h"
#include "Arm/Gic/ArmGicDispatcher.h" #include "Arm/Gic/ArmGicDispatcher.h"
#include "Pci/ArmPciConfigSpaceParser.h" #include "Pci/PciConfigSpaceParser.h"
#include "Serial/ArmSerialPortParser.h" #include "Serial/ArmSerialPortParser.h"
/** Ordered table of parsers/dispatchers. /** Ordered table of parsers/dispatchers.
@ -25,7 +25,7 @@ STATIC CONST FDT_HW_INFO_PARSER_FUNC HwInfoParserTable[] = {
ArmBootArchInfoParser, ArmBootArchInfoParser,
ArmGenericTimerInfoParser, ArmGenericTimerInfoParser,
ArmGicDispatcher, ArmGicDispatcher,
ArmPciConfigInfoParser, PciConfigInfoParser,
SerialPortDispatcher SerialPortDispatcher
}; };

4
DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf
View File

@ -22,8 +22,8 @@
FdtHwInfoParser.h FdtHwInfoParser.h
FdtUtility.c FdtUtility.c
FdtUtility.h FdtUtility.h
Pci/ArmPciConfigSpaceParser.c Pci/PciConfigSpaceParser.c
Pci/ArmPciConfigSpaceParser.h Pci/PciConfigSpaceParser.h
Serial/ArmSerialPortParser.c Serial/ArmSerialPortParser.c
Serial/ArmSerialPortParser.h Serial/ArmSerialPortParser.h

17
DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpaceParser.c → DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/PciConfigSpaceParser.c
View File

@ -1,5 +1,5 @@
/** @file /** @file
Arm PCI Configuration Space Parser. PCI Configuration Space Parser.
Copyright (c) 2021, ARM Limited. All rights reserved.<BR> Copyright (c) 2021, ARM Limited. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -16,8 +16,7 @@
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include "FdtHwInfoParser.h" #include "FdtHwInfoParser.h"
#include "Pci/ArmPciConfigSpaceParser.h" #include "Pci/PciConfigSpaceParser.h"
#include "Arm/Gic/ArmGicDispatcher.h"
/** List of "compatible" property values for host PCIe bridges nodes. /** List of "compatible" property values for host PCIe bridges nodes.
@ -306,8 +305,7 @@ ParseIrqMap (
CONST UINT8 *IrqMapMask; CONST UINT8 *IrqMapMask;
INT32 IrqMapMaskSize; INT32 IrqMapMaskSize;
INT32 PHandleOffset; INT32 PHandleOffset;
UINT32 GicVersion;
UINT32 PciAddressAttr; UINT32 PciAddressAttr;
@ -366,13 +364,6 @@ ParseIrqMap (
return EFI_ABORTED; return EFI_ABORTED;
} }
// Only support Gic(s) for now.
Status = GetGicVersion (Fdt, IntcNode, &GicVersion);
if (EFI_ERROR (Status)) {
ASSERT (0);
return Status;
}
// Get the "address-cells" property of the IntcNode. // Get the "address-cells" property of the IntcNode.
Status = FdtGetAddressInfo (Fdt, IntcNode, &IntcAddressCells, NULL); Status = FdtGetAddressInfo (Fdt, IntcNode, &IntcAddressCells, NULL);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
@ -727,7 +718,7 @@ FreeParserTable (
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
ArmPciConfigInfoParser ( PciConfigInfoParser (
IN CONST FDT_HW_INFO_PARSER_HANDLE FdtParserHandle, IN CONST FDT_HW_INFO_PARSER_HANDLE FdtParserHandle,
IN INT32 FdtBranch IN INT32 FdtBranch
) )

10
DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpaceParser.h → DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/PciConfigSpaceParser.h
View File

@ -1,5 +1,5 @@
/** @file /** @file
Arm PCI Configuration Space Parser. PCI Configuration Space Parser.
Copyright (c) 2021, ARM Limited. All rights reserved.<BR> Copyright (c) 2021, ARM Limited. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -12,8 +12,8 @@
- linux kernel code - linux kernel code
**/ **/
#ifndef ARM_PCI_CONFIG_SPACE_PARSER_H_ #ifndef PCI_CONFIG_SPACE_PARSER_H_
#define ARM_PCI_CONFIG_SPACE_PARSER_H_ #define PCI_CONFIG_SPACE_PARSER_H_
/** Read LEN bits at OFF offsets bits of the ADDR. /** Read LEN bits at OFF offsets bits of the ADDR.
@ -135,9 +135,9 @@ typedef struct PciParserTable {
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
ArmPciConfigInfoParser ( PciConfigInfoParser (
IN CONST FDT_HW_INFO_PARSER_HANDLE FdtParserHandle, IN CONST FDT_HW_INFO_PARSER_HANDLE FdtParserHandle,
IN INT32 FdtBranch IN INT32 FdtBranch
); );
#endif // ARM_PCI_CONFIG_SPACE_PARSER_H_ #endif // PCI_CONFIG_SPACE_PARSER_H_