irqchip: intc-irqpin: Add support for shared interrupt lines
Subsystems (6)
PATCH v4 1/2 irqchip: intc-irqpin: Add support for shared interrupt lines
On some hardware we don't have a 1-1 mapping from the external interrupts coming from INTC to the GIC SPI pins. We can however share lines to demux incoming IRQs on these SoCs.
This patch enables the intc_irqpin driver to detect requests for shared interrupt lines and demuxes them properly by querying the INTC INTREQx0A registers.
If you need multiple shared intc_irqpin device instances, be sure to mask out all interrupts on the INTC that share the one line before you start to register them. Else you run into IRQ floods that would be caused by interrupts for which no handler has been set up yet when the first intc_irqpin device is registered.
---
v4: rebased on next
drivers/irqchip/irq-renesas-intc-irqpin.c | 90 ++++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 7 deletions(-)
drivers/irqchip/irq-renesas-intc-irqpin.c +83 -7
@@ -76,6 +76,8 @@ struct intc_irqpin_priv {struct platform_device *pdev;struct irq_chip irq_chip;struct irq_domain *irq_domain; +bool shared_irqs; +u8 shared_irq_mask; };static unsigned long intc_irqpin_read32 (void __iomem *iomem)
@@ -195,6 +197,28 @@ static void intc_irqpin_irq_disable(struct irq_data *d)intc_irqpin_irq_write_hwirq (p,INTC_IRQPIN_REG_MASK , hw_irq); } +static void intc_irqpin_shared_irq_enable (struct irq_data *d) +{ +struct intc_irqpin_priv *p =irq_data_get_irq_chip_data (d); +int hw_irq =irqd_to_hwirq (d); + +intc_irqpin_dbg (&p->irq[hw_irq],"shared enable" ); +intc_irqpin_irq_write_hwirq (p,INTC_IRQPIN_REG_CLEAR , hw_irq); + + p->shared_irq_mask &= ~BIT (hw_irq); +} + +static void intc_irqpin_shared_irq_disable (struct irq_data *d) +{ +struct intc_irqpin_priv *p =irq_data_get_irq_chip_data (d); +int hw_irq =irqd_to_hwirq (d); + +intc_irqpin_dbg (&p->irq[hw_irq],"shared disable" ); +intc_irqpin_irq_write_hwirq (p,INTC_IRQPIN_REG_MASK , hw_irq); + + p->shared_irq_mask |=BIT (hw_irq); +} +static void intc_irqpin_irq_enable_force (struct irq_data *d) {struct intc_irqpin_priv *p =irq_data_get_irq_chip_data (d);
@@ -267,6 +291,25 @@ static irqreturn_t intc_irqpin_irq_handler(int irq, void *dev_id)return IRQ_NONE ; } +static irqreturn_t intc_irqpin_shared_irq_handler (int irq,void *dev_id) +{ +struct intc_irqpin_priv *p = dev_id; +unsigned int reg_source =intc_irqpin_read (p,INTC_IRQPIN_REG_SOURCE ); +irqreturn_t status =IRQ_NONE ; +int k; + +for (k =0 ; k <8 ; k++) { +if (reg_source &BIT (7 - k)) { +if (BIT (k) & p->shared_irq_mask) +continue ; + + status |=intc_irqpin_irq_handler (irq, &p->irq[k]); + } + } + +return status; +} +static int intc_irqpin_irq_domain_map (struct irq_domain *h,unsigned int virq,irq_hw_number_t hw) {
@@ -298,6 +341,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)void (*enable_fn)(struct irq_data *d);void (*disable_fn)(struct irq_data *d);const char *name =dev_name (&pdev->dev); +int ref_irq;int ret;int k;
@@ -385,13 +429,29 @@ static int intc_irqpin_probe(struct platform_device *pdev) p->config.control_parent =of_property_read_bool (pdev->dev.of_node,"control-parent" ); +/* clear all pending interrupts */ +intc_irqpin_write (p,INTC_IRQPIN_REG_SOURCE ,0x0 ); + +/* scan for shared interrupt lines */ + ref_irq = p->irq[0 ].requested_irq; + p->shared_irqs = true; +for (k =1 ; k < p->number_of_irqs; k++) { +if (ref_irq != p->irq[k].requested_irq) { + p->shared_irqs = false; +break ; + } + } +/* use more severe masking method if requested */ if (p->config.control_parent) { enable_fn = intc_irqpin_irq_enable_force; disable_fn = intc_irqpin_irq_disable_force; - }else { + }else if (!p->shared_irqs) { enable_fn = intc_irqpin_irq_enable; disable_fn = intc_irqpin_irq_disable; + }else { + enable_fn = intc_irqpin_shared_irq_enable; + disable_fn = intc_irqpin_shared_irq_disable; } irq_chip = &p->irq_chip;
@@ -413,18 +473,34 @@ static int intc_irqpin_probe(struct platform_device *pdev) goto err0; } -/* request and set priority on interrupts one by one */ -for (k =0 ; k < p->number_of_irqs; k++) { -if (devm_request_irq (&pdev->dev, p->irq[k].requested_irq, - intc_irqpin_irq_handler, -0 , name, &p->irq[k])) { +if (p->shared_irqs) { +/* request one shared interrupt */ +if (devm_request_irq (&pdev->dev, p->irq[0 ].requested_irq, + intc_irqpin_shared_irq_handler, +IRQF_SHARED , name, p)) {dev_err (&pdev->dev,"failed to request low IRQ\n" ); ret = -ENOENT ; goto err1; } -intc_irqpin_mask_unmask_prio (p, k,0 ); + }else { +/* request interrupts one by one */ +for (k =0 ; k < p->number_of_irqs; k++) { +if (devm_request_irq (&pdev->dev, + p->irq[k].requested_irq, + intc_irqpin_irq_handler, +0 , name, &p->irq[k])) { +dev_err (&pdev->dev, +"failed to request low IRQ\n" ); + ret = -ENOENT ; + goto err1; + } + } } +/* unmask all interrupts on prio level */ +for (k =0 ; k < p->number_of_irqs; k++) +intc_irqpin_mask_unmask_prio (p, k,0 ); +dev_info (&pdev->dev,"driving %d irqs\n" , p->number_of_irqs);/* warn in case of mismatch if irq base is specified */
Signature · 1 line
1.7.9.5
PATCH v4 2/2 ARM: shmobile: r8a7740: Migrate from INTC to GIC
With the added capabilty of the intc_irqpin driver to handle shared external IRQs, all prerequisites are fulfilled and we are ready to migrate completely to GIC. This includes the following steps:
- Kconfig: select ARM_GIC and RENESAS_INTC_IRQPIN
- intc-r8a7740: Throw out all legacy INTC code and init the GIC. We need to mask out all shared IRQs as it is needed by the shared intc_irqpin driver.
- setup-r8a7740: Add 4 irqpin devices to handle external IRQs and update all IRQ numbers to point to the GIC SPI.
- board-armadillo: Update all IRQ numbers to point to the GIC SPI.
- pfc-r8a7740: Update all IRQ numbers of the GPIOs to point to the GIC
SPI.
---
v4: rebased on next
arch/arm/mach-shmobile/Kconfig | 2 + arch/arm/mach-shmobile/board-armadillo800eva.c | 35 +- arch/arm/mach-shmobile/intc-r8a7740.c | 641 ++---------------------- arch/arm/mach-shmobile/setup-r8a7740.c | 192 +++++-- drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 64 +-- 5 files changed, 239 insertions(+), 695 deletions(-)
arch/arm/mach-shmobile/Kconfig +2 -0
@@ -21,8 +21,10 @@ config ARCH_SH73A0 config ARCH_R8A7740 bool "R-Mobile A1 (R8A77400)" select ARCH_WANT_OPTIONAL_GPIOLIB + select ARM_GIC select CPU_V7 select SH_CLK_CPG + select RENESAS_INTC_IRQPIN config ARCH_R8A7778 bool "R-Car M1 (R8A77780)"
arch/arm/mach-shmobile/board-armadillo800eva.c +17 -18
@@ -148,7 +148,7 @@* see * usbhsf_power_ctrl() */ -#define IRQ7 evt2irq(0x02e0) +#define IRQ7 irq_pin(7)#define USBCR1 IOMEM(0xe605810a)#define USBH 0xC6700000#define USBH_USBCTR 0x10834
@@ -333,7 +333,7 @@ static struct resource usbhsf_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = evt2irq(0x0A20), + .start = gic_spi(51), .flags = IORESOURCE_IRQ, }, };
@@ -366,7 +366,7 @@ static struct resource sh_eth_resources[] = { .end = 0xe9a02000 - 1, .flags = IORESOURCE_MEM, }, { - .start = evt2irq(0x0500), + .start = gic_spi(110), .flags = IORESOURCE_IRQ, }, };
@@ -420,7 +420,7 @@ static struct resource lcdc0_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = intcs_evt2irq(0x580), + .start = gic_spi(177), .flags = IORESOURCE_IRQ, }, };
@@ -455,7 +455,7 @@ static struct resource hdmi_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = evt2irq(0x1700), + .start = gic_spi(131), .flags = IORESOURCE_IRQ, }, [2] = {
@@ -517,7 +517,7 @@ static struct resource hdmi_lcdc_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = intcs_evt2irq(0x1780), + .start = gic_spi(178), .flags = IORESOURCE_IRQ, }, };
@@ -681,7 +681,7 @@ static struct platform_device vcc_sdhi1 = {* We can use IRQ31 as card detect irq, * but it needs chattering removal operation */ -#define IRQ31 evt2irq(0x33E0) +#define IRQ31 irq_pin(31)static struct sh_mobile_sdhi_info sdhi0_info = { .dma_slave_tx =SHDMA_SLAVE_SDHI0_TX , .dma_slave_rx =SHDMA_SLAVE_SDHI0_RX ,
@@ -703,12 +703,12 @@ static struct resource sdhi0_resources[] = {*/ { .name = SH_MOBILE_SDHI_IRQ_SDCARD, - .start = evt2irq(0x0E20), + .start = gic_spi(118), .flags = IORESOURCE_IRQ, }, { .name = SH_MOBILE_SDHI_IRQ_SDIO, - .start = evt2irq(0x0E40), + .start = gic_spi(119), .flags = IORESOURCE_IRQ, }, };
@@ -742,15 +742,15 @@ static struct resource sdhi1_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = evt2irq(0x0E80), + .start = gic_spi(121), .flags = IORESOURCE_IRQ, }, [2] = { - .start = evt2irq(0x0EA0), + .start = gic_spi(122), .flags = IORESOURCE_IRQ, }, [3] = { - .start = evt2irq(0x0EC0), + .start = gic_spi(123), .flags = IORESOURCE_IRQ, }, };
@@ -793,12 +793,12 @@ static struct resource sh_mmcif_resources[] = { }, [1 ] = {/* MMC ERR */ - .start =evt2irq (0x1AC0 ), + .start =gic_spi (56 ), .flags =IORESOURCE_IRQ , }, [2 ] = {/* MMC NOR */ - .start =evt2irq (0x1AE0 ), + .start =gic_spi (57 ), .flags =IORESOURCE_IRQ , }, };
@@ -875,7 +875,7 @@ static struct resource ceu0_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = intcs_evt2irq(0x0500), + .start = gic_spi(160), .flags = IORESOURCE_IRQ, }, [2] = {
@@ -917,7 +917,7 @@ static struct resource fsi_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = evt2irq(0x1840), + .start = gic_spi(9), .flags = IORESOURCE_IRQ, }, };
@@ -1000,7 +1000,7 @@ static struct platform_device i2c_gpio_device = {static struct i2c_board_info i2c0_devices[] = { {I2C_BOARD_INFO ("st1232-ts" ,0x55 ), - .irq =evt2irq (0x0340 ), + .irq =irq_pin (10 ), }, {I2C_BOARD_INFO ("wm8978" ,0x1a ),
@@ -1283,7 +1283,6 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") .map_io = r8a7740_map_io, .init_early = eva_add_early_devices, .init_irq = r8a7740_init_irq, - .handle_irq = shmobile_handle_irq_intc, .init_machine = eva_init, .init_late = shmobile_init_late, .init_time = eva_earlytimer_init,
arch/arm/mach-shmobile/intc-r8a7740.c +30 -611
650 lines not on this page · raw message
arch/arm/mach-shmobile/setup-r8a7740.c +158 -34
348 lines not on this page · raw message
drivers/pinctrl/sh-pfc/pfc-r8a7740.c +32 -32
70 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 2/2 ARM: shmobile: r8a7740: Migrate from INTC to GIC
Quoted 14 lines · Bastian Hecht
With the added capabilty of the
intc_irqpindriver to handle shared external IRQs, all prerequisites are fulfilled and we are ready to migrate completely to GIC. This includes the following steps:-
Kconfig: selectARM_GICandRENESAS_INTC_IRQPIN
- intc-r8a7740: Throw out all legacy INTC code and init the GIC. We need to mask out all shared IRQs as it is needed by the sharedintc_irqpindriver.
- setup-r8a7740: Add 4 irqpin devices to handle external IRQs and update all IRQ numbers to point to the GIC SPI.
- board-armadillo: Update all IRQ numbers to point to the GIC SPI.
- pfc-r8a7740: Update all IRQ numbers of the GPIOs to point to the GIC
SPI.
Quoted 2 lines
Signed-off-by Bastian Hecht <[email protected]>
Thanks, queued up for v3.10 in the soc branch.
PATCH v4 1/2 irqchip: intc-irqpin: Add support for shared interrupt lines
In reply to Bastian HechtQuoted 8 lines · Bastian Hecht
On some hardware we don't have a 1-1 mapping from the external interrupts coming from INTC to the GIC SPI pins. We can however share lines to demux incoming IRQs on these SoCs.
This patch enables the
intc_irqpindriver to detect requests for shared interrupt lines and demuxes them properly by querying the INTC INTREQx0A registers.
Quoted 8 lines
If you need multiple shared
intc_irqpindevice instances, be sure to mask out all interrupts on the INTC that share the one line before you start to register them. Else you run into IRQ floods that would be caused by interrupts for which no handler has been set up yet when the firstintc_irqpindevice is registered.Signed-off-by Bastian Hecht <[email protected]>Acked-by Magnus Damm <[email protected]>
Thanks, queued-up for v3.10 in the pinmux branch.