OMAP4+: Get rid of internal SRAM handling
Subsystems (4)
v3 cover OMAP4+: Get rid of internal SRAM handling
v3:
Fix minor issue in last patch to check for null sram_pool if no sram phandle is given in DT.
Make all OMAP DT only platforms (am33xx, am43xx, omap4 and omap5) use drivers/misc/sram.c driver instead of the omap internal implementation for SRAM handling.
Previous discussion can be found at [1].
Regards,
Dave
[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-August/195588.html
Rajendra Nayak (3):
ARM: AM335x: Get rid of unused sram init function
ARM: OMAP4+: Move SRAM data to DT
ARM: OMAP4+: Remove static iotable mappings for SRAM
Documentation/devicetree/bindings/arm/omap/mpu.txt | 3 ++ arch/arm/boot/dts/am33xx.dtsi | 5 ++- arch/arm/boot/dts/am4372.dtsi | 5 +++ arch/arm/boot/dts/omap4.dtsi | 6 ++++ arch/arm/boot/dts/omap5.dtsi | 8 ++++- arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/mach-omap2/io.c | 17 ---------- arch/arm/mach-omap2/omap4-common.c | 22 +++++++++++- arch/arm/mach-omap2/sram.c | 39 +--------------------- arch/arm/mach-omap2/sram.h | 7 ---- 10 files changed, 46 insertions(+), 67 deletions(-)
Signature · 1 line
1.9.0
PATCH v3 1/3 ARM: AM335x: Get rid of unused sram init function
From: Rajendra Nayak <[email protected]>
Remove the empty am33xx_sram_init() function.
--- arch/arm/mach-omap2/sram.c | 7 ------- 1 file changed, 7 deletions(-)
arch/arm/mach-omap2/sram.c +0 -7
@@ -285,11 +285,6 @@ static inline int omap34xx_sram_init(void) }#endif /* CONFIG_ARCH_OMAP3 */ -static inline int am33xx_sram_init (void ) -{ -return 0 ; -} -int __init omap_sram_init (void ) {omap_detect_sram ();
@@ -299,8 +294,6 @@ int __init omap_sram_init(void)omap242x_sram_init (); else if (cpu_is_omap2430()) omap243x_sram_init(); - else if (soc_is_am33xx()) - am33xx_sram_init(); else if (cpu_is_omap34xx()) omap34xx_sram_init();
Signature · 1 line
1.9.0
PATCH v3 2/3 ARM: OMAP4+: Move SRAM data to DT
In reply to Dave GerlachFrom: Rajendra Nayak <[email protected]>
Use drivers/misc/sram.c driver to manage SRAM on all DT only OMAP platforms (am33xx, am43xx, omap4 and omap5) instead of the existing private plat-omap/sram.c
Address and size related data is removed from mach-omap2/sram.c and now passed to drivers/misc/sram.c from DT.
Users can hence use general purpose allocator apis instead of OMAP private ones to manage and use SRAM.
--- arch/arm/boot/dts/am33xx.dtsi | 5 ++--- arch/arm/boot/dts/am4372.dtsi | 5 +++++ arch/arm/boot/dts/omap4.dtsi | 5 +++++ arch/arm/boot/dts/omap5.dtsi | 5 +++++ arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/mach-omap2/sram.c | 26 +------------------------- arch/arm/mach-omap2/sram.h | 1 - 7 files changed, 19 insertions(+), 29 deletions(-)
arch/arm/boot/dts/am33xx.dtsi +2 -3
@@ -726,9 +726,8 @@ }; ocmcram: ocmcram at 40300000 { - compatible = "ti,am3352-ocmcram"; - reg = <0x40300000 0x10000>; - ti,hwmods = "ocmcram"; + compatible = "mmio-sram"; + reg = <0x40300000 0x10000>; /* 64k */ }; wkup_m3: wkup_m3 at 44d00000 {
arch/arm/boot/dts/am4372.dtsi +5 -0
@@ -885,6 +885,11 @@ clock-names = "fck"; }; }; + + ocmcram: ocmcram at 40300000 { + compatible = "mmio-sram"; + reg = <0x40300000 0x40000>; /* 256k */ + }; }; };
arch/arm/boot/dts/omap4.dtsi +5 -0
@@ -208,6 +208,11 @@ }; }; + ocmcram: ocmcram at 40304000 { + compatible = "mmio-sram"; + reg = <0x40304000 0xa000>; /* 40k */ + }; + sdma: dma-controller at 4a056000 { compatible = "ti,omap4430-sdma"; reg = <0x4a056000 0x1000>;
arch/arm/boot/dts/omap5.dtsi +5 -0
@@ -219,6 +219,11 @@ }; }; + ocmcram: ocmcram at 40300000 { + compatible = "mmio-sram"; + reg = <0x40300000 0x20000>; /* 128k */ + }; + sdma: dma-controller at 4a056000 { compatible = "ti,omap4430-sdma"; reg = <0x4a056000 0x1000>;
arch/arm/configs/omap2plus_defconfig +1 -0
@@ -101,6 +101,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_SENSORS_TSL2550=m CONFIG_BMP085_I2C=m CONFIG_SENSORS_LIS3_I2C=m +CONFIG_SRAM=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_MULTI_LUN=y
arch/arm/mach-omap2/sram.c +1 -25
@@ -32,12 +32,6 @@#define OMAP2_SRAM_PUB_PA (OMAP2_SRAM_PA + 0xf800)#define OMAP3_SRAM_PUB_PA (OMAP3_SRAM_PA + 0x8000) -#ifdef CONFIG_OMAP4_ERRATA_I688 -#define OMAP4_SRAM_PUB_PA OMAP4_SRAM_PA -#else -#define OMAP4_SRAM_PUB_PA (OMAP4_SRAM_PA + 0x4000) -#endif -#define OMAP5_SRAM_PA 0x40300000#define SRAM_BOOTLOADER_SZ 0x00
@@ -105,32 +99,14 @@ static void __init omap_detect_sram(void) }else { omap_sram_size =0x8000 ;/* 32K */ } - }else if (cpu_is_omap44xx ()) { - omap_sram_start =OMAP4_SRAM_PUB_PA ; - omap_sram_size =0xa000 ;/* 40K */ - }else if (soc_is_omap54xx ()) { - omap_sram_start =OMAP5_SRAM_PA ; - omap_sram_size =SZ_128K ;/* 128KB */ }else { omap_sram_start =OMAP2_SRAM_PUB_PA ; omap_sram_size =0x800 ;/* 2K */ } }else { -if (soc_is_am33xx ()) { - omap_sram_start =AM33XX_SRAM_PA ; - omap_sram_size =0x10000 ;/* 64K */ - }else if (soc_is_am43xx ()) { - omap_sram_start =AM33XX_SRAM_PA ; - omap_sram_size =SZ_256K ; - }else if (cpu_is_omap34xx ()) { +if (cpu_is_omap34xx ()) { omap_sram_start =OMAP3_SRAM_PA ; omap_sram_size =0x10000 ;/* 64K */ - }else if (cpu_is_omap44xx ()) { - omap_sram_start =OMAP4_SRAM_PA ; - omap_sram_size =0xe000 ;/* 56K */ - }else if (soc_is_omap54xx ()) { - omap_sram_start =OMAP5_SRAM_PA ; - omap_sram_size =SZ_128K ;/* 128KB */ }else { omap_sram_start =OMAP2_SRAM_PA ;if (cpu_is_omap242x ())
arch/arm/mach-omap2/sram.h +0 -1
@@ -80,4 +80,3 @@ static inline void omap_push_sram_idle(void) {}#else #define OMAP4_SRAM_PA 0x40300000#endif -#define AM33XX_SRAM_PA 0x40300000
Signature · 1 line
1.9.0
PATCH v3 3/3 ARM: OMAP4+: Remove static iotable mappings for SRAM
In reply to Dave GerlachFrom: Rajendra Nayak <[email protected]>
In order to handle errata I688, a page of sram was reserved by doing a static iotable map. Now that we use gen_pool to manage sram, we can completely remove all of these static mappings and use gen_pool_alloc() to get the one page of sram space needed to implement errata I688. omap_bus_sync will be NOP until SRAM initialization happens.
---v2->v3: add check for null sram_pool
Documentation/devicetree/bindings/arm/omap/mpu.txt | 3 +++ arch/arm/boot/dts/omap4.dtsi | 1 + arch/arm/boot/dts/omap5.dtsi | 3 ++- arch/arm/mach-omap2/io.c | 17 ----------------- arch/arm/mach-omap2/omap4-common.c | 22 +++++++++++++++++++++- arch/arm/mach-omap2/sram.c | 6 ------ arch/arm/mach-omap2/sram.h | 6 ------ 7 files changed, 27 insertions(+), 31 deletions(-)
Documentation/devicetree/bindings/arm/omap/mpu.txt +3 -0
@@ -10,6 +10,9 @@ Required properties: Should be "ti,omap5-mpu" for OMAP5 - ti,hwmods: "mpu" +Optional properties: +- sram: Phandle to the ocmcram node + Examples: - For an OMAP5 SMP system:
arch/arm/boot/dts/omap4.dtsi +1 -0
@@ -81,6 +81,7 @@ mpu { compatible = "ti,omap4-mpu"; ti,hwmods = "mpu"; + sram = <&ocmcram>; }; dsp {
arch/arm/boot/dts/omap5.dtsi +2 -1
@@ -104,8 +104,9 @@ soc { compatible = "ti,omap-infra"; mpu { - compatible = "ti,omap5-mpu"; + compatible = "ti,omap4-mpu"; ti,hwmods = "mpu"; + sram = <&ocmcram>; }; };
arch/arm/mach-omap2/io.c +0 -17
@@ -231,15 +231,6 @@ static struct map_desc omap44xx_io_desc[] __initdata = { .length = L4_PER_44XX_SIZE, .type = MT_DEVICE, }, -#ifdef CONFIG_OMAP4_ERRATA_I688 - { - .virtual = OMAP4_SRAM_VA, - .pfn = __phys_to_pfn(OMAP4_SRAM_PA), - .length = PAGE_SIZE, - .type = MT_MEMORY_RW_SO, - }, -#endif - };#endif
@@ -269,14 +260,6 @@ static struct map_desc omap54xx_io_desc[] __initdata = { .length = L4_PER_54XX_SIZE, .type = MT_DEVICE, }, -#ifdef CONFIG_OMAP4_ERRATA_I688 - { - .virtual = OMAP4_SRAM_VA, - .pfn = __phys_to_pfn(OMAP4_SRAM_PA), - .length = PAGE_SIZE, - .type = MT_MEMORY_RW_SO, - }, -#endif };#endif
arch/arm/mach-omap2/omap4-common.c +21 -1
@@ -25,6 +25,7 @@#include <linux/irqchip/irq-crossbar.h> #include <linux/of_address.h> #include <linux/reboot.h> +#include <linux/genalloc.h> #include <asm/hardware/cache-l2x0.h> #include <asm/mach/map.h>
@@ -71,6 +72,26 @@ void omap_bus_sync(void) }EXPORT_SYMBOL (omap_bus_sync); +static int __init omap4_sram_init (void ) +{ +struct device_node *np; +struct gen_pool *sram_pool; + + np =of_find_compatible_node (NULL ,NULL ,"ti,omap4-mpu" ); +if (!np) +pr_warn ("%s:Unable to allocate sram needed to handle errata I688\n" , + __func__); + sram_pool =of_get_named_gen_pool (np,"sram" ,0 ); +if (!sram_pool) +pr_warn ("%s:Unable to get sram pool needed to handle errata I688\n" , + __func__); +else + sram_sync = (void *)gen_pool_alloc (sram_pool,PAGE_SIZE ); + +return 0 ; +} +omap_arch_initcall (omap4_sram_init); +/* Steal one page physical memory for barrier implementation */ int __init omap_barrier_reserve_memblock (void ) {
@@ -91,7 +112,6 @@ void __init omap_barriers_init(void) dram_io_desc[0 ].type =MT_MEMORY_RW_SO ;iotable_init (dram_io_desc,ARRAY_SIZE (dram_io_desc)); dram_sync = (void __iomem *) dram_io_desc[0 ].virtual; - sram_sync = (void __iomem *)OMAP4_SRAM_VA ;pr_info ("OMAP4: Map 0x%08llx to 0x%08lx for dram barrier\n" , (long long ) paddr, dram_io_desc[0 ].virtual);
arch/arm/mach-omap2/sram.c +0 -6
@@ -124,12 +124,6 @@ static void __init omap2_map_sram(void) {int cached =1 ; -#ifdef CONFIG_OMAP4_ERRATA_I688 -if (cpu_is_omap44xx ()) { - omap_sram_start +=PAGE_SIZE ; - omap_sram_size -=SZ_16K ; - } -#endif if (cpu_is_omap34xx ()) {/* * SRAM must be marked as non-cached on OMAP3 since the
arch/arm/mach-omap2/sram.h +0 -6
@@ -74,9 +74,3 @@ static inline void omap_push_sram_idle(void) {}*/ #define OMAP2_SRAM_PA 0x40200000#define OMAP3_SRAM_PA 0x40200000 -#ifdef CONFIG_OMAP4_ERRATA_I688 -#define OMAP4_SRAM_PA 0x40304000 -#define OMAP4_SRAM_VA 0xfe404000 -#else -#define OMAP4_SRAM_PA 0x40300000 -#endif
Signature · 1 line
1.9.0
v3 cover OMAP4+: Get rid of internal SRAM handling
In reply to Dave GerlachQuoted 20 lines · Dave Gerlach
v3:
Fix minor issue in last patch to check for nullsram_poolif no sram phandle is given in DT.Make all OMAP DT only platforms (am33xx, am43xx, omap4 and omap5) use
drivers/misc/sram.cdriver instead of the omap internal implementation for SRAM handling.Previous discussion can be found at [1].
Regards,
Dave[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-August/195588.html
Rajendra Nayak (3):
ARM: AM335x: Get rid of unused sram init function
ARM: OMAP4+: Move SRAM data to DT
ARM: OMAP4+: Remove static iotable mappings for SRAM
Quoted 12 lines
Documentation/devicetree/bindings/arm/omap/mpu.txt | 3 ++ arch/arm/boot/dts/am33xx.dtsi | 5 ++- arch/arm/boot/dts/am4372.dtsi | 5 +++ arch/arm/boot/dts/omap4.dtsi | 6 ++++ arch/arm/boot/dts/omap5.dtsi | 8 ++++- arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/mach-omap2/io.c | 17 ---------- arch/arm/mach-omap2/omap4-common.c | 22 +++++++++++- arch/arm/mach-omap2/sram.c | 39 +--------------------- arch/arm/mach-omap2/sram.h | 7 ---- 10 files changed, 46 insertions(+), 67 deletions(-)
Could you please provide logs for the following:
a) Low power transition tests for OMAP3,4 on all available platforms as well?
b) provide bootlogs on all omap2plus platforms to ensure we have no regressions.
Signature · 2 lines
Regards, Nishanth Menon
v3 cover OMAP4+: Get rid of internal SRAM handling
Quoted 34 lines · Nishanth Menon
Quoted 20 lines · Dave Gerlach
v3:
Fix minor issue in last patch to check for nullsram_poolif no sram phandle is given in DT.Make all OMAP DT only platforms (am33xx, am43xx, omap4 and omap5) use
drivers/misc/sram.cdriver instead of the omap internal implementation for SRAM handling.Previous discussion can be found at [1].
Regards,
Dave[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-August/195588.html
Rajendra Nayak (3):
ARM: AM335x: Get rid of unused sram init function
ARM: OMAP4+: Move SRAM data to DT
ARM: OMAP4+: Remove static iotable mappings for SRAMQuoted 12 lines
Documentation/devicetree/bindings/arm/omap/mpu.txt | 3 ++ arch/arm/boot/dts/am33xx.dtsi | 5 ++- arch/arm/boot/dts/am4372.dtsi | 5 +++ arch/arm/boot/dts/omap4.dtsi | 6 ++++ arch/arm/boot/dts/omap5.dtsi | 8 ++++- arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/mach-omap2/io.c | 17 ---------- arch/arm/mach-omap2/omap4-common.c | 22 +++++++++++- arch/arm/mach-omap2/sram.c | 39 +--------------------- arch/arm/mach-omap2/sram.h | 7 ---- 10 files changed, 46 insertions(+), 67 deletions(-)
Quoted 6 lines
Could you please provide logs for the following:
a) Low power transition tests for OMAP3,4 on all available platforms as well?
b) provide bootlogs on all omap2plus platforms to ensure we have no regressions.
Here are logs for low power transition, all platforms passed, properly transitioned power domains with mem sleep using wakeup_timer to wake.
Low Power transition on v3.17-rc4 with patches applied, omap2plus_defconfig (OMAP3 and OMAP4):
1: BeagleBoard-XM: http://fpaste.org/133215/
2: OMAP3430-Labrador(LDP): http://fpaste.org/133225/
3: n900: http://fpaste.org/133244/
4: pandaboard-es: http://fpaste.org/133213/
5: pandaboard-vanilla: http://fpaste.org/133214/
6: sdp3430: http://fpaste.org/133246/
Boot on v3.17-rc4 with patches applied, omap2plus_defconfig:
1: am335x-evm: Boot PASS: http://fpaste.org/133179/ 2: am335x-sk: Boot PASS: http://fpaste.org/133180/ 3: am3517-evm: Boot PASS: http://fpaste.org/133181/ 4: am37x-evm: Boot PASS: http://fpaste.org/133182/ 5: am43xx-epos: Boot PASS: http://fpaste.org/133183/ 6: am43xx-gpevm: Boot PASS: http://fpaste.org/133184/ 7: BeagleBoard-XM: Boot PASS: http://fpaste.org/133191/ 8: beagleboard-vanilla: Boot PASS: http://fpaste.org/133192/ 9: beaglebone-black: Boot PASS: http://fpaste.org/133193/ 10: beaglebone: Boot PASS: http://fpaste.org/133194/ 11: craneboard: Boot PASS: http://fpaste.org/133186/ 12: dra7xx-evm: Boot PASS: http://fpaste.org/131396/
13: OMAP3430-Labrador(LDP): Boot PASS: http://fpaste.org/133206/
14: n900: Boot PASS: http://fpaste.org/133207/
15: omap5-evm: Boot PASS: http://fpaste.org/133208/
16: pandaboard-es: Boot PASS: http://fpaste.org/133187/
17: pandaboard-vanilla: Boot PASS: http://fpaste.org/133188/
18: sdp2430: Boot PASS: http://fpaste.org/133189/ 19: sdp3430: Boot PASS: http://fpaste.org/133212/
TOTAL = 19 boards, Booted Boards = 19, No Boot boards = 0
Again, all pass. I have also tested with next AM335x Suspend/Resume implementation, next version will use generic sram driver to allocate for low-level assembly code, and that works fine as well.
Regards,
Dave
Tony Lindgren
maintainerv3 cover OMAP4+: Get rid of internal SRAM handling
Quoted 74 lines · Dave Gerlach
Quoted 34 lines · Nishanth Menon
Quoted 20 lines · Dave Gerlach
v3:
Fix minor issue in last patch to check for nullsram_poolif no sram phandle is given in DT.Make all OMAP DT only platforms (am33xx, am43xx, omap4 and omap5) use
drivers/misc/sram.cdriver instead of the omap internal implementation for SRAM handling.Previous discussion can be found at [1].
Regards,
Dave[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-August/195588.html
Rajendra Nayak (3):
ARM: AM335x: Get rid of unused sram init function
ARM: OMAP4+: Move SRAM data to DT
ARM: OMAP4+: Remove static iotable mappings for SRAMQuoted 12 lines
Documentation/devicetree/bindings/arm/omap/mpu.txt | 3 ++ arch/arm/boot/dts/am33xx.dtsi | 5 ++- arch/arm/boot/dts/am4372.dtsi | 5 +++ arch/arm/boot/dts/omap4.dtsi | 6 ++++ arch/arm/boot/dts/omap5.dtsi | 8 ++++- arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/mach-omap2/io.c | 17 ---------- arch/arm/mach-omap2/omap4-common.c | 22 +++++++++++- arch/arm/mach-omap2/sram.c | 39 +--------------------- arch/arm/mach-omap2/sram.h | 7 ---- 10 files changed, 46 insertions(+), 67 deletions(-)Quoted 6 lines
Could you please provide logs for the following:
a) Low power transition tests for OMAP3,4 on all available platforms as well?
b) provide bootlogs on all omap2plus platforms to ensure we have no regressions.Here are logs for low power transition, all platforms passed, properly transitioned power domains with mem sleep using
wakeup_timerto wake.Low Power transition on v3.17-rc4 with patches applied,
omap2plus_defconfig(OMAP3 and OMAP4):1: BeagleBoard-XM: http://fpaste.org/133215/
2: OMAP3430-Labrador(LDP): http://fpaste.org/133225/
3: n900: http://fpaste.org/133244/
4: pandaboard-es: http://fpaste.org/133213/
5: pandaboard-vanilla: http://fpaste.org/133214/
6: sdp3430: http://fpaste.org/133246/Boot on v3.17-rc4 with patches applied,
omap2plus_defconfig:1: am335x-evm: Boot PASS: http://fpaste.org/133179/ 2: am335x-sk: Boot PASS: http://fpaste.org/133180/ 3: am3517-evm: Boot PASS: http://fpaste.org/133181/ 4: am37x-evm: Boot PASS: http://fpaste.org/133182/ 5: am43xx-epos: Boot PASS: http://fpaste.org/133183/ 6: am43xx-gpevm: Boot PASS: http://fpaste.org/133184/ 7: BeagleBoard-XM: Boot PASS: http://fpaste.org/133191/ 8: beagleboard-vanilla: Boot PASS: http://fpaste.org/133192/ 9: beaglebone-black: Boot PASS: http://fpaste.org/133193/ 10: beaglebone: Boot PASS: http://fpaste.org/133194/ 11: craneboard: Boot PASS: http://fpaste.org/133186/ 12: dra7xx-evm: Boot PASS: http://fpaste.org/131396/13: OMAP3430-Labrador(LDP): Boot PASS: http://fpaste.org/133206/
14: n900: Boot PASS: http://fpaste.org/133207/
15: omap5-evm: Boot PASS: http://fpaste.org/133208/
16: pandaboard-es: Boot PASS: http://fpaste.org/133187/
17: pandaboard-vanilla: Boot PASS: http://fpaste.org/133188/
Quoted 7 lines
18: sdp2430: Boot PASS: http://fpaste.org/133189/ 19: sdp3430: Boot PASS: http://fpaste.org/133212/TOTAL = 19 boards, Booted Boards = 19, No Boot boards = 0
Again, all pass. I have also tested with next AM335x Suspend/Resume implementation, next version will use generic sram driver to allocate for low-level assembly code, and that works fine as well.
Great, thanks for doing that. Applying all into omap-for-v3.18/soc.
Regards,
Tony