ARM: cns3xxx: fix allmodconfig panic in pci driver

The kernel panic occurs when running an allmodconfig kernel on
OMAP4460. The inicall "cns3xxx_pcie_init" does not check which
hardware it's running on and just tries to access to its specific
registers. Now call it from .init_late callback from the two
machine descriptors.

Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Felix Fietkau <nbd@openwrt.org>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: linaro-kernel@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org

diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c
index d863d8729edc54c9744cfd4137748727b57673f6..6428bcc77e87fe7b16ad41342db02184f8100f5b 100644 (file)
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -250,5 +250,6 @@ MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board")
        .init_irq       = cns3xxx_init_irq,
        .init_time      = cns3xxx_timer_init,
        .init_machine   = cns3420_init,
+       .init_late      = cns3xxx_pcie_init_late,
        .restart        = cns3xxx_restart,
 MACHINE_END

diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c
index f85449a6accd9210544952b6f2ce9939f5bed1da..4e9837ded96dbd7deda10dbfc3fd5e502c37b4f7 100644 (file)
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
@@ -404,5 +404,6 @@ DT_MACHINE_START(CNS3XXX_DT, "Cavium Networks CNS3xxx")
        .init_irq       = cns3xxx_init_irq,
        .init_time      = cns3xxx_timer_init,
        .init_machine   = cns3xxx_init,
+       .init_late      = cns3xxx_pcie_init_late,
        .restart        = cns3xxx_restart,
 MACHINE_END

diff --git a/arch/arm/mach-cns3xxx/core.h b/arch/arm/mach-cns3xxx/core.h
index 5218b6198dc2e5f40aac9303e4ae336258d0307c..dc5df7f1e39fdfbfb6413f4f8cf123aa36ed6c0e 100644 (file)
--- a/arch/arm/mach-cns3xxx/core.h
+++ b/arch/arm/mach-cns3xxx/core.h
@@ -21,6 +21,12 @@ void __init cns3xxx_l2x0_init(void);
 static inline void cns3xxx_l2x0_init(void) {}
 #endif /* CONFIG_CACHE_L2X0 */
 
+#ifdef CONFIG_PCI
+extern void __init cns3xxx_pcie_init_late(void);
+#else
+static inline void __init cns3xxx_pcie_init_late(void) {}
+#endif
+
 void __init cns3xxx_map_io(void);
 void __init cns3xxx_init_irq(void);
 void cns3xxx_power_off(void);

diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c
index 413134c54452b5d7fa2a91c0b1f68978eb79c811..70fd81ea1828f100ec1e7a679824c67a15b8695d 100644 (file)
--- a/arch/arm/mach-cns3xxx/pcie.c
+++ b/arch/arm/mach-cns3xxx/pcie.c
@@ -318,7 +318,7 @@ static int cns3xxx_pcie_abort_handler(unsigned long addr, unsigned int fsr,
        return 0;
 }
 
-static int __init cns3xxx_pcie_init(void)
+void __init cns3xxx_pcie_init_late(void)
 {
        int i;
 
@@ -337,7 +337,4 @@ static int __init cns3xxx_pcie_init(void)
        }
 
        pci_assign_unassigned_resources();
-
-       return 0;
 }
-device_initcall(cns3xxx_pcie_init);

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 7364a538e0562a82b855c95305f983d8a63eb2be..18ad141907ffa92f8768218ec3417749c095bb95 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -77,7 +77,7 @@ config ARM_EXYNOS5440_CPUFREQ
 
 config ARM_EXYNOS_CPU_FREQ_BOOST_SW
        bool "EXYNOS Frequency Overclocking - Software"
-       depends on ARM_EXYNOS_CPUFREQ
+       depends on ARM_EXYNOS_CPUFREQ && THERMAL
        select CPU_FREQ_BOOST_SW
        select EXYNOS_THERMAL
        help