From owner-svn-src-all@FreeBSD.ORG Fri Mar 30 17:38:58 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B4F9106566C; Fri, 30 Mar 2012 17:38:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E05478FC1A; Fri, 30 Mar 2012 17:38:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2UHcvMO051455; Fri, 30 Mar 2012 17:38:57 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2UHcvqo051452; Fri, 30 Mar 2012 17:38:57 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201203301738.q2UHcvqo051452@svn.freebsd.org> From: John Baldwin Date: Fri, 30 Mar 2012 17:38:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233706 - in stable/8/sys: dev/twa i386/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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, 30 Mar 2012 17:38:58 -0000 Author: jhb Date: Fri Mar 30 17:38:57 2012 New Revision: 233706 URL: http://svn.freebsd.org/changeset/base/233706 Log: MFC 232669: Use bus_get_dma_tag() to inherit the 4G boundary restriction from the parent PCI bus and remove the home-grown version in this driver. Modified: stable/8/sys/dev/twa/tw_osl.h stable/8/sys/dev/twa/tw_osl_freebsd.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/boot/ (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/e1000/ (props changed) stable/8/sys/i386/conf/XENHVM (props changed) Modified: stable/8/sys/dev/twa/tw_osl.h ============================================================================== --- stable/8/sys/dev/twa/tw_osl.h Fri Mar 30 17:38:28 2012 (r233705) +++ stable/8/sys/dev/twa/tw_osl.h Fri Mar 30 17:38:57 2012 (r233706) @@ -55,12 +55,6 @@ #define TW_OSLI_MAX_NUM_IOS (TW_OSLI_MAX_NUM_REQUESTS - 2) #define TW_OSLI_MAX_NUM_AENS 0x100 -#ifdef PAE -#define TW_OSLI_DMA_BOUNDARY (1u << 31) -#else -#define TW_OSLI_DMA_BOUNDARY ((bus_size_t)((uint64_t)1 << 32)) -#endif - /* Possible values of req->state. */ #define TW_OSLI_REQ_STATE_INIT 0x0 /* being initialized */ #define TW_OSLI_REQ_STATE_BUSY 0x1 /* submitted to CL */ Modified: stable/8/sys/dev/twa/tw_osl_freebsd.c ============================================================================== --- stable/8/sys/dev/twa/tw_osl_freebsd.c Fri Mar 30 17:38:28 2012 (r233705) +++ stable/8/sys/dev/twa/tw_osl_freebsd.c Fri Mar 30 17:38:57 2012 (r233706) @@ -562,9 +562,9 @@ tw_osli_alloc_mem(struct twa_softc *sc) } /* Create the parent dma tag. */ - if (bus_dma_tag_create(NULL, /* parent */ + if (bus_dma_tag_create(bus_get_dma_tag(sc->bus_dev), /* parent */ sc->alignment, /* alignment */ - TW_OSLI_DMA_BOUNDARY, /* boundary */ + 0, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */