[PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Magnus Damm]

From: Magnus Damm <damm+renesas@opensource.se>

Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.

As it is today Marzen multiplatform is working, but the legacy code
is broken. This patch intends to leave multiplatform as-is but do
a simple one-shot fix to unbreak the legacy code base.

Without this patch there is no preset delay and the TWD is defined
both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
and simply disable TWD in case of building for legacy.

Marzen legacy code will be removed in the near future, but until then
we may as well avoid breaking it.

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

 Developed and tested on top of renesas-devel-20150706-v4.2-rc1

 arch/arm/Kconfig                       |    1 -
 arch/arm/mach-shmobile/setup-r8a7779.c |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

--- 0001/arch/arm/Kconfig
+++ work/arch/arm/Kconfig	2015-07-14 16:00:38.902366518 +0900
@@ -626,7 +626,6 @@ config ARCH_SHMOBILE_LEGACY
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select HAVE_ARM_SCU if SMP
-	select HAVE_ARM_TWD if SMP
 	select HAVE_SMP
 	select MIGHT_HAVE_CACHE_L2X0
 	select MULTI_IRQ_HANDLER
--- 0003/arch/arm/mach-shmobile/setup-r8a7779.c
+++ work/arch/arm/mach-shmobile/setup-r8a7779.c	2015-07-13 15:18:50.000000000 +0900
@@ -677,6 +677,8 @@ void __init r8a7779_add_standard_devices
 
 void __init r8a7779_add_early_devices(void)
 {
+	shmobile_init_delay();
+
 	early_platform_add_devices(r8a7779_early_devices,
 				   ARRAY_SIZE(r8a7779_early_devices));
 

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Simon Horman]

On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
> 
> Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
> 
> As it is today Marzen multiplatform is working, but the legacy code
> is broken. This patch intends to leave multiplatform as-is but do
> a simple one-shot fix to unbreak the legacy code base.
> 
> Without this patch there is no preset delay and the TWD is defined
> both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
> and simply disable TWD in case of building for legacy.
> 
> Marzen legacy code will be removed in the near future, but until then
> we may as well avoid breaking it.
> 
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>


Thanks, that does seem to improve things a lot.
I can now boot all the way to a nfs userspace :^)

Tested-by: Simon Horman <horms+renesas@verge.net.au>

I wonder if we should also add the following?

Fixes: f2a5473861cf ("clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast")


For the record, I found that after I enabled CONFIG_SMSC_PHY the boot
now gets as far as initialising SDHI.

> ---
> 
>  Developed and tested on top of renesas-devel-20150706-v4.2-rc1
> 
>  arch/arm/Kconfig                       |    1 -
>  arch/arm/mach-shmobile/setup-r8a7779.c |    2 ++
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> --- 0001/arch/arm/Kconfig
> +++ work/arch/arm/Kconfig	2015-07-14 16:00:38.902366518 +0900
> @@ -626,7 +626,6 @@ config ARCH_SHMOBILE_LEGACY
>  	select CPU_V7
>  	select GENERIC_CLOCKEVENTS
>  	select HAVE_ARM_SCU if SMP
> -	select HAVE_ARM_TWD if SMP
>  	select HAVE_SMP
>  	select MIGHT_HAVE_CACHE_L2X0
>  	select MULTI_IRQ_HANDLER
> --- 0003/arch/arm/mach-shmobile/setup-r8a7779.c
> +++ work/arch/arm/mach-shmobile/setup-r8a7779.c	2015-07-13 15:18:50.000000000 +0900
> @@ -677,6 +677,8 @@ void __init r8a7779_add_standard_devices
>  
>  void __init r8a7779_add_early_devices(void)
>  {
> +	shmobile_init_delay();
> +
>  	early_platform_add_devices(r8a7779_early_devices,
>  				   ARRAY_SIZE(r8a7779_early_devices));
>  
> 

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Magnus Damm]

Hi Simon,

On Wed, Jul 15, 2015 at 9:23 AM, Simon Horman <horms@verge.net.au> wrote:
> On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
>> From: Magnus Damm <damm+renesas@opensource.se>
>>
>> Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
>>
>> As it is today Marzen multiplatform is working, but the legacy code
>> is broken. This patch intends to leave multiplatform as-is but do
>> a simple one-shot fix to unbreak the legacy code base.
>>
>> Without this patch there is no preset delay and the TWD is defined
>> both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
>> and simply disable TWD in case of building for legacy.
>>
>> Marzen legacy code will be removed in the near future, but until then
>> we may as well avoid breaking it.
>>
>> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
>
>
> Thanks, that does seem to improve things a lot.
> I can now boot all the way to a nfs userspace :^)

