ARM: remove init_consistent_dma_size() stub

PATCH New Marek Szyprowski 6 participants 17 messages Nov 8, 2012 – Nov 13, 2012

Subsystems (8)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos Arm/Microchip (AT91) SoC support +4 more subsystems

lore

Share & tools

lore

Marek Szyprowski

author

2012-11-08 07:46 UTC #0 lore raw

cover ARM: remove init_consistent_dma_size() stub

Hello,

Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma region") replaced custom consistent memory handling, so setting consistent dma memory size is not longer required. This patch series cleans sub-architecture platform code to remove all calls to the obsolated init_consistent_dma_size() function and finally removes the init_consistent_dma_size() stub itself.

Arnd, Olof: could You apply it to arm-soc cleanup branch?

Best regards
Marek Szyprowski
Samsung Poland R&D Center

CC Tony Lindgren <[email protected]>

CC Kukjin Kim <[email protected]>

CC Sekhar Nori <[email protected]>

CC Kevin Hilman <[email protected]>

CC Paul Mundt <[email protected]>

CC Magnus Damm <[email protected]>

CC Nicolas Ferre <[email protected]>

CC Andrew Victor <[email protected]>

CC Jean-Christophe Plagniol-Villard <[email protected]>

CC Linus Walleij <[email protected]>

Patch summary:

Marek Szyprowski (7):
ARM: omap: remove obsoleted init_consistent_dma_size()
ARM: samsung: remove obsoleted init_consistent_dma_size()
ARM: davinci: remove obsoleted init_consistent_dma_size()
ARM: shmobile: remove obsoleted init_consistent_dma_size()
ARM: at91: remove obsoleted init_consistent_dma_size()
ARM: u300: remove obsoleted init_consistent_dma_size()
ARM: dma-mapping: remove init_consistent_dma_size() stub

 arch/arm/include/asm/dma-mapping.h     |    7 -------
 arch/arm/mach-at91/at91sam9g45.c       |    1 -
 arch/arm/mach-davinci/common.c         |    2 --
 arch/arm/mach-omap1/io.c               |    1 -
 arch/arm/mach-omap2/io.c               |   12 ------------
 arch/arm/mach-s3c64xx/common.c         |    1 -
 arch/arm/mach-s5p64x0/common.c         |    2 --
 arch/arm/mach-s5pv210/common.c         |    2 --
 arch/arm/mach-shmobile/setup-r8a7740.c |    6 ------
 arch/arm/mach-shmobile/setup-sh7372.c  |    6 ------
 arch/arm/mach-u300/core.c              |    2 --
 arch/arm/plat-omap/common.c            |    7 -------
 arch/arm/plat-omap/include/plat/dma.h  |    1 -
 13 files changed, 50 deletions(-)

Signature · 1 line

1.7.9.5

Marek Szyprowski

author

2012-11-08 07:46 UTC #1 lore raw

PATCH 1/7 ARM: omap: remove obsoleted init_consistent_dma_size()

Signed-off-by Marek Szyprowski <[email protected]>

CC Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap1/io.c              |    1 -
 arch/arm/mach-omap2/io.c              |   12 ------------
 arch/arm/plat-omap/common.c           |    7 -------
 arch/arm/plat-omap/include/plat/dma.h |    1 -
 4 files changed, 21 deletions(-)

arch/arm/mach-omap1/io.c +0 -1

index 6a5baab..b3d0fb3 100644
@@ -134,7 +134,6 @@ void __init omap1_init_early(void)
 	 */
 	omap1_clk_init();
 	omap1_mux_init();
-	omap_init_consistent_dma_size();
 }
 
 void __init omap1_init_late(void)

arch/arm/mach-omap2/io.c +0 ~~-12~~

index 4234d28..2597846 100644
@@ -354,11 +354,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data)
 	return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);
 }
 
