Skip to contentSkip to conversation

powerpc/dma: Remove ZONE_DMA completely

PATCH In review Benjamin Herrenschmidt 3 participants 7 messages Feb 20, 2015 – Mar 20, 2015 PowerPC

lore
Share & tools
lore
#0 lore raw

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
index 22b0940..4efbfba 100644
@@ -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
index e24e0ae..6306d4e 100644
@@ -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);
#1 lore raw
Quoted 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.

---
 arch/powerpc/Kconfig      |    2 +-
 arch/powerpc/kernel/dma.c |   10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)
arch/powerpc/Kconfig +1 -1
index 22b0940..4efbfba 100644
@@ -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
index e24e0ae..6306d4e 100644
@@ -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

#2 lore raw
Quoted 23 lines · Michael Ellerman
Quoted 9 lines · Benjamin Herrenschmidt
arch/powerpc/kernel/dma.c +0 -1
index e24e0ae..6306d4e 100644
@@ -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

#3 lore raw
Quoted 24 lines · Michael Ellerman
Quoted 23 lines · Michael Ellerman
Quoted 9 lines · Benjamin Herrenschmidt
arch/powerpc/kernel/dma.c +0 -1
index e24e0ae..6306d4e 100644
@@ -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.

#4 lore raw
In reply to Benjamin Herrenschmidt
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.

---
 arch/powerpc/Kconfig      |    2 +-
 arch/powerpc/kernel/dma.c |   10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)
arch/powerpc/Kconfig +1 -1
index 22b0940..4efbfba 100644
@@ -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
index e24e0ae..6306d4e 100644
@@ -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
index 38fe9c5409be..3a448cdaa22f 100644
@@ -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
index 03511968a9c6..253222ddb308 100644
@@ -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;
#5 lore raw
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 select ZONE_DMA32. Everywhere else ZONE_DMA32 is same as ZONE_NORMAL ? So instead of having confusing output for show_mem(), we now have

There may be cases where we want ZONE_DMA32, what's confusing ?

Ben.

#6 lore raw
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 select ZONE_DMA32. Everywhere else ZONE_DMA32 is same as ZONE_NORMAL ? So instead of having confusing output for show_mem(), we now have

There 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