Yay!

> Tested-by: Simon Horman <horms+renesas@verge.net.au>

Thanks for testing!

> I wonder if we should also add the following?
>
> Fixes: f2a5473861cf ("clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast")
>
>
> For the record, I found that after I enabled CONFIG_SMSC_PHY the boot
> now gets as far as initialising SDHI.

Feel free to include any comment you think will help. My view is that
the TMU commit pointed out by itself is not really troublesome, it is
more that on legacy systems using earlytimer and TWD that this problem
happens. For multiplatform the commit is fine.

Cheers,

/ magnus

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Simon Horman]

On Wed, Jul 15, 2015 at 02:59:32PM +0900, Magnus Damm wrote:
> Hi Simon,
> 
> On Wed, Jul 15, 2015 at 9:23 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
> >> From: Magnus Damm <damm+renesas@opensource.se>
> >>
> >> Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
> >>
> >> As it is today Marzen multiplatform is working, but the legacy code
> >> is broken. This patch intends to leave multiplatform as-is but do
> >> a simple one-shot fix to unbreak the legacy code base.
> >>
> >> Without this patch there is no preset delay and the TWD is defined
> >> both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
> >> and simply disable TWD in case of building for legacy.
> >>
> >> Marzen legacy code will be removed in the near future, but until then
> >> we may as well avoid breaking it.
> >>
> >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> >
> >
> > Thanks, that does seem to improve things a lot.
> > I can now boot all the way to a nfs userspace :^)
> 
> Yay!
> 
> > Tested-by: Simon Horman <horms+renesas@verge.net.au>
> 
> Thanks for testing!
> 
> > I wonder if we should also add the following?
> >
> > Fixes: f2a5473861cf ("clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast")
> >
> >
> > For the record, I found that after I enabled CONFIG_SMSC_PHY the boot
> > now gets as far as initialising SDHI.
> 
> Feel free to include any comment you think will help. My view is that
> the TMU commit pointed out by itself is not really troublesome, it is
> more that on legacy systems using earlytimer and TWD that this problem
> happens. For multiplatform the commit is fine.

From my point of view the patch mentioned caused a behavioural
change on legacy systems which this patch addresses.

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Magnus Damm]

On Wed, Jul 15, 2015 at 3:47 PM, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Jul 15, 2015 at 02:59:32PM +0900, Magnus Damm wrote:
>> Hi Simon,
>>
>> On Wed, Jul 15, 2015 at 9:23 AM, Simon Horman <horms@verge.net.au> wrote:
>> > On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
>> >> From: Magnus Damm <damm+renesas@opensource.se>
>> >>
>> >> Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
>> >>
>> >> As it is today Marzen multiplatform is working, but the legacy code
>> >> is broken. This patch intends to leave multiplatform as-is but do
>> >> a simple one-shot fix to unbreak the legacy code base.
>> >>
>> >> Without this patch there is no preset delay and the TWD is defined
>> >> both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
>> >> and simply disable TWD in case of building for legacy.
>> >>
>> >> Marzen legacy code will be removed in the near future, but until then
>> >> we may as well avoid breaking it.
>> >>
>> >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
>> >
>> >
>> > Thanks, that does seem to improve things a lot.
>> > I can now boot all the way to a nfs userspace :^)
>>
>> Yay!
>>
>> > Tested-by: Simon Horman <horms+renesas@verge.net.au>
>>
>> Thanks for testing!
>>
>> > I wonder if we should also add the following?
>> >
>> > Fixes: f2a5473861cf ("clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast")
>> >
>> >
>> > For the record, I found that after I enabled CONFIG_SMSC_PHY the boot
>> > now gets as far as initialising SDHI.
>>
>> Feel free to include any comment you think will help. My view is that
>> the TMU commit pointed out by itself is not really troublesome, it is
>> more that on legacy systems using earlytimer and TWD that this problem
>> happens. For multiplatform the commit is fine.
>
> From my point of view the patch mentioned caused a behavioural
> change on legacy systems which this patch addresses.

Sure, I agree about that. =)

/ magnus

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Simon Horman]

