[PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T

linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT)
@ 2010-09-03  0:51 FUJITA Tomonori
  2010-09-03  0:49 ` [PATCH -mm 1/8] x86: enable ARCH_DMA_ADDR_T_64BIT with X86_64 || HIGHMEM64G FUJITA Tomonori
                   ` (9 more replies)
  0 siblings, 10 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:51 UTC (permalink / raw)
  To: akpm; +Cc: davem, linux-kernel, linux-arch

There are about twenty architectures have the own dma_addr_t typedef
because include/asm-generic/types.h can't be perfect (some of them can
use it though):

#ifndef dma_addr_t
#ifdef CONFIG_PHYS_ADDR_T_64BIT
typedef u64 dma_addr_t;
#else
typedef u32 dma_addr_t;
#endif /* CONFIG_PHYS_ADDR_T_64BIT */
#endif /* dma_addr_t */

Another problem is that there is a way to determine if dma_addr_t is
64-bit. We see hopeless tricks like the following:

#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))

This clean up the mess with introducing CONFIG_ARCH_DMA_ADDR_T_64BIT
define (like CONFIG_ARCH_PHYS_ADDR_T_64BIT).

If architecture needs 64bit dma_addr_t, it must enable
CONFIG_ARCH_DMA_ADDR_T_64BIT.

The summary are:

- always 64bit
-- alpha
-- ia64
-- tile

- conditionally 64bit
-- x86
-- mips
-- powerpc
-- s390

- always 32bit
-- arm
-- avr32
-- cris
-- frv
-- h8300
-- m32r
-- m68k
-- mn10300
-- parisc
-- xtensa
-- sparc
-- blackfin
-- microblaze
-- score
-- sh

=
 arch/alpha/Kconfig               |    3 +++
 arch/alpha/include/asm/types.h   |    1 -
 arch/arm/include/asm/types.h     |    3 ---
 arch/avr32/include/asm/types.h   |    8 --------
 arch/cris/include/asm/types.h    |    3 ---
 arch/frv/include/asm/types.h     |    8 --------
 arch/h8300/include/asm/types.h   |    4 ----
 arch/ia64/Kconfig                |    3 +++
 arch/ia64/include/asm/types.h    |    3 ---
 arch/m32r/include/asm/types.h    |    3 ---
 arch/m68k/include/asm/types.h    |    3 ---
 arch/mips/Kconfig                |    3 +++
 arch/mips/include/asm/types.h    |    6 ------
 arch/mn10300/include/asm/types.h |    7 -------
 arch/parisc/include/asm/types.h  |    3 ---
 arch/powerpc/Kconfig             |    3 +++
 arch/powerpc/include/asm/types.h |    5 -----
 arch/s390/Kconfig                |    3 +++
 arch/s390/include/asm/types.h    |    6 ------
 arch/sparc/include/asm/types.h   |    4 ----
 arch/tile/Kconfig                |    3 +++
 arch/x86/Kconfig                 |    3 +++
 arch/x86/include/asm/types.h     |    8 --------
 arch/xtensa/include/asm/types.h  |    4 ----
 include/asm-generic/types.h      |   27 ---------------------------
 include/linux/types.h            |    6 ++++++
 26 files changed, 27 insertions(+), 106 deletions(-)

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH -mm 1/8] x86: enable ARCH_DMA_ADDR_T_64BIT with X86_64 || HIGHMEM64G
  2010-09-03  0:51 [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) FUJITA Tomonori
