[PATCH 00/03] ARM: shmobile: Remove legacy memory bits

[PATCH 00/03] ARM: shmobile: Remove legacy memory bits

[Laurent Pinchart]

Hi Magnus,

On Monday 10 June 2013 18:46:38 Magnus Damm wrote:
> ARM: shmobile: Remove legacy memory bits
> 
> [PATCH 01/03] ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT
> [PATCH 02/03] ARM: shmobile: Remove MEMORY_START/SIZE
> [PATCH 03/03] ARM: shmobile: Remove mach/memory.h
> 
> Now when all users are gone this series removes the legacy memory code
> and enables CONFIG_ARM_PATCH_PHYS_VIRT. Depends on the following code:
> 
> [PATCH v2] ARM: shmobile: uImage load address rework
> [PATCH] ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
> [PATCH 00/06] ARM: shmobile: SMP virt_to_phys() conversion
> [PATCH 00/02] ARM: shmobile: romImage update
> 
> The romImage series above still needs to be updated.
> 
> This is the final bit of code not to rely on CONFIG_MEMORY_START/SIZE
> which in turn is one component that we need for ARCH_MULTIPLATFORM.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

I'm very happy to see CONFIG_MEMORY_START|SIZE go, thanks a lot for your work.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

-- 
Regards,

Laurent Pinchart

[PATCH 00/03] ARM: shmobile: Remove legacy memory bits

[Magnus Damm]

ARM: shmobile: Remove legacy memory bits

[PATCH 01/03] ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT
[PATCH 02/03] ARM: shmobile: Remove MEMORY_START/SIZE
[PATCH 03/03] ARM: shmobile: Remove mach/memory.h

Now when all users are gone this series removes the legacy memory code
and enables CONFIG_ARM_PATCH_PHYS_VIRT. Depends on the following code:

[PATCH v2] ARM: shmobile: uImage load address rework
[PATCH] ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
[PATCH 00/06] ARM: shmobile: SMP virt_to_phys() conversion
[PATCH 00/02] ARM: shmobile: romImage update

The romImage series above still needs to be updated.

This is the final bit of code not to rely on CONFIG_MEMORY_START/SIZE
which in turn is one component that we need for ARCH_MULTIPLATFORM.

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

 Written against renesas.git renesas-next-20130607

 arch/arm/Kconfig                             |    2 -
 arch/arm/mach-shmobile/Kconfig               |   31 --------------------------
 arch/arm/mach-shmobile/include/mach/memory.h |    7 -----
 3 files changed, 1 insertion(+), 39 deletions(-)

[PATCH 01/03] ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

Adjust mach-shmobile to add a select for CONFIG_ARM_PATCH_PHYS_VIRT
and at the same time remove NEED_MACH_MEMORY_H.

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

 arch/arm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 0001/arch/arm/Kconfig
+++ work/arch/arm/Kconfig	2013-06-05 12:01:18.000000000 +0900
@@ -634,6 +634,7 @@ config ARCH_MSM
 
 config ARCH_SHMOBILE
 	bool "Renesas SH-Mobile / R-Mobile"
+	select ARM_PATCH_PHYS_VIRT
 	select CLKDEV_LOOKUP
 	select GENERIC_CLOCKEVENTS
 	select HAVE_ARM_SCU if SMP
@@ -643,7 +644,6 @@ config ARCH_SHMOBILE
 	select HAVE_SMP
 	select MIGHT_HAVE_CACHE_L2X0
 	select MULTI_IRQ_HANDLER
-	select NEED_MACH_MEMORY_H
 	select NO_IOPORT
 	select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB
 	select PM_GENERIC_DOMAINS if PM

[PATCH 02/03] ARM: shmobile: Remove MEMORY_START/SIZE

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

Remove CONFIG_MEMORY_START and CONFIG_MEMORY_SIZE from mach-shmobile.

Boards should use DT to specify their memory setup. Boards that still
not support DT may pass ATAGS with memory information from the boot
loader. If those ATAGS turn out to be incorrect then appended DTB with
memory information should be used as a workaround.

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

 arch/arm/mach-shmobile/Kconfig |   31 -------------------------------
 1 file changed, 31 deletions(-)

