From nobody Fri Jan 19 17:17:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TGmX70h3Gz56xP2; Fri, 19 Jan 2024 17:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TGmX65trcz4MnJ; Fri, 19 Jan 2024 17:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705684662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bWnB6M7NJmSLG/81HXw2tgu39Se2Eh9tnrguP5DVeqU=; b=WQOYskRF3h0ydx4ueqkQ7W1ZMGcQeiGKUYlOnKQYjebw0P7N8EWbN4r4nBSIe497k7L0Zv uKh/ZywXE9HNcPwsXmGinW4VB6RVkO1SGF7/yFlzkg+ir2RgBRpt8ZBoh4lxq+jWciqdiL 3PuItETIHNiQrM+4niJufhXxyp9in5k5sk9fsu1haaftjLG8C1zP2oLUsFBTblVfObTk2K pa4bvCXLxVLcw4Sj4OQUX3kefJfG4tvnWM/TFRMQ7nrDblvLyhY/Wpf7ZOTvK98R45EFNQ 8IPeoxPiXNgu1SdMeaMH6eiYcpqbh9U54yBMblHDhJA6L2tUb6FsAXN62C/MMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705684662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bWnB6M7NJmSLG/81HXw2tgu39Se2Eh9tnrguP5DVeqU=; b=MW3i1MUH0thZc2jlhtvjEYBDVCCEAGz1pxFSYXzJ+ENdkVWOjHlfqjpQsDv0C2dNM0bq39 TMrLJqaT81ICHyEr+HdS0me6h63f3UyAnLq0K9mdt4URztgSGj0bT7zY+6SgHfLwpOjVsu zYutdURGmq06BU6LvjPehR2lZXO38nVzTzDzmkWEmaumCvvGsx+c6VNjzejKYCUOOKlYxM Jk+UP0ZrIQa74b2guB9VNpmYWseU4ylGZ+Imxm3QQq7LcmXbIJgT3x2uS15YG+s7kvrsgI EKCmR145ZuavBPSArCCxa6cLM42kp1Tg64osgxopXu2VooOexwmLDYzaTNUkpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705684662; a=rsa-sha256; cv=none; b=sgQJzl44ry1Dkqx/+QmtSS9se2DimwBy9nImHLy4Wc6BIYwQBardDESnnwiT8mz6ej5Nwv e25OQN+7uv3v522DhskZ8/jt6+Wzupe1V+wBoM5setj/R6Q+IEAzGB5tXOmFKSMiu6Is1h MawFtaq6XuJKYJhFZuph1A+jBqcZ/Noy2Tr0c3J+MLN1olJLOBdOlokkECXNtrRvcpI6H+ Fj1Uv4cy3XfOQHRPJt/bPJXY7uKjpRzFaSDs7X8R4UDQaY2jXnSA49xlSSXKPauEuR7DSP XuVg4upzIsU+fb6/1aepIjQL+DZEeIZQRhi9nfHmCFFW+Woj+jN1xrHJWVcxsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TGmX64zqJz10v0; Fri, 19 Jan 2024 17:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40JHHg1r097340; Fri, 19 Jan 2024 17:17:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JHHgXK097337; Fri, 19 Jan 2024 17:17:42 GMT (envelope-from git) Date: Fri, 19 Jan 2024 17:17:42 GMT Message-Id: <202401191717.40JHHgXK097337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 23a5782dc0c0 - stable/14 - mpi3mr: Use template for main busdma tag. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 23a5782dc0c0064c2e5693193caeb0dbf67cd718 Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=23a5782dc0c0064c2e5693193caeb0dbf67cd718 commit 23a5782dc0c0064c2e5693193caeb0dbf67cd718 Author: Alexander Motin AuthorDate: 2023-11-29 01:50:39 +0000 Commit: Alexander Motin CommitDate: 2024-01-19 17:16:50 +0000 mpi3mr: Use template for main busdma tag. Use the simpler template code for the parent busdma tag for all I/O to this card. Reviewed by: mav, jhb, imp Differential Revision: https://reviews.freebsd.org/D42607 (cherry picked from commit 489eee0d41dce317678adb0dae8d509a5f1d6d93) --- sys/dev/mpi3mr/mpi3mr_pci.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index d07463366943..c1c0211aab4e 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -256,6 +256,7 @@ mpi3mr_release_resources(struct mpi3mr_softc *sc) static int mpi3mr_setup_resources(struct mpi3mr_softc *sc) { + bus_dma_template_t t; int i; device_t dev = sc->mpi3mr_dev; @@ -288,20 +289,11 @@ static int mpi3mr_setup_resources(struct mpi3mr_softc *sc) * dma_mask on the device. */ /* Allocate the parent DMA tag */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ - 1, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - BUS_SPACE_MAXSIZE_32BIT,/* maxsize */ - BUS_SPACE_UNRESTRICTED, /* nsegments */ - BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */ - 0, /* flags */ - NULL, NULL, /* lockfunc, lockarg */ - &sc->mpi3mr_parent_dmat)) { + bus_dma_template_init(&t, bus_get_dma_tag(dev)); + if (bus_dma_template_tag(&t, &sc->mpi3mr_parent_dmat)) { mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate parent DMA tag\n"); return (ENOMEM); - } + } sc->max_msix_vectors = pci_msix_count(dev);