From: Pierre Gondois Date: Wed, 27 Apr 2022 14:49:31 +0000 (+0200) Subject: DynamicTables: Fix DT PCI interrupt flags parsing X-Git-Tag: edk2-stable202208~110 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fc4a132c0e9d108d30115cb8729f8fcd5564b855;p=mirror_edk2.git DynamicTables: Fix DT PCI interrupt flags parsing Device Tree PCI interrupt flags use the convention described at linux/Documentation/devicetree/bindings/interrupt-controller/arm,gic.yaml The 3rd cell is the flags, encoded as follows: bits[3:0] trigger type and level flags. 1 = low-to-high edge triggered 2 = high-to-low edge triggered (invalid for SPIs) 4 = active high level-sensitive 8 = active low level-sensitive (invalid for SPIs). Fix the incorrect code. Signed-off-by: Pierre Gondois Reviewed-by: Sami Mujawar --- diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c index a34018151f..626e53d702 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c @@ -449,7 +449,7 @@ GeneratePrt ( if ((Index > 0) && (IrqMapInfo->IntcInterrupt.Interrupt >= 32) && (IrqMapInfo->IntcInterrupt.Interrupt < 1020) && - ((IrqMapInfo->IntcInterrupt.Flags & 0x3) != BIT0)) + ((IrqMapInfo->IntcInterrupt.Flags & 0xB) != 0)) { Status = EFI_INVALID_PARAMETER; ASSERT_EFI_ERROR (Status); diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtUtility.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtUtility.h index f2f425632b..3f5d131d9a 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtUtility.h +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtUtility.h @@ -60,7 +60,7 @@ #define SPI_OFFSET (32U) #define DT_PPI_IRQ (1U) #define DT_SPI_IRQ (0U) -#define DT_IRQ_IS_EDGE_TRIGGERED(x) ((((x) & (BIT0 | BIT2)) != 0)) +#define DT_IRQ_IS_EDGE_TRIGGERED(x) ((((x) & (BIT0 | BIT1)) != 0)) #define DT_IRQ_IS_ACTIVE_LOW(x) ((((x) & (BIT1 | BIT3)) != 0)) #define IRQ_TYPE_OFFSET (0U) #define IRQ_NUMBER_OFFSET (1U)