--- 0007/arch/arm/mach-shmobile/Kconfig
+++ work/arch/arm/mach-shmobile/Kconfig	2013-06-05 12:06:25.000000000 +0900
@@ -199,37 +199,6 @@ config CPU_HAS_INTEVT
         bool
 	default y
 
-menu "Memory configuration"
-
-config MEMORY_START
-	hex "Physical memory start address"
-	default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \
-				MACH_MACKEREL || MACH_BONITO || \
-				MACH_ARMADILLO800EVA || MACH_APE6EVM || \
-				MACH_LAGER
-	default "0x41000000" if MACH_KOTA2
-	default "0x00000000"
-	---help---
-	  Tweak this only when porting to a new machine which does not
-	  already have a defconfig. Changing it from the known correct
-	  value on any of the known systems will only lead to disaster.
-
-config MEMORY_SIZE
-	hex "Physical memory size"
-	default "0x80000000" if MACH_LAGER
-	default "0x40000000" if MACH_APE6EVM
-	default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \
-				MACH_ARMADILLO800EVA
-	default "0x1e000000" if MACH_KOTA2
-	default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL
-	default "0x04000000"
-	help
-	  This sets the default memory size assumed by your kernel. It can
-	  be overridden as normal by the 'mem=' argument on the kernel command
-	  line.
-
-endmenu
-
 menu "Timer and clock configuration"
 
 config SHMOBILE_TIMER_HZ

[PATCH 03/03] ARM: shmobile: Remove mach/memory.h

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

Remove mach-shmobile memory.h since it is no longer needed.

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

 arch/arm/mach-shmobile/include/mach/memory.h |    7 -------
 1 file changed, 7 deletions(-)

--- 0001/arch/arm/mach-shmobile/include/mach/memory.h
+++ /dev/null	2013-06-03 21:41:10.638032047 +0900
@@ -1,7 +0,0 @@
-#ifndef __ASM_MACH_MEMORY_H
-#define __ASM_MACH_MEMORY_H
-
-#define PLAT_PHYS_OFFSET	UL(CONFIG_MEMORY_START)
-#define MEM_SIZE	UL(CONFIG_MEMORY_SIZE)
-
-#endif /* __ASM_MACH_MEMORY_H */

[PATCH 00/03] ARM: shmobile: Remove legacy memory bits

[Arnd Bergmann]

On Monday 10 June 2013, Magnus Damm wrote:
> ARM: shmobile: Remove legacy memory bits
> 
> [PATCH 01/03] ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT
> [PATCH 02/03] ARM: shmobile: Remove MEMORY_START/SIZE
> [PATCH 03/03] ARM: shmobile: Remove mach/memory.h
> 
> Now when all users are gone this series removes the legacy memory code
> and enables CONFIG_ARM_PATCH_PHYS_VIRT. Depends on the following code:
> 
> [PATCH v2] ARM: shmobile: uImage load address rework
> [PATCH] ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
> [PATCH 00/06] ARM: shmobile: SMP virt_to_phys() conversion
> [PATCH 00/02] ARM: shmobile: romImage update
> 
> The romImage series above still needs to be updated.
> 
> This is the final bit of code not to rely on CONFIG_MEMORY_START/SIZE
> which in turn is one component that we need for ARCH_MULTIPLATFORM.
> 
> Signed-off-by: Magnus Damm <damm@opensource.se>

Looks all good to me.

	Arnd

[PATCH 00/03] ARM: shmobile: Remove legacy memory bits

[Simon Horman]

On Mon, Jun 10, 2013 at 05:00:22PM +0200, Arnd Bergmann wrote:
> On Monday 10 June 2013, Magnus Damm wrote:
> > ARM: shmobile: Remove legacy memory bits
> > 
> > [PATCH 01/03] ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT
> > [PATCH 02/03] ARM: shmobile: Remove MEMORY_START/SIZE
> > [PATCH 03/03] ARM: shmobile: Remove mach/memory.h
> > 
> > Now when all users are gone this series removes the legacy memory code
> > and enables CONFIG_ARM_PATCH_PHYS_VIRT. Depends on the following code:
> > 
> > [PATCH v2] ARM: shmobile: uImage load address rework
> > [PATCH] ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
> > [PATCH 00/06] ARM: shmobile: SMP virt_to_phys() conversion
> > [PATCH 00/02] ARM: shmobile: romImage update
> > 
> > The romImage series above still needs to be updated.
> > 
> > This is the final bit of code not to rely on CONFIG_MEMORY_START/SIZE
> > which in turn is one component that we need for ARCH_MULTIPLATFORM.
> > 
> > Signed-off-by: Magnus Damm <damm@opensource.se>
> 
> Looks all good to me.