@ 2010-09-03  0:49 ` FUJITA Tomonori
  2010-09-03  0:49 ` [PATCH -mm 2/8] alpha: enable ARCH_DMA_ADDR_T_64BIT FUJITA Tomonori
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, x86

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: x86@kernel.org
---
 arch/x86/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cea0cd9..2924f4e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1148,6 +1148,9 @@ config X86_PAE
 config ARCH_PHYS_ADDR_T_64BIT
 	def_bool X86_64 || X86_PAE
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool X86_64 || HIGHMEM64G
+
 config DIRECT_GBPAGES
 	bool "Enable 1GB pages for kernel pagetables" if EMBEDDED
 	default y
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH -mm 2/8] alpha: enable ARCH_DMA_ADDR_T_64BIT
  2010-09-03  0:51 [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) FUJITA Tomonori
  2010-09-03  0:49 ` [PATCH -mm 1/8] x86: enable ARCH_DMA_ADDR_T_64BIT with X86_64 || HIGHMEM64G FUJITA Tomonori
@ 2010-09-03  0:49 ` FUJITA Tomonori
  2010-09-03  0:49 ` [PATCH -mm 3/8] ia64: " FUJITA Tomonori
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, linux-alpha

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: linux-alpha@vger.kernel.org
---
 arch/alpha/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index b9647bb..953e31e 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -54,6 +54,9 @@ config ZONE_DMA
 	bool
 	default y
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool y
+
 config NEED_DMA_MAP_STATE
        def_bool y
 
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH -mm 3/8] ia64: enable ARCH_DMA_ADDR_T_64BIT
  2010-09-03  0:51 [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) FUJITA Tomonori
  2010-09-03  0:49 ` [PATCH -mm 1/8] x86: enable ARCH_DMA_ADDR_T_64BIT with X86_64 || HIGHMEM64G FUJITA Tomonori
  2010-09-03  0:49 ` [PATCH -mm 2/8] alpha: enable ARCH_DMA_ADDR_T_64BIT FUJITA Tomonori
@ 2010-09-03  0:49 ` FUJITA Tomonori
  2010-09-03  0:49 ` [PATCH -mm 4/8] mips: enable ARCH_DMA_ADDR_T_64BIT with (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT FUJITA Tomonori
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, linux-ia64

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: linux-ia64@vger.kernel.org
---
 arch/ia64/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ba22849..5d5e32e 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -53,6 +53,9 @@ config MMU
 	bool
 	default y
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool y
+
 config NEED_DMA_MAP_STATE
 	def_bool y
 
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH -mm 4/8] mips: enable ARCH_DMA_ADDR_T_64BIT with (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
  2010-09-03  0:51 [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) FUJITA Tomonori
                   ` (2 preceding siblings ...)
  2010-09-03  0:49 ` [PATCH -mm 3/8] ia64: " FUJITA Tomonori
@ 2010-09-03  0:49 ` FUJITA Tomonori
  2010-09-03  0:49   ` FUJITA Tomonori
  2010-09-20 13:34   ` Ralf Baechle
  2010-09-03  0:49 ` [PATCH -mm 5/8] powerpc: enable ARCH_DMA_ADDR_T_64BIT with ARCH_PHYS_ADDR_T_64BIT FUJITA Tomonori
                   ` (5 subsequent siblings)
  9 siblings, 2 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, linux-mips

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: linux-mips@linux-mips.org
---
 arch/mips/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3ad59dd..3e9db47 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -830,6 +830,9 @@ config GPIO_TXX9
 config CFE
 	bool
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
+
 config DMA_COHERENT
 	bool
 
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH -mm 4/8] mips: enable ARCH_DMA_ADDR_T_64BIT with (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
  2010-09-03  0:49 ` [PATCH -mm 4/8] mips: enable ARCH_DMA_ADDR_T_64BIT with (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT FUJITA Tomonori
@ 2010-09-03  0:49   ` FUJITA Tomonori
  2010-09-20 13:34   ` Ralf Baechle
  1 sibling, 0 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, linux-mips

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: linux-mips@linux-mips.org
---
 arch/mips/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3ad59dd..3e9db47 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -830,6 +830,9 @@ config GPIO_TXX9
 config CFE
 	bool
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
+
 config DMA_COHERENT
 	bool
 
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* Re: [PATCH -mm 4/8] mips: enable ARCH_DMA_ADDR_T_64BIT with (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
  2010-09-03  0:49 ` [PATCH -mm 4/8] mips: enable ARCH_DMA_ADDR_T_64BIT with (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT FUJITA Tomonori
  2010-09-03  0:49   ` FUJITA Tomonori
@ 2010-09-20 13:34   ` Ralf Baechle
  2010-09-22  9:18     ` FUJITA Tomonori
  1 sibling, 1 reply; 21+ messages in thread
From: Ralf Baechle @ 2010-09-20 13:34 UTC (permalink / raw)
  To: FUJITA Tomonori; +Cc: akpm, linux-arch, linux-kernel, linux-mips

On Fri, Sep 03, 2010 at 09:49:12AM +0900, FUJITA Tomonori wrote:

> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> Cc: linux-mips@linux-mips.org

Looks good:

Acked-by: Ralf Baechle <ralf@linux-mips.org>

As this patch by itself doesn't make any sense in the MIPS tree and would
only cry for a janitor to remove it again I suggest you merge this with
the rest of the series.

Thanks,

  Ralf

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH -mm 4/8] mips: enable ARCH_DMA_ADDR_T_64BIT with (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
  2010-09-20 13:34   ` Ralf Baechle
@ 2010-09-22  9:18     ` FUJITA Tomonori
  0 siblings, 0 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-22  9:18 UTC (permalink / raw)
  To: ralf; +Cc: fujita.tomonori, akpm, linux-arch, linux-kernel, linux-mips

On Mon, 20 Sep 2010 14:34:35 +0100
Ralf Baechle <ralf@linux-mips.org> wrote:

> On Fri, Sep 03, 2010 at 09:49:12AM +0900, FUJITA Tomonori wrote:
> 
> > Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> > Cc: linux-mips@linux-mips.org
> 
> Looks good:
> 
> Acked-by: Ralf Baechle <ralf@linux-mips.org>

Thanks,


> As this patch by itself doesn't make any sense in the MIPS tree and would
> only cry for a janitor to remove it again I suggest you merge this with
> the rest of the series.

I expect akpm to merge all the patches.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH -mm 5/8] powerpc: enable ARCH_DMA_ADDR_T_64BIT with ARCH_PHYS_ADDR_T_64BIT
  2010-09-03  0:51 [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) FUJITA Tomonori
                   ` (3 preceding siblings ...)
  2010-09-03  0:49 ` [PATCH -mm 4/8] mips: enable ARCH_DMA_ADDR_T_64BIT with (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT FUJITA Tomonori
@ 2010-09-03  0:49 ` FUJITA Tomonori
  2010-09-03  0:49   ` FUJITA Tomonori
  2010-09-03  0:49 ` [PATCH -mm 6/8] s390: enable ARCH_DMA_ADDR_T_64BIT with 64BIT FUJITA Tomonori
                   ` (4 subsequent siblings)
  9 siblings, 1 reply; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, linuxppc-dev

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: linuxppc-dev@lists.ozlabs.org
---
 arch/powerpc/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 631e5a0..b0e58f5 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -22,6 +22,9 @@ config WORD_SIZE
 config ARCH_PHYS_ADDR_T_64BIT
        def_bool PPC64 || PHYS_64BIT
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool ARCH_PHYS_ADDR_T_64BIT
+
 config MMU
 	bool
 	default y
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH -mm 5/8] powerpc: enable ARCH_DMA_ADDR_T_64BIT with ARCH_PHYS_ADDR_T_64BIT
  2010-09-03  0:49 ` [PATCH -mm 5/8] powerpc: enable ARCH_DMA_ADDR_T_64BIT with ARCH_PHYS_ADDR_T_64BIT FUJITA Tomonori
@ 2010-09-03  0:49   ` FUJITA Tomonori
  0 siblings, 0 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, linuxppc-dev

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: linuxppc-dev@lists.ozlabs.org
---
 arch/powerpc/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 631e5a0..b0e58f5 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -22,6 +22,9 @@ config WORD_SIZE
 config ARCH_PHYS_ADDR_T_64BIT
        def_bool PPC64 || PHYS_64BIT
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool ARCH_PHYS_ADDR_T_64BIT
+
 config MMU
 	bool
 	default y
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH -mm 6/8] s390: enable ARCH_DMA_ADDR_T_64BIT with 64BIT
  2010-09-03  0:51 [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) FUJITA Tomonori
                   ` (4 preceding siblings ...)
  2010-09-03  0:49 ` [PATCH -mm 5/8] powerpc: enable ARCH_DMA_ADDR_T_64BIT with ARCH_PHYS_ADDR_T_64BIT FUJITA Tomonori
@ 2010-09-03  0:49 ` FUJITA Tomonori
  2010-09-03  0:49 ` [PATCH -mm 7/8] tile: enable ARCH_DMA_ADDR_T_64BIT FUJITA Tomonori
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, linux-s390

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: linux-s390@vger.kernel.org
---
 arch/s390/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index f0777a4..ad804c5 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -60,6 +60,9 @@ config NO_IOMEM
 config NO_DMA
 	def_bool y
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool 64BIT
+
 config GENERIC_LOCKBREAK
 	bool
 	default y
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH -mm 7/8] tile: enable ARCH_DMA_ADDR_T_64BIT
  2010-09-03  0:51 [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) FUJITA Tomonori
                   ` (5 preceding siblings ...)
  2010-09-03  0:49 ` [PATCH -mm 6/8] s390: enable ARCH_DMA_ADDR_T_64BIT with 64BIT FUJITA Tomonori
@ 2010-09-03  0:49 ` FUJITA Tomonori
  2010-09-03  0:49   ` FUJITA Tomonori
  2010-09-03  0:49 ` [PATCH -mm 8/8] add the common dma_addr_t typedef to include/linux/types.h FUJITA Tomonori
                   ` (2 subsequent siblings)
  9 siblings, 1 reply; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, cmetcalf

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: cmetcalf@tilera.com
---
 arch/tile/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 1eb308c..aeca73f 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -58,6 +58,9 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING
 config ARCH_PHYS_ADDR_T_64BIT
 	def_bool y
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool y
+
 config LOCKDEP_SUPPORT
 	def_bool y
 
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH -mm 7/8] tile: enable ARCH_DMA_ADDR_T_64BIT
  2010-09-03  0:49 ` [PATCH -mm 7/8] tile: enable ARCH_DMA_ADDR_T_64BIT FUJITA Tomonori
@ 2010-09-03  0:49   ` FUJITA Tomonori
  0 siblings, 0 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, cmetcalf

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: cmetcalf@tilera.com
---
 arch/tile/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 1eb308c..aeca73f 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -58,6 +58,9 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING
 config ARCH_PHYS_ADDR_T_64BIT
 	def_bool y
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool y
+
 config LOCKDEP_SUPPORT
 	def_bool y
 
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH -mm 8/8] add the common dma_addr_t typedef to include/linux/types.h
  2010-09-03  0:51 [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) FUJITA Tomonori
                   ` (6 preceding siblings ...)
  2010-09-03  0:49 ` [PATCH -mm 7/8] tile: enable ARCH_DMA_ADDR_T_64BIT FUJITA Tomonori
@ 2010-09-03  0:49 ` FUJITA Tomonori
  2010-09-03  0:49   ` FUJITA Tomonori
  2010-09-03 12:19   ` Arnd Bergmann
       [not found] ` <5uMrkKwSLHA.6664@exchange1.tad.internal.tilera.com>
  2010-09-03 22:09 ` [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) Andrew Morton
  9 siblings, 2 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, arnd

All architectures can use the common dma_addr_t typedef now. We can
remove the arch specific dma_addr_t.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: arnd@arndb.de
---
 arch/alpha/include/asm/types.h   |    1 -
 arch/arm/include/asm/types.h     |    3 ---
 arch/avr32/include/asm/types.h   |    8 --------
 arch/cris/include/asm/types.h    |    3 ---
 arch/frv/include/asm/types.h     |    8 --------
 arch/h8300/include/asm/types.h   |    4 ----
 arch/ia64/include/asm/types.h    |    3 ---
 arch/m32r/include/asm/types.h    |    3 ---
 arch/m68k/include/asm/types.h    |    3 ---
 arch/mips/include/asm/types.h    |    6 ------
 arch/mn10300/include/asm/types.h |    7 -------
 arch/parisc/include/asm/types.h  |    3 ---
 arch/powerpc/include/asm/types.h |    5 -----
 arch/s390/include/asm/types.h    |    6 ------
 arch/sparc/include/asm/types.h   |    4 ----
 arch/x86/include/asm/types.h     |    8 --------
 arch/xtensa/include/asm/types.h  |    4 ----
 include/asm-generic/types.h      |   27 ---------------------------
 include/linux/types.h            |    6 ++++++
 19 files changed, 6 insertions(+), 106 deletions(-)

diff --git a/arch/alpha/include/asm/types.h b/arch/alpha/include/asm/types.h
index bd621ec..e46e503 100644
--- a/arch/alpha/include/asm/types.h
+++ b/arch/alpha/include/asm/types.h
@@ -27,7 +27,6 @@ typedef unsigned int umode_t;
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
-typedef u64 dma_addr_t;
 typedef u64 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h
index 345df01..c684e37 100644
--- a/arch/arm/include/asm/types.h
+++ b/arch/arm/include/asm/types.h
@@ -18,9 +18,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/avr32/include/asm/types.h b/arch/avr32/include/asm/types.h
index 9cefda6..72667a3 100644
--- a/arch/avr32/include/asm/types.h
+++ b/arch/avr32/include/asm/types.h
@@ -23,14 +23,6 @@ typedef unsigned short umode_t;
 
 #define BITS_PER_LONG 32
 
-#ifndef __ASSEMBLY__
-
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
 #endif /* __KERNEL__ */
 
 
diff --git a/arch/cris/include/asm/types.h b/arch/cris/include/asm/types.h
index 5790262..4405508 100644
--- a/arch/cris/include/asm/types.h
+++ b/arch/cris/include/asm/types.h
@@ -18,9 +18,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* Dma addresses are 32-bits wide, just like our other addresses.  */
- 
-typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/frv/include/asm/types.h b/arch/frv/include/asm/types.h
index 613bf1e..aa3e7fd 100644
--- a/arch/frv/include/asm/types.h
+++ b/arch/frv/include/asm/types.h
@@ -27,14 +27,6 @@ typedef unsigned short umode_t;
 
 #define BITS_PER_LONG 32
 
-#ifndef __ASSEMBLY__
-
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_TYPES_H */
diff --git a/arch/h8300/include/asm/types.h b/arch/h8300/include/asm/types.h
index 1287519..bb2c91a 100644
--- a/arch/h8300/include/asm/types.h
+++ b/arch/h8300/include/asm/types.h
@@ -22,10 +22,6 @@ typedef unsigned short umode_t;
 
 #define BITS_PER_LONG 32
 
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-
 #endif /* __KERNEL__ */
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h
index 93773fd..82b3939 100644
--- a/arch/ia64/include/asm/types.h
+++ b/arch/ia64/include/asm/types.h
@@ -40,9 +40,6 @@ struct fnptr {
 	unsigned long gp;
 };
 
-/* DMA addresses are 64-bits wide, in general.  */
-typedef u64 dma_addr_t;
-
 # endif /* __KERNEL__ */
 #endif /* !__ASSEMBLY__ */
 
diff --git a/arch/m32r/include/asm/types.h b/arch/m32r/include/asm/types.h
index bc9f7ff..fd84b48 100644
--- a/arch/m32r/include/asm/types.h
+++ b/arch/m32r/include/asm/types.h
@@ -18,9 +18,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* DMA addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
 typedef u64 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/m68k/include/asm/types.h b/arch/m68k/include/asm/types.h
index 6441cb5..10ad92f 100644
--- a/arch/m68k/include/asm/types.h
+++ b/arch/m68k/include/asm/types.h
@@ -25,9 +25,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* DMA addresses are always 32-bits wide */
-
-typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h
index 544a285..9520dc8 100644
--- a/arch/mips/include/asm/types.h
+++ b/arch/mips/include/asm/types.h
@@ -33,12 +33,6 @@ typedef unsigned short umode_t;
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
-#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
-    || defined(CONFIG_64BIT)
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
 typedef u64 dma64_addr_t;
 
 /*
diff --git a/arch/mn10300/include/asm/types.h b/arch/mn10300/include/asm/types.h
index 7b9f010..c1833eb 100644
--- a/arch/mn10300/include/asm/types.h
+++ b/arch/mn10300/include/asm/types.h
@@ -26,13 +26,6 @@ typedef unsigned short umode_t;
 
 #define BITS_PER_LONG 32
 
-#ifndef __ASSEMBLY__
-
-/* Dma addresses are 32-bits wide.  */
-typedef u32 dma_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_TYPES_H */
diff --git a/arch/parisc/include/asm/types.h b/arch/parisc/include/asm/types.h
index 20135cc..bc164dd 100644
--- a/arch/parisc/include/asm/types.h
+++ b/arch/parisc/include/asm/types.h
@@ -16,9 +16,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
 typedef u64 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h
index a5aea0c..e16a6b2 100644
--- a/arch/powerpc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
@@ -44,11 +44,6 @@ typedef struct {
 
 typedef __vector128 vector128;
 
-#if defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
 typedef u64 dma64_addr_t;
 
 typedef struct {
diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h
index 04d6b95..f7f6ae6 100644
--- a/arch/s390/include/asm/types.h
+++ b/arch/s390/include/asm/types.h
@@ -31,12 +31,6 @@ typedef __signed__ long saddr_t;
 #ifndef __ASSEMBLY__
 
 typedef u64 dma64_addr_t;
-#ifdef __s390x__
-/* DMA addresses come in 32-bit and 64-bit flavours. */
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
 
 #ifndef __s390x__
 typedef union {
diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h
index 09c79a9..f02d330 100644
--- a/arch/sparc/include/asm/types.h
+++ b/arch/sparc/include/asm/types.h
@@ -22,10 +22,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* Dma addresses come in generic and 64-bit flavours.  */
-
-typedef u32 dma_addr_t;
-
 #if defined(__arch64__)
 
 /*** SPARC 64 bit ***/
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index df1da20..8810205 100644
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -1,20 +1,12 @@
 #ifndef _ASM_X86_TYPES_H
 #define _ASM_X86_TYPES_H
 
-#define dma_addr_t	dma_addr_t
-
 #include <asm-generic/types.h>
 
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 typedef u64 dma64_addr_t;
-#if defined(CONFIG_X86_64) || defined(CONFIG_HIGHMEM64G)
-/* DMA addresses come in 32-bit and 64-bit flavours. */
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
 
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
diff --git a/arch/xtensa/include/asm/types.h b/arch/xtensa/include/asm/types.h
index c89569a..b1c981e 100644
--- a/arch/xtensa/include/asm/types.h
+++ b/arch/xtensa/include/asm/types.h
@@ -32,10 +32,6 @@ typedef unsigned short umode_t;
 
 #define BITS_PER_LONG 32
 
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-
 #endif	/* __KERNEL__ */
 #endif
 
diff --git a/include/asm-generic/types.h b/include/asm-generic/types.h
index fba7d33..7a0f69e 100644
--- a/include/asm-generic/types.h
+++ b/include/asm-generic/types.h
@@ -12,31 +12,4 @@ typedef unsigned short umode_t;
 
 #endif /* __ASSEMBLY__ */
 
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-/*
- * DMA addresses may be very different from physical addresses
- * and pointers. i386 and powerpc may have 64 bit DMA on 32 bit
- * systems, while sparc64 uses 32 bit DMA addresses for 64 bit
- * physical addresses.
- * This default defines dma_addr_t to have the same size as
- * phys_addr_t, which is the most common way.
- * Do not define the dma64_addr_t type, which never really
- * worked.
- */
-#ifndef dma_addr_t
-#ifdef CONFIG_PHYS_ADDR_T_64BIT
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif /* CONFIG_PHYS_ADDR_T_64BIT */
-#endif /* dma_addr_t */
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_GENERIC_TYPES_H */
diff --git a/include/linux/types.h b/include/linux/types.h
index 01a082f..266f1d0 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -150,6 +150,12 @@ typedef unsigned long blkcnt_t;
 #define pgoff_t unsigned long
 #endif
 
+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
+typedef u64 dma_addr_t;
+#else
+typedef u32 dma_addr_t;
+#endif /* dma_addr_t */
+
 #endif /* __KERNEL__ */
 
 /*
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [PATCH -mm 8/8] add the common dma_addr_t typedef to include/linux/types.h
  2010-09-03  0:49 ` [PATCH -mm 8/8] add the common dma_addr_t typedef to include/linux/types.h FUJITA Tomonori
@ 2010-09-03  0:49   ` FUJITA Tomonori
  2010-09-03 12:19   ` Arnd Bergmann
  1 sibling, 0 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-03  0:49 UTC (permalink / raw)
  To: akpm; +Cc: linux-arch, linux-kernel, fujita.tomonori, arnd

All architectures can use the common dma_addr_t typedef now. We can
remove the arch specific dma_addr_t.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: arnd@arndb.de
---
 arch/alpha/include/asm/types.h   |    1 -
 arch/arm/include/asm/types.h     |    3 ---
 arch/avr32/include/asm/types.h   |    8 --------
 arch/cris/include/asm/types.h    |    3 ---
 arch/frv/include/asm/types.h     |    8 --------
 arch/h8300/include/asm/types.h   |    4 ----
 arch/ia64/include/asm/types.h    |    3 ---
 arch/m32r/include/asm/types.h    |    3 ---
 arch/m68k/include/asm/types.h    |    3 ---
 arch/mips/include/asm/types.h    |    6 ------
 arch/mn10300/include/asm/types.h |    7 -------
 arch/parisc/include/asm/types.h  |    3 ---
 arch/powerpc/include/asm/types.h |    5 -----
 arch/s390/include/asm/types.h    |    6 ------
 arch/sparc/include/asm/types.h   |    4 ----
 arch/x86/include/asm/types.h     |    8 --------
 arch/xtensa/include/asm/types.h  |    4 ----
 include/asm-generic/types.h      |   27 ---------------------------
 include/linux/types.h            |    6 ++++++
 19 files changed, 6 insertions(+), 106 deletions(-)

diff --git a/arch/alpha/include/asm/types.h b/arch/alpha/include/asm/types.h
index bd621ec..e46e503 100644
--- a/arch/alpha/include/asm/types.h
+++ b/arch/alpha/include/asm/types.h
@@ -27,7 +27,6 @@ typedef unsigned int umode_t;
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
-typedef u64 dma_addr_t;
 typedef u64 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h
index 345df01..c684e37 100644
--- a/arch/arm/include/asm/types.h
+++ b/arch/arm/include/asm/types.h
@@ -18,9 +18,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/avr32/include/asm/types.h b/arch/avr32/include/asm/types.h
index 9cefda6..72667a3 100644
--- a/arch/avr32/include/asm/types.h
+++ b/arch/avr32/include/asm/types.h
@@ -23,14 +23,6 @@ typedef unsigned short umode_t;
 
 #define BITS_PER_LONG 32
 
-#ifndef __ASSEMBLY__
-
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
 #endif /* __KERNEL__ */
 
 
diff --git a/arch/cris/include/asm/types.h b/arch/cris/include/asm/types.h
index 5790262..4405508 100644
--- a/arch/cris/include/asm/types.h
+++ b/arch/cris/include/asm/types.h
@@ -18,9 +18,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* Dma addresses are 32-bits wide, just like our other addresses.  */
- 
-typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/frv/include/asm/types.h b/arch/frv/include/asm/types.h
index 613bf1e..aa3e7fd 100644
--- a/arch/frv/include/asm/types.h
+++ b/arch/frv/include/asm/types.h
@@ -27,14 +27,6 @@ typedef unsigned short umode_t;
 
 #define BITS_PER_LONG 32
 
-#ifndef __ASSEMBLY__
-
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_TYPES_H */
diff --git a/arch/h8300/include/asm/types.h b/arch/h8300/include/asm/types.h
index 1287519..bb2c91a 100644
--- a/arch/h8300/include/asm/types.h
+++ b/arch/h8300/include/asm/types.h
@@ -22,10 +22,6 @@ typedef unsigned short umode_t;
 
 #define BITS_PER_LONG 32
 
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-
 #endif /* __KERNEL__ */
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h
index 93773fd..82b3939 100644
--- a/arch/ia64/include/asm/types.h
+++ b/arch/ia64/include/asm/types.h
@@ -40,9 +40,6 @@ struct fnptr {
 	unsigned long gp;
 };
 
-/* DMA addresses are 64-bits wide, in general.  */
-typedef u64 dma_addr_t;
-
 # endif /* __KERNEL__ */
 #endif /* !__ASSEMBLY__ */
 
diff --git a/arch/m32r/include/asm/types.h b/arch/m32r/include/asm/types.h
index bc9f7ff..fd84b48 100644
--- a/arch/m32r/include/asm/types.h
+++ b/arch/m32r/include/asm/types.h
@@ -18,9 +18,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* DMA addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
 typedef u64 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/m68k/include/asm/types.h b/arch/m68k/include/asm/types.h
index 6441cb5..10ad92f 100644
--- a/arch/m68k/include/asm/types.h
+++ b/arch/m68k/include/asm/types.h
@@ -25,9 +25,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* DMA addresses are always 32-bits wide */
-
-typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h
index 544a285..9520dc8 100644
--- a/arch/mips/include/asm/types.h
+++ b/arch/mips/include/asm/types.h
@@ -33,12 +33,6 @@ typedef unsigned short umode_t;
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
-#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
-    || defined(CONFIG_64BIT)
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
 typedef u64 dma64_addr_t;
 
 /*
diff --git a/arch/mn10300/include/asm/types.h b/arch/mn10300/include/asm/types.h
index 7b9f010..c1833eb 100644
--- a/arch/mn10300/include/asm/types.h
+++ b/arch/mn10300/include/asm/types.h
@@ -26,13 +26,6 @@ typedef unsigned short umode_t;
 
 #define BITS_PER_LONG 32
 
-#ifndef __ASSEMBLY__
-
-/* Dma addresses are 32-bits wide.  */
-typedef u32 dma_addr_t;
-
-#endif /* __ASSEMBLY__ */
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_TYPES_H */
diff --git a/arch/parisc/include/asm/types.h b/arch/parisc/include/asm/types.h
index 20135cc..bc164dd 100644
--- a/arch/parisc/include/asm/types.h
+++ b/arch/parisc/include/asm/types.h
@@ -16,9 +16,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
 typedef u64 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h
index a5aea0c..e16a6b2 100644
--- a/arch/powerpc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
@@ -44,11 +44,6 @@ typedef struct {
 
 typedef __vector128 vector128;
 
-#if defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
 typedef u64 dma64_addr_t;
 
 typedef struct {
diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h
index 04d6b95..f7f6ae6 100644
--- a/arch/s390/include/asm/types.h
+++ b/arch/s390/include/asm/types.h
@@ -31,12 +31,6 @@ typedef __signed__ long saddr_t;
 #ifndef __ASSEMBLY__
 
 typedef u64 dma64_addr_t;
-#ifdef __s390x__
-/* DMA addresses come in 32-bit and 64-bit flavours. */
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
 
 #ifndef __s390x__
 typedef union {
diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h
index 09c79a9..f02d330 100644
--- a/arch/sparc/include/asm/types.h
+++ b/arch/sparc/include/asm/types.h
@@ -22,10 +22,6 @@ typedef unsigned short umode_t;
 
 #ifndef __ASSEMBLY__
 
-/* Dma addresses come in generic and 64-bit flavours.  */
-
-typedef u32 dma_addr_t;
-
 #if defined(__arch64__)
 
 /*** SPARC 64 bit ***/
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index df1da20..8810205 100644
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -1,20 +1,12 @@
 #ifndef _ASM_X86_TYPES_H
 #define _ASM_X86_TYPES_H
 
-#define dma_addr_t	dma_addr_t
-
 #include <asm-generic/types.h>
 
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 typedef u64 dma64_addr_t;
-#if defined(CONFIG_X86_64) || defined(CONFIG_HIGHMEM64G)
-/* DMA addresses come in 32-bit and 64-bit flavours. */
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
 
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
diff --git a/arch/xtensa/include/asm/types.h b/arch/xtensa/include/asm/types.h
index c89569a..b1c981e 100644
--- a/arch/xtensa/include/asm/types.h
+++ b/arch/xtensa/include/asm/types.h
@@ -32,10 +32,6 @@ typedef unsigned short umode_t;
 
 #define BITS_PER_LONG 32
 
-/* Dma addresses are 32-bits wide.  */
-
-typedef u32 dma_addr_t;
-
 #endif	/* __KERNEL__ */
 #endif
 
diff --git a/include/asm-generic/types.h b/include/asm-generic/types.h
index fba7d33..7a0f69e 100644
--- a/include/asm-generic/types.h
+++ b/include/asm-generic/types.h
@@ -12,31 +12,4 @@ typedef unsigned short umode_t;
 
 #endif /* __ASSEMBLY__ */
 
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-/*
- * DMA addresses may be very different from physical addresses
- * and pointers. i386 and powerpc may have 64 bit DMA on 32 bit
- * systems, while sparc64 uses 32 bit DMA addresses for 64 bit
- * physical addresses.
- * This default defines dma_addr_t to have the same size as
- * phys_addr_t, which is the most common way.
- * Do not define the dma64_addr_t type, which never really
- * worked.
- */
-#ifndef dma_addr_t
-#ifdef CONFIG_PHYS_ADDR_T_64BIT
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif /* CONFIG_PHYS_ADDR_T_64BIT */
-#endif /* dma_addr_t */
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_GENERIC_TYPES_H */
diff --git a/include/linux/types.h b/include/linux/types.h
index 01a082f..266f1d0 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -150,6 +150,12 @@ typedef unsigned long blkcnt_t;
 #define pgoff_t unsigned long
 #endif
 
+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
+typedef u64 dma_addr_t;
+#else
+typedef u32 dma_addr_t;
+#endif /* dma_addr_t */
+
 #endif /* __KERNEL__ */
 
 /*
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 21+ messages in thread

* Re: [PATCH -mm 8/8] add the common dma_addr_t typedef to include/linux/types.h
  2010-09-03  0:49 ` [PATCH -mm 8/8] add the common dma_addr_t typedef to include/linux/types.h FUJITA Tomonori
  2010-09-03  0:49   ` FUJITA Tomonori
@ 2010-09-03 12:19   ` Arnd Bergmann
  2010-09-03 12:19     ` Arnd Bergmann
  1 sibling, 1 reply; 21+ messages in thread
From: Arnd Bergmann @ 2010-09-03 12:19 UTC (permalink / raw)
  To: FUJITA Tomonori; +Cc: akpm, linux-arch, linux-kernel

On Friday 03 September 2010, FUJITA Tomonori wrote:
> All architectures can use the common dma_addr_t typedef now. We can
> remove the arch specific dma_addr_t.

Very nice!

> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> Cc: arnd@arndb.de

Acked-by: Arnd Bergmann <arnd@arndb.de>

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH -mm 8/8] add the common dma_addr_t typedef to include/linux/types.h
  2010-09-03 12:19   ` Arnd Bergmann
@ 2010-09-03 12:19     ` Arnd Bergmann
  0 siblings, 0 replies; 21+ messages in thread
From: Arnd Bergmann @ 2010-09-03 12:19 UTC (permalink / raw)
  To: FUJITA Tomonori; +Cc: akpm, linux-arch, linux-kernel

On Friday 03 September 2010, FUJITA Tomonori wrote:
> All architectures can use the common dma_addr_t typedef now. We can
> remove the arch specific dma_addr_t.

Very nice!

> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> Cc: arnd@arndb.de

Acked-by: Arnd Bergmann <arnd@arndb.de>

^ permalink raw reply	[flat|nested] 21+ messages in thread

[parent not found: <5uMrkKwSLHA.6664@exchange1.tad.internal.tilera.com>]

* Re: [PATCH -mm 7/8] tile: enable ARCH_DMA_ADDR_T_64BIT
       [not found] ` <5uMrkKwSLHA.6664@exchange1.tad.internal.tilera.com>
@ 2010-09-03  1:09   ` Chris Metcalf
  2010-09-03 12:31     ` Chris Metcalf
  0 siblings, 1 reply; 21+ messages in thread
From: Chris Metcalf @ 2010-09-03  1:09 UTC (permalink / raw)
  To: FUJITA Tomonori; +Cc: akpm, linux-arch, linux-kernel

On 9/2/2010 8:49 PM, FUJITA Tomonori wrote:
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> Cc: cmetcalf@tilera.com
> ---
>  arch/tile/Kconfig |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>

-- 
Chris Metcalf, Tilera Corp.
http://www.tilera.com

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH -mm 7/8] tile: enable ARCH_DMA_ADDR_T_64BIT
  2010-09-03  1:09   ` [PATCH -mm 7/8] tile: enable ARCH_DMA_ADDR_T_64BIT Chris Metcalf
@ 2010-09-03 12:31     ` Chris Metcalf
  0 siblings, 0 replies; 21+ messages in thread
From: Chris Metcalf @ 2010-09-03 12:31 UTC (permalink / raw)
  To: FUJITA Tomonori; +Cc: akpm, linux-arch, linux-kernel

 On 9/2/2010 9:09 PM, Chris Metcalf wrote:
> On 9/2/2010 8:49 PM, FUJITA Tomonori wrote:
>> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
>> Cc: cmetcalf@tilera.com
>> ---
>>  arch/tile/Kconfig |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
> Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>

Sorry, should have said

Acked-by: Chris Metcalf <cmetcalf@tilera.com>

I didn't mean to suggest I was taking the patch into my own patch queue.

-- 
Chris Metcalf, Tilera Corp.
http://www.tilera.com

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT)
  2010-09-03  0:51 [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) FUJITA Tomonori
                   ` (8 preceding siblings ...)
       [not found] ` <5uMrkKwSLHA.6664@exchange1.tad.internal.tilera.com>
@ 2010-09-03 22:09 ` Andrew Morton
  2010-09-04  6:58   ` FUJITA Tomonori
  9 siblings, 1 reply; 21+ messages in thread
From: Andrew Morton @ 2010-09-03 22:09 UTC (permalink / raw)
  To: FUJITA Tomonori; +Cc: davem, linux-kernel, linux-arch

On Fri, 3 Sep 2010 09:51:31 +0900
FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> wrote:

> There are about twenty architectures have the own dma_addr_t typedef
> because include/asm-generic/types.h can't be perfect (some of them can
> use it though):
> 
> #ifndef dma_addr_t
> #ifdef CONFIG_PHYS_ADDR_T_64BIT
> typedef u64 dma_addr_t;
> #else
> typedef u32 dma_addr_t;
> #endif /* CONFIG_PHYS_ADDR_T_64BIT */
> #endif /* dma_addr_t */
> 
> Another problem is that there is a way to determine if dma_addr_t is
> 64-bit. We see hopeless tricks like the following:
> 
> #if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
> 
> This clean up the mess with introducing CONFIG_ARCH_DMA_ADDR_T_64BIT
> define (like CONFIG_ARCH_PHYS_ADDR_T_64BIT).
> 
> If architecture needs 64bit dma_addr_t, it must enable
> CONFIG_ARCH_DMA_ADDR_T_64BIT.
> 
> The summary are:
> 
> - always 64bit
> -- alpha
> -- ia64
> -- tile
> 
> - conditionally 64bit
> -- x86
> -- mips
> -- powerpc
> -- s390
> 
> - always 32bit
> -- arm
> -- avr32
> -- cris
> -- frv
> -- h8300
> -- m32r
> -- m68k
> -- mn10300
> -- parisc
> -- xtensa
> -- sparc
> -- blackfin
> -- microblaze
> -- score
> -- sh

Am I correct in believing that we can merge the first seven patches
into arch trees at any time and, once they are all merged, patch 8/8
can then go into mainline?

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT)
  2010-09-03 22:09 ` [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) Andrew Morton
@ 2010-09-04  6:58   ` FUJITA Tomonori
  0 siblings, 0 replies; 21+ messages in thread
From: FUJITA Tomonori @ 2010-09-04  6:58 UTC (permalink / raw)
  To: akpm; +Cc: fujita.tomonori, davem, linux-kernel, linux-arch

On Fri, 3 Sep 2010 15:09:48 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:

> Am I correct in believing that we can merge the first seven patches
> into arch trees at any time and, once they are all merged, patch 8/8
> can then go into mainline?

Yes. The first seven patches simply introduce
ARCH_DMA_ADDR_T_64BIT. They don't affect the existing code.

Thanks,

^ permalink raw reply	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2010-09-22  9:19 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-03  0:51 [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) FUJITA Tomonori
2010-09-03  0:49 ` [PATCH -mm 1/8] x86: enable ARCH_DMA_ADDR_T_64BIT with X86_64 || HIGHMEM64G FUJITA Tomonori
2010-09-03  0:49 ` [PATCH -mm 2/8] alpha: enable ARCH_DMA_ADDR_T_64BIT FUJITA Tomonori
2010-09-03  0:49 ` [PATCH -mm 3/8] ia64: " FUJITA Tomonori
2010-09-03  0:49 ` [PATCH -mm 4/8] mips: enable ARCH_DMA_ADDR_T_64BIT with (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT FUJITA Tomonori
2010-09-03  0:49   ` FUJITA Tomonori
2010-09-20 13:34   ` Ralf Baechle
2010-09-22  9:18     ` FUJITA Tomonori
2010-09-03  0:49 ` [PATCH -mm 5/8] powerpc: enable ARCH_DMA_ADDR_T_64BIT with ARCH_PHYS_ADDR_T_64BIT FUJITA Tomonori
2010-09-03  0:49   ` FUJITA Tomonori
2010-09-03  0:49 ` [PATCH -mm 6/8] s390: enable ARCH_DMA_ADDR_T_64BIT with 64BIT FUJITA Tomonori
2010-09-03  0:49 ` [PATCH -mm 7/8] tile: enable ARCH_DMA_ADDR_T_64BIT FUJITA Tomonori
2010-09-03  0:49   ` FUJITA Tomonori
2010-09-03  0:49 ` [PATCH -mm 8/8] add the common dma_addr_t typedef to include/linux/types.h FUJITA Tomonori
2010-09-03  0:49   ` FUJITA Tomonori
2010-09-03 12:19   ` Arnd Bergmann
2010-09-03 12:19     ` Arnd Bergmann
     [not found] ` <5uMrkKwSLHA.6664@exchange1.tad.internal.tilera.com>
2010-09-03  1:09   ` [PATCH -mm 7/8] tile: enable ARCH_DMA_ADDR_T_64BIT Chris Metcalf
2010-09-03 12:31     ` Chris Metcalf
2010-09-03 22:09 ` [PATCH -mm 0/8] unify dma_addr_t typedef (CONFIG_ARCH_DMA_ADDR_T_64BIT) Andrew Morton
2010-09-04  6:58   ` FUJITA Tomonori

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).