From nobody Fri Dec 24 01:03:15 2021
X-Original-To: dev-commits-src-branches@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 8549A190B1A7;
Fri, 24 Dec 2021 01:03:15 +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 4JKphg1nBRz58x4;
Fri, 24 Dec 2021 01:03:15 +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 1D0201AEC5;
Fri, 24 Dec 2021 01:03:15 +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 1BO13FcE017596;
Fri, 24 Dec 2021 01:03:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BO13FKD017595;
Fri, 24 Dec 2021 01:03:15 GMT
(envelope-from git)
Date: Fri, 24 Dec 2021 01:03:15 GMT
Message-Id: <202112240103.1BO13FKD017595@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Motin <mav@FreeBSD.org>
Subject: git: c5794c708c7f - stable/13 - fxp: Remove unneeded Giant from bus_dma_tag_create().
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@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/13
X-Git-Reftype: branch
X-Git-Commit: c5794c708c7f51f793aa1c4d07ca1055eab357e5
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1640307795;
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=7JWnO5mNjjhX2wcqnJBIlwneBgAOnI0VqX7qq6rMjjs=;
b=x40vdEf4UuWH/3DO2aDPhTf3abh4DOkP1+VbqBVu+fx4Ewbo/jeQOARBdk0XqBTc5NbIUG
AOrQ9Dr4RASwCUhbJ+HsgaQB4vm6tBRC+AajCVCtjkSoYxhRIhNxY1iVLbaIbl1PAMtNvD
kh70jvKhkwQpaHmZhSkpVrb8rgZhLDFS0xQI9e8le3ruG+dHu0WVT3QcYc0r5LgwpEDqMj
FUo6ZBZA+c/ZeUk0OjGfRZ+3cvalWYUlWfjwRV3XZStdM+CY9R8U2SvD0UQISb5I+1Z5VK
qFOb+WYilPsneJypvIHB5J+g+5MAuxKxvE8yqqzCD3udqEY2MF+yKKZIuRu61Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640307795; a=rsa-sha256; cv=none;
b=O7MgEXIacMWn+9xq13mp4U/cAbzH7eAE3ThBKV39OdZB0Kns4LfnsAV8TAkbgdSXzLpAwu
RYOr0odLHbM8OJhJaIhD8hvoD3ilFB7/L2MojdH2ch1ryvD4ljDTHxzdHsQsQdrsg4KvQU
U1j34zOJikEFW2FYuV/pkV0LaV8gLfFNammS+1cMChiheWwpw4Svv1ZtkNwepIXg5ILi0K
8bRrQpWTVE08qSXPRiwO51aouF5hY5Nb22o3Xz1dPOpAo5F1cCXrDw2ivAHIe0eZqj4zi/
xGiBW+4FNGqLb5WQvEJJ+/ZohoMRlfeqEYa+gafo2DR63NK8Y8PfpT1AvO6LxA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mav:
URL: https://cgit.FreeBSD.org/src/commit/?id=c5794c708c7f51f793aa1c4d07ca1055eab357e5
commit c5794c708c7f51f793aa1c4d07ca1055eab357e5
Author: Alexander Motin <mav@FreeBSD.org>
AuthorDate: 2021-12-10 01:09:48 +0000
Commit: Alexander Motin <mav@FreeBSD.org>
CommitDate: 2021-12-24 01:03:05 +0000
fxp: Remove unneeded Giant from bus_dma_tag_create().
All bus_dmamap_load() calls here use BUS_DMA_NOWAIT.
MFC after: 2 weeks
(cherry picked from commit 5ae7518b7b9711d54fdf3627dd052501bfab5407)
---
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 d89d19632a9a..800a6ffdedb1 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");