powerpc/dma: Remove ZONE_DMA completely
PATCH 3/3 powerpc/dma: Remove ZONE_DMA completely
We don't initialize it, we don't use it, remove it.
We can bring it back if we ever wish to have support for devices who have smaller than 32-bit DMA limitations but I don't think we care much anymore.
--- arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/dma.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-)
arch/powerpc/Kconfig +1 -1
@@ -712,7 +712,7 @@ config ISA config ZONE_DMA bool - default y + default n config NEED_DMA_MAP_STATE def_bool (PPC64 || NOT_COHERENT_CACHE)
arch/powerpc/kernel/dma.c +1 -9
@@ -63,16 +63,8 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size,return NULL ; } -switch (zone) { -case ZONE_DMA : - flag |=GFP_DMA ; -break ; -#ifdef CONFIG_ZONE_DMA32 -case ZONE_DMA32 : +if (zone ==ZONE_DMA32 ) flag |=GFP_DMA32 ; -break ; -#endif - };/* ignore region specifiers */ flag &= ~(__GFP_HIGHMEM);
Michael Ellerman
reviewerQuoted 34 lines · Benjamin Herrenschmidt
We don't initialize it, we don't use it, remove it.
We can bring it back if we ever wish to have support for devices who have smaller than 32-bit DMA limitations but I don't think we care much anymore.
Signed-off-by Benjamin Herrenschmidt <[email protected]>--- arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/dma.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-)arch/powerpc/Kconfig +1
-1@@ -712,7 +712,7 @@ config ISA config ZONE_DMA bool - default y + default n config NEED_DMA_MAP_STATE def_bool (PPC64 || NOT_COHERENT_CACHE)arch/powerpc/kernel/dma.c +0
-1@@ -63,16 +63,8 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size,return NULL ; } -switch (zone) {
arch/powerpc/kernel/dma.c void *dma_direct_alloc_coherent(struct device *dev, size_t size, · line 75
Quoted 10 lines
arch/powerpc/kernel/dma.c +1
-8-case ZONE_DMA : - flag |=GFP_DMA ; -break ; -#ifdef CONFIG_ZONE_DMA32 -case ZONE_DMA32 : +if (zone ==ZONE_DMA32 ) flag |=GFP_DMA32 ; -break ; -#endif - };
You still need the ifdef, else eg. ppc6xx_defconfig:
arch/powerpc/kernel/dma.c:66:14: error: 'ZONE_DMA32' undeclared (first use in this function)
cheers
Michael Ellerman
reviewerQuoted 23 lines · Michael Ellerman
Quoted 9 lines · Benjamin Herrenschmidt
arch/powerpc/kernel/dma.c +0
-1@@ -63,16 +63,8 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size,return NULL ; } -switch (zone) {arch/powerpc/kernel/dma.c void *dma_direct_alloc_coherent(struct device *dev, size_t size, · line 75
Quoted 10 lines
arch/powerpc/kernel/dma.c +1
-8-case ZONE_DMA : - flag |=GFP_DMA ; -break ; -#ifdef CONFIG_ZONE_DMA32 -case ZONE_DMA32 : +if (zone ==ZONE_DMA32 ) flag |=GFP_DMA32 ; -break ; -#endif - };You still need the ifdef, else eg.
ppc6xx_defconfig:
Quoted 1 line
arch/powerpc/kernel/dma.c:66:14: error: 'ZONE_DMA32' undeclared (first use in this function)
And the rest :)
http://kisskb.ellerman.id.au/kisskb/head/8505/
Successful: 45% 49/109
cheers
Quoted 24 lines · Michael Ellerman
Quoted 23 lines · Michael Ellerman
Quoted 9 lines · Benjamin Herrenschmidt
arch/powerpc/kernel/dma.c +0
-1@@ -63,16 +63,8 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size,return NULL ; } -switch (zone) {arch/powerpc/kernel/dma.c void *dma_direct_alloc_coherent(struct device *dev, size_t size, · line 75
Quoted 10 lines
arch/powerpc/kernel/dma.c +1
-8-case ZONE_DMA : - flag |=GFP_DMA ; -break ; -#ifdef CONFIG_ZONE_DMA32 -case ZONE_DMA32 : +if (zone ==ZONE_DMA32 ) flag |=GFP_DMA32 ; -break ; -#endif - };You still need the ifdef, else eg.
ppc6xx_defconfig:
Quoted 7 lines
Quoted 1 line
arch/powerpc/kernel/dma.c:66:14: error: 'ZONE_DMA32' undeclared (first use in this function)And the rest :)
http://kisskb.ellerman.id.au/kisskb/head/8505/
Successful: 45% 49/109
Yup, I forgot I didn't have it unconditionally on ppc32 :-)
I'll respin some time next week.
Cheers,
Ben.
Quoted 35 lines · Benjamin Herrenschmidt
We don't initialize it, we don't use it, remove it.
We can bring it back if we ever wish to have support for devices who have smaller than 32-bit DMA limitations but I don't think we care much anymore.
Signed-off-by Benjamin Herrenschmidt <[email protected]>--- arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/dma.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-)arch/powerpc/Kconfig +1
-1@@ -712,7 +712,7 @@ config ISA config ZONE_DMA bool - default y + default n config NEED_DMA_MAP_STATE def_bool (PPC64 || NOT_COHERENT_CACHE)arch/powerpc/kernel/dma.c +0
-2@@ -63,16 +63,8 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size,return NULL ; } -switch (zone) { -case ZONE_DMA :
arch/powerpc/kernel/dma.c void *dma_direct_alloc_coherent(struct device *dev, size_t size, · line 68
Quoted 10 lines
arch/powerpc/kernel/dma.c +1
-7- flag |=GFP_DMA ; -break ; -#ifdef CONFIG_ZONE_DMA32 -case ZONE_DMA32 : +if (zone ==ZONE_DMA32 ) flag |=GFP_DMA32 ; -break ; -#endif - };
Why not do it also for DMA32 as below. We call limit_zone_pfn() only for few platforms. They can select ZONE_DMA32. Everywhere else ZONE_DMA32 is same as ZONE_NORMAL ? So instead of having confusing output for show_mem(), we now have
Node 0 Normal: 6*64kB (UM) 566*128kB (UEM) 367*256kB (UM) 185*512kB (UM)59*1024kB (UEM) 11*2048kB (UM) 4*4096kB (UM) 3*8192kB (UEM) 4016*16384kB
Node 1 Normal: 42*64kB (UEM) 14*128kB (UEM) 10*256kB (UM) 2*512kB (UM) 6*1024kB (UM) 7*2048kB (UEM) 5*4096kB (UM) 2*8192kB (U) 3644*16384kB (MR) =
arch/powerpc/Kconfig +1 -1
@@ -290,7 +290,7 @@ config PPC_EMULATE_SSTEP config ZONE_DMA32 bool - default y if PPC64 + default n source "init/Kconfig"
arch/powerpc/kernel/dma.c +5 -0
@@ -71,6 +71,11 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size, }switch (zone) { +#ifdef CONFIG_ZONE_DMA +case ZONE_DMA : + flag |=GFP_DMA ; +break ; +#endif #ifdef CONFIG_ZONE_DMA32 case ZONE_DMA32 : flag |=GFP_DMA32 ;
Quoted 5 lines · Aneesh Kumar K.V
Why not do it also for DMA32 as below. We call
limit_zone_pfn()only for few
platforms. They can selectZONE_DMA32. Everywhere elseZONE_DMA32is same asZONE_NORMAL? So instead of having confusing output forshow_mem(), we now have
There may be cases where we want ZONE_DMA32, what's confusing ?
Ben.
Quoted 9 lines · Benjamin Herrenschmidt
Quoted 5 lines · Aneesh Kumar K.V
Why not do it also for DMA32 as below. We call
limit_zone_pfn()only for few
platforms. They can selectZONE_DMA32. Everywhere elseZONE_DMA32is same asZONE_NORMAL? So instead of having confusing output forshow_mem(), we now haveThere may be cases where we want
ZONE_DMA32, what's confusing ?
To see output like below
Node 0 DMA32: 6*64kB (UM) 566*128kB (UEM) 367*256kB (UM) 185*512kB (UM)59*1024kB (UEM) 11*2048kB (UM) 4*4096kB (UM) 3*8192kB (UEM) 4016*16384kB
Node 1 DMA32: 42*64kB (UEM) 14*128kB (UEM) 10*256kB (UM) 2*512kB (UM) 6*1024kB (UM) 7*2048kB (UEM) 5*4096kB (UM) 2*8192kB (U) 3644*16384kB (MR) =
That is to find DMA32 convering more than 4GB range.
-aneesh