Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a2e912d authored by Xia Kaixu's avatar Xia Kaixu Committed by Arnd Bergmann
Browse files

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: default avatarXia Kaixu <kaixu.xia@linaro.org>
Signed-off-by: default avatarArnd 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
parent c96bfaff

arch/arm/mach-cns3xxx/cns3420vb.c

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-cns3xxx/core.c

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-cns3xxx/core.h

+6 −0
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-cns3xxx/pcie.c

+1 −4
Original line number Diff line number Diff line
@@ -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);

drivers/cpufreq/Kconfig.arm

+1 −1
Original line number Diff line number Diff line
@@ -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