diff mbox

[10/14] ARM: shmobile: Rename to emev2_init_early(), use smp_set_ops()

Message ID 20130809094936.6530.31840.sendpatchset@w520 (mailing list archive)
State New, archived
Headers show

Commit Message

Magnus Damm Aug. 9, 2013, 9:49 a.m. UTC
From: Magnus Damm <damm@opensource.se>

Rename emev2_init_delay() into emev2_init_early()
to make the function name show that more than just
delay setup will happen.

Also, instead of specifying the smp ops in DT_MACHINE
convert the EMEV2 SoC code to install the smp ops
from emev2_init_early().

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 arch/arm/mach-shmobile/board-kzm9d-reference.c |    3 +--
 arch/arm/mach-shmobile/board-kzm9d.c           |    3 +--
 arch/arm/mach-shmobile/include/mach/emev2.h    |    2 +-
 arch/arm/mach-shmobile/setup-emev2.c           |    8 +++++---
 4 files changed, 8 insertions(+), 8 deletions(-)

Comments

Laurent Pinchart Aug. 9, 2013, 10:41 a.m. UTC | #1
Hi Magnus,

Thank you for the patch.

On Friday 09 August 2013 18:49:36 Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Rename emev2_init_delay() into emev2_init_early()
> to make the function name show that more than just
> delay setup will happen.
> 
> Also, instead of specifying the smp ops in DT_MACHINE
> convert the EMEV2 SoC code to install the smp ops
> from emev2_init_early().

Could you please explain in the commit message why this is needed ? Same 
comment for the other patches in this series.

> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
> 
>  arch/arm/mach-shmobile/board-kzm9d-reference.c |    3 +--
>  arch/arm/mach-shmobile/board-kzm9d.c           |    3 +--
>  arch/arm/mach-shmobile/include/mach/emev2.h    |    2 +-
>  arch/arm/mach-shmobile/setup-emev2.c           |    8 +++++---
>  4 files changed, 8 insertions(+), 8 deletions(-)
> 
> --- 0001/arch/arm/mach-shmobile/board-kzm9d-reference.c
> +++ work/arch/arm/mach-shmobile/board-kzm9d-reference.c	2013-08-08
> 16:18:34.000000000 +0900 @@ -38,9 +38,8 @@ static const char
> *kzm9d_boards_compat_d
>  };
> 
>  DT_MACHINE_START(KZM9D_DT, "kzm9d")
> -	.smp		= smp_ops(emev2_smp_ops),
>  	.map_io		= emev2_map_io,
> -	.init_early	= emev2_init_delay,
> +	.init_early	= emev2_init_early,
>  	.init_machine	= kzm9d_add_standard_devices,
>  	.init_late	= shmobile_init_late,
>  	.dt_compat	= kzm9d_boards_compat_dt,
> --- 0001/arch/arm/mach-shmobile/board-kzm9d.c
> +++ work/arch/arm/mach-shmobile/board-kzm9d.c	2013-08-08 
16:18:17.000000000
> +0900 @@ -83,9 +83,8 @@ static const char *kzm9d_boards_compat_d
>  };
> 
>  DT_MACHINE_START(KZM9D_DT, "kzm9d")
> -	.smp		= smp_ops(emev2_smp_ops),
>  	.map_io		= emev2_map_io,
> -	.init_early	= emev2_init_delay,
> +	.init_early	= emev2_init_early,
>  	.init_machine	= kzm9d_add_standard_devices,
>  	.init_late	= shmobile_init_late,
>  	.dt_compat	= kzm9d_boards_compat_dt,
> --- 0001/arch/arm/mach-shmobile/include/mach/emev2.h
> +++ work/arch/arm/mach-shmobile/include/mach/emev2.h	2013-08-08
> 16:17:57.000000000 +0900 @@ -2,7 +2,7 @@
>  #define __ASM_EMEV2_H__
> 
>  extern void emev2_map_io(void);
> -extern void emev2_init_delay(void);
> +extern void emev2_init_early(void);
>  extern void emev2_add_standard_devices(void);
>  extern void emev2_clock_init(void);
> 
> --- 0001/arch/arm/mach-shmobile/setup-emev2.c
> +++ work/arch/arm/mach-shmobile/setup-emev2.c	2013-08-08 
16:17:47.000000000
> +0900 @@ -190,9 +190,12 @@ void __init emev2_add_standard_devices(v
>  	emev2_register_pmu();
>  }
> 
> -void __init emev2_init_delay(void)
> +void __init emev2_init_early(void)
>  {
>  	shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */
> +#ifdef CONFIG_SMP
> +	smp_set_ops(&emev2_smp_ops);
> +#endif
>  }
> 
>  #ifdef CONFIG_USE_OF
> @@ -203,9 +206,8 @@ static const char *emev2_boards_compat_d
>  };
> 
>  DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device
> Tree)") -	.smp		= smp_ops(emev2_smp_ops),
>  	.map_io		= emev2_map_io,
> -	.init_early	= emev2_init_delay,
> +	.init_early	= emev2_init_early,
>  	.dt_compat	= emev2_boards_compat_dt,
>  MACHINE_END
>
Magnus Damm Aug. 28, 2013, 7:03 a.m. UTC | #2
Hi Laurent,

