socsvn commit: r337277 - in soc2018/sduo/head/sys: dev/cxgbe dev/ixl net

[sduo at FreeBSD.org]

Author: sduo
Date: Thu Aug  2 10:11:37 2018
New Revision: 337277
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=337277

Log:
  Updated calls to NMB() and PNMB().

Modified:
  soc2018/sduo/head/sys/dev/cxgbe/t4_netmap.c
  soc2018/sduo/head/sys/dev/ixl/ixl_txrx.c
  soc2018/sduo/head/sys/net/iflib.c

Modified: soc2018/sduo/head/sys/dev/cxgbe/t4_netmap.c
==============================================================================
--- soc2018/sduo/head/sys/dev/cxgbe/t4_netmap.c	Thu Aug  2 10:03:51 2018	(r337276)
+++ soc2018/sduo/head/sys/dev/cxgbe/t4_netmap.c	Thu Aug  2 10:11:37 2018	(r337277)
@@ -360,7 +360,7 @@
 		for (j = 0; j < nm_rxq->fl_sidx; j++) {
 			uint64_t ba;
 
-			PNMB(na, &slot[j], &ba);
+			PNMB(kring, &slot[j], &ba);
 			MPASS(ba != 0);
 			nm_rxq->fl_desc[j] = htobe64(ba | hwidx);
 		}
@@ -598,7 +598,7 @@
 
 		for (i = 0; i < n; i++) {
 			slot = &ring->slot[kring->nr_hwcur];
-			PNMB(kring->na, slot, &ba);
+			PNMB(kring, slot, &ba);
 			MPASS(ba != 0);
 
 			cpl->ctrl0 = nm_txq->cpl_ctrl0;
@@ -825,7 +825,7 @@
 
 		while (n > 0) {
 			for (i = 0; i < 8; i++, fl_pidx++, slot++) {
-				PNMB(na, slot, &ba);
+				PNMB(kring, slot, &ba);
 				MPASS(ba != 0);
 				nm_rxq->fl_desc[fl_pidx] = htobe64(ba | hwidx);
 				slot->flags &= ~NS_BUF_CHANGED;

Modified: soc2018/sduo/head/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- soc2018/sduo/head/sys/dev/ixl/ixl_txrx.c	Thu Aug  2 10:03:51 2018	(r337276)
+++ soc2018/sduo/head/sys/dev/ixl/ixl_txrx.c	Thu Aug  2 10:11:37 2018	(r337277)
@@ -547,8 +547,9 @@
 		 * netmap slot index, si
 		 */
 		if (slot) {
-			int si = netmap_idx_n2k(na->tx_rings[que->me], i);
-			netmap_load_map(na, buf->tag, buf->map, NMB(na, slot + si));
+			struct netmap_kring *kring = na->tx_rings[que->me];
+			int si = netmap_idx_n2k(kring, i);
+			netmap_load_map(na, buf->tag, buf->map, NMB(kring, slot + si));
 		}
 #endif /* DEV_NETMAP */
 		/* Clear the EOP index */
@@ -1214,11 +1215,12 @@
 		 * an mbuf, so end the block with a continue;
 		 */
 		if (slot) {
-			int sj = netmap_idx_n2k(na->rx_rings[que->me], j);
+			struct netmap_kring *kring = na->rx_rings[que->me];
+			int sj = netmap_idx_n2k(kring, j);
 			uint64_t paddr;
 			void *addr;
 
-			addr = PNMB(na, slot + sj, &paddr);
+			addr = PNMB(kring, slot + sj, &paddr);
 			netmap_load_map(na, rxr->dma.tag, buf->pmap, addr);
 			/* Update descriptor and the cached value */
 			rxr->base[j].read.pkt_addr = htole64(paddr);

Modified: soc2018/sduo/head/sys/net/iflib.c
==============================================================================
--- soc2018/sduo/head/sys/net/iflib.c	Thu Aug  2 10:03:51 2018	(r337276)
+++ soc2018/sduo/head/sys/net/iflib.c	Thu Aug  2 10:11:37 2018	(r337277)
@@ -832,7 +832,7 @@
 	while (nm_i != head) {
 		for (int tmp_pidx = 0; tmp_pidx < IFLIB_MAX_RX_REFRESH && nm_i != head; tmp_pidx++) {
 			struct netmap_slot *slot = &ring->slot[nm_i];
-			void *addr = PNMB(na, slot, &fl->ifl_bus_addrs[tmp_pidx]);
+			void *addr = PNMB(kring, slot, &fl->ifl_bus_addrs[tmp_pidx]);
 			uint32_t nic_i_dma = refill_pidx;
 			nic_i = netmap_idx_k2n(kring, nm_i);
 
@@ -959,7 +959,7 @@
 			struct netmap_slot *slot = &ring->slot[nm_i];
 			u_int len = slot->len;
 			uint64_t paddr;
-			void *addr = PNMB(na, slot, &paddr);
+			void *addr = PNMB(kring, slot, &paddr);
 			int flags = (slot->flags & NS_REPORT ||
 				nic_i == 0 || nic_i == report_frequency) ?
 				IPI_TX_INTR : 0;
@@ -1185,8 +1185,9 @@
 		 * netmap_idx_n2k() maps a nic index, i, into the corresponding
 		 * netmap slot index, si
 		 */
-		int si = netmap_idx_n2k(na->tx_rings[txq->ift_id], i);
-		netmap_load_map(na, txq->ift_desc_tag, txq->ift_sds.ifsd_map[i], NMB(na, slot + si));
+		struct netmap_kring *kring = na->tx_rings[txq->ift_id];
+		int si = netmap_idx_n2k(kring, i);
+		netmap_load_map(na, txq->ift_desc_tag, txq->ift_sds.ifsd_map[i], NMB(kring, slot + si));
 	}
 }