[PATCH v4 07/10] net/ps3_gelic: Add new routine gelic_unmap_link
From: Geoff Levand <geoff@infradead.org>
Date: 2021-07-23 20:35:00
Subsystem:
networking drivers, ps3 network support, ps3 platform support, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Geoff Levand, Linus Torvalds
Put the common code for unmaping a link into its own routine, gelic_unmap_link, and add some debugging checks. Signed-off-by: Geoff Levand <geoff@infradead.org> --- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 23 +++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
index 85fc1915c8be..e55aa9fecfeb 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c@@ -288,6 +288,21 @@ void gelic_card_down(struct gelic_card *card) mutex_unlock(&card->updown_lock); } +static void gelic_unmap_link(struct device *dev, struct gelic_descr *descr) +{ + BUG_ON_DEBUG(descr->hw_regs.payload.dev_addr); + BUG_ON_DEBUG(descr->hw_regs.payload.size); + + BUG_ON_DEBUG(!descr->link.cpu_addr); + BUG_ON_DEBUG(!descr->link.size); + + dma_unmap_single(dev, descr->link.cpu_addr, descr->link.size, + DMA_BIDIRECTIONAL); + + descr->link.cpu_addr = 0; + descr->link.size = 0; +} + /** * gelic_card_free_chain - free descriptor chain * @card: card structure
@@ -301,9 +316,7 @@ static void gelic_card_free_chain(struct gelic_card *card, for (descr = descr_in; descr && descr->link.cpu_addr; descr = descr->next) { - dma_unmap_single(dev, descr->link.cpu_addr, descr->link.size, - DMA_BIDIRECTIONAL); - descr->link.cpu_addr = 0; + gelic_unmap_link(dev, descr); } }
@@ -364,9 +377,7 @@ static int gelic_card_init_chain(struct gelic_card *card, iommu_error: for (i--, descr--; 0 <= i; i--, descr--) if (descr->link.cpu_addr) - dma_unmap_single(dev, descr->link.cpu_addr, - descr->link.size, - DMA_BIDIRECTIONAL); + gelic_unmap_link(dev, descr); return -ENOMEM; }
--
2.25.1