-static void __init omap_common_init_early(void)
-{
-	omap_init_consistent_dma_size();
-}
-
 static void __init omap_hwmod_init_postsetup(void)
 {
 	u8 postsetup_state;

@@ -379,7 +374,6 @@ void __init omap2420_init_early(void)
 {
 	omap2_set_globals_242x();
 	omap2xxx_check_revision();
-	omap_common_init_early();
 	omap2xxx_voltagedomains_init();
 	omap242x_powerdomains_init();
 	omap242x_clockdomains_init();

@@ -401,7 +395,6 @@ void __init omap2430_init_early(void)
 {
 	omap2_set_globals_243x();
 	omap2xxx_check_revision();
-	omap_common_init_early();
 	omap2xxx_voltagedomains_init();
 	omap243x_powerdomains_init();
 	omap243x_clockdomains_init();

@@ -428,7 +421,6 @@ void __init omap3_init_early(void)
 	omap2_set_globals_3xxx();
 	omap3xxx_check_revision();
 	omap3xxx_check_features();
-	omap_common_init_early();
 	omap3xxx_voltagedomains_init();
 	omap3xxx_powerdomains_init();
 	omap3xxx_clockdomains_init();

@@ -462,7 +454,6 @@ void __init ti81xx_init_early(void)
 	omap2_set_globals_ti81xx();
 	omap3xxx_check_revision();
 	ti81xx_check_features();
-	omap_common_init_early();
 	omap3xxx_voltagedomains_init();
 	omap3xxx_powerdomains_init();
 	omap3xxx_clockdomains_init();

@@ -520,7 +511,6 @@ void __init am33xx_init_early(void)
 	omap2_set_globals_am33xx();
 	omap3xxx_check_revision();
 	ti81xx_check_features();
-	omap_common_init_early();
 	am33xx_voltagedomains_init();
 	am33xx_powerdomains_init();
 	am33xx_clockdomains_init();

@@ -536,7 +526,6 @@ void __init omap4430_init_early(void)
 	omap2_set_globals_443x();
 	omap4xxx_check_revision();
 	omap4xxx_check_features();
-	omap_common_init_early();
 	omap44xx_voltagedomains_init();
 	omap44xx_powerdomains_init();
 	omap44xx_clockdomains_init();

@@ -558,7 +547,6 @@ void __init omap5_init_early(void)
 {
 	omap2_set_globals_5xxx();
 	omap5xxx_check_revision();
-	omap_common_init_early();
 }
 #endif

arch/arm/plat-omap/common.c +0 -7

index 111315a..ab44d34 100644
@@ -31,13 +31,6 @@ void __init omap_reserve(void)
 	omap_barrier_reserve_memblock();
 }
 
-void __init omap_init_consistent_dma_size(void)
-{
-#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
-	init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20);
-#endif
-}
-
 /*
  * Stub function for OMAP2 so that common files
  * continue to build when custom builds are used

arch/arm/plat-omap/include/plat/dma.h +0 -1

index 0a87b05..f1b2ad3 100644
@@ -449,7 +449,6 @@ struct omap_system_dma_plat_info {
 	u32 (*dma_read)(int reg, int lch);
 };
 
-extern void __init omap_init_consistent_dma_size(void);
 extern void omap_set_dma_priority(int lch, int dst_port, int priority);
 extern int omap_request_dma(int dev_id, const char *dev_name,
 			void (*callback)(int lch, u16 ch_status, void *data),

Signature · 1 line

1.7.9.5

Tony Lindgren

maintainer

2012-11-08 16:27 UTC #2 lore raw

PATCH 1/7 ARM: omap: remove obsoleted init_consistent_dma_size()

Quoted 27 lines · Marek Szyprowski

Signed-off-by Marek Szyprowski <[email protected]>

CC Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap1/io.c              |    1 -
 arch/arm/mach-omap2/io.c              |   12 ------------
 arch/arm/plat-omap/common.c           |    7 -------
 arch/arm/plat-omap/include/plat/dma.h |    1 -
 4 files changed, 21 deletions(-)

arch/arm/mach-omap1/io.c +0 -1

index 6a5baab..b3d0fb3 100644
@@ -134,7 +134,6 @@ void __init omap1_init_early(void)
 	 */
 	omap1_clk_init();
 	omap1_mux_init();
-	omap_init_consistent_dma_size();
 }
 
 void __init omap1_init_late(void)

