ARM: mvebu: use dt_fixup to provide fallback for enable-method
Subsystems (3)
PATCH v5 1/1 ARM: mvebu: use dt_fixup to provide fallback for enable-method
We need to maintain backwards compatibility with device trees that don't define an enable method. At the same time we want the device tree to be able to specify an enable-method and have it stick.
Previously by having smp assigned in the DT_MACHINE definition this would be picked up by setup_arch() and override whatever arm_dt_init_cpu_maps() had configured. Now we move the initial assignment of default smp_ops to a dt_fixup and let arm_dt_init_cpu_maps() override that if the device tree defines an enable-method.
---
Pervious versions
v1: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/300182.html
v2: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/300480.html
v3: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/302945.html
v4: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/303899.html
Changes since v4:
- drop "RFC"
arch/arm/mach-mvebu/board-v7.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-mvebu/board-v7.c +6 -6
@@ -145,6 +145,11 @@ static void __init mvebu_dt_init(void)i2c_quirk (); } +static void __init armada_370_xp_dt_fixup (void ) +{ +smp_set_ops (smp_ops (armada_xp_smp_ops)); +} +static const char *const armada_370_xp_dt_compat[]__initconst = {"marvell,armada-370-xp" ,NULL ,
@@ -153,17 +158,12 @@ static const char * const armada_370_xp_dt_compat[] __initconst = {DT_MACHINE_START (ARMADA_370_XP_DT ,"Marvell Armada 370/XP (Device Tree)" ) .l2c_aux_val = 0, .l2c_aux_mask = ~0, -/* -* The following field (.smp) is still needed to ensure backward -* compatibility with old Device Trees that were not specifying the -* cpus enable-method property. -*/ - .smp = smp_ops(armada_xp_smp_ops), .init_machine = mvebu_dt_init, .init_irq = mvebu_init_irq, .restart = mvebu_restart, .reserve = mvebu_memblock_reserve, .dt_compat = armada_370_xp_dt_compat, + .dt_fixup = armada_370_xp_dt_fixup, MACHINE_ENDstatic const char *const armada_375_dt_compat[]__initconst = {
Signature · 1 line
2.18.0
Hi Chris,
Quoted 4 lines · Chris Packham
We need to maintain backwards compatibility with device trees that don't define an enable method. At the same time we want the device tree to be able to specify an enable-method and have it stick.
Quoted 8 lines
Previously by having smp assigned in the
DT_MACHINEdefinition this would be picked up bysetup_arch()and override whateverarm_dt_init_cpu_maps()had configured. Now we move the initial assignment of defaultsmp_opsto adt_fixupand letarm_dt_init_cpu_maps()override that if the device tree defines an enable-method.Signed-off-by Chris Packham <[email protected]>
I made several tests on an Armada XP based board: OpenBlock AX3: I modify the enable-method in the decvice tree, and I confirm that without your patch it is not taken into account whereas with this patch the enable-method is applied form the device tree. I also didn't see any regression with the original dtb.
So I added my:
and applied on mvebu/soc
Thanks,
Gregory
Quoted 52 lines
---
Pervious versionsv1: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/300182.html
v2: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/300480.html
v3: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/302945.html
v4: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-November/303899.htmlChanges since v4:
- drop "RFC"arch/arm/mach-mvebu/board-v7.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm/mach-mvebu/board-v7.c +6
-6@@ -145,6 +145,11 @@ static void __init mvebu_dt_init(void)i2c_quirk (); } +static void __init armada_370_xp_dt_fixup (void ) +{ +smp_set_ops (smp_ops (armada_xp_smp_ops)); +} +static const char *const armada_370_xp_dt_compat[]__initconst = {"marvell,armada-370-xp" ,NULL ,@@ -153,17 +158,12 @@ static const char * const armada_370_xp_dt_compat[] __initconst = {DT_MACHINE_START (ARMADA_370_XP_DT ,"Marvell Armada 370/XP (Device Tree)" ) .l2c_aux_val = 0, .l2c_aux_mask = ~0, -/* -* The following field (.smp) is still needed to ensure backward -* compatibility with old Device Trees that were not specifying the -* cpus enable-method property. -*/ - .smp = smp_ops(armada_xp_smp_ops), .init_machine = mvebu_dt_init, .init_irq = mvebu_init_irq, .restart = mvebu_restart, .reserve = mvebu_memblock_reserve, .dt_compat = armada_370_xp_dt_compat, + .dt_fixup = armada_370_xp_dt_fixup, MACHINE_ENDstatic const char *const armada_375_dt_compat[]__initconst = {Signature · 1 line
2.18.0
Signature · 3 lines
Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com
Quoted 23 lines · Gregory CLEMENT
Hi Chris,
Quoted 4 lines · Chris Packham
We need to maintain backwards compatibility with device trees that don't define an enable method. At the same time we want the device tree to be able to specify an enable-method and have it stick.
Quoted 8 lines
Previously by having smp assigned in the
DT_MACHINEdefinition this would be picked up bysetup_arch()and override whateverarm_dt_init_cpu_maps()had configured. Now we move the initial assignment of defaultsmp_opsto adt_fixupand letarm_dt_init_cpu_maps()override that if the device tree defines an enable-method.Signed-off-by Chris Packham <[email protected]>I made several tests on an Armada XP based board: OpenBlock AX3: I modify the enable-method in the decvice tree, and I confirm that without your patch it is not taken into account whereas with this patch the enable-method is applied form the device tree. I also didn't see any regression with the original dtb.
Quoted 4 lines
So I added my:
Tested-by Gregory CLEMENT <[email protected]>and applied on mvebu/soc
Hi,
Looks like this broke non-SMP. Not a huge deal, but please apply this as closely as possible on top of the previous patch (or squash it in).
- 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< -
Quoted 1 line
From
3190d9502607995c7aecce79beec36714574d494Mon Sep 17 00:00:00 2001
From: Olof Johansson <[email protected]>
Date: Mon, 24 Sep 2018 02:37:31 -0700
Subject: [PATCH] ARM: mvebu: fix !SMP build
Wrap set_smp_ops() in CONFIG_SMP.
--- arch/arm/mach-mvebu/board-v7.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-mvebu/board-v7.c +2 -0
@@ -147,7 +147,9 @@ static void __init mvebu_dt_init(void)static void __init armada_370_xp_dt_fixup (void ) { +#ifdef CONFIG_SMP smp_set_ops (smp_ops (armada_xp_smp_ops)); +#endif }static const char *const armada_370_xp_dt_compat[]__initconst = {
Signature · 1 line
2.8.6
Quoted 59 lines · Olof Johansson
Quoted 23 lines · Gregory CLEMENT
Hi Chris,
Quoted 4 lines · Chris Packham
We need to maintain backwards compatibility with device trees that don't define an enable method. At the same time we want the device tree to be able to specify an enable-method and have it stick.
Quoted 8 lines
Previously by having smp assigned in the
DT_MACHINEdefinition this would be picked up bysetup_arch()and override whateverarm_dt_init_cpu_maps()had configured. Now we move the initial assignment of defaultsmp_opsto adt_fixupand letarm_dt_init_cpu_maps()override that if the device tree defines an enable-method.Signed-off-by Chris Packham <[email protected]>I made several tests on an Armada XP based board: OpenBlock AX3: I modify the enable-method in the decvice tree, and I confirm that without your patch it is not taken into account whereas with this patch the enable-method is applied form the device tree. I also didn't see any regression with the original dtb.
Quoted 4 lines
So I added my:
Tested-by Gregory CLEMENT <[email protected]>and applied on mvebu/soc
Hi,
Looks like this broke non-SMP. Not a huge deal, but please apply this as closely as possible on top of the previous patch (or squash it in).
- 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< -
From
3190d9502607995c7aecce79beec36714574d494Mon Sep 17 00:00:00 2001
From: Olof Johansson <[email protected]>
Date: Mon, 24 Sep 2018 02:37:31 -0700
Subject: [PATCH] ARM: mvebu: fix !SMP buildWrap
set_smp_ops()inCONFIG_SMP.Fixes d6ec59de9a0a8 ("ARM: mvebu: use dt_fixup to provide fallback for enable-method")Cc Chris Packham <[email protected]>Signed-off-by Olof Johansson <[email protected]>--- arch/arm/mach-mvebu/board-v7.c | 2 ++ 1 file changed, 2 insertions(+)arch/arm/mach-mvebu/board-v7.c +0
-0
arch/arm/mach-mvebu/board-v7.c static void __init mvebu_dt_init(void) · line 155
Quoted 9 lines
arch/arm/mach-mvebu/board-v7.c +2
-0@@ -147,7 +147,9 @@ static void __init mvebu_dt_init(void)static void __init armada_370_xp_dt_fixup (void ) { +#ifdef CONFIG_SMP smp_set_ops (smp_ops (armada_xp_smp_ops)); +#endif }static const char *const armada_370_xp_dt_compat[]__initconst = {
Makes sense to me.
Gregory, do you want me to send a v6 or are you able to squash this in?
Gregory CLEMENT
maintainerPATCH v5 1/1 ARM: mvebu: use dt_fixup to provide fallback for enable-method
Hi Chris and Olof
Quoted 67 lines · Chris Packham
Quoted 66 lines · Olof Johansson
Quoted 23 lines · Gregory CLEMENT
Hi Chris,
Quoted 4 lines · Chris Packham
We need to maintain backwards compatibility with device trees that don't define an enable method. At the same time we want the device tree to be able to specify an enable-method and have it stick.
Quoted 8 lines
Previously by having smp assigned in the
DT_MACHINEdefinition this would be picked up bysetup_arch()and override whateverarm_dt_init_cpu_maps()had configured. Now we move the initial assignment of defaultsmp_opsto adt_fixupand letarm_dt_init_cpu_maps()override that if the device tree defines an enable-method.Signed-off-by Chris Packham <[email protected]>I made several tests on an Armada XP based board: OpenBlock AX3: I modify the enable-method in the decvice tree, and I confirm that without your patch it is not taken into account whereas with this patch the enable-method is applied form the device tree. I also didn't see any regression with the original dtb.
Quoted 4 lines
So I added my:
Tested-by Gregory CLEMENT <[email protected]>and applied on mvebu/soc
Hi,
Looks like this broke non-SMP. Not a huge deal, but please apply this as closely as possible on top of the previous patch (or squash it in).
- 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< - 8< -
From
3190d9502607995c7aecce79beec36714574d494Mon Sep 17 00:00:00 2001
From: Olof Johansson <[email protected]>
Date: Mon, 24 Sep 2018 02:37:31 -0700
Subject: [PATCH] ARM: mvebu: fix !SMP buildWrap
set_smp_ops()inCONFIG_SMP.Fixes d6ec59de9a0a8 ("ARM: mvebu: use dt_fixup to provide fallback for enable-method")Cc Chris Packham <[email protected]>Signed-off-by Olof Johansson <[email protected]>--- arch/arm/mach-mvebu/board-v7.c | 2 ++ 1 file changed, 2 insertions(+)arch/arm/mach-mvebu/board-v7.c +2
-0@@ -147,7 +147,9 @@ static void __init mvebu_dt_init(void)static void __init armada_370_xp_dt_fixup (void ) { +#ifdef CONFIG_SMP smp_set_ops (smp_ops (armada_xp_smp_ops)); +#endif }
Quoted 7 lines
arch/arm/mach-mvebu/board-v7.c static void __init mvebu_dt_init(void) · line 155
Quoted 2 lines
arch/arm/mach-mvebu/board-v7.c +0
-0static const char *const armada_370_xp_dt_compat[]__initconst = {Makes sense to me.
Gregory, do you want me to send a v6 or are you able to squash this in?
I squashed Olof fix in the commit of the mvebu/soc .
Thanks,
Gregory
Signature · 3 lines
Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com