From owner-svn-src-all@FreeBSD.ORG Fri Dec 26 22:56:04 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1721BA8A; Fri, 26 Dec 2014 22:56:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01F9764D7D; Fri, 26 Dec 2014 22:56:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBQMu3Mc077628; Fri, 26 Dec 2014 22:56:03 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBQMu3CG077626; Fri, 26 Dec 2014 22:56:03 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201412262256.sBQMu3CG077626@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Fri, 26 Dec 2014 22:56:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r276268 - in stable/10/sys/dev: ahci ida X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Dec 2014 22:56:04 -0000 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,