* [PATCH 0/7] ARM: remove init_consistent_dma_size() stub
@ 2012-11-08 7:46 Marek Szyprowski
2012-11-08 7:46 ` [PATCH 1/7] ARM: omap: remove obsoleted init_consistent_dma_size() Marek Szyprowski
` (8 more replies)
0 siblings, 9 replies; 17+ messages in thread
From: Marek Szyprowski @ 2012-11-08 7:46 UTC (permalink / raw)
To: linux-arm-kernel
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 <tony@atomide.com>
CC: Kukjin Kim <kgene.kim@samsung.com>
CC: Sekhar Nori <nsekhar@ti.com>
CC: Kevin Hilman <khilman@ti.com>
CC: Paul Mundt <lethal@linux-sh.org>
CC: Magnus Damm <magnus.damm@gmail.com>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Andrew Victor <linux@maxim.org.za>
CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
CC: Linus Walleij <linus.walleij@linaro.org>
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(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/7] ARM: omap: remove obsoleted init_consistent_dma_size()
2012-11-08 7:46 [PATCH 0/7] ARM: remove init_consistent_dma_size() stub Marek Szyprowski
@ 2012-11-08 7:46 ` Marek Szyprowski
2012-11-08 16:27 ` Tony Lindgren
2012-11-08 7:46 ` [PATCH 2/7] ARM: samsung: " Marek Szyprowski
` (7 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: Marek Szyprowski @ 2012-11-08 7:46 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Tony Lindgren <tony@atomide.com>
---
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(-)
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index 6a5baab..b3d0fb3 100644
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -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)
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 4234d28..2597846 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -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
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 111315a..ab44d34 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -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
diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h
index 0a87b05..f1b2ad3 100644
--- a/arch/arm/plat-omap/include/plat/dma.h
+++ b/arch/arm/plat-omap/include/plat/dma.h
@@ -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),
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/7] ARM: samsung: remove obsoleted init_consistent_dma_size()
2012-11-08 7:46 [PATCH 0/7] ARM: remove init_consistent_dma_size() stub Marek Szyprowski
2012-11-08 7:46 ` [PATCH 1/7] ARM: omap: remove obsoleted init_consistent_dma_size() Marek Szyprowski
@ 2012-11-08 7:46 ` Marek Szyprowski
2012-11-08 7:46 ` [PATCH 3/7] ARM: davinci: " Marek Szyprowski
` (6 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Marek Szyprowski @ 2012-11-08 7:46 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Kukjin Kim <kgene.kim@samsung.com>
---
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(-)
diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c
index be746e3..aef303b 100644
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@ -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();
diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c
index 111e404..8ae5800 100644
--- a/arch/arm/mach-s5p64x0/common.c
+++ b/arch/arm/mach-s5p64x0/common.c
@@ -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);
}
/*
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
index a0c50ef..9dfe93e 100644
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@ -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();
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/7] ARM: davinci: remove obsoleted init_consistent_dma_size()
2012-11-08 7:46 [PATCH 0/7] ARM: remove init_consistent_dma_size() stub Marek Szyprowski
2012-11-08 7:46 ` [PATCH 1/7] ARM: omap: remove obsoleted init_consistent_dma_size() Marek Szyprowski
2012-11-08 7:46 ` [PATCH 2/7] ARM: samsung: " Marek Szyprowski
@ 2012-11-08 7:46 ` Marek Szyprowski
2012-11-08 7:46 ` [PATCH 4/7] ARM: shmobile: " Marek Szyprowski
` (5 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Marek Szyprowski @ 2012-11-08 7:46 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Sekhar Nori <nsekhar@ti.com>
CC: Kevin Hilman <khilman@ti.com>
---
arch/arm/mach-davinci/common.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c
index 64b0f65..a794f6d 100644
--- a/arch/arm/mach-davinci/common.c
+++ b/arch/arm/mach-davinci/common.c
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 4/7] ARM: shmobile: remove obsoleted init_consistent_dma_size()
2012-11-08 7:46 [PATCH 0/7] ARM: remove init_consistent_dma_size() stub Marek Szyprowski
` (2 preceding siblings ...)
2012-11-08 7:46 ` [PATCH 3/7] ARM: davinci: " Marek Szyprowski
@ 2012-11-08 7:46 ` Marek Szyprowski
2012-11-08 7:46 ` [PATCH 5/7] ARM: at91: " Marek Szyprowski
` (4 subsequent siblings)
8 siblings, 0 replies; 17+ messages in thread
From: Marek Szyprowski @ 2012-11-08 7:46 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Paul Mundt <lethal@linux-sh.org>
CC: Magnus Damm <magnus.damm@gmail.com>
---
arch/arm/mach-shmobile/setup-r8a7740.c | 6 ------
arch/arm/mach-shmobile/setup-sh7372.c | 6 ------
2 files changed, 12 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 11bb1d9..96f1139 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -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 */
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index a07954f..be6f746 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 5/7] ARM: at91: remove obsoleted init_consistent_dma_size()
2012-11-08 7:46 [PATCH 0/7] ARM: remove init_consistent_dma_size() stub Marek Szyprowski
` (3 preceding siblings ...)
2012-11-08 7:46 ` [PATCH 4/7] ARM: shmobile: " Marek Szyprowski
@ 2012-11-08 7:46 ` Marek Szyprowski
2012-11-08 15:21 ` Jean-Christophe PLAGNIOL-VILLARD
2012-11-08 7:46 ` [PATCH 6/7] ARM: u300: " Marek Szyprowski
` (3 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: Marek Szyprowski @ 2012-11-08 7:46 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Andrew Victor <linux@maxim.org.za>
CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/at91sam9g45.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 84af1b5..b7ae124 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -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)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 6/7] ARM: u300: remove obsoleted init_consistent_dma_size()
2012-11-08 7:46 [PATCH 0/7] ARM: remove init_consistent_dma_size() stub Marek Szyprowski
` (4 preceding siblings ...)
2012-11-08 7:46 ` [PATCH 5/7] ARM: at91: " Marek Szyprowski
@ 2012-11-08 7:46 ` Marek Szyprowski
2012-11-08 8:25 ` Linus Walleij
2012-11-08 7:46 ` [PATCH 7/7] ARM: dma-mapping: remove init_consistent_dma_size() stub Marek Szyprowski
` (2 subsequent siblings)
8 siblings, 1 reply; 17+ messages in thread
From: Marek Szyprowski @ 2012-11-08 7:46 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/mach-u300/core.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index b8efac4..d8632eb 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -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);
}
/*
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 7/7] ARM: dma-mapping: remove init_consistent_dma_size() stub
2012-11-08 7:46 [PATCH 0/7] ARM: remove init_consistent_dma_size() stub Marek Szyprowski
` (5 preceding siblings ...)
2012-11-08 7:46 ` [PATCH 6/7] ARM: u300: " Marek Szyprowski
@ 2012-11-08 7:46 ` Marek Szyprowski
2012-11-08 16:28 ` [PATCH 0/7] ARM: " Tony Lindgren
2012-11-12 21:21 ` Arnd Bergmann
8 siblings, 0 replies; 17+ messages in thread
From: Marek Szyprowski @ 2012-11-08 7:46 UTC (permalink / raw)
To: linux-arm-kernel
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 <m.szyprowski@samsung.com>
---
arch/arm/include/asm/dma-mapping.h | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 2300484..8ea02ac 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -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.
*
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 6/7] ARM: u300: remove obsoleted init_consistent_dma_size()
2012-11-08 7:46 ` [PATCH 6/7] ARM: u300: " Marek Szyprowski
@ 2012-11-08 8:25 ` Linus Walleij
0 siblings, 0 replies; 17+ messages in thread
From: Linus Walleij @ 2012-11-08 8:25 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Nov 8, 2012 at 8:46 AM, Marek Szyprowski
<m.szyprowski@samsung.com> wrote:
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> CC: Linus Walleij <linus.walleij@linaro.org>
> ---
> arch/arm/mach-u300/core.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
> index b8efac4..d8632eb 100644
> --- a/arch/arm/mach-u300/core.c
> +++ b/arch/arm/mach-u300/core.c
> @@ -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 <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 5/7] ARM: at91: remove obsoleted init_consistent_dma_size()
2012-11-08 7:46 ` [PATCH 5/7] ARM: at91: " Marek Szyprowski
@ 2012-11-08 15:21 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 17+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-11-08 15:21 UTC (permalink / raw)
To: linux-arm-kernel
On 08:46 Thu 08 Nov , Marek Szyprowski wrote:
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> CC: Nicolas Ferre <nicolas.ferre@atmel.com>
> CC: Andrew Victor <linux@maxim.org.za>
> CC: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> ---
> arch/arm/mach-at91/at91sam9g45.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
> index 84af1b5..b7ae124 100644
> --- a/arch/arm/mach-at91/at91sam9g45.c
> +++ b/arch/arm/mach-at91/at91sam9g45.c
> @@ -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 <plagnioj@jcrosoft.com>
Best Regards,
J.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/7] ARM: omap: remove obsoleted init_consistent_dma_size()
2012-11-08 7:46 ` [PATCH 1/7] ARM: omap: remove obsoleted init_consistent_dma_size() Marek Szyprowski
@ 2012-11-08 16:27 ` Tony Lindgren
0 siblings, 0 replies; 17+ messages in thread
From: Tony Lindgren @ 2012-11-08 16:27 UTC (permalink / raw)
To: linux-arm-kernel
* Marek Szyprowski <m.szyprowski@samsung.com> [121107 23:48]:
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> CC: Tony Lindgren <tony@atomide.com>
> ---
> 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(-)
>
> diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
> index 6a5baab..b3d0fb3 100644
> --- a/arch/arm/mach-omap1/io.c
> +++ b/arch/arm/mach-omap1/io.c
> @@ -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)
> diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
> index 4234d28..2597846 100644
> --- a/arch/arm/mach-omap2/io.c
> +++ b/arch/arm/mach-omap2/io.c
> @@ -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;
...
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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 0/7] ARM: remove init_consistent_dma_size() stub
2012-11-08 7:46 [PATCH 0/7] ARM: remove init_consistent_dma_size() stub Marek Szyprowski
` (6 preceding siblings ...)
2012-11-08 7:46 ` [PATCH 7/7] ARM: dma-mapping: remove init_consistent_dma_size() stub Marek Szyprowski
@ 2012-11-08 16:28 ` Tony Lindgren
2012-11-12 21:21 ` Arnd Bergmann
8 siblings, 0 replies; 17+ messages in thread
From: Tony Lindgren @ 2012-11-08 16:28 UTC (permalink / raw)
To: linux-arm-kernel
* Marek Szyprowski <m.szyprowski@samsung.com> [121107 23:48]:
> 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 0/7] ARM: remove init_consistent_dma_size() stub
2012-11-08 7:46 [PATCH 0/7] ARM: remove init_consistent_dma_size() stub Marek Szyprowski
` (7 preceding siblings ...)
2012-11-08 16:28 ` [PATCH 0/7] ARM: " Tony Lindgren
@ 2012-11-12 21:21 ` Arnd Bergmann
2012-11-13 4:55 ` Kukjin Kim
8 siblings, 1 reply; 17+ messages in thread
From: Arnd Bergmann @ 2012-11-12 21:21 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 08 November 2012, Marek Szyprowski wrote:
> 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
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 0/7] ARM: remove init_consistent_dma_size() stub
2012-11-12 21:21 ` Arnd Bergmann
@ 2012-11-13 4:55 ` Kukjin Kim
2012-11-13 8:49 ` Arnd Bergmann
0 siblings, 1 reply; 17+ messages in thread
From: Kukjin Kim @ 2012-11-13 4:55 UTC (permalink / raw)
To: linux-arm-kernel
Arnd Bergmann wrote:
>
> 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 <kgene.kim@samsung.com>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 0/7] ARM: remove init_consistent_dma_size() stub
2012-11-13 4:55 ` Kukjin Kim
@ 2012-11-13 8:49 ` Arnd Bergmann
2012-11-13 8:54 ` Marek Szyprowski
0 siblings, 1 reply; 17+ messages in thread
From: Arnd Bergmann @ 2012-11-13 8:49 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 13 November 2012, Kukjin Kim wrote:
> Arnd Bergmann wrote:
> >
> > 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 <kgene.kim@samsung.com>
>
Thanks for your Ack, but I'd prefer not to redo the branch now, since I already
merged other patches on top.
Arnd
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 0/7] ARM: remove init_consistent_dma_size() stub
2012-11-13 8:49 ` Arnd Bergmann
@ 2012-11-13 8:54 ` Marek Szyprowski
2012-11-13 9:21 ` Arnd Bergmann
0 siblings, 1 reply; 17+ messages in thread
From: Marek Szyprowski @ 2012-11-13 8:54 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
On 11/13/2012 9:49 AM, Arnd Bergmann wrote:
> On Tuesday 13 November 2012, Kukjin Kim wrote:
> > Arnd Bergmann wrote:
> > >
> > > 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 <kgene.kim@samsung.com>
> >
>
> 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
--
Marek Szyprowski
Samsung Poland R&D Center
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 0/7] ARM: remove init_consistent_dma_size() stub
2012-11-13 8:54 ` Marek Szyprowski
@ 2012-11-13 9:21 ` Arnd Bergmann
0 siblings, 0 replies; 17+ messages in thread
From: Arnd Bergmann @ 2012-11-13 9:21 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 13 November 2012, Marek Szyprowski wrote:
> On 11/13/2012 9:49 AM, Arnd Bergmann wrote:
> > On Tuesday 13 November 2012, Kukjin Kim wrote:
> > > Arnd Bergmann wrote:
> > > >
> > > > 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 <kgene.kim@samsung.com>
> > >
> >
> > 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
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2012-11-13 9:21 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-08 7:46 [PATCH 0/7] ARM: remove init_consistent_dma_size() stub Marek Szyprowski
2012-11-08 7:46 ` [PATCH 1/7] ARM: omap: remove obsoleted init_consistent_dma_size() Marek Szyprowski
2012-11-08 16:27 ` Tony Lindgren
2012-11-08 7:46 ` [PATCH 2/7] ARM: samsung: " Marek Szyprowski
2012-11-08 7:46 ` [PATCH 3/7] ARM: davinci: " Marek Szyprowski
2012-11-08 7:46 ` [PATCH 4/7] ARM: shmobile: " Marek Szyprowski
2012-11-08 7:46 ` [PATCH 5/7] ARM: at91: " Marek Szyprowski
2012-11-08 15:21 ` Jean-Christophe PLAGNIOL-VILLARD
2012-11-08 7:46 ` [PATCH 6/7] ARM: u300: " Marek Szyprowski
2012-11-08 8:25 ` Linus Walleij
2012-11-08 7:46 ` [PATCH 7/7] ARM: dma-mapping: remove init_consistent_dma_size() stub Marek Szyprowski
2012-11-08 16:28 ` [PATCH 0/7] ARM: " Tony Lindgren
2012-11-12 21:21 ` Arnd Bergmann
2012-11-13 4:55 ` Kukjin Kim
2012-11-13 8:49 ` Arnd Bergmann
2012-11-13 8:54 ` Marek Szyprowski
2012-11-13 9:21 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).