 @@ -1,14 +1,14 @@
-/* $NetBSD: ix_txrx.c,v 1.48 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.49 2018/07/31 09:19:34 msaitoh Exp $ */
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -1333,27 +1333,27 @@ ixgbe_refresh_mbufs(struct rx_ring *rxr,
 	struct ixgbe_rx_buf *rxbuf;
 	struct mbuf         *mp;
 	int                 i, j, error;
 	bool                refreshed = false;
 	i = j = rxr->next_to_refresh;
 	/* Control the loop with one beyond */
 	if (++j == rxr->num_desc)
 		j = 0;
 	while (j != limit) {
 		rxbuf = &rxr->rx_buffers[i];
 		if (rxbuf->buf == NULL) {
-			mp = ixgbe_getjcl(&adapter->jcl_head, M_NOWAIT,
+			mp = ixgbe_getjcl(&rxr->jcl_head, M_NOWAIT,
 			    MT_DATA, M_PKTHDR, rxr->mbuf_sz);
 			if (mp == NULL) {
 				rxr->no_jmbuf.ev_count++;
 				goto update;
+			}
 			if (adapter->max_frame_size <= (MCLBYTES - ETHER_ALIGN))
 				m_adj(mp, ETHER_ALIGN);
 		} else
 			mp = rxbuf->buf;
 		mp->m_pkthdr.len = mp->m_len = rxr->mbuf_sz;
 		/* If we're dealing with an mbuf that was copied rather
 @@ -1495,26 +1495,37 @@ ixgbe_setup_receive_ring(struct rx_ring
 	if (adapter->feat_en & IXGBE_FEATURE_NETMAP)
 		slot = netmap_reset(na, NR_RX, rxr->me, 0);
 #endif /* DEV_NETMAP */
 	rsize = roundup2(adapter->num_rx_desc *
 	    sizeof(union ixgbe_adv_rx_desc), DBA_ALIGN);
 	bzero((void *)rxr->rx_base, rsize);
 	/* Cache the size */
 	rxr->mbuf_sz = adapter->rx_mbuf_sz;
 	/* Free current RX buffer structs and their mbufs */
 	ixgbe_free_receive_ring(rxr);
 	IXGBE_RX_UNLOCK(rxr);
 	/*
 	 * Now reinitialize our supply of jumbo mbufs.  The number
 	 * or size of jumbo mbufs may have changed.
 	 * Assume all of rxr->ptag are the same.
 	 */
 	ixgbe_jcl_reinit(adapter, rxr->ptag->dt_dmat, rxr,
 	    (2 * adapter->num_rx_desc), adapter->rx_mbuf_sz);
 	IXGBE_RX_LOCK(rxr);
 	/* Now replenish the mbufs */
 	for (int j = 0; j != rxr->num_desc; ++j) {
 		struct mbuf *mp;
 		rxbuf = &rxr->rx_buffers[j];
 #ifdef DEV_NETMAP
 		/*
 		 * In netmap mode, fill the map and set the buffer
 		 * address in the NIC ring, considering the offset
 		 * between the netmap and NIC rings (see comment in
 		 * ixgbe_setup_transmit_ring() ). No need to allocate
 		 * an mbuf, so end the block with a continue;
 @@ -1524,27 +1535,27 @@ ixgbe_setup_receive_ring(struct rx_ring
 			uint64_t paddr;
 			void *addr;
 			addr = PNMB(na, slot + sj, &paddr);
 			netmap_load_map(na, rxr->ptag, rxbuf->pmap, addr);
 			/* Update descriptor and the cached value */
 			rxr->rx_base[j].read.pkt_addr = htole64(paddr);
 			rxbuf->addr = htole64(paddr);
 			continue;
+		}
 #endif /* DEV_NETMAP */
 		rxbuf->flags = 0;
-		rxbuf->buf = ixgbe_getjcl(&adapter->jcl_head, M_NOWAIT,
+		rxbuf->buf = ixgbe_getjcl(&rxr->jcl_head, M_NOWAIT,
 		    MT_DATA, M_PKTHDR, adapter->rx_mbuf_sz);
 		if (rxbuf->buf == NULL) {
 			error = ENOBUFS;
 			goto fail;
+		}
 		mp = rxbuf->buf;
 		mp->m_pkthdr.len = mp->m_len = rxr->mbuf_sz;
 		/* Get the memory mapping */
 		error = bus_dmamap_load_mbuf(rxr->ptag->dt_dmat, rxbuf->pmap,
 		    mp, BUS_DMA_NOWAIT);
 		if (error != 0)
                         goto fail;
 		bus_dmamap_sync(rxr->ptag->dt_dmat, rxbuf->pmap,
 @@ -1601,35 +1612,26 @@ fail:
 	return (error);
 } /* ixgbe_setup_receive_ring */
 /************************************************************************
  * ixgbe_setup_receive_structures - Initialize all receive rings.
  ************************************************************************/
 int
 ixgbe_setup_receive_structures(struct adapter *adapter)
+{
 	struct rx_ring *rxr = adapter->rx_rings;
 	int            j;
 	/*
 	 * Now reinitialize our supply of jumbo mbufs.  The number
 	 * or size of jumbo mbufs may have changed.
 	 * Assume all of rxr->ptag are the same.
 	 */
 	ixgbe_jcl_reinit(adapter, rxr->ptag->dt_dmat,
 	    (2 * adapter->num_rx_desc) * adapter->num_queues,
 	    adapter->rx_mbuf_sz);
 	for (j = 0; j < adapter->num_queues; j++, rxr++)
 		if (ixgbe_setup_receive_ring(rxr))
 			goto fail;
 	return (0);
 fail:
 	/*
 	 * Free RX buffers allocated so far, we will only handle
 	 * the rings that completed, the failing case will have
 	 * cleaned up for itself. 'j' failed, so its the terminus.
 	 */
 	for (int i = 0; i < j; ++i) {
 		rxr = &adapter->rx_rings[i];

 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe.h,v 1.50 2018/06/25 05:06:10 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.51 2018/07/31 09:19:34 msaitoh Exp $ */
 /******************************************************************************
   SPDX-License-Identifier: BSD-3-Clause
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 @@ -407,26 +407,29 @@ struct rx_ring {
 #endif /* LRO */
 	bool			lro_enabled;
 	bool			hw_rsc;
 	bool			vtag_strip;
         u16			next_to_refresh;
         u16 			next_to_check;
 	u16			num_desc;
 	u16			mbuf_sz;
 #if 0
 	char			mtx_name[16]; /* NetBSD has no mutex name */
 #endif
 	struct ixgbe_rx_buf	*rx_buffers;
 	ixgbe_dma_tag_t		*ptag;
 	u16	                last_rx_mbuf_sz;
 	u32                	last_num_rx_desc;
 	ixgbe_extmem_head_t	jcl_head;
 	u64			bytes; /* Used for AIM calc */
 	u64			packets;
 	/* Soft stats */
 	struct evcnt		rx_copies;
 	struct evcnt		rx_packets;
 	struct evcnt 		rx_bytes;
 	struct evcnt 		rx_discarded;
 	struct evcnt 		no_jmbuf;
 	u64 			rsc_num;
 	/* Flow Director */
 @@ -592,27 +595,26 @@ struct adapter {
 	u64			ibytes;
 	u64			obytes;
 	u64			imcasts;
 	u64			omcasts;
 	u64			iqdrops;
 	u64			noproto;
 #endif
 	/* Feature capable/enabled flags.  See ixgbe_features.h */
 	u32                     feat_cap;
 	u32                     feat_en;
 	struct sysctllog	*sysctllog;
 	const struct sysctlnode *sysctltop;
 	ixgbe_extmem_head_t jcl_head;
 };
 /* Precision Time Sync (IEEE 1588) defines */
 #define ETHERTYPE_IEEE1588      0x88F7
 #define PICOSECS_PER_TICK       20833
 #define TSYNC_UDP_PORT          319 /* UDP port for the protocol */
 #define IXGBE_ADVTXD_TSTAMP     0x00080000
 #define IXGBE_CORE_LOCK_INIT(_sc, _name) \
         mutex_init(&(_sc)->core_mtx, MUTEX_DEFAULT, IPL_SOFTNET)
 #define IXGBE_CORE_LOCK_DESTROY(_sc)      mutex_destroy(&(_sc)->core_mtx)
 #define IXGBE_TX_LOCK_DESTROY(_sc)        mutex_destroy(&(_sc)->tx_mtx)
 @@ -742,21 +744,22 @@ void ixgbe_deferred_mq_start_work(struct
 void ixgbe_drain_all(struct adapter *);
 int  ixgbe_allocate_queues(struct adapter *);
 int  ixgbe_setup_transmit_structures(struct adapter *);
 void ixgbe_free_transmit_structures(struct adapter *);
 int  ixgbe_setup_receive_structures(struct adapter *);
 void ixgbe_free_receive_structures(struct adapter *);
 bool ixgbe_txeof(struct tx_ring *);
 bool ixgbe_rxeof(struct ix_queue *);
 const struct sysctlnode *ixgbe_sysctl_instance(struct adapter *);
 /* For NetBSD */
-void ixgbe_jcl_reinit(struct adapter *, bus_dma_tag_t, int, size_t);
+void ixgbe_jcl_reinit(struct adapter *, bus_dma_tag_t, struct rx_ring *,
     int, size_t);
 #include "ixgbe_bypass.h"
 #include "ixgbe_fdir.h"
 #include "ixgbe_rss.h"
 #include "ixgbe_netmap.h"
 #endif /* _IXGBE_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe_netbsd.c,v 1.7 2018/04/25 08:46:19 msaitoh Exp $ */
+/* $NetBSD: ixgbe_netbsd.c,v 1.8 2018/07/31 09:19:34 msaitoh Exp $ */
 /*
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Coyote Point Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -152,71 +152,71 @@ ixgbe_newext(ixgbe_extmem_head_t *eh, bu
 	em->em_dmat = dmat;
 	em->em_size = size;
 	em->em_head = eh;
 	return em;
 post_dmamem_err:
 	bus_dmamem_free(dmat, &em->em_seg, 1);
 post_zalloc_err:
 	kmem_free(em, sizeof(*em));
 	return NULL;
+}
 void
-ixgbe_jcl_reinit(struct adapter *adapter, bus_dma_tag_t dmat, int nbuf,
+ixgbe_jcl_reinit(struct adapter *adapter, bus_dma_tag_t dmat,
-    size_t size)
+    struct rx_ring *rxr, int nbuf, size_t size)
+{
-	ixgbe_extmem_head_t *eh = &adapter->jcl_head;
+	ixgbe_extmem_head_t *eh = &rxr->jcl_head;
 	ixgbe_extmem_t *em;
 	int i;
 	if (!eh->eh_initialized) {
 		TAILQ_INIT(&eh->eh_freelist);
 		mutex_init(&eh->eh_mtx, MUTEX_DEFAULT, IPL_NET);
 		eh->eh_initialized = true;
+	}
 	/*
 	 *  Check previous parameters. If it's not required to reinit, just
 	 * return.
+	 *
 	 *  Note that the num_rx_desc is currently fixed value. It's never
 	 * changed after device is attached.
 	 */
-	if ((adapter->osdep.last_rx_mbuf_sz == adapter->rx_mbuf_sz)
+	if ((rxr->last_rx_mbuf_sz == rxr->mbuf_sz)
-	    && (adapter->osdep.last_num_rx_desc == adapter->num_rx_desc))
+	    && (rxr->last_num_rx_desc == adapter->num_rx_desc))
 		return;
 	/* Free all dmamem */
 	while ((em = ixgbe_getext(eh, 0)) != NULL) {
 		KASSERT(em->em_vaddr != NULL);
 		bus_dmamem_unmap(dmat, em->em_vaddr, em->em_size);
 		bus_dmamem_free(dmat, &em->em_seg, 1);
 		memset(em, 0, sizeof(*em));
 		kmem_free(em, sizeof(*em));
+	}
 	for (i = 0; i < nbuf; i++) {
 		if ((em = ixgbe_newext(eh, dmat, size)) == NULL) {
 			printf("%s: only %d of %d jumbo buffers allocated\n",
 			    __func__, i, nbuf);
 			break;
+		}
 		ixgbe_putext(em);
+	}
 	/* Keep current parameters */
-	adapter->osdep.last_rx_mbuf_sz = adapter->rx_mbuf_sz;
+	rxr->last_rx_mbuf_sz = adapter->rx_mbuf_sz;
-	adapter->osdep.last_num_rx_desc = adapter->num_rx_desc;
+	rxr->last_num_rx_desc = adapter->num_rx_desc;
+}
 static void
 ixgbe_jcl_free(struct mbuf *m, void *buf, size_t size, void *arg)
+{
 	ixgbe_extmem_t *em = arg;
 	KASSERT(em->em_size == size);
 	ixgbe_putext(em);
 	/* this is an abstraction violation, but it does not lead to a
 	 * double-free
 	 */

 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe_osdep.h,v 1.22 2018/04/25 08:46:19 msaitoh Exp $ */
+/* $NetBSD: ixgbe_osdep.h,v 1.23 2018/07/31 09:19:34 msaitoh Exp $ */
 /******************************************************************************
   SPDX-License-Identifier: BSD-3-Clause
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 @@ -198,27 +198,26 @@ ixgbe_bcopy(void *restrict _src, void *r
 	return (0);
+}
 struct ixgbe_osdep
+{
 	struct ethercom    ec;
 	pci_chipset_tag_t  pc;
 	pcitag_t           tag;
 	bus_space_tag_t    mem_bus_space_tag;
 	bus_space_handle_t mem_bus_space_handle;
 	bus_size_t         mem_size;
 	bus_dma_tag_t      dmat;
 	u16                last_rx_mbuf_sz;
 	u32                last_num_rx_desc;
 	pci_intr_handle_t  *intrs;
 	int		   nintrs;
 	void               *ihs[IXG_MAX_NINTR];
 	bool		   attached;
 };
 /* These routines need struct ixgbe_hw declared */
 struct ixgbe_hw;
 device_t ixgbe_dev_from_hw(struct ixgbe_hw *hw);
 /* These routines are needed by the shared code */
 extern u16 ixgbe_read_pci_cfg(struct ixgbe_hw *, u32);
 #define IXGBE_READ_PCIE_WORD ixgbe_read_pci_cfg