From owner-svn-src-all@freebsd.org Sat Dec 16 04:35:38 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89822E9CC46; Sat, 16 Dec 2017 04:35:38 +0000 (UTC) (envelope-from landonf@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 4B58B76BE8; Sat, 16 Dec 2017 04:35:38 +0000 (UTC) (envelope-from landonf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBG4Zbce078601; Sat, 16 Dec 2017 04:35:37 GMT (envelope-from landonf@FreeBSD.org) Received: (from landonf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBG4ZbDB078599; Sat, 16 Dec 2017 04:35:37 GMT (envelope-from landonf@FreeBSD.org) Message-Id: <201712160435.vBG4ZbDB078599@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: landonf set sender to landonf@FreeBSD.org using -f From: "Landon J. Fuller" Date: Sat, 16 Dec 2017 04:35:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326893 - head/sys/dev/bhnd/bhndb X-SVN-Group: head X-SVN-Commit-Author: landonf X-SVN-Commit-Paths: head/sys/dev/bhnd/bhndb X-SVN-Commit-Revision: 326893 X-SVN-Commit-Repository: base 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.25 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: Sat, 16 Dec 2017 04:35:38 -0000 Author: landonf Date: Sat Dec 16 04:35:37 2017 New Revision: 326893 URL: https://svnweb.freebsd.org/changeset/base/326893 Log: bhndb(4): Enable addrext support on DMA64 devices, and fix an incorrect DMA DMA boundary constraint applied in bhndb_dma_tag_create(). Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.c head/sys/dev/bhnd/bhndb/bhndb_subr.c Modified: head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.c ============================================================================== --- head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.c Sat Dec 16 00:47:45 2017 (r326892) +++ head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.c Sat Dec 16 04:35:37 2017 (r326893) @@ -511,7 +511,7 @@ static const struct bhndb_hwcfg bhndb_pci_hwcfg_v1_pci { .base_addr = BHND_PCIE_DMA64_TRANSLATION, .addr_mask = ~BHND_PCIE_DMA64_MASK, - .addrext_mask = 0 + .addrext_mask = BHND_PCIE_DMA64_MASK }, BHND_DMA_TRANSLATION_TABLE_END } @@ -594,7 +594,7 @@ static const struct bhndb_hwcfg bhndb_pci_hwcfg_v2 = { { .base_addr = BHND_PCIE_DMA64_TRANSLATION, .addr_mask = ~BHND_PCIE_DMA64_MASK, - .addrext_mask = 0 + .addrext_mask = BHND_PCIE_DMA64_MASK }, BHND_DMA_TRANSLATION_TABLE_END } @@ -672,7 +672,7 @@ static const struct bhndb_hwcfg bhndb_pci_hwcfg_v3 = { { .base_addr = BHND_PCIE2_DMA64_TRANSLATION, .addr_mask = ~BHND_PCIE2_DMA64_MASK, - .addrext_mask = 0 + .addrext_mask = BHND_PCIE_DMA64_MASK }, BHND_DMA_TRANSLATION_TABLE_END } Modified: head/sys/dev/bhnd/bhndb/bhndb_subr.c ============================================================================== --- head/sys/dev/bhnd/bhndb/bhndb_subr.c Sat Dec 16 00:47:45 2017 (r326892) +++ head/sys/dev/bhnd/bhndb/bhndb_subr.c Sat Dec 16 04:35:37 2017 (r326893) @@ -521,12 +521,12 @@ bhndb_dma_tag_create(device_t dev, bus_dma_tag_t paren { bus_dma_tag_t translation_tag; bhnd_addr_t dt_mask; - bus_addr_t boundary; bus_addr_t lowaddr, highaddr; + bus_size_t maxsegsz; int error; highaddr = BUS_SPACE_MAXADDR; - boundary = 0; + maxsegsz = BUS_SPACE_MAXSIZE; /* Determine full addressable mask */ dt_mask = (translation->addr_mask | translation->addrext_mask); @@ -536,19 +536,17 @@ bhndb_dma_tag_create(device_t dev, bus_dma_tag_t paren /* (addr_mask|addrext_mask) is our maximum supported address */ lowaddr = MIN(dt_mask, BUS_SPACE_MAXADDR); - /* Do we need to to avoid crossing a DMA translation window boundary? */ - if (translation->addr_mask < BUS_SPACE_MAXADDR) { - /* round down to nearest power of two */ - boundary = translation->addr_mask & (~1ULL); - } + /* Constrain to translation window size */ + if (translation->addr_mask < maxsegsz) + maxsegsz = translation->addr_mask; /* Create our DMA tag */ error = bus_dma_tag_create(parent_dmat, - 1, /* alignment */ - boundary, lowaddr, highaddr, + 1, 0, /* alignment, boundary */ + lowaddr, highaddr, NULL, NULL, /* filter, filterarg */ BUS_SPACE_MAXSIZE, 0, /* maxsize, nsegments */ - BUS_SPACE_MAXSIZE, 0, /* maxsegsize, flags */ + maxsegsz, 0, /* maxsegsize, flags */ NULL, NULL, /* lockfunc, lockarg */ &translation_tag); if (error) {