arch/arm/mach-omap2/io.c +0 -0

index 4234d28..2597846 100644
@@ -354,11 +354,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data)
 	return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);

arch/arm/mach-omap2/io.c static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) · line 359

Quoted 10 lines

arch/arm/mach-omap2/io.c +0 -5

 }
 
-static void __init omap_common_init_early(void)
-{
-	omap_init_consistent_dma_size();
-}
-
 static void __init omap_hwmod_init_postsetup(void)
 {
 	u8 postsetup_state;

...

Thanks we already have a similar patch from Tomi Valkeinen queued in the omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 branch, so this patch can be dropped.

Regards,

Tony

Marek Szyprowski

author

2012-11-08 07:46 UTC #3 lore raw

PATCH 2/7 ARM: samsung: remove obsoleted init_consistent_dma_size()

In reply to Marek Szyprowski

Signed-off-by Marek Szyprowski <[email protected]>

CC Kukjin Kim <[email protected]>

---
 arch/arm/mach-s3c64xx/common.c |    1 -
 arch/arm/mach-s5p64x0/common.c |    2 --
 arch/arm/mach-s5pv210/common.c |    2 --
 3 files changed, 5 deletions(-)

arch/arm/mach-s3c64xx/common.c +0 -1

index be746e3..aef303b 100644
@@ -155,7 +155,6 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
 	/* initialise the io descriptors we need for initialisation */
 	iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
 	iotable_init(mach_desc, size);
-	init_consistent_dma_size(SZ_8M);
 
 	/* detect cpu id */
 	s3c64xx_init_cpu();

arch/arm/mach-s5p64x0/common.c +0 -2

index 111e404..8ae5800 100644
@@ -187,7 +187,6 @@ void __init s5p6440_map_io(void)
 	s5p6440_default_sdhci2();
 
 	iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));
-	init_consistent_dma_size(SZ_8M);
 }
 
 void __init s5p6450_map_io(void)

@@ -202,7 +201,6 @@ void __init s5p6450_map_io(void)
 	s5p6450_default_sdhci2();
 
 	iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc));
-	init_consistent_dma_size(SZ_8M);
 }
 
 /*

arch/arm/mach-s5pv210/common.c +0 -2

index a0c50ef..9dfe93e 100644
@@ -169,8 +169,6 @@ void __init s5pv210_init_io(struct map_desc *mach_desc, int size)
 
 void __init s5pv210_map_io(void)
 {
-	init_consistent_dma_size(14 << 20);
-
 	/* initialise device information early */
 	s5pv210_default_sdhci0();
 	s5pv210_default_sdhci1();

Signature · 1 line

1.7.9.5

Marek Szyprowski

author

2012-11-08 07:46 UTC #4 lore raw

PATCH 3/7 ARM: davinci: remove obsoleted init_consistent_dma_size()

In reply to Marek Szyprowski

Signed-off-by Marek Szyprowski <[email protected]>

CC Sekhar Nori <[email protected]>

CC Kevin Hilman <[email protected]>

---
 arch/arm/mach-davinci/common.c |    2 --
 1 file changed, 2 deletions(-)

arch/arm/mach-davinci/common.c +0 -2

index 64b0f65..a794f6d 100644
@@ -87,8 +87,6 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info)
 		iotable_init(davinci_soc_info.io_desc,
 				davinci_soc_info.io_desc_num);
 
