The patch titled
libata-sff: fix 32-bit PIO regression
has been added to the -mm tree. Its filename is
libata-sff-fix-32-bit-pio-regression.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: libata-sff: fix 32-bit PIO regression
From: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Commit 871af1210f13966ab911ed2166e4ab2ce775b99d ("libata: Add 32bit PIO
support") caused all kind of errors on the ATAPI devices, so it's been
empirically proven that one shouldn't read/write an extra data word when a
device isn't expecting it already. "Don't do it then"; however still
taking a chance to use 32-bit I/O one last time when there are exactly 3
trailing bytes. Oh, and stop pointless swapping bytes to and fro as well
by using io*_rep() which shouldn't byte-swap.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=12609
akpm: needs signoff
akpm: awaiting a commented update, "along with the patch cleaning up
the corresponding fragment of the 16-bit I/O method."
Reported-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Mikael Pettersson <mikpe@xxxxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ata/libata-sff.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff -puN drivers/ata/libata-sff.c~libata-sff-fix-32-bit-pio-regression drivers/ata/libata-sff.c
--- a/drivers/ata/libata-sff.c~libata-sff-fix-32-bit-pio-regression
+++ a/drivers/ata/libata-sff.c
@@ -773,18 +773,27 @@ unsigned int ata_sff_data_xfer32(struct
else
iowrite32_rep(data_addr, buf, words);
+ /* Transfer trailing bytes, if any */
if (unlikely(slop)) {
- __le32 pad;
+ unsigned char pad[4];
+
+ /* Point buf to the tail of buffer */
+ buf += buflen - slop;
if (rw == READ) {
- pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
- memcpy(buf + buflen - slop, &pad, slop);
+ if (slop < 3)
+ ioread16_rep(data_addr, pad, 1);
+ else
+ ioread32_rep(data_addr, pad, 1);
+ memcpy(buf, pad, slop);
} else {
- memcpy(&pad, buf + buflen - slop, slop);
- iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
+ memcpy(pad, buf, slop);
+ if (slop < 3)
+ iowrite16_rep(data_addr, pad, 1);
+ else
+ iowrite32_rep(data_addr, pad, 1);
}
- words++;
}
- return words << 2;
+ return (buflen + 1) & ~1;
}
EXPORT_SYMBOL_GPL(ata_sff_data_xfer32);
_
Patches currently in -mm which might be from sshtylyov@xxxxxxxxxxxxx are
linux-next.patch
libata-sff-fix-32-bit-pio-regression.patch
3x59x-fix-pci-resource-management.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
