[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[Masahiro Yamada]

Hi Olof,

Here is a small patch series for UniPhier SoC updates.



Masahiro Yamada (2):
  ARM: uniphier: add missing of_node_put()
  ARM: uniphier: rework SMP code to support new System Bus binding

 arch/arm/mach-uniphier/platsmp.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

-- 
1.9.1

[PATCH 1/2] ARM: uniphier: add missing of_node_put()

[Masahiro Yamada]

This node pointer is allocated by of_find_compatible_node() in this
function.  It should be put before exitting this function.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/mach-uniphier/platsmp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c
index e1cfc1d..8d988f5 100644
--- a/arch/arm/mach-uniphier/platsmp.c
+++ b/arch/arm/mach-uniphier/platsmp.c
@@ -100,6 +100,7 @@ static int __init uniphier_smp_prepare_trampoline(unsigned int max_cpus)
 
 	np = of_find_compatible_node(NULL, NULL,
 				"socionext,uniphier-system-bus-controller");
+	of_node_put(np);
 	ret = of_address_to_resource(np, 1, &res);
 	if (ret) {
 		pr_err("failed to get resource of system-bus-controller\n");
-- 
1.9.1

[PATCH 2/2] ARM: uniphier: rework SMP code to support new System Bus binding

[Masahiro Yamada]

During the review process of the UniPhier System Bus driver
(drivers/bus/uniphier.c), the current binding of the System Bus
Controller turned out to be no good.  In order to use the driver,
some nodes in the device trees must be tweaked.  It would also have
impacts on the SMP code because the SMP related registers are
located in the System Bus Controller block.  This commit reworks
the smp_operations to support the new binding, but still supports
the old binding, too.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/mach-uniphier/platsmp.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c
index 8d988f5..6914135 100644
--- a/arch/arm/mach-uniphier/platsmp.c
+++ b/arch/arm/mach-uniphier/platsmp.c
@@ -30,7 +30,7 @@
  * The secondary CPUs check this register from the boot ROM for the jump
  * destination.  After that, it can be reused as a scratch register.
  */
-#define UNIPHIER_SBC_ROM_BOOT_RSV2	0x1208
+#define UNIPHIER_SMPCTRL_ROM_RSV2	0x208
 
 static void __iomem *uniphier_smp_rom_boot_rsv2;
 static unsigned int uniphier_smp_max_cpus;
@@ -98,17 +98,24 @@ static int __init uniphier_smp_prepare_trampoline(unsigned int max_cpus)
 	phys_addr_t rom_rsv2_phys;
 	int ret;
 
-	np = of_find_compatible_node(NULL, NULL,
-				"socionext,uniphier-system-bus-controller");
+	np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl");
 	of_node_put(np);
-	ret = of_address_to_resource(np, 1, &res);
-	if (ret) {
-		pr_err("failed to get resource of system-bus-controller\n");
-		return ret;
+	ret = of_address_to_resource(np, 0, &res);
+	if (!ret) {
+		rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_RSV2;
+	} else {
+		/* try old binding too */
+		np = of_find_compatible_node(NULL, NULL,
+					     "socionext,uniphier-system-bus-controller");
+		of_node_put(np);
+		ret = of_address_to_resource(np, 1, &res);
+		if (ret) {
+			pr_err("failed to get resource of SMP control\n");
+			return ret;
+		}
+		rom_rsv2_phys = res.start + 0x1000 + UNIPHIER_SMPCTRL_ROM_RSV2;
 	}
 
-	rom_rsv2_phys = res.start + UNIPHIER_SBC_ROM_BOOT_RSV2;
-
 	ret = uniphier_smp_copy_trampoline(rom_rsv2_phys);
 	if (ret)
 		return ret;
-- 
1.9.1

[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[Masahiro Yamada]

Hi Olof and Arnd,


I have two series for 4.6-rc1 that have not been applied yet.

 - ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)   (this series)
 - ARM: dts: uniphier: UniPhier DT updates for Linux 4.6-rc1 (2nd round)

I am getting uneasy because it is already -rc7.

I hope you will find some time to check them out.


2016-02-26 16:16 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Hi Olof,
>
> Here is a small patch series for UniPhier SoC updates.
>
>
>
> Masahiro Yamada (2):
>   ARM: uniphier: add missing of_node_put()
>   ARM: uniphier: rework SMP code to support new System Bus binding
>
>  arch/arm/mach-uniphier/platsmp.c | 26 +++++++++++++++++---------
>  1 file changed, 17 insertions(+), 9 deletions(-)
>
> --
> 1.9.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel



-- 
Best Regards
Masahiro Yamada

[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[Masahiro Yamada]

Olof?  Arnd?




2016-03-07 18:30 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Hi Olof and Arnd,
>
>
> I have two series for 4.6-rc1 that have not been applied yet.
>
>  - ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)   (this series)
>  - ARM: dts: uniphier: UniPhier DT updates for Linux 4.6-rc1 (2nd round)
>
> I am getting uneasy because it is already -rc7.
>
> I hope you will find some time to check them out.
>
>
> 2016-02-26 16:16 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
>> Hi Olof,
>>
>> Here is a small patch series for UniPhier SoC updates.
>>
>>
>>
>> Masahiro Yamada (2):
>>   ARM: uniphier: add missing of_node_put()
>>   ARM: uniphier: rework SMP code to support new System Bus binding
>>
>>  arch/arm/mach-uniphier/platsmp.c | 26 +++++++++++++++++---------
>>  1 file changed, 17 insertions(+), 9 deletions(-)
>>
>> --
>> 1.9.1
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
>
>
> --
> Best Regards
> Masahiro Yamada



-- 
Best Regards
Masahiro Yamada

[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[Masahiro Yamada]

Olof, Arnd,


I sent my patches around -rc4 and
took action soon as requested.

But, my series is still not applied due to the long silence on your side.

Please respond!





2016-03-13 8:42 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Olof?  Arnd?
>
>
>
>
> 2016-03-07 18:30 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
>> Hi Olof and Arnd,
>>
>>
>> I have two series for 4.6-rc1 that have not been applied yet.
>>
>>  - ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)   (this series)
>>  - ARM: dts: uniphier: UniPhier DT updates for Linux 4.6-rc1 (2nd round)
>>
>> I am getting uneasy because it is already -rc7.
>>
>> I hope you will find some time to check them out.
>>
>>
>> 2016-02-26 16:16 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
>>> Hi Olof,
>>>
>>> Here is a small patch series for UniPhier SoC updates.
>>>
>>>
>>>
>>> Masahiro Yamada (2):
>>>   ARM: uniphier: add missing of_node_put()
>>>   ARM: uniphier: rework SMP code to support new System Bus binding
>>>
>>>  arch/arm/mach-uniphier/platsmp.c | 26 +++++++++++++++++---------
>>>  1 file changed, 17 insertions(+), 9 deletions(-)
>>>
>>> --
>>> 1.9.1
>>>
>>>
>>> _______________________________________________
>>> linux-arm-kernel mailing list
>>> linux-arm-kernel at lists.infradead.org
>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
>>
>>
>> --
>> Best Regards
>> Masahiro Yamada
>
>
>
> --
> Best Regards
> Masahiro Yamada



-- 
Best Regards
Masahiro Yamada

[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[Arnd Bergmann]

On Tuesday 15 March 2016 11:01:00 Masahiro Yamada wrote:
> Olof, Arnd,
> 
> 
> I sent my patches around -rc4 and
> took action soon as requested.
> 
> But, my series is still not applied due to the long silence on your side.
> 
> Please respond!

Sorry for all the delays, we screwed this one up, and you did everything
right. I have put the DT changes into the next/dt2 branch now, and applied
the two other patches to next/soc directly.

Please check that the for-next branch in arm-soc has everything you need now.

	Arnd

[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[Masahiro Yamada]

Hi Arnd,

2016-03-19 1:49 GMT+09:00 Arnd Bergmann <arnd@arndb.de>:
> On Tuesday 15 March 2016 11:01:00 Masahiro Yamada wrote:
>> Olof, Arnd,
>>
>>
>> I sent my patches around -rc4 and
>> took action soon as requested.
>>
>> But, my series is still not applied due to the long silence on your side.
>>
>> Please respond!
>
> Sorry for all the delays, we screwed this one up, and you did everything
> right. I have put the DT changes into the next/dt2 branch now, and applied
> the two other patches to next/soc directly.
>
> Please check that the for-next branch in arm-soc has everything you need now.
>

I checked both branch and everything is fine.

Thanks you very much!



-- 
Best Regards
Masahiro Yamada

[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[Masahiro Yamada]

Hi Arnd,


2016-03-19 8:49 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Hi Arnd,
>
> 2016-03-19 1:49 GMT+09:00 Arnd Bergmann <arnd@arndb.de>:
>> On Tuesday 15 March 2016 11:01:00 Masahiro Yamada wrote:
>>> Olof, Arnd,
>>>
>>>
>>> I sent my patches around -rc4 and
>>> took action soon as requested.
>>>
>>> But, my series is still not applied due to the long silence on your side.
>>>
>>> Please respond!
>>
>> Sorry for all the delays, we screwed this one up, and you did everything
>> right. I have put the DT changes into the next/dt2 branch now, and applied
>> the two other patches to next/soc directly.
>>
>> Please check that the for-next branch in arm-soc has everything you need now.
>>
>
> I checked both branch and everything is fine.
>
> Thanks you very much!


I thought you'd include DT updates in the pull requests,
but you didn't.

Why was next/dt2 missed?



-- 
Best Regards
Masahiro Yamada

[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[Arnd Bergmann]

On Monday 21 March 2016 12:59:20 Masahiro Yamada wrote:
> 
> I thought you'd include DT updates in the pull requests,
> but you didn't.
> 
> Why was next/dt2 missed?

This is the branch that I pulled in some patches last, I'm going to send
it in a couple of days, after it has been in linux-next. It should be there
in the end.

	Arnd

[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[Masahiro Yamada]

Hi Arnd,

2016-03-21 18:49 GMT+09:00 Arnd Bergmann <arnd@arndb.de>:
> On Monday 21 March 2016 12:59:20 Masahiro Yamada wrote:
>>
>> I thought you'd include DT updates in the pull requests,
>> but you didn't.
>>
>> Why was next/dt2 missed?
>
> This is the branch that I pulled in some patches last, I'm going to send
> it in a couple of days, after it has been in linux-next. It should be there
> in the end.

I did not know this.
That'll be great.

Sorry for poking you again and again.




-- 
Best Regards
Masahiro Yamada

[PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round)

[Arnd Bergmann]

On Monday 21 March 2016 21:39:31 Masahiro Yamada wrote:
> Hi Arnd,
> 
> 2016-03-21 18:49 GMT+09:00 Arnd Bergmann <arnd@arndb.de>:
> > On Monday 21 March 2016 12:59:20 Masahiro Yamada wrote:
> >>
> >> I thought you'd include DT updates in the pull requests,
> >> but you didn't.
> >>
> >> Why was next/dt2 missed?
> >
> > This is the branch that I pulled in some patches last, I'm going to send
> > it in a couple of days, after it has been in linux-next. It should be there
> > in the end.
> 
> I did not know this.
> That'll be great.
> 
> Sorry for poking you again and again.

Nothing wrong on your end. Generally it's a good idea to remind us if you
send patches and nothing happens after a week, or you are unsure whether
we actually did what we said we'd do (as in this case).

I should really have been clearer in the pull request message about the
fact that there is still some part missing.

	Arnd