-	init_consistent_dma_size(14 << 20);
-
 	/*
 	 * Normally devicemaps_init() would flush caches and tlb after
 	 * mdesc->map_io(), but we must also do it here because of the CPU

Signature · 1 line

1.7.9.5

Marek Szyprowski

author

2012-11-08 07:46 UTC #5 lore raw

PATCH 4/7 ARM: shmobile: remove obsoleted init_consistent_dma_size()

In reply to Marek Szyprowski

Signed-off-by Marek Szyprowski <[email protected]>

CC Paul Mundt <[email protected]>

CC Magnus Damm <[email protected]>

---
 arch/arm/mach-shmobile/setup-r8a7740.c |    6 ------
 arch/arm/mach-shmobile/setup-sh7372.c  |    6 ------
 2 files changed, 12 deletions(-)

arch/arm/mach-shmobile/setup-r8a7740.c +0 -6

index 11bb1d9..96f1139 100644
@@ -66,12 +66,6 @@ static struct map_desc r8a7740_io_desc[] __initdata = {
 void __init r8a7740_map_io(void)
 {
 	iotable_init(r8a7740_io_desc, ARRAY_SIZE(r8a7740_io_desc));
-
-	/*
-	 * DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't
-	 * enough to allocate the frame buffer memory.
-	 */
-	init_consistent_dma_size(12 << 20);
 }
 
 /* SCIFA0 */

arch/arm/mach-shmobile/setup-sh7372.c +0 -6

