From nobody Fri Dec 10 01:11:59 2021 X-Original-To: dev-commits-src-main@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 D98CD18D7891; Fri, 10 Dec 2021 01:11:59 +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 4J9CYC4fBqz4hPb; Fri, 10 Dec 2021 01:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7F8C0116BF; Fri, 10 Dec 2021 01:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BA1Bxv2050566; Fri, 10 Dec 2021 01:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA1BxEr050565; Fri, 10 Dec 2021 01:11:59 GMT (envelope-from git) Date: Fri, 10 Dec 2021 01:11:59 GMT Message-Id: <202112100111.1BA1BxEr050565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 5ae7518b7b97 - main - fxp: Remove unneeded Giant from bus_dma_tag_create(). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5ae7518b7b9711d54fdf3627dd052501bfab5407 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639098719; 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=7awnBD8UnCruOwsGW1J/4jW4R3BNXcN1wHTjLykJty4=; b=b2w/q5uBTF3gGbDJTBcaSTNDLyT94gBYOwBt8NwZruEtE7kjohrILanBKGKKCafH3GVW1M uWVbTwYaRP49hmY+BZU7QwhJabzEWxBkmlOvmK8ieIk4IiPfTyuQIdie32iLS9WnRS2UG+ U+YCAijcQk4+CQZHEvRE5MfhTixMaxHxSeTJvc1A0b2RoGtqaqnLug1MfxplfVvzRgjQSp v2YCDpKsM38QXPJqKDlOFv7VJAgZLiILA2WMTOX4yYEe9Pmny7sq9CyNp8TlN3Qu1te9ul gA895GpEZg78LHQWVhVP3RLghbSigwfTE94ndj7Gxk514oFchdT8GJvuwesxAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639098719; a=rsa-sha256; cv=none; b=NgGLpy2q7FCXf3o8Vxd50H4F1nAwVLEvb//KriBVIWqhBq1FMc8RRCwFa5/D8wOWtsCHBN Om4MNRSVYNKPXdVeYYQB22XSitdZpe43Pm/oBuvLhsDOvoL4BSiJnahBPg//02Z+lIcxY1 euzbjVWfRus4kZ3BnaeVVuvI3lAN5aZ4tIXGzfLmDT0Us6sG186Ux4bl7NAiKip01KRYL3 5s88JbOeVFhZiUi8kgFfiEC0XqH4z2davDWjMAX//cfoE2U88Piwsm4VjgOHXzp42xuYml bgPeSDfWfrfVw75Aw16MimMiaNXeIL6gBLa2Px4UNkiR8MJpIDFx50RaaHI/eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=5ae7518b7b9711d54fdf3627dd052501bfab5407 commit 5ae7518b7b9711d54fdf3627dd052501bfab5407 Author: Alexander Motin AuthorDate: 2021-12-10 01:09:48 +0000 Commit: Alexander Motin CommitDate: 2021-12-10 01:09:48 +0000 fxp: Remove unneeded Giant from bus_dma_tag_create(). All bus_dmamap_load() calls here use BUS_DMA_NOWAIT. MFC after: 2 weeks --- sys/dev/fxp/if_fxp.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index ae2f522ad44c..6def42343804 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -667,8 +667,7 @@ fxp_attach(device_t dev) error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sc->maxsegsize * sc->maxtxseg + sizeof(struct ether_vlan_header), - sc->maxtxseg, sc->maxsegsize, 0, - busdma_lock_mutex, &Giant, &sc->fxp_txmtag); + sc->maxtxseg, sc->maxsegsize, 0, NULL, NULL, &sc->fxp_txmtag); if (error) { device_printf(dev, "could not create TX DMA tag\n"); goto fail; @@ -676,8 +675,7 @@ fxp_attach(device_t dev) error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - MCLBYTES, 1, MCLBYTES, 0, - busdma_lock_mutex, &Giant, &sc->fxp_rxmtag); + MCLBYTES, 1, MCLBYTES, 0, NULL, NULL, &sc->fxp_rxmtag); if (error) { device_printf(dev, "could not create RX DMA tag\n"); goto fail; @@ -686,7 +684,7 @@ fxp_attach(device_t dev) error = bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sizeof(struct fxp_stats), 1, sizeof(struct fxp_stats), 0, - busdma_lock_mutex, &Giant, &sc->fxp_stag); + NULL, NULL, &sc->fxp_stag); if (error) { device_printf(dev, "could not create stats DMA tag\n"); goto fail; @@ -708,8 +706,7 @@ fxp_attach(device_t dev) error = bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - FXP_TXCB_SZ, 1, FXP_TXCB_SZ, 0, - busdma_lock_mutex, &Giant, &sc->cbl_tag); + FXP_TXCB_SZ, 1, FXP_TXCB_SZ, 0, NULL, NULL, &sc->cbl_tag); if (error) { device_printf(dev, "could not create TxCB DMA tag\n"); goto fail; @@ -733,7 +730,7 @@ fxp_attach(device_t dev) error = bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sizeof(struct fxp_cb_mcs), 1, sizeof(struct fxp_cb_mcs), 0, - busdma_lock_mutex, &Giant, &sc->mcs_tag); + NULL, NULL, &sc->mcs_tag); if (error) { device_printf(dev, "could not create multicast setup DMA tag\n");