Commit 1e1d137f authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch irq/modular-irqchips into irq/irqchip-next 



* irq/modular-irqchips:
  : .
  : Update a set of irqchip drivers to be build as modules.
  :
  : This includes an Amlogic and multiple Broadcom drivers, triggering
  : a cascade of other changes (MIPS arch code, symbols being exported,
  : config changes)
  : .
  irqchip: Fix kernel-doc parameter typo for IRQCHIP_DECLARE
  ARM: bcm: Removed forced select of interrupt controllers
  arm64: broadcom: Removed forced select of interrupt controllers
  irqchip/irq-bcm7120-l2: Switch to IRQCHIP_PLATFORM_DRIVER
  genirq: Export irq_gc_noop()
  irqchip/irq-brcmstb-l2: Switch to IRQCHIP_PLATFORM_DRIVER
  genirq: Export irq_gc_{unmask_enable,mask_disable}_reg
  irqchip/irq-bcm7038-l1: Switch to IRQCHIP_PLATFORM_DRIVER
  irqchip/irq-bcm7038-l1: Restrict affinity setting to MIPS
  irqchip/irq-bcm7038-l1: Gate use of CPU logical map to MIPS
  irqchip/irq-bcm7038-l1: Use irq_get_irq_data()
  irqchip/irq-bcm7038-l1: Remove .irq_cpu_offline()
  MIPS: BMIPS: Remove use of irq_cpu_offline
  arm64: meson: remove MESON_IRQ_GPIO selection
  irqchip/meson-gpio: Make it possible to build as a module
  irqchip: Provide stronger type checking for IRQCHIP_MATCH/IRQCHIP_DECLARE

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 12f04f9f b8419e7b

arch/arm/mach-bcm/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ config ARCH_BCM2835 
	select ARM_TIMER_SP804

	select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7

	select BCM2835_TIMER

	select BRCMSTB_L2_IRQ

	select PINCTRL

	select PINCTRL_BCM2835

	select MFD_CORE
@@ -209,9 +208,6 @@ config ARCH_BRCMSTB 
	select ARM_GIC

	select ARM_ERRATA_798181 if SMP

	select HAVE_ARM_ARCH_TIMER

	select BCM7038_L1_IRQ

	select BRCMSTB_L2_IRQ

	select BCM7120_L2_IRQ

	select ZONE_DMA if ARM_LPAE

	select SOC_BRCMSTB

	select SOC_BUS

arch/arm64/Kconfig.platforms

+0 −4
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ config ARCH_BCM2835 
	select ARM_AMBA

	select ARM_GIC

	select ARM_TIMER_SP804

	select BRCMSTB_L2_IRQ

	help

	  This enables support for the Broadcom BCM2837 and BCM2711 SoC.

	  These SoCs are used in the Raspberry Pi 3 and 4 devices.
@@ -82,8 +81,6 @@ config ARCH_BITMAIN 
config ARCH_BRCMSTB

	bool "Broadcom Set-Top-Box SoCs"

	select ARCH_HAS_RESET_CONTROLLER

	select BCM7038_L1_IRQ

	select BRCMSTB_L2_IRQ

	select GENERIC_IRQ_CHIP

	select PINCTRL

	help
@@ -167,7 +164,6 @@ config ARCH_MEDIATEK 
config ARCH_MESON

	bool "Amlogic Platforms"

	select COMMON_CLK

	select MESON_IRQ_GPIO

	help

	  This enables support for the arm64 based Amlogic SoCs

	  such as the s905, S905X/D, S912, A113X/D or S905X/D2

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1782,6 +1782,7 @@ config CPU_BMIPS 
	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_CPUFREQ

	select MIPS_EXTERNAL_TIMER

	select GENERIC_IRQ_MIGRATION if HOTPLUG_CPU

	help

	  Support for BMIPS32/3300/4350/4380 and BMIPS5000 processors.

arch/mips/kernel/smp-bmips.c

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/bug.h>

#include <linux/kernel.h>

#include <linux/kexec.h>

#include <linux/irq.h>



#include <asm/time.h>

#include <asm/processor.h>
@@ -373,7 +374,7 @@ static int bmips_cpu_disable(void) 


	set_cpu_online(cpu, false);

	calculate_cpu_foreign_map();

	irq_cpu_offline();

	irq_migrate_all_off_this_cpu();

	clear_c0_status(IE_IRQ5);



	local_flush_tlb_all();

drivers/irqchip/Kconfig

+12 −5
Original line number Diff line number Diff line
@@ -115,18 +115,24 @@ config BCM6345_L1_IRQ 
	select GENERIC_IRQ_EFFECTIVE_AFF_MASK



config BCM7038_L1_IRQ

	bool

	tristate "Broadcom STB 7038-style L1/L2 interrupt controller driver"

	depends on ARCH_BRCMSTB || BMIPS_GENERIC

	default ARCH_BRCMSTB || BMIPS_GENERIC

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN

	select GENERIC_IRQ_EFFECTIVE_AFF_MASK



config BCM7120_L2_IRQ

	bool

	tristate "Broadcom STB 7120-style L2 interrupt controller driver"

	depends on ARCH_BRCMSTB || BMIPS_GENERIC

	default ARCH_BRCMSTB || BMIPS_GENERIC

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN



config BRCMSTB_L2_IRQ

	bool

	tristate "Broadcom STB generic L2 interrupt controller driver"

	depends on ARCH_BCM2835 || ARCH_BRCMSTB || BMIPS_GENERIC

	default ARCH_BCM2835 || ARCH_BRCMSTB || BMIPS_GENERIC

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN
@@ -400,8 +406,9 @@ config IRQ_UNIPHIER_AIDET 
	  Support for the UniPhier AIDET (ARM Interrupt Detector).



config MESON_IRQ_GPIO

       bool "Meson GPIO Interrupt Multiplexer"

       depends on ARCH_MESON

       tristate "Meson GPIO Interrupt Multiplexer"

       depends on ARCH_MESON || COMPILE_TEST

       default ARCH_MESON

       select IRQ_DOMAIN_HIERARCHY

       help

         Support Meson SoC Family GPIO Interrupt Multiplexer