[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130510184711.32151.70337.stgit@linux-yegoshin>
Date: Fri, 10 May 2013 11:47:11 -0700
From: Leonid Yegoshin <Leonid.Yegoshin@...tec.com>
To: <linux-ide@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC: <davem@...emloft.net>
Subject: [PATCH] IDE: bugfix of IDE PIO size calculation
IDE PIO calculates size wrong.
Proven by test on MIPS Malta platform with multiple CPU types
with bootparam flag "ide-core.nodma=0.0".
It is still needed to test non-DMA IO.
Change-Id: Id82c2bc5965d85960846db53d84846d9a05d75a3
Author: Leonid Yegoshin <yegoshin@...s.com>
Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@...tec.com>
(imported from commit 43cee988ce0aa8d2ca1eec014d25f014e95eefe6)
(imported from commit d74805b8b12cada05df811e112eb7e3ec197d565)
---
drivers/ide/ide-taskfile.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 729428e..dabb88b 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -239,9 +239,6 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
unsigned nr_bytes = min(len, cursg->length - cmd->cursg_ofs);
int page_is_high;
- if (nr_bytes > PAGE_SIZE)
- nr_bytes = PAGE_SIZE;
-
page = sg_page(cursg);
offset = cursg->offset + cmd->cursg_ofs;
@@ -249,6 +246,8 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
page = nth_page(page, (offset >> PAGE_SHIFT));
offset %= PAGE_SIZE;
+ nr_bytes = min_t(unsigned, nr_bytes, (PAGE_SIZE - offset));
+
page_is_high = PageHighMem(page);
if (page_is_high)
local_irq_save(flags);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists