svn commit: r276268 - in stable/10/sys/dev: ahci ida

[Ian Lepore]

Author: ian
Date: Fri Dec 26 22:56:02 2014
New Revision: 276268
URL: https://svnweb.freebsd.org/changeset/base/276268

Log:
  MFC r274188, r274189:
   DMA tag alignment should be 1 (not 0) when a device can dma at any address.

Modified:
  stable/10/sys/dev/ahci/ahci.c
  stable/10/sys/dev/ida/ida_eisa.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/ahci/ahci.c
==============================================================================
--- stable/10/sys/dev/ahci/ahci.c	Fri Dec 26 22:52:44 2014	(r276267)
+++ stable/10/sys/dev/ahci/ahci.c	Fri Dec 26 22:56:02 2014	(r276268)
@@ -529,7 +529,7 @@ ahci_attach(device_t dev)
 	ctlr->emloc = ATA_INL(ctlr->r_mem, AHCI_EM_LOC);
 
 	/* Create controller-wide DMA tag. */
-	if (bus_dma_tag_create(bus_get_dma_tag(dev), 0, 0,
+	if (bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0,
 	    (ctlr->caps & AHCI_CAP_64BIT) ? BUS_SPACE_MAXADDR :
 	    BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
 	    BUS_SPACE_MAXSIZE, BUS_SPACE_UNRESTRICTED, BUS_SPACE_MAXSIZE,

Modified: stable/10/sys/dev/ida/ida_eisa.c
==============================================================================
--- stable/10/sys/dev/ida/ida_eisa.c	Fri Dec 26 22:52:44 2014	(r276267)
+++ stable/10/sys/dev/ida/ida_eisa.c	Fri Dec 26 22:56:02 2014	(r276268)
@@ -296,7 +296,7 @@ ida_eisa_attach(device_t dev)
 
 	error = bus_dma_tag_create(
 		/* parent	*/	bus_get_dma_tag(dev),
-		/* alignment	*/	0,
+		/* alignment	*/	1,
 		/* boundary	*/	0,
 		/* lowaddr	*/	BUS_SPACE_MAXADDR_32BIT,
 		/* highaddr	*/	BUS_SPACE_MAXADDR,