svn commit: r197495 - in stable/8/sys: . amd64/include/xen
cddl/contrib/opensolaris contrib/dev/acpica contrib/pf
dev/ata dev/xen/xenpci
Alexander Motin
mav at FreeBSD.org
Fri Sep 25 18:07:24 UTC 2009
Author: mav
Date: Fri Sep 25 18:07:23 2009
New Revision: 197495
URL: http://svn.freebsd.org/changeset/base/197495
Log:
Remove constraint, requiring request data to fulfill controller's
alignment requirements. It is busdma task, to manage proper alignment by
loading data to bounce buffers.
PR: kern/127316
Reviewed by: current@
Tested by: Ryan Rogers
Approved by: re (kib)
Modified:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/ata/ata-dma.c
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/ata/ata-dma.c
==============================================================================
--- stable/8/sys/dev/ata/ata-dma.c Fri Sep 25 18:04:55 2009 (r197494)
+++ stable/8/sys/dev/ata/ata-dma.c Fri Sep 25 18:07:23 2009 (r197495)
@@ -272,10 +272,10 @@ ata_dmaload(struct ata_request *request,
"FAILURE - zero length DMA transfer attempted\n");
return EIO;
}
- if (((uintptr_t)(request->data) & (ch->dma.alignment - 1)) ||
- (request->bytecount & (ch->dma.alignment - 1))) {
+ if (request->bytecount & (ch->dma.alignment - 1)) {
device_printf(request->dev,
- "FAILURE - non aligned DMA transfer attempted\n");
+ "FAILURE - odd-sized DMA transfer attempt %d %% %d\n",
+ request->bytecount, ch->dma.alignment);
return EIO;
}
if (request->bytecount > ch->dma.max_iosize) {
More information about the svn-src-stable-8
mailing list