On Fri, Aug 9, 2013 at 7:41 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> Hi Magnus,
>
> Thank you for the patch.
>
> On Friday 09 August 2013 18:49:36 Magnus Damm wrote:
>> From: Magnus Damm <damm@opensource.se>
>>
>> Rename emev2_init_delay() into emev2_init_early()
>> to make the function name show that more than just
>> delay setup will happen.
>>
>> Also, instead of specifying the smp ops in DT_MACHINE
>> convert the EMEV2 SoC code to install the smp ops
>> from emev2_init_early().
>
> Could you please explain in the commit message why this is needed ? Same
> comment for the other patches in this series.

I personally think it is neat to use as few callbacks as possible in
the DT_MACHINE. Hooking in SMP ops in ->init_early() means that the
boards now are unaware if SMP is used or not - and it makes sense to
me to write board code that is independent of SMP.

Anyway, I suspect that Olof prefers to use smp_ops() instead, so I
think these patches just should be dropped.

Cheers,
/ magnus
Laurent Pinchart Aug. 28, 2013, 7:53 a.m. UTC | #3
Hi Magnus,

On Wednesday 28 August 2013 16:03:23 Magnus Damm wrote:
> On Fri, Aug 9, 2013 at 7:41 PM, Laurent Pinchart wrote:
> > On Friday 09 August 2013 18:49:36 Magnus Damm wrote:
> >> From: Magnus Damm <damm@opensource.se>
> >> 
> >> Rename emev2_init_delay() into emev2_init_early()
> >> to make the function name show that more than just
> >> delay setup will happen.
> >> 
> >> Also, instead of specifying the smp ops in DT_MACHINE
> >> convert the EMEV2 SoC code to install the smp ops
> >> from emev2_init_early().
> > 
> > Could you please explain in the commit message why this is needed ? Same
> > comment for the other patches in this series.
> 
> I personally think it is neat to use as few callbacks as possible in
> the DT_MACHINE. Hooking in SMP ops in ->init_early() means that the
> boards now are unaware if SMP is used or not - and it makes sense to
> me to write board code that is independent of SMP.

That's a good enough explanation, I'd just like it to be included in the 
commit message.

> Anyway, I suspect that Olof prefers to use smp_ops() instead, so I think
> these patches just should be dropped.

I suppose that's for you to sort out with him :-)
diff mbox

Patch

--- 0001/arch/arm/mach-shmobile/board-kzm9d-reference.c
+++ work/arch/arm/mach-shmobile/board-kzm9d-reference.c	2013-08-08 16:18:34.000000000 +0900
@@ -38,9 +38,8 @@  static const char *kzm9d_boards_compat_d
 };
 
 DT_MACHINE_START(KZM9D_DT, "kzm9d")
-	.smp		= smp_ops(emev2_smp_ops),
 	.map_io		= emev2_map_io,
-	.init_early	= emev2_init_delay,
+	.init_early	= emev2_init_early,
 	.init_machine	= kzm9d_add_standard_devices,
 	.init_late	= shmobile_init_late,
 	.dt_compat	= kzm9d_boards_compat_dt,
--- 0001/arch/arm/mach-shmobile/board-kzm9d.c
+++ work/arch/arm/mach-shmobile/board-kzm9d.c	2013-08-08 16:18:17.000000000 +0900
@@ -83,9 +83,8 @@  static const char *kzm9d_boards_compat_d
 };
 
 DT_MACHINE_START(KZM9D_DT, "kzm9d")
-	.smp		= smp_ops(emev2_smp_ops),
 	.map_io		= emev2_map_io,
-	.init_early	= emev2_init_delay,
+	.init_early	= emev2_init_early,
 	.init_machine	= kzm9d_add_standard_devices,
 	.init_late	= shmobile_init_late,
 	.dt_compat	= kzm9d_boards_compat_dt,
--- 0001/arch/arm/mach-shmobile/include/mach/emev2.h
+++ work/arch/arm/mach-shmobile/include/mach/emev2.h	2013-08-08 16:17:57.000000000 +0900
@@ -2,7 +2,7 @@ 
 #define __ASM_EMEV2_H__
 
 extern void emev2_map_io(void);
-extern void emev2_init_delay(void);
+extern void emev2_init_early(void);
 extern void emev2_add_standard_devices(void);
 extern void emev2_clock_init(void);
 
--- 0001/arch/arm/mach-shmobile/setup-emev2.c
+++ work/arch/arm/mach-shmobile/setup-emev2.c	2013-08-08 16:17:47.000000000 +0900
@@ -190,9 +190,12 @@  void __init emev2_add_standard_devices(v
 	emev2_register_pmu();
 }
 
-void __init emev2_init_delay(void)
+void __init emev2_init_early(void)
 {
 	shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */
+#ifdef CONFIG_SMP
+	smp_set_ops(&emev2_smp_ops);
+#endif
 }
 
 #ifdef CONFIG_USE_OF
@@ -203,9 +206,8 @@  static const char *emev2_boards_compat_d
 };
 
 DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
-	.smp		= smp_ops(emev2_smp_ops),
 	.map_io		= emev2_map_io,
-	.init_early	= emev2_init_delay,
+	.init_early	= emev2_init_early,
 	.dt_compat	= emev2_boards_compat_dt,
 MACHINE_END