I will queue these up once all the dependencies are ready.

[PATCH 00/03] ARM: shmobile: Remove legacy memory bits

[Magnus Damm]

Hi Simon,

On Tue, Jun 11, 2013 at 4:46 PM, Simon Horman <horms@verge.net.au> wrote:
> On Mon, Jun 10, 2013 at 05:00:22PM +0200, Arnd Bergmann wrote:
>> On Monday 10 June 2013, Magnus Damm wrote:
>> > ARM: shmobile: Remove legacy memory bits
>> >
>> > [PATCH 01/03] ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT
>> > [PATCH 02/03] ARM: shmobile: Remove MEMORY_START/SIZE
>> > [PATCH 03/03] ARM: shmobile: Remove mach/memory.h
>> >
>> > Now when all users are gone this series removes the legacy memory code
>> > and enables CONFIG_ARM_PATCH_PHYS_VIRT. Depends on the following code:
>> >
>> > [PATCH v2] ARM: shmobile: uImage load address rework
>> > [PATCH] ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
>> > [PATCH 00/06] ARM: shmobile: SMP virt_to_phys() conversion
>> > [PATCH 00/02] ARM: shmobile: romImage update
>> >
>> > The romImage series above still needs to be updated.
>> >
>> > This is the final bit of code not to rely on CONFIG_MEMORY_START/SIZE
>> > which in turn is one component that we need for ARCH_MULTIPLATFORM.
>> >
>> > Signed-off-by: Magnus Damm <damm@opensource.se>
>>
>> Looks all good to me.
>
> I will queue these up once all the dependencies are ready.

Thanks, I believe they are now.

I will update the Mackerel romImage support as an incremental patch.

Cheers,

/ magnus

[PATCH 00/03] ARM: shmobile: Remove legacy memory bits

[Simon Horman]

On Wed, Jun 12, 2013 at 03:26:01PM +0900, Magnus Damm wrote:
> Hi Simon,
> 
> On Tue, Jun 11, 2013 at 4:46 PM, Simon Horman <horms@verge.net.au> wrote:
> > On Mon, Jun 10, 2013 at 05:00:22PM +0200, Arnd Bergmann wrote:
> >> On Monday 10 June 2013, Magnus Damm wrote:
> >> > ARM: shmobile: Remove legacy memory bits
> >> >
> >> > [PATCH 01/03] ARM: shmobile: Enable ARM_PATCH_PHYS_VIRT
> >> > [PATCH 02/03] ARM: shmobile: Remove MEMORY_START/SIZE
> >> > [PATCH 03/03] ARM: shmobile: Remove mach/memory.h
> >> >
> >> > Now when all users are gone this series removes the legacy memory code
> >> > and enables CONFIG_ARM_PATCH_PHYS_VIRT. Depends on the following code:
> >> >
> >> > [PATCH v2] ARM: shmobile: uImage load address rework
> >> > [PATCH] ARM: shmobile: Rework sh7372 sleep code to use virt_to_phys()
> >> > [PATCH 00/06] ARM: shmobile: SMP virt_to_phys() conversion
> >> > [PATCH 00/02] ARM: shmobile: romImage update
> >> >
> >> > The romImage series above still needs to be updated.
> >> >
> >> > This is the final bit of code not to rely on CONFIG_MEMORY_START/SIZE
> >> > which in turn is one component that we need for ARCH_MULTIPLATFORM.
> >> >
> >> > Signed-off-by: Magnus Damm <damm@opensource.se>
> >>
> >> Looks all good to me.
> >
> > I will queue these up once all the dependencies are ready.
> 
> Thanks, I believe they are now.
> 
> I will update the Mackerel romImage support as an incremental patch.

Thanks, I have this and the dependencies queued up locally.
I will push them after doing some build and boot tests.