Hi,
On Wed, Apr 13, 2016 at 04:59:27PM +0100, Suzuki K Poulose wrote:
> The sunxi-nmi and sun4i irq chips are selected by ARCH_SUNXI on both arm
> and arm64 (recently added). However on arm64, we don't explicitly select
> GENERIC_IRQ_CHIP which is required by the sunxi-nmi irq chip driver and
> causes build breaks on 4.6-rc1 :
>
> UPD include/generated/compile.h
> CC init/version.o
> LD init/built-in.o
> drivers/built-in.o: In function `sunxi_sc_nmi_set_type':
> drivers/irqchip/irq-sunxi-nmi.c:114: undefined reference to
> `irq_setup_alt_chip'
> drivers/built-in.o: In function `irq_domain_add_linear':
> include/linux/irqdomain.h:253: undefined reference to `irq_generic_chip_ops'
> include/linux/irqdomain.h:253: undefined reference to `irq_generic_chip_ops'
> drivers/built-in.o: In function `sunxi_sc_nmi_irq_init':
> drivers/irqchip/irq-sunxi-nmi.c:146: undefined reference to
> `irq_alloc_domain_generic_chips'
> drivers/irqchip/irq-sunxi-nmi.c:161: undefined reference to
> `irq_get_domain_generic_chip'
> drivers/irqchip/irq-sunxi-nmi.c:170: undefined reference to
> `irq_gc_mask_clr_bit'
> drivers/irqchip/irq-sunxi-nmi.c:171: undefined reference to
> `irq_gc_mask_set_bit'
> drivers/irqchip/irq-sunxi-nmi.c:172: undefined reference to
> `irq_gc_ack_set_bit'
> drivers/irqchip/irq-sunxi-nmi.c:170: undefined reference to
> `irq_gc_mask_clr_bit'
>
> This patch fixes the dependency by introducing a separate Kconfig
> symbol for sunxi irqchips which does the proper dependency selections.
>
> Build tested on arm and arm64.
>
> Fixes: commit ce3dd55b99b1 ("arm64: Introduce Allwinner SoC config option")
> Suggested-by: Olof Johansson <o...@lixom.net>
> Cc: Andre Przywara <andre.przyw...@arm.com>
> Cc: Russell King <li...@arm.linux.org.uk>
> Cc: Maxime Ripard <maxime.rip...@free-electrons.com>
> Cc: Chen-Yu Tsai <w...@csie.org>
> Cc: Catalin Marinas <catalin.mari...@arm.com>
> Cc: Will Deacon <will.dea...@arm.com>
> Cc: Thomas Gleixner <t...@linutronix.de>
> Cc: Jason Cooper <ja...@lakedaemon.net>
> Cc: Marc Zyngier <marc.zyng...@arm.com>
> Signed-off-by: Suzuki K Poulose <suzuki.poul...@arm.com>
> ---
> arch/arm/mach-sunxi/Kconfig | 2 +-
> arch/arm64/Kconfig.platforms | 1 +
> drivers/irqchip/Kconfig | 6 ++++++
> drivers/irqchip/Makefile | 4 ++--
> 4 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index c124d65..7a4fc8c 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -4,9 +4,9 @@ menuconfig ARCH_SUNXI
> select ARCH_REQUIRE_GPIOLIB
> select ARCH_HAS_RESET_CONTROLLER
> select CLKSRC_MMIO
> - select GENERIC_IRQ_CHIP
> select PINCTRL
> select SUN4I_TIMER
> + select SUNXI_IRQCHIP
> select RESET_CONTROLLER
>
> if ARCH_SUNXI
> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
> index efa77c1..c77ad2d 100644
> --- a/arch/arm64/Kconfig.platforms
> +++ b/arch/arm64/Kconfig.platforms
> @@ -2,6 +2,7 @@ menu "Platform selection"
>
> config ARCH_SUNXI
> bool "Allwinner sunxi 64-bit SoC Family"
> + select SUNXI_IRQCHIP
> help
> This enables support for Allwinner sunxi based SoCs like the A64.
>
> diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
> index 3e12479..772c8ba 100644
> --- a/drivers/irqchip/Kconfig
> +++ b/drivers/irqchip/Kconfig
> @@ -165,6 +165,12 @@ config ST_IRQCHIP
> help
> Enables SysCfg Controlled IRQs on STi based platforms.
>
> +config SUNXI_IRQCHIP
> + bool
> + select GENERIC_IRQ_CHIP
> + help
> + Support for Allwinner A1x/A20/A31 SoCs NMI IRQ chip driver
> +
> config TANGO_IRQ
> bool
> select IRQ_DOMAIN
> diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
> index b03cfcb..c9626f4 100644
> --- a/drivers/irqchip/Makefile
> +++ b/drivers/irqchip/Makefile
> @@ -19,8 +19,8 @@ obj-$(CONFIG_CLPS711X_IRQCHIP) +=
> irq-clps711x.o
> obj-$(CONFIG_OR1K_PIC) += irq-or1k-pic.o
> obj-$(CONFIG_ORION_IRQCHIP) += irq-orion.o
> obj-$(CONFIG_OMAP_IRQCHIP) += irq-omap-intc.o
> -obj-$(CONFIG_ARCH_SUNXI) += irq-sun4i.o
> -obj-$(CONFIG_ARCH_SUNXI) += irq-sunxi-nmi.o
> +obj-$(CONFIG_SUNXI_IRQCHIP) += irq-sun4i.o
> +obj-$(CONFIG_SUNXI_IRQCHIP) += irq-sunxi-nmi.oThose are two different drivers, that should be selected by different SoCs (MACH_SUN4I and MACH_SUN5I for the former, SUN6I, SUN7I and SUN8I for the latter) Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
signature.asc
Description: Digital signature
