Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Thu, 23 Apr 2009
 18:41:40 -0700
Received: from psmtp.com ([64.18.0.51]) by mail.onstor.com with Microsoft
 SMTPSVC(6.0.3790.3959);	 Thu, 23 Apr 2009 18:41:35 -0700
Received: from source ([213.58.128.207]) by exprod5mx255.postini.com
 ([64.18.4.11]) with SMTP;	Thu, 23 Apr 2009 21:41:34 EDT
Received: from localhost.localdomain ([127.0.0.1]:59266 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP	id S20021949AbZDXBlX
 (ORCPT <rfc822;andy.sharp@onstor.com>);	Fri, 24 Apr 2009 02:41:23 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 24 Apr 2009 02:41:06
 +0100 (BST)
Received: from [65.98.92.6] ([65.98.92.6]:17672 "EHLO b32.net")	by
 ftp.linux-mips.org with ESMTP id S20021956AbZDXBk5 (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Fri, 24 Apr 2009 02:40:57 +0100
Received: (qmail 22954 invoked from network); 24 Apr 2009 01:40:55 -0000
Received: from softdnserror (HELO two) (127.0.0.1)  by softdnserror with SMTP;
 24 Apr 2009 01:40:55 -0000
Received: by two (sSMTP sendmail emulation); Thu, 23 Apr 2009 18:40:14 -0700
From: Kevin Cernekee <cernekee@gmail.com>
To: "ralf@linux-mips.org" <ralf@linux-mips.org>
CC: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Thu, 23 Apr 2009 17:03:43 -0700
Subject: [PATCH 1/3] MIPS: Add size and direction arguments to
 plat_unmap_dma_mem()
Thread-Topic: [PATCH 1/3] MIPS: Add size and direction arguments to
 plat_unmap_dma_mem()
Thread-Index: AcnEfdDaGqAZfhXVRYaoR3LL2YNmUw==
Message-ID:
 <0483452db22e72f57289e63fcf097120d94c2a73.1240533480.git@localhost>
References:
 <0483452db22e72f57289e63fcf097120d94c2a37.1240533480.git@localhost>
In-Reply-To:
 <0483452db22e72f57289e63fcf097120d94c2a37.1240533480.git@localhost>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 24 Apr 2009 01:41:35.0072 (UTC)
 FILETIME=[CD472E00:01C9C47D]
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:99.00932/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-neptune: 0/0/0.00/0
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
x-ems-stamp: fvN9kSIcdgD+YwBuPEyKVg==
x-list: linux-mips
x-archive-position: 22451
x-ecartis-version: Ecartis v1.0.0
x-original-sender: cernekee@gmail.com
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
---
 .../include/asm/mach-cavium-octeon/dma-coherence.h |    3 ++-
 arch/mips/include/asm/mach-generic/dma-coherence.h |    3 ++-
 arch/mips/include/asm/mach-ip27/dma-coherence.h    |    3 ++-
 arch/mips/include/asm/mach-ip32/dma-coherence.h    |    3 ++-
 arch/mips/include/asm/mach-jazz/dma-coherence.h    |    3 ++-
 arch/mips/include/asm/mach-lemote/dma-coherence.h  |    3 ++-
 arch/mips/mm/dma-default.c                         |    8 ++++----
 7 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h b/arc=
h/mips/include/asm/mach-cavium-octeon/dma-coherence.h
index f30fce9..7289e67 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
@@ -35,7 +35,8 @@ static inline unsigned long plat_dma_addr_to_phys(dma_add=
r_t dma_addr)
 	return dma_addr;
 }
=20
-static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_a=
ddr)
+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_a=
ddr,
+	size_t size, enum dma_data_direction direction)
 {
 	octeon_unmap_dma_mem(dev, dma_addr);
 }
diff --git a/arch/mips/include/asm/mach-generic/dma-coherence.h b/arch/mips=
/include/asm/mach-generic/dma-coherence.h
index 36c611b..804c2de 100644
--- a/arch/mips/include/asm/mach-generic/dma-coherence.h
+++ b/arch/mips/include/asm/mach-generic/dma-coherence.h
@@ -28,7 +28,8 @@ static inline unsigned long plat_dma_addr_to_phys(dma_add=
r_t dma_addr)
 	return dma_addr;
 }
=20
-static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_a=
ddr)
+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_a=
ddr,
+	size_t size, enum dma_data_direction direction)
 {
 }