index a07954f..be6f746 100644
@@ -58,12 +58,6 @@ static struct map_desc sh7372_io_desc[] __initdata = {
 void __init sh7372_map_io(void)
 {
 	iotable_init(sh7372_io_desc, ARRAY_SIZE(sh7372_io_desc));
-
-	/*
-	 * DMA memory@0xff200000 - 0xffdfffff. The default 2MB size isn't
-	 * enough to allocate the frame buffer memory.
-	 */
-	init_consistent_dma_size(12 << 20);
 }
 
 /* SCIFA0 */

Signature · 1 line

1.7.9.5

Marek Szyprowski

author

2012-11-08 07:46 UTC #6 lore raw

PATCH 5/7 ARM: at91: remove obsoleted init_consistent_dma_size()

In reply to Marek Szyprowski

Signed-off-by Marek Szyprowski <[email protected]>

CC Nicolas Ferre <[email protected]>

CC Andrew Victor <[email protected]>

CC Jean-Christophe Plagniol-Villard <[email protected]>

---
 arch/arm/mach-at91/at91sam9g45.c |    1 -
 1 file changed, 1 deletion(-)

arch/arm/mach-at91/at91sam9g45.c +0 -1

index 84af1b5..b7ae124 100644
@@ -343,7 +343,6 @@ static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = {
 static void __init at91sam9g45_map_io(void)
 {
 	at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE);
-	init_consistent_dma_size(SZ_4M);
 }
 
 static void __init at91sam9g45_ioremap_registers(void)

Signature · 1 line

1.7.9.5

Jean-Christophe PLAGNIOL-VILLARD

2012-11-08 15:21 UTC #7 lore raw

PATCH 5/7 ARM: at91: remove obsoleted init_consistent_dma_size()

Quoted 13 lines · Marek Szyprowski

Signed-off-by Marek Szyprowski <[email protected]>
CC Nicolas Ferre <[email protected]>
CC Andrew Victor <[email protected]>
CC Jean-Christophe Plagniol-Villard <[email protected]>
---
 arch/arm/mach-at91/at91sam9g45.c |    1 -
 1 file changed, 1 deletion(-)
arch/arm/mach-at91/at91sam9g45.c +0 -0
index 84af1b5..b7ae124 100644

arch/arm/mach-at91/at91sam9g45.c static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = { · line 346

Quoted 4 lines

arch/arm/mach-at91/at91sam9g45.c +0 -1

@@ -343,7 +343,6 @@ static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = {
 static void __init at91sam9g45_map_io(void)
 {
 	at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE);
-	init_consistent_dma_size(SZ_4M);

Acked-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Best Regards,
J.

Marek Szyprowski

author

2012-11-08 07:46 UTC #8 lore raw

PATCH 6/7 ARM: u300: remove obsoleted init_consistent_dma_size()

In reply to Marek Szyprowski

Signed-off-by Marek Szyprowski <[email protected]>

CC Linus Walleij <[email protected]>

---
 arch/arm/mach-u300/core.c |    2 --
 1 file changed, 2 deletions(-)

arch/arm/mach-u300/core.c +0 -2

index b8efac4..d8632eb 100644
@@ -82,8 +82,6 @@ static struct map_desc u300_io_desc[] __initdata = {
 static void __init u300_map_io(void)
 {
 	iotable_init(u300_io_desc, ARRAY_SIZE(u300_io_desc));
-	/* We enable a real big DMA buffer if need be. */
-	init_consistent_dma_size(SZ_4M);
 }
 
 /*

Signature · 1 line

1.7.9.5

Linus Walleij

2012-11-08 08:25 UTC #9 lore raw

PATCH 6/7 ARM: u300: remove obsoleted init_consistent_dma_size()

Quoted 11 lines · Marek Szyprowski

Signed-off-by Marek Szyprowski <[email protected]>
CC Linus Walleij <[email protected]>
---
 arch/arm/mach-u300/core.c |    2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-u300/core.c +0 -0
index b8efac4..d8632eb 100644

arch/arm/mach-u300/core.c static struct map_desc u300_io_desc[] __initdata = { · line 85

Quoted 6 lines

arch/arm/mach-u300/core.c +0 -2

@@ -82,8 +82,6 @@ static struct map_desc u300_io_desc[] __initdata = {
 static void __init u300_map_io(void)
 {
        iotable_init(u300_io_desc, ARRAY_SIZE(u300_io_desc));
-       /* We enable a real big DMA buffer if need be. */
-       init_consistent_dma_size(SZ_4M);
 }

Acked-by Linus Walleij <[email protected]>

Yours,
Linus Walleij

Marek Szyprowski

author

2012-11-08 07:46 UTC #10 lore raw

PATCH 7/7 ARM: dma-mapping: remove init_consistent_dma_size() stub

In reply to Marek Szyprowski

Since commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma region") setting consistent dma memory size is not longer required. All calls to this function has been already removed, so the init_consistent_dma_size() stub can also be gone.

Signed-off-by Marek Szyprowski <[email protected]>

---
 arch/arm/include/asm/dma-mapping.h |    7 -------
 1 file changed, 7 deletions(-)

arch/arm/include/asm/dma-mapping.h +0 -7

index 2300484..8ea02ac 100644
@@ -211,13 +211,6 @@ static inline void dma_free_writecombine(struct device *dev, size_t size,
 extern void __init init_dma_coherent_pool_size(unsigned long size);
 
 /*
- * This can be called during boot to increase the size of the consistent
- * DMA region above it's default value of 2MB. It must be called before the
- * memory allocator is initialised, i.e. before any core_initcall.
- */
-static inline void init_consistent_dma_size(unsigned long size) { }
-
-/*
  * For SA-1111, IXP425, and ADI systems  the dma-mapping functions are "magic"
  * and utilize bounce buffers as needed to work around limited DMA windows.
  *

Signature · 1 line

1.7.9.5

Tony Lindgren

maintainer

2012-11-08 16:28 UTC #11 lore raw

cover ARM: remove init_consistent_dma_size() stub

In reply to Marek Szyprowski

Quoted 10 lines · Marek Szyprowski

Hello,
Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma region") replaced custom consistent memory handling, so setting consistent dma memory size is not longer required. This patch series cleans sub-architecture platform code to remove all calls to the obsolated init_consistent_dma_size() function and finally removes the init_consistent_dma_size() stub itself.
Arnd, Olof: could You apply it to arm-soc cleanup branch?

The omap patch in this series is no longer needed as soon as Arnd and Olof pull in the pending omap pull requests I sent.

Regards,

Tony

Arnd Bergmann

Applied

2012-11-12 21:21 UTC #12 lore raw

cover ARM: remove init_consistent_dma_size() stub

In reply to Marek Szyprowski

Quoted 9 lines · Marek Szyprowski

Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma region") replaced custom consistent memory handling, so setting consistent dma memory size is not longer required. This patch series cleans sub-architecture platform code to remove all calls to the obsolated init_consistent_dma_size() function and finally removes the init_consistent_dma_size() stub itself.
Arnd, Olof: could You apply it to arm-soc cleanup branch?

Applied patches 2-7 to next/cleanup branch, with the Acks that came in.

Thanks,

Arnd

Kukjin Kim

2012-11-13 04:55 UTC #13 lore raw

cover ARM: remove init_consistent_dma_size() stub

Quoted 3 lines · Arnd Bergmann

Applied patches 2-7 to next/cleanup branch, with the Acks that came in.

(- many guys in Cc)

Hi Arnd,

If possible, please adding my ack on Samsung stuff.

Acked-by Kukjin Kim <[email protected]>

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Arnd Bergmann

2012-11-13 08:49 UTC #14 lore raw

cover ARM: remove init_consistent_dma_size() stub

Quoted 4 lines · Kukjin Kim

Quoted 3 lines · Arnd Bergmann
Applied patches 2-7 to next/cleanup branch, with the Acks that came in.

Quoted 8 lines

(- many guys in Cc)
Hi Arnd,
If possible, please adding my ack on Samsung stuff.
Acked-by Kukjin Kim <[email protected]>

Thanks for your Ack, but I'd prefer not to redo the branch now, since I already merged other patches on top.

Arnd

Marek Szyprowski

author

2012-11-13 08:54 UTC #15 lore raw

cover ARM: remove init_consistent_dma_size() stub

Hello,

Quoted 9 lines · Arnd Bergmann

Quoted 8 lines · Kukjin Kim
Quoted 3 lines · Arnd Bergmann
Applied patches 2-7 to next/cleanup branch, with the Acks that came in.
(- many guys in Cc)
Hi Arnd,

Quoted 7 lines

Quoted 4 lines
If possible, please adding my ack on Samsung stuff.
Acked-by Kukjin Kim <[email protected]>
Thanks for your Ack, but I'd prefer not to redo the branch now, since I already merged other patches on top.

If you redo your branch, please make sure that the patch which removes the init_consistent_dma_size() stub from dma-mapping.h (7th in my series) would be the last one to avoid build break on git bisect. For unknown reason the order of patches on your tree got changed in compared to the series I've sent.

Best regards

Signature · 2 lines

Marek Szyprowski
Samsung Poland R&D Center

Arnd Bergmann

2012-11-13 09:21 UTC #16 lore raw

cover ARM: remove init_consistent_dma_size() stub

Quoted 15 lines · Marek Szyprowski

Quoted 14 lines · Arnd Bergmann
Quoted 12 lines · Kukjin Kim
Quoted 3 lines · Arnd Bergmann
Applied patches 2-7 to next/cleanup branch, with the Acks that came in.
(- many guys in Cc)
Hi Arnd,
If possible, please adding my ack on Samsung stuff.
Acked-by Kukjin Kim <[email protected]>

Quoted 8 lines

Quoted 2 lines
Thanks for your Ack, but I'd prefer not to redo the branch now, since I already merged other patches on top.
If you redo your branch, please make sure that the patch which removes the init_consistent_dma_size() stub from dma-mapping.h (7th in my series) would be the last one to avoid build break on git bisect. For unknown reason the order of patches on your tree got changed in compared to the series I've sent.

Ok, I've redone the branch now and added Kukjin's Ack.

Arnd