On Wed, Jul 15, 2015 at 03:49:01PM +0900, Magnus Damm wrote:
> On Wed, Jul 15, 2015 at 3:47 PM, Simon Horman <horms@verge.net.au> wrote:
> > On Wed, Jul 15, 2015 at 02:59:32PM +0900, Magnus Damm wrote:
> >> Hi Simon,
> >>
> >> On Wed, Jul 15, 2015 at 9:23 AM, Simon Horman <horms@verge.net.au> wrote:
> >> > On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
> >> >> From: Magnus Damm <damm+renesas@opensource.se>
> >> >>
> >> >> Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
> >> >>
> >> >> As it is today Marzen multiplatform is working, but the legacy code
> >> >> is broken. This patch intends to leave multiplatform as-is but do
> >> >> a simple one-shot fix to unbreak the legacy code base.
> >> >>
> >> >> Without this patch there is no preset delay and the TWD is defined
> >> >> both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
> >> >> and simply disable TWD in case of building for legacy.
> >> >>
> >> >> Marzen legacy code will be removed in the near future, but until then
> >> >> we may as well avoid breaking it.
> >> >>
> >> >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> >> >
> >> >
> >> > Thanks, that does seem to improve things a lot.
> >> > I can now boot all the way to a nfs userspace :^)
> >>
> >> Yay!
> >>
> >> > Tested-by: Simon Horman <horms+renesas@verge.net.au>
> >>
> >> Thanks for testing!
> >>
> >> > I wonder if we should also add the following?
> >> >
> >> > Fixes: f2a5473861cf ("clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast")
> >> >
> >> >
> >> > For the record, I found that after I enabled CONFIG_SMSC_PHY the boot
> >> > now gets as far as initialising SDHI.
> >>
> >> Feel free to include any comment you think will help. My view is that
> >> the TMU commit pointed out by itself is not really troublesome, it is
> >> more that on legacy systems using earlytimer and TWD that this problem
> >> happens. For multiplatform the commit is fine.
> >
> > From my point of view the patch mentioned caused a behavioural
> > change on legacy systems which this patch addresses.
> 
> Sure, I agree about that. =)

Excellent.

With the above in mind I will queue this up with the Fixes tag
as a fix for v4.3. It may well filter into -stable from there.

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Magnus Damm]

Hi Simon,

On Wed, Jul 15, 2015 at 3:53 PM, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Jul 15, 2015 at 03:49:01PM +0900, Magnus Damm wrote:
>> On Wed, Jul 15, 2015 at 3:47 PM, Simon Horman <horms@verge.net.au> wrote:
>> > On Wed, Jul 15, 2015 at 02:59:32PM +0900, Magnus Damm wrote:
>> >> Hi Simon,
>> >>
>> >> On Wed, Jul 15, 2015 at 9:23 AM, Simon Horman <horms@verge.net.au> wrote:
>> >> > On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
>> >> >> From: Magnus Damm <damm+renesas@opensource.se>
>> >> >>
>> >> >> Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
>> >> >>
>> >> >> As it is today Marzen multiplatform is working, but the legacy code
>> >> >> is broken. This patch intends to leave multiplatform as-is but do
>> >> >> a simple one-shot fix to unbreak the legacy code base.
>> >> >>
>> >> >> Without this patch there is no preset delay and the TWD is defined
>> >> >> both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
>> >> >> and simply disable TWD in case of building for legacy.
>> >> >>
>> >> >> Marzen legacy code will be removed in the near future, but until then
>> >> >> we may as well avoid breaking it.
>> >> >>
>> >> >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
>> >> >
>> >> >
>> >> > Thanks, that does seem to improve things a lot.
>> >> > I can now boot all the way to a nfs userspace :^)
>> >>
>> >> Yay!
>> >>
>> >> > Tested-by: Simon Horman <horms+renesas@verge.net.au>
>> >>
>> >> Thanks for testing!
>> >>
>> >> > I wonder if we should also add the following?
>> >> >
>> >> > Fixes: f2a5473861cf ("clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast")
>> >> >
>> >> >
>> >> > For the record, I found that after I enabled CONFIG_SMSC_PHY the boot
>> >> > now gets as far as initialising SDHI.
>> >>
>> >> Feel free to include any comment you think will help. My view is that
>> >> the TMU commit pointed out by itself is not really troublesome, it is
>> >> more that on legacy systems using earlytimer and TWD that this problem
>> >> happens. For multiplatform the commit is fine.
>> >
>> > From my point of view the patch mentioned caused a behavioural
>> > change on legacy systems which this patch addresses.
>>
>> Sure, I agree about that. =)
>
> Excellent.
>
> With the above in mind I will queue this up with the Fixes tag
> as a fix for v4.3. It may well filter into -stable from there.

