irqchip: Add Aspeed SCU Interrupt Controller
Subsystems (4)
Eddie James
maintainerv2 cover irqchip: Add Aspeed SCU Interrupt Controller
The Aspeed SOCs provide some interrupts through the System Control Unit registers. Add an interrupt controller that provides these interrupts to the system. Add the interrupt controller to the AST25XX and AST26XX devicetrees.
Changes since v1:
- add a spinlock to protect read-modify-write operation for irq masking
- use readl/writel relaxed versions
- add a comment explaining the irq status/enable register
- provide affinity callback that returns -EINVAL
Eddie James (4):
dt-bindings: interrupt-controller: Add Aspeed SCU interrupt controller
irqchip: Add Aspeed SCU interrupt controller
ARM: dts: aspeed: ast2500: Add SCU interrupt controller
ARM: dts: aspeed: ast2600: Add SCU interrupt controllers
.../interrupt-controller/aspeed,ast2xxx-scu-ic.txt | 26 +++ MAINTAINERS | 8 + arch/arm/boot/dts/aspeed-g5.dtsi | 11 +- arch/arm/boot/dts/aspeed-g6.dtsi | 18 ++ drivers/irqchip/Makefile | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 233 +++++++++++++++++++++ .../interrupt-controller/aspeed-scu-ic.h | 23 ++ 7 files changed, 319 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt create mode 100644 drivers/irqchip/irq-aspeed-scu-ic.c create mode 100644 include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
Signature · 1 line
1.8.3.1
Eddie James
maintainerPATCH v2 1/4 dt-bindings: interrupt-controller: Add Aspeed SCU interrupt controller
Document the Aspeed SCU interrupt controller and add an include file for the interrupts it provides.
--- .../interrupt-controller/aspeed,ast2xxx-scu-ic.txt | 26 ++++++++++++++++++++++ MAINTAINERS | 7 ++++++ .../interrupt-controller/aspeed-scu-ic.h | 23 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt create mode 100644 include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt new file +26 -0
@@ -0,0 +1,26 @@ +Aspeed AST25XX and AST26XX SCU Interrupt Controller + +Required Properties: + - #interrupt-cells : must be 1 + - compatible : must be "aspeed,ast2500-scu-ic", + "aspeed,ast2600-scu-ic0" or + "aspeed,ast2600-scu-ic1" + - reg : address and size of the SCU register + associated with the controller + - interrupts : interrupt from the parent controller + - interrupt-controller : indicates that the controlle receives and + fires new interrupts for child busses + +Example: + + syscon at 1e6e2000 { + ranges = <0 0x1e6e2000 0x1a8>; + + scu_ic: interrupt-controller at 18 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2500-scu-ic"; + reg = <0x18 0x04>; + interrupts = <21>; + interrupt-controller; + }; + };
MAINTAINERS +7 -0
@@ -2651,6 +2651,13 @@ S: Maintained F: drivers/pinctrl/aspeed/ F: Documentation/devicetree/bindings/pinctrl/aspeed,* +ASPEED SCU INTERRUPT CONTROLLER DRIVER +M: Eddie James <[email protected]> +L: linux-aspeed at lists.ozlabs.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt +F: include/dt-bindings/interrupt-controller/aspeed-scu-ic.h + ASPEED VIDEO ENGINE DRIVER M: Eddie James <[email protected]> L: linux-media at vger.kernel.org
include/dt-bindings/interrupt-controller/aspeed-scu-ic.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_ASPEED_SCU_IC_H_ +#define _DT_BINDINGS_INTERRUPT_CONTROLLER_ASPEED_SCU_IC_H_ + +#define ASPEED_SCU_IC_VGA_CURSOR_CHANGE 0 +#define ASPEED_SCU_IC_VGA_SCRATCH_REG_CHANGE 1 + +#define ASPEED_AST2500_SCU_IC_PCIE_RESET_LO_TO_HI 2 +#define ASPEED_AST2500_SCU_IC_PCIE_RESET_HI_TO_LO 3 +#define ASPEED_AST2500_SCU_IC_LPC_RESET_LO_TO_HI 4 +#define ASPEED_AST2500_SCU_IC_LPC_RESET_HI_TO_LO 5 +#define ASPEED_AST2500_SCU_IC_ISSUE_MSI 6 + +#define ASPEED_AST2600_SCU_IC0_PCIE_PERST_LO_TO_HI 2 +#define ASPEED_AST2600_SCU_IC0_PCIE_PERST_HI_TO_LO 3 +#define ASPEED_AST2600_SCU_IC0_PCIE_RCRST_LO_TO_HI 4 +#define ASPEED_AST2600_SCU_IC0_PCIE_RCRST_HI_TO_LO 5 + +#define ASPEED_AST2600_SCU_IC1_LPC_RESET_LO_TO_HI 0 +#define ASPEED_AST2600_SCU_IC1_LPC_RESET_HI_TO_LO 1 + +#endif /* _DT_BINDINGS_INTERRUPT_CONTROLLER_ASPEED_SCU_IC_H_ */
Signature · 1 line
1.8.3.1
Eddie James
maintainerPATCH v2 2/4 irqchip: Add Aspeed SCU interrupt controller
In reply to Eddie JamesThe Aspeed SOCs provide some interrupts through the System Control Unit registers. Add an interrupt controller that provides these interrupts to the system.
---
Changes since v1:
- add a spinlock to protect read-modify-write operation for irq masking
- use readl/writel relaxed versions
- add a comment explaining the irq status/enable register
- provide affinity callback that returns -EINVAL
MAINTAINERS | 1 + drivers/irqchip/Makefile | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 233 ++++++++++++++++++++++++++++++++++++ 3 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 drivers/irqchip/irq-aspeed-scu-ic.c
MAINTAINERS +1 -0
@@ -2656,6 +2656,7 @@ M: Eddie James <[email protected]> L: linux-aspeed at lists.ozlabs.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt +F: drivers/irqchip/irq-aspeed-scu-ic.c F: include/dt-bindings/interrupt-controller/aspeed-scu-ic.h ASPEED VIDEO ENGINE DRIVER
drivers/irqchip/Makefile +1 -1
@@ -86,7 +86,7 @@ obj-$(CONFIG_MVEBU_PIC) += irq-mvebu-pic.o obj-$(CONFIG_MVEBU_SEI) += irq-mvebu-sei.o obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o -obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o irq-aspeed-i2c-ic.o +obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o irq-aspeed-i2c-ic.o irq-aspeed-scu-ic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o obj-$(CONFIG_IRQ_UNIPHIER_AIDET) += irq-uniphier-aidet.o
drivers/irqchip/irq-aspeed-scu-ic.c new file +233 -0
233 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Eddie James
maintainerPATCH v2 3/4 ARM: dts: aspeed: ast2500: Add SCU interrupt controller
In reply to Eddie JamesAdd a node for the interrupt controller provided by the SCU.
--- arch/arm/boot/dts/aspeed-g5.dtsi | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
arch/arm/boot/dts/aspeed-g5.dtsi +10 -1
@@ -209,8 +209,9 @@ syscon: syscon at 1e6e2000 { compatible = "aspeed,ast2500-scu", "syscon", "simple-mfd"; reg = <0x1e6e2000 0x1a8>; + ranges = <0 0x1e6e2000 0x1a8>; #address-cells = <1>; - #size-cells = <0>; + #size-cells = <1>; #clock-cells = <1>; #reset-cells = <1>;
@@ -224,6 +225,14 @@ compatible = "aspeed,ast2500-p2a-ctrl"; status = "disabled"; }; + + scu_ic: interrupt-controller at 18 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2500-scu-ic"; + reg = <0x18 0x04>; + interrupts = <21>; + interrupt-controller; + }; }; rng: hwrng at 1e6e2078 {
Signature · 1 line
1.8.3.1
Eddie James
maintainerPATCH v2 4/4 ARM: dts: aspeed: ast2600: Add SCU interrupt controllers
In reply to Eddie JamesAdd nodes for the interrupt controllers provided by the SCU.
--- arch/arm/boot/dts/aspeed-g6.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm/boot/dts/aspeed-g6.dtsi +18 -0
@@ -159,6 +159,24 @@ compatible = "aspeed,ast2600-smpmem"; reg = <0x180 0x40>; }; + + scu_ic0: interrupt-controller at 0 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2600-scu-ic0"; + reg = <0x560 0x4>; + interrupt-parent = <&gic>; + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + }; + + scu_ic1: interrupt-controller at 1 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2600-scu-ic1"; + reg = <0x570 0x4>; + interrupt-parent = <&gic>; + interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + }; }; rng: hwrng at 1e6e2524 {
Signature · 1 line
1.8.3.1
Re: [PATCH v2 1/4] dt-bindings: interrupt-controller: Add Aspeed SCU interrupt controller
In reply to Eddie JamesQuoted 12 lines · Eddie James
Document the Aspeed SCU interrupt controller and add an include file for the interrupts it provides.
Signed-off-by Eddie James <[email protected]>--- .../interrupt-controller/aspeed,ast2xxx-scu-ic.txt | 26 ++++++++++++++++++++++ MAINTAINERS | 7 ++++++ .../interrupt-controller/aspeed-scu-ic.h | 23 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt create mode 100644 include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
Re: [PATCH v2 2/4] irqchip: Add Aspeed SCU interrupt controller
In reply to Eddie JamesQuoted 9 lines · Eddie James
The Aspeed SOCs provide some interrupts through the System Control Unit registers. Add an interrupt controller that provides these interrupts to the system.
Signed-off-by Eddie James <[email protected]>---
Changes since v1:
- add a spinlock to protect read-modify-write operation for irq masking
- use readl/writel relaxed versions
What's your motivation? I might have missed some comments on v1. The descriptions make me slightly nervous (not guaranteed to be ordered wrt spinlocks).
Quoted 125 lines
- add a comment explaining the irq status/enable register
- provide affinity callback that returns-EINVALMAINTAINERS | 1 + drivers/irqchip/Makefile | 2 +- drivers/irqchip/irq-aspeed-scu-ic.c | 233 ++++++++++++++++++++++++++++++++++++ 3 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 drivers/irqchip/irq-aspeed-scu-ic.cMAINTAINERS +0
-0@@ -2656,6 +2656,7 @@ M: Eddie James <[email protected]> L: [email protected] (moderated for non-subscribers) S: MaintainedF:
Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txtMAINTAINERS +1
-0+F: drivers/irqchip/irq-aspeed-scu-ic.c F: include/dt-bindings/interrupt-controller/aspeed-scu-ic.h ASPEED VIDEO ENGINE DRIVERdrivers/irqchip/Makefile +1
-1@@ -86,7 +86,7 @@ obj-$(CONFIG_MVEBU_PIC) += irq-mvebu-pic.o obj-$(CONFIG_MVEBU_SEI) += irq-mvebu-sei.o obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o -obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o irq-aspeed-i2c-ic.o +obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o irq-aspeed-i2c-ic.oirq-aspeed-scu-ic.o
obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o
obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o
obj-$(CONFIG_IRQ_UNIPHIER_AIDET) += irq-uniphier-aidet.odrivers/irqchip/irq-aspeed-scu-ic.c new file +81
-0@@ -0,0 +1,233 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Aspeed AST24XX, AST25XX, and AST26XX SCU Interrupt Controller +* Copyright 2019 IBM Corporation +* +* Eddie James <[email protected]> +*/ + +#include <linux/bitops.h> +#include <linux/irq.h> +#include <linux/irqchip.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/irqdomain.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/io.h> +#include <linux/spinlock.h> + +#define ASPEED_SCU_IC_SHIFT 0 +#define ASPEED_SCU_IC_ENABLE GENMASK(6, ASPEED_SCU_IC_SHIFT) +#define ASPEED_SCU_IC_NUM_IRQS 7 +#define ASPEED_SCU_IC_STATUS_SHIFT 16 + +#define ASPEED_AST2600_SCU_IC0_SHIFT 0 +#define ASPEED_AST2600_SCU_IC0_ENABLE \ + GENMASK(5, ASPEED_AST2600_SCU_IC0_SHIFT) +#define ASPEED_AST2600_SCU_IC0_NUM_IRQS 6 + +#define ASPEED_AST2600_SCU_IC1_SHIFT 4 +#define ASPEED_AST2600_SCU_IC1_ENABLE \ + GENMASK(5, ASPEED_AST2600_SCU_IC1_SHIFT) +#define ASPEED_AST2600_SCU_IC1_NUM_IRQS 2 + +struct aspeed_scu_ic { +unsigned long irq_enable; +unsigned long irq_shift; +unsigned int num_irqs; +void __iomem *reg; +struct irq_domain *irq_domain; +spinlock_t lock; +}; + +static void aspeed_scu_ic_irq_handler (struct irq_desc *desc) +{ +unsigned int irq; +unsigned long bit; +unsigned long enabled; +unsigned long max; +unsigned long status; +struct aspeed_scu_ic *scu_ic =irq_desc_get_handler_data (desc); +struct irq_chip *chip =irq_desc_get_chip (desc); + +chained_irq_enter (chip, desc); + +/* +* The SCU IC has just one register to control its operation and read +* status. The interrupt enable bits occupy the lower 16 bits of the +* register, while the interrupt status bits occupy the upper 16 bits. +* The status bit for a given interrupt is always 16 bits shifted from +* the enable bit for the same interrupt. +* Therefore, perform the IRQ operations in the enable bit space by +* shifting the status down to get the mapping and then back up to +* clear the bit. +*/ + status =readl_relaxed (scu_ic->reg); + enabled = status & scu_ic->irq_enable; + status = (status >>ASPEED_SCU_IC_STATUS_SHIFT ) & enabled; + + bit = scu_ic->irq_shift; + max = scu_ic->num_irqs + bit; + +for_each_set_bit_from (bit, &status, max) { + irq =irq_find_mapping (scu_ic->irq_domain, + bit - scu_ic->irq_shift); +generic_handle_irq (irq); + +writel_relaxed (enabled |BIT (bit +ASPEED_SCU_IC_STATUS_SHIFT ), + scu_ic->reg); + } + +chained_irq_exit (chip, desc);
drivers/irqchip/irq-aspeed-scu-ic.c line 91
Quoted 10 lines
drivers/irqchip/irq-aspeed-scu-ic.c new file +10
-0+} + +static void aspeed_scu_ic_irq_mask (struct irq_data *data) +{ +struct aspeed_scu_ic *scu_ic =irq_data_get_irq_chip_data (data); +unsigned long bit =BIT (data->hwirq + scu_ic->irq_shift); +unsigned long flags; +unsigned long reg; + +spin_lock_irqsave (&scu_ic->lock, flags);
The SCU is represented by a syscon in the devicetree, which has a regmap, which does it's own locking internally. You could use regmap_update_bits() to do an atomic read/modify/write and this will provide consistency for other SCU drivers that might be accessing shared registers. Nothing else should _currently_ be touching the SCU IRQ status/enable register, but using the regmap would give us a consistent approach across all SCU drivers.
Andrew