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, 22 Jan 2009
 07:43:57 -0800
Received: from dalesmta2-3.messageone.com ([129.41.169.249]) by
 mail.onstor.com with Microsoft SMTPSVC(6.0.3790.3959);	 Thu, 22 Jan 2009
 07:43:55 -0800
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])	by
 dalesmta2-3.messageone.com (8.13.8/8.13.8) with ESMTP id n0MFhsc2013338	for
 <andy.sharp@onstor.com>; Thu, 22 Jan 2009 09:43:54 -0600
Received: from localhost.localdomain ([127.0.0.1]:64173 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP	id S21103359AbZAVPmi
 (ORCPT <rfc822;andy.sharp@onstor.com>);	Thu, 22 Jan 2009 15:42:38 +0000
Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 22 Jan 2009 15:42:21
 +0000 (GMT)
Received: from mba.ocn.ne.jp ([122.1.235.107]:15080 "HELO smtp.mba.ocn.ne.jp")
	by ftp.linux-mips.org with SMTP id S21103349AbZAVPmR (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Thu, 22 Jan 2009 15:42:17 +0000
Received: from localhost.localdomain (p7001-ipad208funabasi.chiba.ocn.ne.jp
 [60.43.108.1])	by smtp.mba.ocn.ne.jp (Postfix) with ESMTP	id F20DDA857; Fri,
 23 Jan 2009 00:42:10 +0900 (JST)
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
CC: "ralf@linux-mips.org" <ralf@linux-mips.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Thu, 22 Jan 2009 07:42:11 -0800
Subject: [PATCH] Synchronize dma_map_page and dma_map_single
Thread-Topic: [PATCH] Synchronize dma_map_page and dma_map_single
Thread-Index: Acl8qDz1iuuOSyqOQ+qF8aabdDNvsg==
Message-ID: <1232638931-6203-1-git-send-email-anemo@mba.ocn.ne.jp>
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: 22 Jan 2009 15:43:55.0593 (UTC)
 FILETIME=[3BC5AB90:01C97CA8]
errors-to: linux-mips-bounce@linux-mips.org
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
x-ems-stamp: h1U1uNe9HfkJPFie3p9Vcg==
x-messageone-virus-version: vendor=fsecure
 engine=4.65.7400:2.4.4,1.2.40,4.0.164
 definitions=2009-01-22_13:2009-01-21,2009-01-22,2009-01-22 signatures=0
x-messageone-virus-scanned: Clean
x-messageone-envelope-sender: linux-mips-bounce@linux-mips.org
x-messageone-spam-details: rule=m773emszm_notspam policy=m773emszm score=0
 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam
 adjust=0 reason=mlx engine=3.1.0-0810130000 definitions=main-0901220095
x-messageone-spam-score: 0
x-messageone-spam-bar:
x-list: linux-mips
x-archive-position: 21796
x-ecartis-version: Ecartis v1.0.0
x-original-sender: anemo@mba.ocn.ne.jp
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Synchronize dma_map_page/dma_unmap_page and dma_map_single/dma_unmap_single=
.
This will reduce unnecessary writeback/invalidate.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
This patch depends on a patch titled "fix oops in dma_unmap_page on not
coherent mips platforms". by Jan Nikitenko.

http://www.linux-mips.org/cgi-bin/mesg.cgi?a=3Dlinux-mips&i=3D2008112807525=
8.GA10200%40nikitenko.systek.local

 arch/mips/mm/dma-default.c |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index bed56f1..96b0061 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -209,7 +209,7 @@ dma_addr_t dma_map_page(struct device *dev, struct page=
 *page,
 		unsigned long addr;
=20
 		addr =3D (unsigned long) page_address(page) + offset;
-		dma_cache_wback_inv(addr, size);
+		__dma_sync(addr, size, direction);
 	}
=20
 	return plat_map_dma_mem_page(dev, page) + offset;
@@ -220,16 +220,7 @@ EXPORT_SYMBOL(dma_map_page);
 void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t siz=
e,
 	enum dma_data_direction direction)
 {
-	BUG_ON(direction =3D=3D DMA_NONE);
-
-	if (!plat_device_is_coherent(dev) && direction !=3D DMA_TO_DEVICE) {
-		unsigned long addr;
-
-		addr =3D dma_addr_to_virt(dma_address);
-		dma_cache_wback_inv(addr, size);
-	}
-
-	plat_unmap_dma_mem(dev, dma_address);
+	dma_unmap_single(dev, dma_address, size, direction);
 }
=20
 EXPORT_SYMBOL(dma_unmap_page);
--=20
1.5.6.3