Sounds good, thanks for your help!

/ magnus

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Geert Uytterhoeven]

On Wed, Jul 15, 2015 at 8:53 AM, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Jul 15, 2015 at 03:49:01PM +0900, Magnus Damm wrote:
>> On Wed, Jul 15, 2015 at 3:47 PM, Simon Horman <horms@verge.net.au> wrote:
>> > On Wed, Jul 15, 2015 at 02:59:32PM +0900, Magnus Damm wrote:
>> >> Hi Simon,
>> >>
>> >> On Wed, Jul 15, 2015 at 9:23 AM, Simon Horman <horms@verge.net.au> wrote:
>> >> > On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
>> >> >> From: Magnus Damm <damm+renesas@opensource.se>
>> >> >>
>> >> >> Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
>> >> >>
>> >> >> As it is today Marzen multiplatform is working, but the legacy code
>> >> >> is broken. This patch intends to leave multiplatform as-is but do
>> >> >> a simple one-shot fix to unbreak the legacy code base.
>> >> >>
>> >> >> Without this patch there is no preset delay and the TWD is defined
>> >> >> both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
>> >> >> and simply disable TWD in case of building for legacy.
>> >> >>
>> >> >> Marzen legacy code will be removed in the near future, but until then
>> >> >> we may as well avoid breaking it.
>> >> >>
>> >> >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>

> With the above in mind I will queue this up with the Fixes tag
> as a fix for v4.3. It may well filter into -stable from there.

Before you tag it for stable: keeping in mind commit 30225743852ed5c3
("ARM: shmobile: sh73a0 dtsi: Add Cortex-A9 TWD node), does it work with
CONFIG_CPU_IDLE=y?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Simon Horman]

Hi Geert,

On Wed, Jul 15, 2015 at 09:37:30AM +0200, Geert Uytterhoeven wrote:
> On Wed, Jul 15, 2015 at 8:53 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Wed, Jul 15, 2015 at 03:49:01PM +0900, Magnus Damm wrote:
> >> On Wed, Jul 15, 2015 at 3:47 PM, Simon Horman <horms@verge.net.au> wrote:
> >> > On Wed, Jul 15, 2015 at 02:59:32PM +0900, Magnus Damm wrote:
> >> >> Hi Simon,
> >> >>
> >> >> On Wed, Jul 15, 2015 at 9:23 AM, Simon Horman <horms@verge.net.au> wrote:
> >> >> > On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
> >> >> >> From: Magnus Damm <damm+renesas@opensource.se>
> >> >> >>
> >> >> >> Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
> >> >> >>
> >> >> >> As it is today Marzen multiplatform is working, but the legacy code
> >> >> >> is broken. This patch intends to leave multiplatform as-is but do
> >> >> >> a simple one-shot fix to unbreak the legacy code base.
> >> >> >>
> >> >> >> Without this patch there is no preset delay and the TWD is defined
> >> >> >> both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
> >> >> >> and simply disable TWD in case of building for legacy.
> >> >> >>
> >> >> >> Marzen legacy code will be removed in the near future, but until then
> >> >> >> we may as well avoid breaking it.
> >> >> >>
> >> >> >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> 
> > With the above in mind I will queue this up with the Fixes tag
> > as a fix for v4.3. It may well filter into -stable from there.
> 
> Before you tag it for stable: keeping in mind commit 30225743852ed5c3
> ("ARM: shmobile: sh73a0 dtsi: Add Cortex-A9 TWD node), does it work with
> CONFIG_CPU_IDLE=y?

CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
CONFIG_DT_IDLE_STATES=y
CONFIG_ARM_CPUIDLE=y

I tried enabling the above and then tested booting the marzen
board both with and without this patch (the one in the subject of the email).

The result was the same as without the above options enabled:

* The patch seems to be required for marzen to boot to any
  kind of console without CONFIG_DEBUG_LL set.

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Geert Uytterhoeven]

Hi SImon,

