git: 5ae7518b7b97 - main - fxp: Remove unneeded Giant from bus_dma_tag_create().
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 10 Dec 2021 01:11:59 UTC
The branch main has been updated by mav:
URL: https://cgit.FreeBSD.org/src/commit/?id=5ae7518b7b9711d54fdf3627dd052501bfab5407
commit 5ae7518b7b9711d54fdf3627dd052501bfab5407
Author: Alexander Motin <mav@FreeBSD.org>
AuthorDate: 2021-12-10 01:09:48 +0000
Commit: Alexander Motin <mav@FreeBSD.org>
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");