From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Mon, 29 Dec 2008 19:27:28 +0000 (+0100)
Subject: tx4939ide: Do not use zero count PRD entry
X-Git-Tag: v2.6.29-rc1~561^2~32
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a0fce792b55b260589c3d77293a224e84395ec07;p=linux-2.6-omap-h63xx.git

tx4939ide: Do not use zero count PRD entry

This fixes data corruption on some heavy load.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: stable <stable@kernel.org>
Cc: sshtylyov@ru.mvista.com
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index bafb7d1a22e..30d0d256230 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -259,6 +259,12 @@ static int tx4939ide_build_dmatable(ide_drive_t *drive, struct request *rq)
 			bcount = 0x10000 - (cur_addr & 0xffff);
 			if (bcount > cur_len)
 				bcount = cur_len;
+			/*
+			 * This workaround for zero count seems required.
+			 * (standard ide_build_dmatable do it too)
+			 */
+			if ((bcount & 0xffff) == 0x0000)
+				bcount = 0x8000;
 			*table++ = bcount & 0xffff;
 			*table++ = cur_addr;
 			cur_addr += bcount;