On Thu, Jul 16, 2015 at 2:59 AM, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Jul 15, 2015 at 09:37:30AM +0200, Geert Uytterhoeven wrote:
>> On Wed, Jul 15, 2015 at 8:53 AM, Simon Horman <horms@verge.net.au> wrote:
>> > On Wed, Jul 15, 2015 at 03:49:01PM +0900, Magnus Damm wrote:
>> >> On Wed, Jul 15, 2015 at 3:47 PM, Simon Horman <horms@verge.net.au> wrote:
>> >> > On Wed, Jul 15, 2015 at 02:59:32PM +0900, Magnus Damm wrote:
>> >> >> Hi Simon,
>> >> >>
>> >> >> On Wed, Jul 15, 2015 at 9:23 AM, Simon Horman <horms@verge.net.au> wrote:
>> >> >> > On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
>> >> >> >> From: Magnus Damm <damm+renesas@opensource.se>
>> >> >> >>
>> >> >> >> Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
>> >> >> >>
>> >> >> >> As it is today Marzen multiplatform is working, but the legacy code
>> >> >> >> is broken. This patch intends to leave multiplatform as-is but do
>> >> >> >> a simple one-shot fix to unbreak the legacy code base.
>> >> >> >>
>> >> >> >> Without this patch there is no preset delay and the TWD is defined
>> >> >> >> both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
>> >> >> >> and simply disable TWD in case of building for legacy.
>> >> >> >>
>> >> >> >> Marzen legacy code will be removed in the near future, but until then
>> >> >> >> we may as well avoid breaking it.
>> >> >> >>
>> >> >> >> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
>>
>> > With the above in mind I will queue this up with the Fixes tag
>> > as a fix for v4.3. It may well filter into -stable from there.
>>
>> Before you tag it for stable: keeping in mind commit 30225743852ed5c3
>> ("ARM: shmobile: sh73a0 dtsi: Add Cortex-A9 TWD node), does it work with
>> CONFIG_CPU_IDLE=y?
>
> CONFIG_CPU_IDLE=y
> CONFIG_CPU_IDLE_GOV_LADDER=y
> CONFIG_CPU_IDLE_GOV_MENU=y
> CONFIG_DT_IDLE_STATES=y
> CONFIG_ARM_CPUIDLE=y
>
> I tried enabling the above and then tested booting the marzen
> board both with and without this patch (the one in the subject of the email).
>
> The result was the same as without the above options enabled:
>
> * The patch seems to be required for marzen to boot to any
>   kind of console without CONFIG_DEBUG_LL set.

OK, then I'd go for it!

Thanks for checking.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Simon Horman]

On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
> 
> Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
> 
> As it is today Marzen multiplatform is working, but the legacy code
> is broken. This patch intends to leave multiplatform as-is but do
> a simple one-shot fix to unbreak the legacy code base.
> 
> Without this patch there is no preset delay and the TWD is defined
> both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
> and simply disable TWD in case of building for legacy.
> 
> Marzen legacy code will be removed in the near future, but until then
> we may as well avoid breaking it.
> 
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>

I currently have this patch queued up.
However, as "[PATCH 00/03] ARM: shmobile: r8a7779 Marzen legacy removal" is
also queued up I have it in mind to drop this patch. The reasoning is
twofold:

* There seems little benefit to fix legacy code that is being removed
* There is a tedious merge conflict between fixing and removing the code

Re: [PATCH v2] ARM: shmobile: r8a7779 Marzen legacy fix V2

[Simon Horman]

On Wed, Jul 22, 2015 at 09:34:38AM +0900, Simon Horman wrote:
> On Tue, Jul 14, 2015 at 04:25:22PM +0900, Magnus Damm wrote:
> > From: Magnus Damm <damm+renesas@opensource.se>
> > 
> > Unbreak the r8a7779 Marzen legacy code provided by marzen_defconfig.
> > 
> > As it is today Marzen multiplatform is working, but the legacy code
> > is broken. This patch intends to leave multiplatform as-is but do
> > a simple one-shot fix to unbreak the legacy code base.
> > 
> > Without this patch there is no preset delay and the TWD is defined
> > both in C code and in DT. Solve the delay by invoking shmobile_init_delay()
> > and simply disable TWD in case of building for legacy.
> > 
> > Marzen legacy code will be removed in the near future, but until then
> > we may as well avoid breaking it.
> > 
> > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> 
> I currently have this patch queued up.
> However, as "[PATCH 00/03] ARM: shmobile: r8a7779 Marzen legacy removal" is
> also queued up I have it in mind to drop this patch. The reasoning is
> twofold:
> 
> * There seems little benefit to fix legacy code that is being removed
> * There is a tedious merge conflict between fixing and removing the code

I have gone ahead and dropped this patch.