ARM: default machine descriptor for multiplatform
Subsystems (6)
PATCH 1/2 ARM: default machine descriptor for multiplatform
Since we now have default implementations for init_time and init_irq, the init_machine callback is the only one that is not yet optional, but since simple DT based platforms all have the same of_platform_populate function call in there, we can consolidate them as well, and then actually boot with a completely empty machine_desc. Unofortunately we cannot just default to an empty init_machine: We cannot call of_platform_populate before init_machine because that does not work in case of auxdata, and we cannot call it after init_machine either because the machine might need to run code after adding the devices.
To take the final step, this adds support for booting without defining any machine_desc whatsoever.
For the case that CONFIG_MULTIPLATFORM is enabled, it adds a global machine descriptor that never matches any machine but is used as a fallback if nothing else matches. We assume that without CONFIG_MULTIPLATFORM, we only want to boot on the systems that the kernel is built for, so we still retain the build-time warning for missing machine descriptors and the run-time warning when the platform does not match in that case.
In the case that we run on a multiplatform kernel and the machine provides a fully populated device tree, we attempt to keep booting, hoping that no machine specific callbacks are necessary.
Finally, this also removes the misguided "select ARCH_VEXPRESS" that was only added to avoid a build error for allnoconfig kernels.
--- arch/arm/Kconfig | 1 - arch/arm/kernel/devtree.c | 9 ++++++++- arch/arm/kernel/setup.c | 13 +++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-)
arch/arm/Kconfig +0 -1
@@ -1014,7 +1014,6 @@ config ARCH_MULTI_V7 bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" default y select ARCH_MULTI_V6_V7 - select ARCH_VEXPRESS select CPU_V7 config ARCH_MULTI_V6_V7
arch/arm/kernel/devtree.c +8 -1
@@ -180,6 +180,13 @@ struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)unsigned long dt_root;const char *model; +if (IS_ENABLED (CONFIG_ARCH_MULTIPLATFORM )) { + DT_MACHINE_START(GENERIC_DT, "Generic DT based system") +MACHINE_END + + mdesc_best = (struct machine_desc *)&__mach_desc_GENERIC_DT; + } +if (!dt_phys)return NULL ;
@@ -199,7 +206,7 @@ struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys) mdesc_score = score; } } -if (!mdesc_best) { +if (!mdesc_best && !IS_ENABLED (CONFIG_ARCH_MULTIPLATFORM )) {const char *prop;long size;
arch/arm/kernel/setup.c +11 -2
@@ -18,6 +18,7 @@#include <linux/bootmem.h> #include <linux/seq_file.h> #include <linux/screen_info.h> +#include <linux/of_platform.h> #include <linux/init.h> #include <linux/kexec.h> #include <linux/of_fdt.h>
@@ -660,9 +661,17 @@ struct screen_info screen_info = {static int __init customize_machine (void ) { -/* customizes platform devices, or adds new ones */ +/* +* customizes platform devices, or adds new ones +* On DT based machines, we fall back to populating the +* machine from the device tree, if no callback is provided, +* otherwise we would always need an init_machine callback. +*/ if (machine_desc->init_machine) machine_desc->init_machine (); +else +of_platform_populate (NULL , of_default_bus_match_table, +NULL ,NULL );return 0 ; }arch_initcall (customize_machine);
@@ -752,7 +761,7 @@ void __init setup_arch(char **cmdline_p)setup_processor (); mdesc =setup_machine_fdt (__atags_pointer); -if (!mdesc) +if (!mdesc && __machine_arch_type != ~0 ) mdesc =setup_machine_tags (__atags_pointer, __machine_arch_type); machine_desc = mdesc; machine_name = mdesc->name;
Signature · 1 line
1.8.1.2
PATCH 2/2 ARM: remove all trivial init_machine callbacks
The call to of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL) is now implied by having no init_machine callback in the machine descriptor, so we can save a couple of lines in those machines that do not need to do anything else.
--- arch/arm/mach-at91/board-dt.c | 6 ------ arch/arm/mach-at91/board-rm9200-dt.c | 6 ------ arch/arm/mach-exynos/mach-exynos4-dt.c | 7 ------- arch/arm/mach-imx/imx25-dt.c | 6 ------ arch/arm/mach-imx/imx31-dt.c | 6 ------ arch/arm/mach-imx/imx51-dt.c | 6 ------ arch/arm/mach-msm/board-dt-8660.c | 11 ----------- arch/arm/mach-msm/board-dt-8960.c | 6 ------ arch/arm/mach-tegra/board-dt-tegra114.c | 6 ------ arch/arm/mach-tegra/board-dt-tegra30.c | 6 ------ arch/arm/mach-virt/virt.c | 6 ------ 11 files changed, 72 deletions(-)
arch/arm/mach-at91/board-dt.c +0 -6
@@ -37,11 +37,6 @@ static void __init at91_dt_init_irq(void)of_irq_init (irq_of_match); } -static void __init at91_dt_device_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *at91_dt_board_compat[]__initdata = {"atmel,at91sam9" ,NULL
@@ -54,6 +49,5 @@ DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") .handle_irq = at91_aic_handle_irq, .init_early = at91_dt_initialize, .init_irq = at91_dt_init_irq, - .init_machine = at91_dt_device_init, .dt_compat = at91_dt_board_compat,MACHINE_END
arch/arm/mach-at91/board-rm9200-dt.c +0 -6
@@ -36,11 +36,6 @@ static void __init at91rm9200_dt_init_irq(void)of_irq_init (irq_of_match); } -static void __init at91rm9200_dt_device_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *at91rm9200_dt_board_compat[]__initdata = {"atmel,at91rm9200" ,NULL
@@ -52,6 +47,5 @@ DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)") .handle_irq = at91_aic_handle_irq, .init_early = at91rm9200_dt_initialize, .init_irq = at91rm9200_dt_init_irq, - .init_machine = at91rm9200_dt_device_init, .dt_compat = at91rm9200_dt_board_compat,MACHINE_END
arch/arm/mach-exynos/mach-exynos4-dt.c +0 -7
@@ -122,12 +122,6 @@ static void __init exynos4_dt_map_io(void)s3c24xx_init_clocks (24000000 ); } -static void __init exynos4_dt_machine_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table, - exynos4_auxdata_lookup,NULL ); -} -static char const *exynos4_dt_compat[]__initdata = {"samsung,exynos4210" ,"samsung,exynos4212" ,
@@ -140,7 +134,6 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") .smp = smp_ops(exynos_smp_ops), .init_irq = exynos4_init_irq, .map_io = exynos4_dt_map_io, - .init_machine = exynos4_dt_machine_init, .init_late = exynos_init_late, .init_time = exynos4_timer_init, .dt_compat = exynos4_dt_compat,
arch/arm/mach-imx/imx25-dt.c +0 -6
@@ -17,11 +17,6 @@#include "common.h" #include "mx25.h" -static void __init imx25_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *const imx25_dt_board_compat[]__initconst = {"fsl,imx25" ,NULL
@@ -38,7 +33,6 @@ DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)") .init_irq = mx25_init_irq, .handle_irq = imx25_handle_irq, .init_time = imx25_timer_init, - .init_machine = imx25_dt_init, .dt_compat = imx25_dt_board_compat, .restart = mxc_restart,MACHINE_END
arch/arm/mach-imx/imx31-dt.c +0 -6
@@ -18,11 +18,6 @@#include "common.h" #include "mx31.h" -static void __init imx31_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *imx31_dt_board_compat[]__initdata = {"fsl,imx31" ,NULL
@@ -39,7 +34,6 @@ DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)") .init_irq = mx31_init_irq, .handle_irq = imx31_handle_irq, .init_time = imx31_dt_timer_init, - .init_machine = imx31_dt_init, .dt_compat = imx31_dt_board_compat, .restart = mxc_restart,MACHINE_END
arch/arm/mach-imx/imx51-dt.c +0 -6
@@ -19,11 +19,6 @@#include "common.h" #include "mx51.h" -static void __init imx51_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *imx51_dt_board_compat[]__initdata = {"fsl,imx51" ,NULL
@@ -40,7 +35,6 @@ DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)") .init_irq = mx51_init_irq, .handle_irq = imx51_handle_irq, .init_time = imx51_timer_init, - .init_machine = imx51_dt_init, .init_late = imx51_init_late, .dt_compat = imx51_dt_board_compat, .restart = mxc_restart,
arch/arm/mach-msm/board-dt-8660.c +0 -11
@@ -25,16 +25,6 @@ static void __init msm8x60_init_late(void)smd_debugfs_init (); } -static struct of_dev_auxdata msm_auxdata_lookup[]__initdata = { - {} -}; - -static void __init msm8x60_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table, - msm_auxdata_lookup,NULL ); -} -static const char *msm8x60_fluid_match[]__initdata = {"qcom,msm8660-fluid" ,"qcom,msm8660-surf" ,
@@ -45,7 +35,6 @@ DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") .smp = smp_ops(msm_smp_ops), .map_io = msm_map_msm8x60_io, .init_irq = irqchip_init, - .init_machine = msm8x60_dt_init, .init_late = msm8x60_init_late, .init_time = msm_dt_timer_init, .dt_compat = msm8x60_fluid_match,
arch/arm/mach-msm/board-dt-8960.c +0 -6
@@ -18,11 +18,6 @@#include "common.h" -static void __init msm_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *const msm8960_dt_match[]__initconst = {"qcom,msm8960-cdp" ,NULL
@@ -33,6 +28,5 @@ DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)") .map_io = msm_map_msm8960_io, .init_irq = irqchip_init, .init_time = msm_dt_timer_init, - .init_machine = msm_dt_init, .dt_compat = msm8960_dt_match,MACHINE_END
arch/arm/mach-tegra/board-dt-tegra114.c +0 -6
@@ -23,11 +23,6 @@#include "board.h" #include "common.h" -static void __init tegra114_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *const tegra114_dt_board_compat[] = {"nvidia,tegra114" ,NULL ,
@@ -39,7 +34,6 @@ DT_MACHINE_START(TEGRA114_DT, "NVIDIA Tegra114 (Flattened Device Tree)") .init_early = tegra114_init_early, .init_irq = tegra_dt_init_irq, .init_time = clocksource_of_init, - .init_machine = tegra114_dt_init, .init_late = tegra_init_late, .restart = tegra_assert_system_reset, .dt_compat = tegra114_dt_board_compat,
arch/arm/mach-tegra/board-dt-tegra30.c +0 -6
@@ -37,11 +37,6 @@#include "common.h" #include "iomap.h" -static void __init tegra30_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *tegra30_dt_board_compat[] = {"nvidia,tegra30" ,NULL
@@ -53,7 +48,6 @@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)") .init_early = tegra30_init_early, .init_irq = tegra_dt_init_irq, .init_time = clocksource_of_init, - .init_machine = tegra30_dt_init, .init_late = tegra_init_late, .restart = tegra_assert_system_reset, .dt_compat = tegra30_dt_board_compat,
arch/arm/mach-virt/virt.c +0 -6
@@ -27,11 +27,6 @@#include <asm/mach/arch.h> #include <asm/mach/time.h> -static void __init virt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static void __init virt_timer_init (void ) {WARN_ON (arch_timer_of_register () !=0 );
@@ -48,7 +43,6 @@ extern struct smp_operations virt_smp_ops;DT_MACHINE_START (VIRT ,"Dummy Virtual Machine" ) .init_irq = irqchip_init, .init_time = virt_timer_init, - .init_machine = virt_init, .smp = smp_ops(virt_smp_ops), .dt_compat = virt_dt_match,MACHINE_END
Signature · 1 line
1.8.1.2
PATCH 2/2 ARM: remove all trivial init_machine callbacks
arch/arm/mach-exynos/mach-exynos4-dt.c static void __init exynos4_dt_map_io(void) · line 130
Quoted 7 lines · Arnd Bergmann
arch/arm/mach-exynos/mach-exynos4-dt.c +0
-6-static void __init exynos4_dt_machine_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table, - exynos4_auxdata_lookup,NULL ); -} -
This part was wrong, sorry. In the kernel I used as a base, we actually still need exynos4_auxdata_lookup, so this patch actually changes the behavior. In the for-next branch however, the auxdata is gone.
Arnd
PATCH 2/2 ARM: remove all trivial init_machine callbacks
In reply to Arnd BergmannQuoted 7 lines · Arnd Bergmann
The call to
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL)is now implied by having noinit_machinecallback in the machine descriptor, so we can save a couple of lines in those machines that do not need to do anything else.arch/arm/mach-tegra/board-dt-tegra114.c | 6 ------ arch/arm/mach-tegra/board-dt-tegra30.c | 6 ------
Those two files don't exist any more; they were merged with board-dt-tegra20.c and all squashed into the new tegra.c.
PATCH 2/2 ARM: remove all trivial init_machine callbacks
Quoted 11 lines · Stephen Warren
Quoted 7 lines · Arnd Bergmann
The call to
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL)is now implied by having noinit_machinecallback in the machine descriptor, so we can save a couple of lines in those machines that do not need to do anything else.arch/arm/mach-tegra/board-dt-tegra114.c | 6 ------ arch/arm/mach-tegra/board-dt-tegra30.c | 6 ------Those two files don't exist any more; they were merged with
board-dt-tegra20.cand all squashed into the newtegra.c.
Right, I also noticed this when merging with the latest for-next branch. The merged code refers to auxdata, so I'll drop the above two without a replacement.
Arnd
PATCH 2/2 ARM: remove all trivial init_machine callbacks
In reply to Arnd BergmannQuoted 5 lines · Arnd Bergmann
The call to
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL)is now implied by having noinit_machinecallback in the machine descriptor, so we can save a couple of lines in those machines that do not need to do anything else.
Quoted 8 lines
Signed-off-by Arnd Bergmann <[email protected]>Cc Nicolas Pitre <[email protected]>Cc Olof Johansson <[email protected]>Cc "Russell King - ARM Linux" <[email protected]>Cc Rob Herring <[email protected]>--- arch/arm/mach-at91/board-dt.c | 6 ------ arch/arm/mach-at91/board-rm9200-dt.c | 6 ------
on AT91 you have also sama5 file and those file are renaned for 3.10
Best Regards,
J.
Quoted 286 lines
arch/arm/mach-exynos/mach-exynos4-dt.c | 7 ------- arch/arm/mach-imx/imx25-dt.c | 6 ------ arch/arm/mach-imx/imx31-dt.c | 6 ------ arch/arm/mach-imx/imx51-dt.c | 6 ------ arch/arm/mach-msm/board-dt-8660.c | 11 ----------- arch/arm/mach-msm/board-dt-8960.c | 6 ------ arch/arm/mach-tegra/board-dt-tegra114.c | 6 ------ arch/arm/mach-tegra/board-dt-tegra30.c | 6 ------ arch/arm/mach-virt/virt.c | 6 ------ 11 files changed, 72 deletions(-)arch/arm/mach-at91/board-dt.c +0
-6@@ -37,11 +37,6 @@ static void __init at91_dt_init_irq(void)of_irq_init (irq_of_match); } -static void __init at91_dt_device_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *at91_dt_board_compat[]__initdata = {"atmel,at91sam9" ,NULL @@ -54,6 +49,5 @@ DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") .handle_irq = at91_aic_handle_irq, .init_early = at91_dt_initialize, .init_irq = at91_dt_init_irq, - .init_machine = at91_dt_device_init, .dt_compat = at91_dt_board_compat,MACHINE_END arch/arm/mach-at91/board-rm9200-dt.c +0
-6@@ -36,11 +36,6 @@ static void __init at91rm9200_dt_init_irq(void)of_irq_init (irq_of_match); } -static void __init at91rm9200_dt_device_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *at91rm9200_dt_board_compat[]__initdata = {"atmel,at91rm9200" ,NULL @@ -52,6 +47,5 @@ DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)") .handle_irq = at91_aic_handle_irq, .init_early = at91rm9200_dt_initialize, .init_irq = at91rm9200_dt_init_irq, - .init_machine = at91rm9200_dt_device_init, .dt_compat = at91rm9200_dt_board_compat,MACHINE_END arch/arm/mach-exynos/mach-exynos4-dt.c +0
-7@@ -122,12 +122,6 @@ static void __init exynos4_dt_map_io(void)s3c24xx_init_clocks (24000000 ); } -static void __init exynos4_dt_machine_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table, - exynos4_auxdata_lookup,NULL ); -} -static char const *exynos4_dt_compat[]__initdata = {"samsung,exynos4210" ,"samsung,exynos4212" ,@@ -140,7 +134,6 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") .smp = smp_ops(exynos_smp_ops), .init_irq = exynos4_init_irq, .map_io = exynos4_dt_map_io, - .init_machine = exynos4_dt_machine_init, .init_late = exynos_init_late, .init_time = exynos4_timer_init, .dt_compat = exynos4_dt_compat,arch/arm/mach-imx/imx25-dt.c +0
-6@@ -17,11 +17,6 @@#include "common.h" #include "mx25.h" -static void __init imx25_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *const imx25_dt_board_compat[]__initconst = {"fsl,imx25" ,NULL @@ -38,7 +33,6 @@ DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)") .init_irq = mx25_init_irq, .handle_irq = imx25_handle_irq, .init_time = imx25_timer_init, - .init_machine = imx25_dt_init, .dt_compat = imx25_dt_board_compat, .restart = mxc_restart,MACHINE_END arch/arm/mach-imx/imx31-dt.c +0
-6@@ -18,11 +18,6 @@#include "common.h" #include "mx31.h" -static void __init imx31_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *imx31_dt_board_compat[]__initdata = {"fsl,imx31" ,NULL @@ -39,7 +34,6 @@ DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)") .init_irq = mx31_init_irq, .handle_irq = imx31_handle_irq, .init_time = imx31_dt_timer_init, - .init_machine = imx31_dt_init, .dt_compat = imx31_dt_board_compat, .restart = mxc_restart,MACHINE_END arch/arm/mach-imx/imx51-dt.c +0
-6@@ -19,11 +19,6 @@#include "common.h" #include "mx51.h" -static void __init imx51_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *imx51_dt_board_compat[]__initdata = {"fsl,imx51" ,NULL @@ -40,7 +35,6 @@ DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)") .init_irq = mx51_init_irq, .handle_irq = imx51_handle_irq, .init_time = imx51_timer_init, - .init_machine = imx51_dt_init, .init_late = imx51_init_late, .dt_compat = imx51_dt_board_compat, .restart = mxc_restart,arch/arm/mach-msm/board-dt-8660.c +0
-11@@ -25,16 +25,6 @@ static void __init msm8x60_init_late(void)smd_debugfs_init (); } -static struct of_dev_auxdata msm_auxdata_lookup[]__initdata = { - {} -}; - -static void __init msm8x60_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table, - msm_auxdata_lookup,NULL ); -} -static const char *msm8x60_fluid_match[]__initdata = {"qcom,msm8660-fluid" ,"qcom,msm8660-surf" ,@@ -45,7 +35,6 @@ DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") .smp = smp_ops(msm_smp_ops), .map_io = msm_map_msm8x60_io, .init_irq = irqchip_init, - .init_machine = msm8x60_dt_init, .init_late = msm8x60_init_late, .init_time = msm_dt_timer_init, .dt_compat = msm8x60_fluid_match,arch/arm/mach-msm/board-dt-8960.c +0
-6@@ -18,11 +18,6 @@#include "common.h" -static void __init msm_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *const msm8960_dt_match[]__initconst = {"qcom,msm8960-cdp" ,NULL @@ -33,6 +28,5 @@ DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)") .map_io = msm_map_msm8960_io, .init_irq = irqchip_init, .init_time = msm_dt_timer_init, - .init_machine = msm_dt_init, .dt_compat = msm8960_dt_match,MACHINE_END arch/arm/mach-tegra/board-dt-tegra114.c +0
-6@@ -23,11 +23,6 @@#include "board.h" #include "common.h" -static void __init tegra114_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *const tegra114_dt_board_compat[] = {"nvidia,tegra114" ,NULL ,@@ -39,7 +34,6 @@ DT_MACHINE_START(TEGRA114_DT, "NVIDIA Tegra114 (Flattened Device Tree)") .init_early = tegra114_init_early, .init_irq = tegra_dt_init_irq, .init_time = clocksource_of_init, - .init_machine = tegra114_dt_init, .init_late = tegra_init_late, .restart = tegra_assert_system_reset, .dt_compat = tegra114_dt_board_compat,arch/arm/mach-tegra/board-dt-tegra30.c +0
-6@@ -37,11 +37,6 @@#include "common.h" #include "iomap.h" -static void __init tegra30_dt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static const char *tegra30_dt_board_compat[] = {"nvidia,tegra30" ,NULL @@ -53,7 +48,6 @@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)") .init_early = tegra30_init_early, .init_irq = tegra_dt_init_irq, .init_time = clocksource_of_init, - .init_machine = tegra30_dt_init, .init_late = tegra_init_late, .restart = tegra_assert_system_reset, .dt_compat = tegra30_dt_board_compat,arch/arm/mach-virt/virt.c +0
-6@@ -27,11 +27,6 @@#include <asm/mach/arch.h> #include <asm/mach/time.h> -static void __init virt_init (void ) -{ -of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); -} -static void __init virt_timer_init (void ) {WARN_ON (arch_timer_of_register () !=0 );@@ -48,7 +43,6 @@ extern struct smp_operations virt_smp_ops;DT_MACHINE_START (VIRT ,"Dummy Virtual Machine" ) .init_irq = irqchip_init, .init_time = virt_timer_init, - .init_machine = virt_init, .smp = smp_ops(virt_smp_ops), .dt_compat = virt_dt_match,MACHINE_END Signature · 7 lines
1.8.1.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/2 ARM: default machine descriptor for multiplatform
In reply to Arnd Bergmannarch/arm/kernel/setup.c void __init setup_arch(char **cmdline_p) · line 767
Quoted 9 lines · Arnd Bergmann
arch/arm/kernel/setup.c +1
-1@@ -752,7 +761,7 @@ void __init setup_arch(char **cmdline_p)setup_processor (); mdesc =setup_machine_fdt (__atags_pointer); -if (!mdesc) +if (!mdesc && __machine_arch_type != ~0 ) mdesc =setup_machine_tags (__atags_pointer, __machine_arch_type); machine_desc = mdesc; machine_name = mdesc->name;
If mdesc is NULL and __machine_arch_type is ~0, then mdesc remains NULL. That means machine_desc is NULL (which is probably very bad), and the initialization of machine_name causes a NULL pointer dereference.
This is clearly wrong. mdesc must never be NULL if you're using FDT here, so the original code should be fine.
PATCH 1/2 ARM: default machine descriptor for multiplatform
Quoted 15 lines · Russell King - ARM Linux
arch/arm/kernel/setup.c void __init setup_arch(char **cmdline_p) · line 767
Quoted 9 lines · Arnd Bergmann
arch/arm/kernel/setup.c +1
-1@@ -752,7 +761,7 @@ void __init setup_arch(char **cmdline_p)setup_processor (); mdesc =setup_machine_fdt (__atags_pointer); -if (!mdesc) +if (!mdesc && __machine_arch_type != ~0 ) mdesc =setup_machine_tags (__atags_pointer, __machine_arch_type); machine_desc = mdesc; machine_name = mdesc->name;If mdesc is NULL and
__machine_arch_typeis ~0, then mdesc remains NULL. That meansmachine_descis NULL (which is probably very bad), and the initialization ofmachine_namecauses a NULL pointer dereference.
Quoted 2 lines
This is clearly wrong. mdesc must never be NULL if you're using FDT here, so the original code should be fine.
Ah, right. I think was a leftover from an earlier version of the patch where I only assigned the default platform after this.
There is also a related mistake in setup_machine_fdt, the second change is not needed there either AFAICT.
Thanks for taking a look!
Arnd
PATCH v3 1/1 ARM: default machine descriptor for multiplatform
Since we now have default implementations for init_time and init_irq, the init_machine callback is the only one that is not yet optional, but since simple DT based platforms all have the same of_platform_populate function call in there, we can consolidate them as well, and then actually boot with a completely empty machine_desc. Unofortunately we cannot just default to an empty init_machine: We cannot call of_platform_populate before init_machine because that does not work in case of auxdata, and we cannot call it after init_machine either because the machine might need to run code after adding the devices.
To take the final step, this adds support for booting without defining any machine_desc whatsoever.
For the case that CONFIG_MULTIPLATFORM is enabled, it adds a global machine descriptor that never matches any machine but is used as a fallback if nothing else matches. We assume that without CONFIG_MULTIPLATFORM, we only want to boot on the systems that the kernel is built for, so we still retain the build-time warning for missing machine descriptors and the run-time warning when the platform does not match in that case.
In the case that we run on a multiplatform kernel and the machine provides a fully populated device tree, we attempt to keep booting, hoping that no machine specific callbacks are necessary.
Finally, this also removes the misguided "select ARCH_VEXPRESS" that was only added to avoid a build error for allnoconfig kernels.
arch/arm/Kconfig +0 -1
@@ -1014,7 +1014,6 @@ config ARCH_MULTI_V7 bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" default y select ARCH_MULTI_V6_V7 - select ARCH_VEXPRESS select CPU_V7 config ARCH_MULTI_V6_V7
arch/arm/kernel/devtree.c +7 -0
@@ -180,6 +180,13 @@ struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)unsigned long dt_root;const char *model; +if (IS_ENABLED (CONFIG_ARCH_MULTIPLATFORM )) { + DT_MACHINE_START(GENERIC_DT, "Generic DT based system") +MACHINE_END + + mdesc_best = (struct machine_desc *)&__mach_desc_GENERIC_DT; + } +if (!dt_phys)return NULL ;
arch/arm/kernel/setup.c +10 -1
@@ -18,6 +18,7 @@#include <linux/bootmem.h> #include <linux/seq_file.h> #include <linux/screen_info.h> +#include <linux/of_platform.h> #include <linux/init.h> #include <linux/kexec.h> #include <linux/of_fdt.h>
@@ -660,9 +661,17 @@ struct screen_info screen_info = {static int __init customize_machine (void ) { -/* customizes platform devices, or adds new ones */ +/* +* customizes platform devices, or adds new ones +* On DT based machines, we fall back to populating the +* machine from the device tree, if no callback is provided, +* otherwise we would always need an init_machine callback. +*/ if (machine_desc->init_machine) machine_desc->init_machine (); +else +of_platform_populate (NULL , of_default_bus_match_table, +NULL ,NULL );return 0 ; }arch_initcall (customize_machine);
PATCH v3 1/1 ARM: default machine descriptor for multiplatform
Quoted 33 lines · Arnd Bergmann
Since we now have default implementations for
init_timeandinit_irq, theinit_machinecallback is the only one that is not yet optional, but since simple DT based platforms all have the sameof_platform_populatefunction call in there, we can consolidate them as well, and then actually boot with a completely emptymachine_desc. Unofortunately we cannot just default to an emptyinit_machine: We cannot callof_platform_populatebeforeinit_machinebecause that does not work in case of auxdata, and we cannot call it afterinit_machineeither because the machine might need to run code after adding the devices.To take the final step, this adds support for booting without defining any
machine_descwhatsoever.For the case that
CONFIG_MULTIPLATFORMis enabled, it adds a global machine descriptor that never matches any machine but is used as a fallback if nothing else matches. We assume that withoutCONFIG_MULTIPLATFORM, we only want to boot on the systems that the kernel is built for, so we still retain the build-time warning for missing machine descriptors and the run-time warning when the platform does not match in that case.In the case that we run on a multiplatform kernel and the machine provides a fully populated device tree, we attempt to keep booting, hoping that no machine specific callbacks are necessary.
Finally, this also removes the misguided "select
ARCH_VEXPRESS" that was only added to avoid a build error for allnoconfig kernels.Signed-off-by Arnd Bergmann <[email protected]>Acked-by Nicolas Pitre <[email protected]>Acked-by Olof Johansson <[email protected]>Cc "Russell King - ARM Linux" <[email protected]>
[...]
arch/arm/kernel/setup.c struct screen_info screen_info = { · line 673
Quoted 4 lines
arch/arm/kernel/setup.c +2
-0if (machine_desc->init_machine) machine_desc->init_machine (); +else + of_platform_populate(NULL, of_default_bus_match_table,
This will fail to build for !OF. of_platform.h needs this:
#define of_default_bus_match_table NULL
You may need some struct forward declarations, but this commit in my tree for 3.10 should fix those:
commit d450f445f9a654080a6be4094376c2192d9a1f36
Author: Sergei Shtylyov <[email protected]> Date: Tue Feb 19 02:58:25 2013 +0300
<linux/of_platform.h>: fix compilation warnings with DT disabled
Rob
Quoted 5 lines
arch/arm/kernel/setup.c +1
-0+ NULL, NULL);return 0 ; }arch_initcall (customize_machine);
PATCH v3 1/1 ARM: default machine descriptor for multiplatform
Quoted 4 lines · Rob Herring
This will fail to build for !OF.
of_platform.hneeds this:#define
of_default_bus_match_tableNULL
Quoted 9 lines
You may need some struct forward declarations, but this commit in my tree for 3.10 should fix those:
commit
d450f445f9a654080a6be4094376c2192d9a1f36Author: Sergei Shtylyov <[email protected]> Date: Tue Feb 19 02:58:25 2013 +0300<
linux/of_platform.h>: fix compilation warnings with DT disabled
Ok. I've actually stumbled over missing declarations from of_platform.h and related files a number of times. Could we please not hide any declarations inside of #ifdef when there is no #else alternative?
If we just show the of_default_bus_match_table declaration in the header file, there is no need to provide the silly NULL macro, since the of_platform_populate alternative will just ignore it.
I'll just put the code in an #ifdef for now, but I'd really prefer to clean up this and many other locations that currently have to do #ifdef CONFIG_OF when they really don't need to.
Arnd
PATCH v3 1/1 ARM: default machine descriptor for multiplatform
Quoted 19 lines · Arnd Bergmann
Quoted 4 lines · Rob Herring
This will fail to build for !OF.
of_platform.hneeds this:#define
of_default_bus_match_tableNULLQuoted 9 lines
You may need some struct forward declarations, but this commit in my tree for 3.10 should fix those:
commit
d450f445f9a654080a6be4094376c2192d9a1f36Author: Sergei Shtylyov <[email protected]> Date: Tue Feb 19 02:58:25 2013 +0300<
linux/of_platform.h>: fix compilation warnings with DT disabledOk. I've actually stumbled over missing declarations from
of_platform.hand related files a number of times. Could we please not hide any declarations inside of #ifdef when there is no #else alternative?
Quoted 7 lines
If we just show the
of_default_bus_match_tabledeclaration in the header file, there is no need to provide the silly NULL macro, since theof_platform_populatealternative will just ignore it.I'll just put the code in an #ifdef for now, but I'd really prefer to clean up this and many other locations that currently have to do #ifdef
CONFIG_OFwhen they really don't need to.
I think we can kill off CONFIG_OF_DEVICE completely. It is always enabled when OF is (even for the oddball Sparc).
The only remaining user of of_platform_driver is ibmebus and 2 drivers. It would be good to convert those to regular platform drivers.
Rob
PATCH v3 1/1 ARM: default machine descriptor for multiplatform
Quoted 3 lines · Rob Herring
The only remaining user of
of_platform_driveris ibmebus and 2 drivers. It would be good to convert those to regular platform drivers.
Right, I would not expect any trouble in converting ibmebus to use a regular platform_driver. It already uses platform_device anyway. We cannot remove ibmebus itself because it has special DMA requirements, but we could move it to drivers/bus if the powerpc maintainers like that.
Arnd.