| Message ID | 20210118055040.21910-1-samuel@sholland.org (mailing list archive) |
|---|---|
| Headers | show |
| Series | sunxi: Support IRQ wakeup from deep sleep | expand |
On Sun, 17 Jan 2021 23:50:30 -0600, Samuel Holland wrote: > Allwinner sun6i/sun8i/sun50i SoCs (A31 and newer) have two interrupt > controllers: GIC and R_INTC. GIC does not support wakeup. R_INTC handles > the external NMI pin, and provides 32+ IRQs to the ARISC. The first 16 > of these correspond 1:1 to a block of GIC IRQs starting with the NMI. > The last 13-16 multiplex the first (up to) 128 GIC SPIs. > > This series replaces the existing chained irqchip driver that could only > control the NMI, with a stacked irqchip driver that also provides wakeup > capability for those multiplexed SPI IRQs. The idea is to preconfigure > the ARISC's IRQ controller, and then the ARISC firmware knows to wake up > as soon as it receives an IRQ. It can also decide how deep it can > suspend based on the enabled wakeup IRQs. > > [...] Applied to irq/irqchip-5.12, thanks! [01/10] dt-bindings: irq: sun6i-r: Split the binding from sun7i-nmi commit: ad6b47cdef760410311f41876b21eb0c6fda4717 [02/10] dt-bindings: irq: sun6i-r: Add a compatible for the H3 commit: 6436eb4417094ea3308b33d8392fc02a1068dc78 [03/10] irqchip/sun6i-r: Use a stacked irqchip driver commit: 4e34614636b31747b190488240a95647c227021f [04/10] irqchip/sun6i-r: Add wakeup support commit: 7ab365f6cd6de1e2b0cb1e1e3873dbf68e6f1003 Please route the dts patches via the soc tree. Also, I had to manually fix the first patch as it wouldn't apply on top of 5.11-rc4 (which tree has it been diffed against?). Please check that the resolution is correct. Cheers, M.
On 1/21/21 2:35 PM, Marc Zyngier wrote: > On Sun, 17 Jan 2021 23:50:30 -0600, Samuel Holland wrote: >> Allwinner sun6i/sun8i/sun50i SoCs (A31 and newer) have two interrupt >> controllers: GIC and R_INTC. GIC does not support wakeup. R_INTC handles >> the external NMI pin, and provides 32+ IRQs to the ARISC. The first 16 >> of these correspond 1:1 to a block of GIC IRQs starting with the NMI. >> The last 13-16 multiplex the first (up to) 128 GIC SPIs. >> >> This series replaces the existing chained irqchip driver that could only >> control the NMI, with a stacked irqchip driver that also provides wakeup >> capability for those multiplexed SPI IRQs. The idea is to preconfigure >> the ARISC's IRQ controller, and then the ARISC firmware knows to wake up >> as soon as it receives an IRQ. It can also decide how deep it can >> suspend based on the enabled wakeup IRQs. >> >> [...] > > Applied to irq/irqchip-5.12, thanks! > > [01/10] dt-bindings: irq: sun6i-r: Split the binding from sun7i-nmi > commit: ad6b47cdef760410311f41876b21eb0c6fda4717 > [02/10] dt-bindings: irq: sun6i-r: Add a compatible for the H3 > commit: 6436eb4417094ea3308b33d8392fc02a1068dc78 > [03/10] irqchip/sun6i-r: Use a stacked irqchip driver > commit: 4e34614636b31747b190488240a95647c227021f > [04/10] irqchip/sun6i-r: Add wakeup support > commit: 7ab365f6cd6de1e2b0cb1e1e3873dbf68e6f1003 > > Please route the dts patches via the soc tree. Also, I had to > manually fix the first patch as it wouldn't apply on top of > 5.11-rc4 (which tree has it been diffed against?). Please > check that the resolution is correct. This series was based on sunxi/for-next, which contains commit 752b0aac99c7 ("dt-bindings: irq: sun7i-nmi: Add binding documentation for the V3s NMI")[1]. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/commit/?h=sunxi/for-next&id=752b0aac99c7e0b179875cdfa102d378ccb794a2 > Cheers, > > M. >
On Thu, Jan 21, 2021 at 07:33:54PM -0600, Samuel Holland wrote: > On 1/21/21 2:35 PM, Marc Zyngier wrote: > > On Sun, 17 Jan 2021 23:50:30 -0600, Samuel Holland wrote: > >> Allwinner sun6i/sun8i/sun50i SoCs (A31 and newer) have two interrupt > >> controllers: GIC and R_INTC. GIC does not support wakeup. R_INTC handles > >> the external NMI pin, and provides 32+ IRQs to the ARISC. The first 16 > >> of these correspond 1:1 to a block of GIC IRQs starting with the NMI. > >> The last 13-16 multiplex the first (up to) 128 GIC SPIs. > >> > >> This series replaces the existing chained irqchip driver that could only > >> control the NMI, with a stacked irqchip driver that also provides wakeup > >> capability for those multiplexed SPI IRQs. The idea is to preconfigure > >> the ARISC's IRQ controller, and then the ARISC firmware knows to wake up > >> as soon as it receives an IRQ. It can also decide how deep it can > >> suspend based on the enabled wakeup IRQs. > >> > >> [...] > > > > Applied to irq/irqchip-5.12, thanks! > > > > [01/10] dt-bindings: irq: sun6i-r: Split the binding from sun7i-nmi > > commit: ad6b47cdef760410311f41876b21eb0c6fda4717 > > [02/10] dt-bindings: irq: sun6i-r: Add a compatible for the H3 > > commit: 6436eb4417094ea3308b33d8392fc02a1068dc78 > > [03/10] irqchip/sun6i-r: Use a stacked irqchip driver > > commit: 4e34614636b31747b190488240a95647c227021f > > [04/10] irqchip/sun6i-r: Add wakeup support > > commit: 7ab365f6cd6de1e2b0cb1e1e3873dbf68e6f1003 > > > > Please route the dts patches via the soc tree. Also, I had to > > manually fix the first patch as it wouldn't apply on top of > > 5.11-rc4 (which tree has it been diffed against?). Please > > check that the resolution is correct. > > This series was based on sunxi/for-next, which contains commit > 752b0aac99c7 ("dt-bindings: irq: sun7i-nmi: Add binding documentation > for the V3s NMI")[1]. I assume merging the DT bits alone would break things? If so, I guess we can wait for 5.12 to be released before merging it Maxime
On 1/22/21 4:47 AM, Maxime Ripard wrote: > On Thu, Jan 21, 2021 at 07:33:54PM -0600, Samuel Holland wrote: >> On 1/21/21 2:35 PM, Marc Zyngier wrote: >>> On Sun, 17 Jan 2021 23:50:30 -0600, Samuel Holland wrote: >>>> Allwinner sun6i/sun8i/sun50i SoCs (A31 and newer) have two interrupt >>>> controllers: GIC and R_INTC. GIC does not support wakeup. R_INTC handles >>>> the external NMI pin, and provides 32+ IRQs to the ARISC. The first 16 >>>> of these correspond 1:1 to a block of GIC IRQs starting with the NMI. >>>> The last 13-16 multiplex the first (up to) 128 GIC SPIs. >>>> >>>> This series replaces the existing chained irqchip driver that could only >>>> control the NMI, with a stacked irqchip driver that also provides wakeup >>>> capability for those multiplexed SPI IRQs. The idea is to preconfigure >>>> the ARISC's IRQ controller, and then the ARISC firmware knows to wake up >>>> as soon as it receives an IRQ. It can also decide how deep it can >>>> suspend based on the enabled wakeup IRQs. >>>> >>>> [...] >>> >>> Applied to irq/irqchip-5.12, thanks! >>> >>> [01/10] dt-bindings: irq: sun6i-r: Split the binding from sun7i-nmi >>> commit: ad6b47cdef760410311f41876b21eb0c6fda4717 >>> [02/10] dt-bindings: irq: sun6i-r: Add a compatible for the H3 >>> commit: 6436eb4417094ea3308b33d8392fc02a1068dc78 >>> [03/10] irqchip/sun6i-r: Use a stacked irqchip driver >>> commit: 4e34614636b31747b190488240a95647c227021f >>> [04/10] irqchip/sun6i-r: Add wakeup support >>> commit: 7ab365f6cd6de1e2b0cb1e1e3873dbf68e6f1003 >>> >>> Please route the dts patches via the soc tree. Also, I had to >>> manually fix the first patch as it wouldn't apply on top of >>> 5.11-rc4 (which tree has it been diffed against?). Please >>> check that the resolution is correct. >> >> This series was based on sunxi/for-next, which contains commit >> 752b0aac99c7 ("dt-bindings: irq: sun7i-nmi: Add binding documentation >> for the V3s NMI")[1]. > > I assume merging the DT bits alone would break things? If so, I guess we > can wait for 5.12 to be released before merging it Patch 5 does not depend on the new driver, so it could be merged at any time. Yes, the remaining patches would break things if merged without the driver. Cheers, Samuel
On Sat, Jan 23, 2021 at 12:26:26AM -0600, Samuel Holland wrote: > On 1/22/21 4:47 AM, Maxime Ripard wrote: > > On Thu, Jan 21, 2021 at 07:33:54PM -0600, Samuel Holland wrote: > >> On 1/21/21 2:35 PM, Marc Zyngier wrote: > >>> On Sun, 17 Jan 2021 23:50:30 -0600, Samuel Holland wrote: > >>>> Allwinner sun6i/sun8i/sun50i SoCs (A31 and newer) have two interrupt > >>>> controllers: GIC and R_INTC. GIC does not support wakeup. R_INTC handles > >>>> the external NMI pin, and provides 32+ IRQs to the ARISC. The first 16 > >>>> of these correspond 1:1 to a block of GIC IRQs starting with the NMI. > >>>> The last 13-16 multiplex the first (up to) 128 GIC SPIs. > >>>> > >>>> This series replaces the existing chained irqchip driver that could only > >>>> control the NMI, with a stacked irqchip driver that also provides wakeup > >>>> capability for those multiplexed SPI IRQs. The idea is to preconfigure > >>>> the ARISC's IRQ controller, and then the ARISC firmware knows to wake up > >>>> as soon as it receives an IRQ. It can also decide how deep it can > >>>> suspend based on the enabled wakeup IRQs. > >>>> > >>>> [...] > >>> > >>> Applied to irq/irqchip-5.12, thanks! > >>> > >>> [01/10] dt-bindings: irq: sun6i-r: Split the binding from sun7i-nmi > >>> commit: ad6b47cdef760410311f41876b21eb0c6fda4717 > >>> [02/10] dt-bindings: irq: sun6i-r: Add a compatible for the H3 > >>> commit: 6436eb4417094ea3308b33d8392fc02a1068dc78 > >>> [03/10] irqchip/sun6i-r: Use a stacked irqchip driver > >>> commit: 4e34614636b31747b190488240a95647c227021f > >>> [04/10] irqchip/sun6i-r: Add wakeup support > >>> commit: 7ab365f6cd6de1e2b0cb1e1e3873dbf68e6f1003 > >>> > >>> Please route the dts patches via the soc tree. Also, I had to > >>> manually fix the first patch as it wouldn't apply on top of > >>> 5.11-rc4 (which tree has it been diffed against?). Please > >>> check that the resolution is correct. > >> > >> This series was based on sunxi/for-next, which contains commit > >> 752b0aac99c7 ("dt-bindings: irq: sun7i-nmi: Add binding documentation > >> for the V3s NMI")[1]. > > > > I assume merging the DT bits alone would break things? If so, I guess we > > can wait for 5.12 to be released before merging it > > Patch 5 does not depend on the new driver, so it could be merged at any > time. Yes, the remaining patches would break things if merged without > the driver. I've applied patch 5 then, could you send the rest of the DT patches when 5.13-rc1 is out? Thanks! Maxime
On Mon, Jan 25, 2021 at 6:56 PM Maxime Ripard <maxime@cerno.tech> wrote: > > On Sat, Jan 23, 2021 at 12:26:26AM -0600, Samuel Holland wrote: > > On 1/22/21 4:47 AM, Maxime Ripard wrote: > > > On Thu, Jan 21, 2021 at 07:33:54PM -0600, Samuel Holland wrote: > > >> On 1/21/21 2:35 PM, Marc Zyngier wrote: > > >>> On Sun, 17 Jan 2021 23:50:30 -0600, Samuel Holland wrote: > > >>>> Allwinner sun6i/sun8i/sun50i SoCs (A31 and newer) have two interrupt > > >>>> controllers: GIC and R_INTC. GIC does not support wakeup. R_INTC handles > > >>>> the external NMI pin, and provides 32+ IRQs to the ARISC. The first 16 > > >>>> of these correspond 1:1 to a block of GIC IRQs starting with the NMI. > > >>>> The last 13-16 multiplex the first (up to) 128 GIC SPIs. > > >>>> > > >>>> This series replaces the existing chained irqchip driver that could only > > >>>> control the NMI, with a stacked irqchip driver that also provides wakeup > > >>>> capability for those multiplexed SPI IRQs. The idea is to preconfigure > > >>>> the ARISC's IRQ controller, and then the ARISC firmware knows to wake up > > >>>> as soon as it receives an IRQ. It can also decide how deep it can > > >>>> suspend based on the enabled wakeup IRQs. > > >>>> > > >>>> [...] > > >>> > > >>> Applied to irq/irqchip-5.12, thanks! > > >>> > > >>> [01/10] dt-bindings: irq: sun6i-r: Split the binding from sun7i-nmi > > >>> commit: ad6b47cdef760410311f41876b21eb0c6fda4717 > > >>> [02/10] dt-bindings: irq: sun6i-r: Add a compatible for the H3 > > >>> commit: 6436eb4417094ea3308b33d8392fc02a1068dc78 > > >>> [03/10] irqchip/sun6i-r: Use a stacked irqchip driver > > >>> commit: 4e34614636b31747b190488240a95647c227021f > > >>> [04/10] irqchip/sun6i-r: Add wakeup support > > >>> commit: 7ab365f6cd6de1e2b0cb1e1e3873dbf68e6f1003 > > >>> > > >>> Please route the dts patches via the soc tree. Also, I had to > > >>> manually fix the first patch as it wouldn't apply on top of > > >>> 5.11-rc4 (which tree has it been diffed against?). Please > > >>> check that the resolution is correct. > > >> > > >> This series was based on sunxi/for-next, which contains commit > > >> 752b0aac99c7 ("dt-bindings: irq: sun7i-nmi: Add binding documentation > > >> for the V3s NMI")[1]. > > > > > > I assume merging the DT bits alone would break things? If so, I guess we > > > can wait for 5.12 to be released before merging it > > > > Patch 5 does not depend on the new driver, so it could be merged at any > > time. Yes, the remaining patches would break things if merged without > > the driver. > > I've applied patch 5 then, could you send the rest of the DT patches > when 5.13-rc1 is out? I've put them in a for-5.13-late branch and merged them into for-next. This should get a bit of boot testing via KernelCI. Maybe we'll get to sending a late pull request for 5.13, maybe not. ChenYu
Allwinner sun6i/sun8i/sun50i SoCs (A31 and newer) have two interrupt controllers: GIC and R_INTC. GIC does not support wakeup. R_INTC handles the external NMI pin, and provides 32+ IRQs to the ARISC. The first 16 of these correspond 1:1 to a block of GIC IRQs starting with the NMI. The last 13-16 multiplex the first (up to) 128 GIC SPIs. This series replaces the existing chained irqchip driver that could only control the NMI, with a stacked irqchip driver that also provides wakeup capability for those multiplexed SPI IRQs. The idea is to preconfigure the ARISC's IRQ controller, and then the ARISC firmware knows to wake up as soon as it receives an IRQ. It can also decide how deep it can suspend based on the enabled wakeup IRQs. As future work, it may be useful to do the chained->stacked conversion on the sunxi-nmi driver as well. Patches 1-2 add the new bindings. Patch 3 adds the new driver. Patch 4 adds wakeup capability. Remaining patches update the device trees to use R_INTC where beneficial. With appropriate firmware and configuration, this series allows waking from (and it has been tested with) the RTC, NMI/PMIC (power button, A/C plug, etc.), all GPIO ports (button, lid switch, modem, etc.), LRADC, and UARTs. I have tested this patch set on the H3, A64, H5, and H6 SoCs. --- Changes from v4: - Add Acked-by/Reviewed-by tags. - Switch back to writel_relaxed(). My previous explanation for using writel() made no sense, because both the GIC and this write are to device memory, so they cannot be reordered. I was able to reproduce the extra IRQs even with writel(), so I know the issue is elsewhere. - Use NULL instead of 0 when clearing data->chip_data. Changes from v3: - Removed A31 fallback from H6 compatible. - Switch to additionalProperties in binding. - Replace wall of text with ASCII art. - Added macros for NMI_SRC_TYPE constants. - Renamed NR_IRQS to NR_TOP_LEVEL_IRQS to hopefully be more clear. - Use non-relaxed writel in sun6i_r_intc_ack_nmi to fix spurious level interrupts (reordering with gic_unmask_irq). - Use a single irq_chip for edge and level NMI configurations. - For edge, ack ASAP using handle_fasteoi_ack_irq. - For level, ack in .irq_unmask if masked at EOI, else in .irq_eoi. - Enforce that the R_INTC->GIC trigger is IRQ_TYPE_LEVEL_HIGH. - Implement .irq_set_irqchip_state. - Move other IRQs to a new irq_chip that only intercepts .irq_set_wake. - Use radix instead of linear for the IRQ domain since only a handful of the 128 hwirqs will ever be used. Changes from v2: - Fix edge IRQs on GICv2 with EOImode == 0, as found on A83T and older. - Replace .irq_ack callback with .irq_mask. - Drop IRQCHIP_EOI_THREADED. - This removes the dependency on IRQ_FASTEOI_HIERARCHY_HANDLERS. - Move IRQ_DOMAIN_HIERARCHY selection to ARCH_SUNXI to fix A83T build. - Add support for the second IRQ ENABLE/PENDING register on H6 and up. - Add support for multiplexed IRQs beyond the initial 16. - This requires a new binding, but keeps old binding compatibility. - This requires a separate mux mapping for H6 and up. - Rename parent_* => nmi_* because they only apply to the NMI. - Merge code common to probe and resume functions. - Also run suspend callback at syscore shutdown, for boards with no PMIC where firmware is also responsible for poweroff/poweron. - These two changes mean nothing is conditional on CONFIG_PM_SLEEP anymore, since all code is used even without it. - Since the binding changed, update all SoC DTs, A31 and up. - Drop r_ir from inclusion (it needs more than an IRQ to wake) and include pio (the main pin controller) and (r_)lradc. - As there are significant changes, I did not carry forward Maxime's Acked-by or Rob's Reviewed-by. Changes from v1: - Use writel_relaxed() instead if writel(). - Remove use of the MASK register, as it doesn't affect the NMI as seen by the GIC. It only affects the IRQs seen by the coprocessor. - Leave NMI_HWIRQ enabled at all times, since it can be masked at the GIC level (removed .irq_enable and .irq_disable). - Use .irq_ack vs .irq_eoi depending on the trigger type, to avoid missing interrupts or double interrupts. - Because of this change, the driver needs two "irq_chip"s, one with .irq_eoi set to our function and one without. - Also because of this, we need IRQ_FASTEOI_HIERARCHY_HANDLERS for handle_fasteoi_ack_irq(), so our .irq_ack function gets called while the GIC driver works as if handle_fasteoi_irq() was used. - Inline the SUNXI_SRC_TYPE_* enum into sun6i_r_intc_irq_set_type(). - Add a comment explaining how the trigger type is used. - Don't call irqd_set_trigger_type(). - Set IRQCHIP_SET_TYPE_MASKED to match the GIC (since flags from this driver mask flags from that one). - Set IRQCHIP_EOI_THREADED to avoid doubled level interrupts, since the latch will be set again as long as the trigger is met. - Replace sun6i_r_intc_domain_translate() with irq_domain_translate_twocell(). - Use an enum for the device tree binding. - Update commit messages for accuracy and typos. Samuel Holland (10): dt-bindings: irq: sun6i-r: Split the binding from sun7i-nmi dt-bindings: irq: sun6i-r: Add a compatible for the H3 irqchip/sun6i-r: Use a stacked irqchip driver irqchip/sun6i-r: Add wakeup support ARM: dts: sunxi: Rename nmi_intc to r_intc ARM: dts: sunxi: Use the new r_intc binding ARM: dts: sunxi: h3/h5: Add r_intc node ARM: dts: sunxi: Move wakeup-capable IRQs to r_intc arm64: dts: allwinner: Use the new r_intc binding arm64: dts: allwinner: Move wakeup-capable IRQs to r_intc .../allwinner,sun6i-a31-r-intc.yaml | 67 ++++ .../allwinner,sun7i-a20-sc-nmi.yaml | 10 - arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 4 +- arch/arm/boot/dts/sun6i-a31-m9.dts | 4 +- .../boot/dts/sun6i-a31-mele-a1000g-quad.dts | 4 +- arch/arm/boot/dts/sun6i-a31.dtsi | 8 +- arch/arm/boot/dts/sun6i-a31s-primo81.dts | 4 +- .../arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 4 +- .../boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 4 +- .../sun6i-a31s-yones-toptech-bs1078-v2.dts | 4 +- .../dts/sun6i-reference-design-tablet.dtsi | 4 +- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 8 +- arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 4 +- .../arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 4 +- .../dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 4 +- arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 4 +- .../boot/dts/sun8i-a83t-cubietruck-plus.dts | 4 +- arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 +- arch/arm/boot/dts/sun8i-a83t.dtsi | 5 +- arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 4 +- arch/arm/boot/dts/sun8i-r16-parrot.dts | 4 +- .../dts/sun8i-reference-design-tablet.dtsi | 4 +- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 12 + arch/arm/mach-sunxi/Kconfig | 2 + arch/arm64/Kconfig.platforms | 2 + .../allwinner/sun50i-a64-amarula-relic.dts | 2 +- .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 2 +- .../dts/allwinner/sun50i-a64-olinuxino.dts | 2 +- .../dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- .../boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- .../dts/allwinner/sun50i-a64-pinebook.dts | 2 +- .../dts/allwinner/sun50i-a64-pinephone.dtsi | 2 +- .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +- .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 +- .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- .../dts/allwinner/sun50i-h6-orangepi-3.dts | 2 +- .../dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +- .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 +- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 +- drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-sun6i-r.c | 379 ++++++++++++++++++ drivers/irqchip/irq-sunxi-nmi.c | 26 +- 45 files changed, 542 insertions(+), 92 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/allwinner,sun6i-a31-r-intc.yaml create mode 100644 drivers/irqchip/irq-sun6i-r.c