Commit e1318391 authored by Linus Walleij's avatar Linus Walleij Committed by Arnd Bergmann

ARM: integrator: fix section mismatch problem

This addresses a section mismatch problem in the IM-PD1
driver in the Integrator/AP.

The IM-PD1 contains a VIC interrupt controller and therefore
the driver calls vic_init_cascaded() which is marked __init as
irqchips are simply not hot-pluggable and specifically the VIC
is assumed to initiate only on boot.

However the module driver model of the Integrator LM bus
assumes that logic tile drivers can be probed at runtime. This
is not really the case for IM-PD1: these tiles are detected at
boot and they cannot be plugged into a running system. Before
this patch it is of course possible to modprobe them later.

By first forcing the IM-PD1 to bool we make sure this driver
gets compiled into the kernel, and we know it will be probed
only at boot time when the tiles are detected, so we can tag
its probe function __init_refok as we know it won't be called
after boot now, and the section mismatch problem goes away.

As a side effect, sysfs binding from userspace becomes
impossible, so we tag the driver to suppress the bind/unbind
sysfs attributes.

Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent e47043ae
...@@ -28,7 +28,7 @@ config ARCH_CINTEGRATOR ...@@ -28,7 +28,7 @@ config ARCH_CINTEGRATOR
bool bool
config INTEGRATOR_IMPD1 config INTEGRATOR_IMPD1
tristate "Include support for Integrator/IM-PD1" bool "Include support for Integrator/IM-PD1"
depends on ARCH_INTEGRATOR_AP depends on ARCH_INTEGRATOR_AP
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARM_VIC select ARM_VIC
......
...@@ -308,7 +308,12 @@ static struct impd1_device impd1_devs[] = { ...@@ -308,7 +308,12 @@ static struct impd1_device impd1_devs[] = {
*/ */
#define IMPD1_VALID_IRQS 0x00000bffU #define IMPD1_VALID_IRQS 0x00000bffU
static int __init impd1_probe(struct lm_device *dev) /*
* As this module is bool, it is OK to have this as __init_refok() - no
* probe calls will be done after the initial system bootup, as devices
* are discovered as part of the machine startup.
*/
static int __init_refok impd1_probe(struct lm_device *dev)
{ {
struct impd1_module *impd1; struct impd1_module *impd1;
int irq_base; int irq_base;
...@@ -397,6 +402,11 @@ static void impd1_remove(struct lm_device *dev) ...@@ -397,6 +402,11 @@ static void impd1_remove(struct lm_device *dev)
static struct lm_driver impd1_driver = { static struct lm_driver impd1_driver = {
.drv = { .drv = {
.name = "impd1", .name = "impd1",
/*
* As we're dropping the probe() function, suppress driver
* binding from sysfs.
*/
.suppress_bind_attrs = true,
}, },
.probe = impd1_probe, .probe = impd1_probe,
.remove = impd1_remove, .remove = impd1_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment