diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2020-11-08 00:45:48 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2020-11-08 00:45:48 +0000 |
| commit | e0e08c9865c665b595e7e3304c3c6d43d6e1bd7b (patch) | |
| tree | 63053093de56343204b6d5f4649ee991b59eb716 /sys/dev | |
| parent | ecaeb5829dbe69c4ed6de504ebaf445c33a05cf0 (diff) | |
Check that DMA memory has been allocated for the rings and the BM. While
there remove a memset that's already been done by the allocator.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/fdt/if_mvpp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/fdt/if_mvpp.c b/sys/dev/fdt/if_mvpp.c index 3771660c0f2..83c0fef92b9 100644 --- a/sys/dev/fdt/if_mvpp.c +++ b/sys/dev/fdt/if_mvpp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mvpp.c,v 1.29 2020/11/03 21:50:54 patrick Exp $ */ +/* $OpenBSD: if_mvpp.c,v 1.30 2020/11/08 00:45:47 patrick Exp $ */ /* * Copyright (c) 2008, 2019 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2017, 2020 Patrick Wildt <patrick@blueri.se> @@ -581,7 +581,7 @@ mvpp2_bm_pool_init(struct mvpp2_softc *sc) bm->bm_mem = mvpp2_dmamem_alloc(sc, MVPP2_BM_SIZE * sizeof(uint64_t) * 2, MVPP2_BM_POOL_PTR_ALIGN); - memset(MVPP2_DMA_KVA(bm->bm_mem), 0, MVPP2_DMA_LEN(bm->bm_mem)); + KASSERT(bm->bm_mem != NULL); bus_dmamap_sync(sc->sc_dmat, MVPP2_DMA_MAP(bm->bm_mem), 0, MVPP2_DMA_LEN(bm->bm_mem), BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); @@ -2258,6 +2258,7 @@ mvpp2_aggr_txq_hw_init(struct mvpp2_softc *sc, struct mvpp2_tx_queue *txq) txq->ring = mvpp2_dmamem_alloc(sc, MVPP2_AGGR_TXQ_SIZE * sizeof(struct mvpp2_tx_desc), 32); + KASSERT(txq->ring != NULL); txq->descs = MVPP2_DMA_KVA(txq->ring); txq->buf = mallocarray(MVPP2_AGGR_TXQ_SIZE, sizeof(struct mvpp2_buf), @@ -2293,6 +2294,7 @@ mvpp2_txq_hw_init(struct mvpp2_port *sc, struct mvpp2_tx_queue *txq) txq->ring = mvpp2_dmamem_alloc(sc->sc, MVPP2_NTXDESC * sizeof(struct mvpp2_tx_desc), 32); + KASSERT(txq->ring != NULL); txq->descs = MVPP2_DMA_KVA(txq->ring); txq->buf = mallocarray(MVPP2_NTXDESC, sizeof(struct mvpp2_buf), @@ -2351,6 +2353,7 @@ mvpp2_rxq_hw_init(struct mvpp2_port *sc, struct mvpp2_rx_queue *rxq) rxq->ring = mvpp2_dmamem_alloc(sc->sc, MVPP2_NRXDESC * sizeof(struct mvpp2_rx_desc), 32); + KASSERT(rxq->ring != NULL); rxq->descs = MVPP2_DMA_KVA(rxq->ring); bus_dmamap_sync(sc->sc_dmat, MVPP2_DMA_MAP(rxq->ring), |