=20
diff --git a/arch/mips/include/asm/mach-ip27/dma-coherence.h b/arch/mips/in=
clude/asm/mach-ip27/dma-coherence.h
index 4c21bfc..8676673 100644
--- a/arch/mips/include/asm/mach-ip27/dma-coherence.h
+++ b/arch/mips/include/asm/mach-ip27/dma-coherence.h
@@ -38,7 +38,8 @@ static unsigned long plat_dma_addr_to_phys(dma_addr_t dma=
_addr)
 	return dma_addr & ~(0xffUL << 56);
 }
=20
-static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_a=
ddr)
+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_a=
ddr,
+	size_t size, enum dma_data_direction direction)
 {
 }
=20
diff --git a/arch/mips/include/asm/mach-ip32/dma-coherence.h b/arch/mips/in=
clude/asm/mach-ip32/dma-coherence.h
index 7ae40f4..d41805e 100644
--- a/arch/mips/include/asm/mach-ip32/dma-coherence.h
+++ b/arch/mips/include/asm/mach-ip32/dma-coherence.h
@@ -60,7 +60,8 @@ static unsigned long plat_dma_addr_to_phys(dma_addr_t dma=
_addr)
 	return addr;
 }
=20
-static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_a=
ddr)
+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_a=
ddr,
+	size_t size, enum dma_data_direction direction)
 {
 }
=20
diff --git a/arch/mips/include/asm/mach-jazz/dma-coherence.h b/arch/mips/in=
clude/asm/mach-jazz/dma-coherence.h
index 1c7cd27..5f3d7ea 100644
--- a/arch/mips/include/asm/mach-jazz/dma-coherence.h
+++ b/arch/mips/include/asm/mach-jazz/dma-coherence.h
@@ -27,7 +27,8 @@ static unsigned long plat_dma_addr_to_phys(dma_addr_t dma=
_addr)
 	return vdma_log2phys(dma_addr);
 }
=20
-static void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr)
+static void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr,
+	size_t size, enum dma_data_direction direction)
 {
 	vdma_free(dma_addr);
 }
diff --git a/arch/mips/include/asm/mach-lemote/dma-coherence.h b/arch/mips/=
include/asm/mach-lemote/dma-coherence.h
index 38fad7d..c78f1d8 100644
--- a/arch/mips/include/asm/mach-lemote/dma-coherence.h
+++ b/arch/mips/include/asm/mach-lemote/dma-coherence.h
@@ -30,7 +30,8 @@ static inline unsigned long plat_dma_addr_to_phys(dma_add=
r_t dma_addr)
 	return dma_addr & 0x7fffffff;
 }
=20
-static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_a=
ddr)
+static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_a=
ddr,
+	size_t size, enum dma_data_direction direction)
 {
 }
=20
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 4fdb7f5..30b108c 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -111,7 +111,7 @@ EXPORT_SYMBOL(dma_alloc_coherent);
 void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr,
 	dma_addr_t dma_handle)
 {
-	plat_unmap_dma_mem(dev, dma_handle);
+	plat_unmap_dma_mem(dev, dma_handle, size, DMA_BIDIRECTIONAL);
 	free_pages((unsigned long) vaddr, get_order(size));
 }
=20
@@ -122,7 +122,7 @@ void dma_free_coherent(struct device *dev, size_t size,=
 void *vaddr,
 {
 	unsigned long addr =3D (unsigned long) vaddr;
=20
-	plat_unmap_dma_mem(dev, dma_handle);
+	plat_unmap_dma_mem(dev, dma_handle, size, DMA_BIDIRECTIONAL);
=20
 	if (!plat_device_is_coherent(dev))
 		addr =3D CAC_ADDR(addr);
@@ -173,7 +173,7 @@ void dma_unmap_single(struct device *dev, dma_addr_t dm=
a_addr, size_t size,
 		__dma_sync(dma_addr_to_virt(dma_addr), size,
 		           direction);
=20
-	plat_unmap_dma_mem(dev, dma_addr);
+	plat_unmap_dma_mem(dev, dma_addr, size, direction);
 }
=20
 EXPORT_SYMBOL(dma_unmap_single);
@@ -232,7 +232,7 @@ void dma_unmap_sg(struct device *dev, struct scatterlis=
t *sg, int nhwentries,
 			if (addr)
 				__dma_sync(addr, sg->length, direction);
 		}
-		plat_unmap_dma_mem(dev, sg->dma_address);
+		plat_unmap_dma_mem(dev, sg->dma_address, sg->length, direction);
 	}
 }
=20
--=20
1.5.3.6


