diff options
| -rw-r--r-- | src/soc/intel/common/block/gpio/gpio.c | 29 | ||||
| -rw-r--r-- | src/soc/intel/common/block/include/intelblocks/gpio.h | 6 |
2 files changed, 30 insertions, 5 deletions
diff --git a/src/soc/intel/common/block/gpio/gpio.c b/src/soc/intel/common/block/gpio/gpio.c index 28e78fb366..fcce8d7776 100644 --- a/src/soc/intel/common/block/gpio/gpio.c +++ b/src/soc/intel/common/block/gpio/gpio.c @@ -210,6 +210,24 @@ static void gpi_enable_nmi(const struct pad_config *cfg, pcr_or32(comm->port, en_reg, en_value); } +/* 120 GSIs is the default for IOxAPIC */ +static uint32_t gpio_ioapic_irqs_used[120 / (sizeof(uint32_t) * BITS_PER_BYTE) + 1]; +static void set_ioapic_used(uint32_t irq) +{ + size_t word_offset = irq / 32; + size_t bit_offset = irq % 32; + assert (word_offset < ARRAY_SIZE(gpio_ioapic_irqs_used)); + gpio_ioapic_irqs_used[word_offset] |= BIT(bit_offset); +} + +bool gpio_routes_ioapic_irq(uint32_t irq) +{ + size_t word_offset = irq / 32; + size_t bit_offset = irq % 32; + assert (word_offset < ARRAY_SIZE(gpio_ioapic_irqs_used)); + return (gpio_ioapic_irqs_used[word_offset] & BIT(bit_offset)) != 0; +} + static void gpio_configure_itss(const struct pad_config *cfg, uint16_t port, uint16_t pad_cfg_offset) { @@ -217,9 +235,6 @@ static void gpio_configure_itss(const struct pad_config *cfg, uint16_t port, if (ENV_SMM) return; - if (!CONFIG(SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG)) - return; - int irq; /* Set up ITSS polarity if pad is routed to APIC. @@ -242,8 +257,12 @@ static void gpio_configure_itss(const struct pad_config *cfg, uint16_t port, cfg->pad); return; } - itss_set_irq_polarity(irq, !!(cfg->pad_config[0] & - PAD_CFG0_RX_POL_INVERT)); + + if (CONFIG(SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG)) + itss_set_irq_polarity(irq, !!(cfg->pad_config[0] & + PAD_CFG0_RX_POL_INVERT)); + + set_ioapic_used(irq); } /* Number of DWx config registers can be different for different SOCs */ diff --git a/src/soc/intel/common/block/include/intelblocks/gpio.h b/src/soc/intel/common/block/include/intelblocks/gpio.h index 4c29a0c5ba..45ae1da4fd 100644 --- a/src/soc/intel/common/block/include/intelblocks/gpio.h +++ b/src/soc/intel/common/block/include/intelblocks/gpio.h @@ -229,5 +229,11 @@ void gpio_pm_configure(const uint8_t *misccfg_pm_values, size_t num); */ void block_gpio_enable(struct device *dev); +/* + * Returns true if any GPIO that uses the specified IRQ is also programmed to + * route IRQs to IOAPIC. + */ +bool gpio_routes_ioapic_irq(unsigned int irq); + #endif #endif /* _SOC_INTELBLOCKS_GPIO_H_ */ |