 @@ -1,14 +1,14 @@
-#	$NetBSD: files.pci,v 1.413.2.2 2020/07/07 10:29:05 martin Exp $
+#	$NetBSD: files.pci,v 1.413.2.3 2021/03/11 16:00:24 martin Exp $
+#
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
 # defined first.
 defflag	opt_pci.h	PCIVERBOSE PCI_CONFIG_DUMP PCI_NETBSD_CONFIGURE
 defparam opt_pci.h	PCI_NETBSD_ENABLE_IDE
 defflag	opt_bktr.h	BKTR_430_FX_MODE BKTR_GPIO_ACCESS BKTR_NO_MSP_RESET
 			BKTR_REVERSE_MUTE BKTR_SIS_VIA_MODE BKTR_USE_PLL
 defparam opt_bktr.h	BKTR_OVERRIDE_CARD BKTR_OVERRIDE_TUNER BKTR_OVERRIDE_DBX
 			BKTR_OVERRIDE_MSP BKTR_SYSTEM_DEFAULT
 @@ -681,26 +681,27 @@ file	dev/pci/ixgbe/ix_txrx.c		ixg | ixv
 file	dev/pci/ixgbe/ixgbe_netbsd.c	ixg | ixv
 file	dev/pci/ixgbe/ixgbe_82598.c	ixg | ixv
 file	dev/pci/ixgbe/ixgbe_82599.c	ixg | ixv
 file	dev/pci/ixgbe/ixgbe_x540.c	ixg | ixv
 file	dev/pci/ixgbe/ixgbe_x550.c	ixg | ixv
 file	dev/pci/ixgbe/ixgbe_api.c	ixg | ixv
 file	dev/pci/ixgbe/ixgbe_common.c	ixg | ixv
 file	dev/pci/ixgbe/ixgbe_mbx.c	ixg | ixv
 file	dev/pci/ixgbe/ixgbe_osdep.c	ixg | ixv
 file	dev/pci/ixgbe/ixgbe_phy.c	ixg | ixv
 file	dev/pci/ixgbe/ixgbe_vf.c	ixg | ixv
 file	dev/pci/ixgbe/if_bypass.c	ixg | ixv
 file	dev/pci/ixgbe/if_fdir.c		ixg | ixv
 defparam opt_ixgbe.h	IXGBE_JCLNUM_MULTI
 # This appears to be the driver for virtual instances of i82599.
 device	ixv: ether, ifnet, arp, mii, mii_phy
 attach	ixv at pci
 file	dev/pci/ixgbe/ixv.c		ixv
 # Intel i8254x Gigabit Ethernet
 device	wm: ether, ifnet, arp, mii, mii_bitbang
 attach	wm at pci
 file	dev/pci/if_wm.c			wm
 defflag	opt_if_wm.h	WM_EVENT_COUNTERS
 defparam opt_if_wm.h	WM_RX_PROCESS_LIMIT_DEFAULT
 			WM_RX_INTR_PROCESS_LIMIT_DEFAULT

 @@ -1,14 +1,14 @@
-/* $NetBSD: ix_txrx.c,v 1.54.2.4 2020/07/10 11:35:51 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.54.2.5 2021/03/11 16:00:24 martin 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
 @@ -1316,26 +1316,31 @@ ixgbe_setup_hw_rsc(struct rx_ring *rxr)
 	    (IXGBE_RSCDBU_RSCACKDIS | IXGBE_READ_REG(hw, IXGBE_RSCDBU)));
 	rxr->hw_rsc = TRUE;
 } /* ixgbe_setup_hw_rsc */
 /************************************************************************
  * ixgbe_refresh_mbufs
+ *
  *   Refresh mbuf buffers for RX descriptor rings
  *    - now keeps its own state so discards due to resource
  *      exhaustion are unnecessary, if an mbuf cannot be obtained
  *      it just returns, keeping its placeholder, thus it can simply
  *      be recalled to try again.
+ *
  *   XXX NetBSD TODO:
  *    - The ixgbe_rxeof() function always preallocates mbuf cluster (jcl),
  *      so the ixgbe_refresh_mbufs() function can be simplified.
+ *
  ************************************************************************/
 static void
 ixgbe_refresh_mbufs(struct rx_ring *rxr, int limit)
+{
 	struct adapter      *adapter = rxr->adapter;
 	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)
 @@ -1505,27 +1510,27 @@ ixgbe_setup_receive_ring(struct rx_ring
 	/* 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);
+	    adapter->num_jcl, 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
 @@ -1802,87 +1807,126 @@ ixgbe_rx_discard(struct rx_ring *rxr, in
 bool
 ixgbe_rxeof(struct ix_queue *que)
+{
 	struct adapter		*adapter = que->adapter;
 	struct rx_ring		*rxr = que->rxr;
 	struct ifnet		*ifp = adapter->ifp;
 #ifdef LRO
 	struct lro_ctrl		*lro = &rxr->lro;
 #endif /* LRO */
 	union ixgbe_adv_rx_desc	*cur;
 	struct ixgbe_rx_buf	*rbuf, *nbuf;
 	int			i, nextp, processed = 0;
 	u32			staterr = 0;
-	u32			count = adapter->rx_process_limit;
+	u32			count = 0;
 	u32			limit = adapter->rx_process_limit;
 	bool			discard_multidesc = false;
 #ifdef RSS
 	u16			pkt_info;
 #endif
 	IXGBE_RX_LOCK(rxr);
 #ifdef DEV_NETMAP
 	if (adapter->feat_en & IXGBE_FEATURE_NETMAP) {
 		/* Same as the txeof routine: wakeup clients on intr. */
 		if (netmap_rx_irq(ifp, rxr->me, &processed)) {
 			IXGBE_RX_UNLOCK(rxr);
 			return (FALSE);
+		}
+	}
 #endif /* DEV_NETMAP */
-	for (i = rxr->next_to_check; count != 0;) {
+	/*
 	 * The max number of loop is rx_process_limit. If discard_multidesc is
 	 * true, continue processing to not to send broken packet to the upper
 	 * layer.
 	 */
 	for (i = rxr->next_to_check;
 	     (count < limit) || (discard_multidesc == true);) {
 		struct mbuf *sendmp, *mp;
 		struct mbuf *newmp;
 		u32         rsc, ptype;
 		u16         len;
 		u16         vtag = 0;
 		bool        eop;
 		/* Sync the ring. */
 		ixgbe_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		cur = &rxr->rx_base[i];
 		staterr = le32toh(cur->wb.upper.status_error);
 #ifdef RSS
 		pkt_info = le16toh(cur->wb.lower.lo_dword.hs_rss.pkt_info);
 #endif
 		if ((staterr & IXGBE_RXD_STAT_DD) == 0)
 			break;
-		count--;
+		count++;
 		sendmp = NULL;
 		nbuf = NULL;
 		rsc = 0;
 		cur->wb.upper.status_error = 0;
 		rbuf = &rxr->rx_buffers[i];
 		mp = rbuf->buf;
 		len = le16toh(cur->wb.upper.length);
 		ptype = le32toh(cur->wb.lower.lo_dword.data) &
 		    IXGBE_RXDADV_PKTTYPE_MASK;
 		eop = ((staterr & IXGBE_RXD_STAT_EOP) != 0);
 		/* Make sure bad packets are discarded */
 		if (eop && (staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK) != 0) {
 #if __FreeBSD_version >= 1100036
 			if (adapter->feat_en & IXGBE_FEATURE_VF)
 				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 #endif
 			rxr->rx_discarded.ev_count++;
 			ixgbe_rx_discard(rxr, i);
 			discard_multidesc = false;
 			goto next_desc;
+		}
 		/* pre-alloc new mbuf */
 		if (!discard_multidesc)
 			newmp = ixgbe_getjcl(&rxr->jcl_head, M_NOWAIT, MT_DATA,
 			    M_PKTHDR, rxr->mbuf_sz);
 		else
 			newmp = NULL;
 		if (newmp == NULL) {
 			rxr->no_jmbuf.ev_count++;
 			/*
 			 * Descriptor initialization is already done by the
 			 * above code (cur->wb.upper.status_error = 0).
 			 * So, we can reuse current rbuf->buf for new packet.
+			 *
 			 * Rewrite the buffer addr, see comment in
 			 * ixgbe_rx_discard().
 			 */
 			cur->read.pkt_addr = rbuf->addr;
 			m_freem(rbuf->fmp);
 			rbuf->fmp = NULL;
 			if (!eop) {
 				/* Discard the entire packet. */
 				discard_multidesc = true;
 			} else
 				discard_multidesc = false;
 			goto next_desc;
+		}
 		discard_multidesc = false;
 		bus_dmamap_sync(rxr->ptag->dt_dmat, rbuf->pmap, 0,
 		    rbuf->buf->m_pkthdr.len, BUS_DMASYNC_POSTREAD);
 		/*
 		 * On 82599 which supports a hardware
 		 * LRO (called HW RSC), packets need
 		 * not be fragmented across sequential
 		 * descriptors, rather the next descriptor
 		 * is indicated in bits of the descriptor.
 		 * This also means that we might proceses
 		 * more than one packet at a time, something
 		 * that has never been true before, it
 		 * required eliminating global chain pointers
 @@ -1911,49 +1955,53 @@ ixgbe_rxeof(struct ix_queue *que)
 		/*
 		 * Rather than using the fmp/lmp global pointers
 		 * we now keep the head of a packet chain in the
 		 * buffer struct and pass this along from one
 		 * descriptor to the next, until we get EOP.
 		 */
 		mp->m_len = len;
 		/*
 		 * See if there is a stored head
 		 * that determines what we are
 		 */
 		sendmp = rbuf->fmp;
 		if (sendmp != NULL) {  /* secondary frag */
-			rbuf->buf = rbuf->fmp = NULL;
+			rbuf->buf = newmp;
 			rbuf->fmp = NULL;
 			mp->m_flags &= ~M_PKTHDR;
 			sendmp->m_pkthdr.len += mp->m_len;
 		} else {
 			/*
 			 * Optimize.  This might be a small packet,
 			 * maybe just a TCP ACK.  Do a fast copy that
 			 * is cache aligned into a new mbuf, and
 			 * leave the old mbuf+cluster for re-use.
 			 */
 			if (eop && len <= IXGBE_RX_COPY_LEN) {
 				sendmp = m_gethdr(M_NOWAIT, MT_DATA);
 				if (sendmp != NULL) {
 					sendmp->m_data += IXGBE_RX_COPY_ALIGN;
 					ixgbe_bcopy(mp->m_data, sendmp->m_data,
 					    len);
 					sendmp->m_len = len;
 					rxr->rx_copies.ev_count++;
 					rbuf->flags |= IXGBE_RX_COPY;
 					m_freem(newmp);
+				}
+			}
 			if (sendmp == NULL) {
-				rbuf->buf = rbuf->fmp = NULL;
+				rbuf->buf = newmp;
 				rbuf->fmp = NULL;
 				sendmp = mp;
+			}
 			/* first desc of a non-ps chain */
 			sendmp->m_flags |= M_PKTHDR;
 			sendmp->m_pkthdr.len = mp->m_len;
+		}
 		++processed;
 		/* Pass the head pointer on */
 		if (eop == 0) {
 			nbuf->fmp = sendmp;
 			sendmp = NULL;

 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe.c,v 1.199.2.12 2020/09/02 12:34:55 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.199.2.13 2021/03/11 16:00:24 martin 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
 @@ -57,26 +57,27 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_net_mpsafe.h"
 #include "opt_ixgbe.h"
 #endif
 #include "ixgbe.h"
 #include "ixgbe_sriov.h"
 #include "vlan.h"
 #include <sys/cprng.h>
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 /************************************************************************
  * Driver version
  ************************************************************************/
 @@ -933,26 +934,28 @@ ixgbe_attach(device_t parent, device_t d
 	    ixgbe_txd < MIN_TXD || ixgbe_txd > MAX_TXD) {
 		aprint_error_dev(dev, "TXD config issue, using default!\n");
 		adapter->num_tx_desc = DEFAULT_TXD;
 	} else
 		adapter->num_tx_desc = ixgbe_txd;
 	if (((ixgbe_rxd * sizeof(union ixgbe_adv_rx_desc)) % DBA_ALIGN) != 0 ||
 	    ixgbe_rxd < MIN_RXD || ixgbe_rxd > MAX_RXD) {
 		aprint_error_dev(dev, "RXD config issue, using default!\n");
 		adapter->num_rx_desc = DEFAULT_RXD;
 	} else
 		adapter->num_rx_desc = ixgbe_rxd;
 	adapter->num_jcl = adapter->num_rx_desc * IXGBE_JCLNUM_MULTI;
 	/* Allocate our TX/RX Queues */
 	if (ixgbe_allocate_queues(adapter)) {
 		error = ENOMEM;
 		goto err_out;
+	}
 	hw->phy.reset_if_overtemp = TRUE;
 	error = ixgbe_reset_hw(hw);
 	hw->phy.reset_if_overtemp = FALSE;
 	if (error == IXGBE_ERR_SFP_NOT_PRESENT) {
 		/*
 		 * No optics in this port, set up
 		 * so the timer routine will probe
 @@ -1844,27 +1847,27 @@ ixgbe_add_hw_stats(struct adapter *adapt
 			break;
 		evcnt_attach_dynamic(&adapter->queues[i].irqs, EVCNT_TYPE_INTR,
 		    NULL, adapter->queues[i].evnamebuf, "IRQs on queue");
 		evcnt_attach_dynamic(&adapter->queues[i].handleq,
 		    EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf,
 		    "Handled queue in softint");
 		evcnt_attach_dynamic(&adapter->queues[i].req, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf, "Requeued in softint");
 		evcnt_attach_dynamic(&txr->tso_tx, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf, "TSO");
 		evcnt_attach_dynamic(&txr->no_desc_avail, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf,
-		    "Queue No Descriptor Available");
+		    "TX Queue No Descriptor Available");
 		evcnt_attach_dynamic(&txr->total_packets, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf,
 		    "Queue Packets Transmitted");
 #ifndef IXGBE_LEGACY_TX
 		evcnt_attach_dynamic(&txr->pcq_drops, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf,
 		    "Packets dropped in pcq");
 #endif
 		if (sysctl_createv(log, 0, &rnode, &cnode,
 		    CTLFLAG_READONLY,
 		    CTLTYPE_INT,
 		    "rxd_nxck", SYSCTL_DESCR("Receive Descriptor next to check"),
 @@ -3288,26 +3291,33 @@ ixgbe_add_device_sysctls(struct adapter
 	if (sysctl_createv(log, 0, &rnode, &cnode,
 	    CTLFLAG_READWRITE, CTLTYPE_INT,
 	    "debug", SYSCTL_DESCR("Debug Info"),
 	    ixgbe_sysctl_debug, 0, (void *)adapter, 0, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 	if (sysctl_createv(log, 0, &rnode, &cnode,
 	    CTLFLAG_READONLY, CTLTYPE_INT,
 	    "num_rx_desc", SYSCTL_DESCR("Number of rx descriptors"),
 	    NULL, 0, &adapter->num_rx_desc, 0, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 	if (sysctl_createv(log, 0, &rnode, &cnode,
 	    CTLFLAG_READONLY, CTLTYPE_INT, "num_jcl_per_queue",
 	    SYSCTL_DESCR("Number of jumbo buffers per queue"),
 	    NULL, 0, &adapter->num_jcl, 0, CTL_CREATE,
 	    CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 	if (sysctl_createv(log, 0, &rnode, &cnode,
 	    CTLFLAG_READONLY, CTLTYPE_INT,
 	    "num_queues", SYSCTL_DESCR("Number of queues"),
 	    NULL, 0, &adapter->num_queues, 0, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 	/* Sysctls for all devices */
 	if (sysctl_createv(log, 0, &rnode, &cnode, CTLFLAG_READWRITE,
 	    CTLTYPE_INT, "fc", SYSCTL_DESCR(IXGBE_SYSCTL_DESC_SET_FC),
 	    ixgbe_sysctl_flowcntl, 0, (void *)adapter, 0, CTL_CREATE,
 	    CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 	adapter->enable_aim = ixgbe_enable_aim;
 @@ -5372,29 +5382,29 @@ ixgbe_set_advertise(struct adapter *adap
 	/* No speed changes for backplane media */
 	if (hw->phy.media_type == ixgbe_media_type_backplane)
 		return (ENODEV);
 	if (!((hw->phy.media_type == ixgbe_media_type_copper) ||
 	    (hw->phy.multispeed_fiber))) {
 		device_printf(dev,
 		    "Advertised speed can only be set on copper or "
 		    "multispeed fiber media types.\n");
 		return (EINVAL);
+	}
-	if (advertise < 0x0 || advertise > 0x2f) {
+	if (advertise < 0x0 || advertise > 0x3f) {
 		device_printf(dev,
-		    "Invalid advertised speed; valid modes are 0x0 through 0x7\n");
+		    "Invalid advertised speed; valid modes are 0x0 through 0x3f\n");
 		return (EINVAL);
+	}
 	if (hw->mac.ops.get_link_capabilities) {
 		err = hw->mac.ops.get_link_capabilities(hw, &link_caps,
 		    &negotiate);
 		if (err != IXGBE_SUCCESS) {
 			device_printf(dev, "Unable to determine supported advertise speeds\n");
 			return (ENODEV);
+		}
+	}
 	/* Set new value and report new advertised mode */

 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe.h,v 1.56.2.3 2020/07/10 11:35:51 martin Exp $ */
+/* $NetBSD: ixgbe.h,v 1.56.2.4 2021/03/11 16:00:24 martin 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.
 @@ -206,27 +206,27 @@
 #define IOCTL_DEBUGOUT2(S, A, B)    if (DEBUG_IOCTL) printf(S "\n", A, B)
 #define HW_DEBUGOUT(S)              if (DEBUG_HW) printf(S "\n")
 #define HW_DEBUGOUT1(S, A)          if (DEBUG_HW) printf(S "\n", A)
 #define HW_DEBUGOUT2(S, A, B)       if (DEBUG_HW) printf(S "\n", A, B)
 #define MAX_NUM_MULTICAST_ADDRESSES     128
 #define IXGBE_82598_SCATTER             100
 #define IXGBE_82599_SCATTER             32
 #define MSIX_82598_BAR                  3
 #define MSIX_82599_BAR                  4
 #define IXGBE_TSO_SIZE                  262140
 #define IXGBE_RX_HDR                    128
 #define IXGBE_VFTA_SIZE                 128
-#define IXGBE_BR_SIZE                   4096
+#define IXGBE_BR_SIZE                   2048
 #define IXGBE_QUEUE_MIN_FREE            32
 #define IXGBE_MAX_TX_BUSY               10
 #define IXGBE_QUEUE_HUNG                0x80000000
 #define IXGBE_EITR_DEFAULT		128
 /* IOCTL define to gather SFP+ Diagnostic data */
 #define SIOCGI2C	SIOCGIFGENERIC
 /* Offload bits in mbuf flag */
 #define	M_CSUM_OFFLOAD	\
     (M_CSUM_IPv4|M_CSUM_UDPv4|M_CSUM_TCPv4|M_CSUM_UDPv6|M_CSUM_TCPv6)
 @@ -550,26 +550,27 @@ struct adapter {
 	 */
 	struct tx_ring		*tx_rings;
 	u32			num_tx_desc;
 	u32			tx_process_limit;
 	/*
 	 * Receive rings
 	 *      Allocated at run time, an array of rings
 	 */
 	struct rx_ring		*rx_rings;
 	u64			active_queues;
 	u32			num_rx_desc;
 	u32			rx_process_limit;
 	int			num_jcl;
 	/* Multicast array memory */
 	struct ixgbe_mc_addr	*mta;
 	/* SR-IOV */
 	int                     iov_mode;
 	int			num_vfs;
 	int			pool;
 	struct ixgbe_vf		*vfs;
 	/* Bypass */
 	struct ixgbe_bp_data    bypass;

 @@ -1,14 +1,14 @@
-/*$NetBSD: ixgbe_netbsd.h,v 1.11 2019/03/05 08:25:02 msaitoh Exp $*/
+/*$NetBSD: ixgbe_netbsd.h,v 1.11.4.1 2021/03/11 16:00:24 martin 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
 @@ -30,26 +30,40 @@
 #ifndef _IXGBE_NETBSD_H
 #define _IXGBE_NETBSD_H
 #if 0 /* Enable this if you don't want to use TX multiqueue function */
 #define	IXGBE_LEGACY_TX	1
 #endif
 #define	ETHERCAP_VLAN_HWCSUM	0
 #define	MJUM9BYTES	(9 * 1024)
 #define	MJUM16BYTES	(16 * 1024)
 #define	MJUMPAGESIZE	PAGE_SIZE
 /*
  * Number of jcl per queue is calculated by
  * adapter->num_rx_desc * IXGBE_JCLNUM_MULTI. The lower limit is 2.
  */
 #define	IXGBE_JCLNUM_MULTI_LOWLIM	2
 #define	IXGBE_JCLNUM_MULTI_DEFAULT	3
 #if !defined(IXGBE_JCLNUM_MULTI)
 # define IXGBE_JCLNUM_MULTI IXGBE_JCLNUM_MULTI_DEFAULT
 #else
 # if (IXGBE_JCLNUM_MULTI < IXGBE_JCLNUM_MULTI_LOWLIM)
 #  error IXGBE_JCLNUM_MULTI is too low.
 # endif
 #endif
 #define IFCAP_RXCSUM	\
 	(IFCAP_CSUM_IPv4_Rx|IFCAP_CSUM_TCPv4_Rx|IFCAP_CSUM_UDPv4_Rx|\
 	IFCAP_CSUM_TCPv6_Rx|IFCAP_CSUM_UDPv6_Rx)
 #define IFCAP_TXCSUM	\
 	(IFCAP_CSUM_IPv4_Tx|IFCAP_CSUM_TCPv4_Tx|IFCAP_CSUM_UDPv4_Tx|\
 	IFCAP_CSUM_TCPv6_Tx|IFCAP_CSUM_UDPv6_Tx)
 #define IFCAP_HWCSUM	(IFCAP_RXCSUM|IFCAP_TXCSUM)
 struct ixgbe_dma_tag {
 	bus_dma_tag_t	dt_dmat;
 	bus_size_t	dt_alignment;

 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe_vf.c,v 1.18.2.2 2020/07/10 11:35:51 martin Exp $ */
+/* $NetBSD: ixgbe_vf.c,v 1.18.2.3 2021/03/11 16:00:24 martin 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.
 @@ -111,27 +111,28 @@ static void ixgbe_virt_clr_reg(struct ix
 	/* DCA_RXCTRL default value */
 	vfdca_rxctrl = IXGBE_DCA_RXCTRL_DESC_RRO_EN |
 		       IXGBE_DCA_RXCTRL_DATA_WRO_EN |
 		       IXGBE_DCA_RXCTRL_HEAD_WRO_EN;
 	/* DCA_TXCTRL default value */
 	vfdca_txctrl = IXGBE_DCA_TXCTRL_DESC_RRO_EN |
 		       IXGBE_DCA_TXCTRL_DESC_WRO_EN |
 		       IXGBE_DCA_TXCTRL_DATA_RRO_EN;
 	IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, 0);
-	for (i = 0; i < 7; i++) {
+	KASSERT(IXGBE_VF_MAX_TX_QUEUES == IXGBE_VF_MAX_RX_QUEUES);
 	for (i = 0; i < IXGBE_VF_MAX_TX_QUEUES; i++) {
 		IXGBE_WRITE_REG(hw, IXGBE_VFRDH(i), 0);
 		IXGBE_WRITE_REG(hw, IXGBE_VFRDT(i), 0);
 		IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(i), 0);
 		IXGBE_WRITE_REG(hw, IXGBE_VFSRRCTL(i), vfsrrctl);
 		IXGBE_WRITE_REG(hw, IXGBE_VFTDH(i), 0);
 		IXGBE_WRITE_REG(hw, IXGBE_VFTDT(i), 0);
 		IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(i), 0);
 		IXGBE_WRITE_REG(hw, IXGBE_VFTDWBAH(i), 0);
 		IXGBE_WRITE_REG(hw, IXGBE_VFTDWBAL(i), 0);
 		IXGBE_WRITE_REG(hw, IXGBE_VFDCA_RXCTRL(i), vfdca_rxctrl);
 		IXGBE_WRITE_REG(hw, IXGBE_VFDCA_TXCTRL(i), vfdca_txctrl);
+	}
 @@ -165,27 +166,27 @@ s32 ixgbe_start_hw_vf(struct ixgbe_hw *h
 s32 ixgbe_init_hw_vf(struct ixgbe_hw *hw)
+{
 	s32 status = hw->mac.ops.start_hw(hw);
 	hw->mac.ops.get_mac_addr(hw, hw->mac.addr);
 	return status;
+}
 /**
  *  ixgbe_reset_hw_vf - Performs hardware reset
  *  @hw: pointer to hardware structure
+ *
- *  Resets the hardware by reseting the transmit and receive units, masks and
+ *  Resets the hardware by resetting the transmit and receive units, masks and
  *  clears all interrupts.
  **/
 s32 ixgbe_reset_hw_vf(struct ixgbe_hw *hw)
+{
 	struct ixgbe_mbx_info *mbx = &hw->mbx;
 	u32 timeout = IXGBE_VF_INIT_TIMEOUT;
 	s32 ret_val = IXGBE_ERR_INVALID_MAC_ADDR;
 	u32 msgbuf[IXGBE_VF_PERMADDR_MSG_LEN];
 	u8 *addr = (u8 *)(&msgbuf[1]);
 	DEBUGFUNC("ixgbevf_reset_hw_vf");
 	/* Call adapter stop to disable tx/rx and clear interrupts */
 @@ -774,27 +775,27 @@ int ixgbevf_get_queues(struct ixgbe_hw *
 	default:
 		return 0;
+	}
 	/* Fetch queue configuration from the PF */
 	msg[0] = IXGBE_VF_GET_QUEUES;
 	msg[1] = msg[2] = msg[3] = msg[4] = 0;
 	err = ixgbevf_write_msg_read_ack(hw, msg, msg, 5);
 	if (!err) {
 		msg[0] &= ~IXGBE_VT_MSGTYPE_CTS;
 		/*
-		 * if we we didn't get an ACK there must have been
+		 * if we didn't get an ACK there must have been
 		 * some sort of mailbox error so we should treat it
 		 * as such
 		 */
 		if (msg[0] != (IXGBE_VF_GET_QUEUES | IXGBE_VT_MSGTYPE_ACK))
 			return IXGBE_ERR_MBX;
 		/* record and validate values from message */
 		hw->mac.max_tx_queues = msg[IXGBE_VF_TX_QUEUES];
 		if (hw->mac.max_tx_queues == 0 ||
 		    hw->mac.max_tx_queues > IXGBE_VF_MAX_TX_QUEUES)
 			hw->mac.max_tx_queues = IXGBE_VF_MAX_TX_QUEUES;
 		hw->mac.max_rx_queues = msg[IXGBE_VF_RX_QUEUES];

 @@ -1,14 +1,14 @@
-/*$NetBSD: ixv.c,v 1.125.2.10 2020/07/10 11:35:51 martin Exp $*/
+/*$NetBSD: ixv.c,v 1.125.2.11 2021/03/11 16:00:24 martin 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
 @@ -28,26 +28,27 @@
   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE.
 ******************************************************************************/
 /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_net_mpsafe.h"
 #include "opt_ixgbe.h"
 #endif
 #include "ixgbe.h"
 #include "vlan.h"
 /************************************************************************
  * Driver version
  ************************************************************************/
 static const char ixv_driver_version[] = "2.0.1-k";
 /* XXX NetBSD: + 1.5.17 */
 /************************************************************************
  * PCI Device ID Table
 @@ -488,26 +489,28 @@ ixv_attach(device_t parent, device_t dev
 	    ixv_txd < MIN_TXD || ixv_txd > MAX_TXD) {
 		aprint_error_dev(dev, "TXD config issue, using default!\n");
 		adapter->num_tx_desc = DEFAULT_TXD;
 	} else
 		adapter->num_tx_desc = ixv_txd;
 	if (((ixv_rxd * sizeof(union ixgbe_adv_rx_desc)) % DBA_ALIGN) != 0 ||
 	    ixv_rxd < MIN_RXD || ixv_rxd > MAX_RXD) {
 		aprint_error_dev(dev, "RXD config issue, using default!\n");
 		adapter->num_rx_desc = DEFAULT_RXD;
 	} else
 		adapter->num_rx_desc = ixv_rxd;
 	adapter->num_jcl = adapter->num_rx_desc * IXGBE_JCLNUM_MULTI;
 	/* Setup MSI-X */
 	error = ixv_configure_interrupts(adapter);
 	if (error)
 		goto err_out;
 	/* Allocate our TX/RX Queues */
 	if (ixgbe_allocate_queues(adapter)) {
 		aprint_error_dev(dev, "ixgbe_allocate_queues() failed!\n");
 		error = ENOMEM;
 		goto err_out;
+	}
 	/* hw.ix defaults init */
 @@ -2489,26 +2492,33 @@ ixv_add_device_sysctls(struct adapter *a
 	if ((rnode = ixv_sysctl_instance(adapter)) == NULL) {
 		aprint_error_dev(dev, "could not create sysctl root\n");
 		return;
+	}
 	if (sysctl_createv(log, 0, &rnode, &cnode,
 	    CTLFLAG_READWRITE, CTLTYPE_INT,
 	    "debug", SYSCTL_DESCR("Debug Info"),
 	    ixv_sysctl_debug, 0, (void *)adapter, 0, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 	if (sysctl_createv(log, 0, &rnode, &cnode,
 	    CTLFLAG_READONLY, CTLTYPE_INT, "num_jcl_per_queue",
 	    SYSCTL_DESCR("Number of jumbo buffers per queue"),
 	    NULL, 0, &adapter->num_jcl, 0, CTL_CREATE,
 	    CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 	if (sysctl_createv(log, 0, &rnode, &cnode,
 	    CTLFLAG_READWRITE, CTLTYPE_BOOL,
 	    "enable_aim", SYSCTL_DESCR("Interrupt Moderation"),
 	    NULL, 0, &adapter->enable_aim, 0, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
 	if (sysctl_createv(log, 0, &rnode, &cnode,
 	    CTLFLAG_READWRITE, CTLTYPE_BOOL,
 	    "txrx_workqueue", SYSCTL_DESCR("Use workqueue for packet processing"),
 		NULL, 0, &adapter->txrx_use_workqueue, 0, CTL_CREATE, CTL_EOL) != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
+}
 /************************************************************************
 @@ -2588,27 +2598,27 @@ ixv_add_stats_sysctls(struct adapter *ad
 			break;
 		evcnt_attach_dynamic(&adapter->queues[i].irqs, EVCNT_TYPE_INTR,
 		    NULL, adapter->queues[i].evnamebuf, "IRQs on queue");
 		evcnt_attach_dynamic(&adapter->queues[i].handleq,
 		    EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf,
 		    "Handled queue in softint");
 		evcnt_attach_dynamic(&adapter->queues[i].req, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf, "Requeued in softint");
 		evcnt_attach_dynamic(&txr->tso_tx, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf, "TSO");
 		evcnt_attach_dynamic(&txr->no_desc_avail, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf,
-		    "Queue No Descriptor Available");
+		    "TX Queue No Descriptor Available");
 		evcnt_attach_dynamic(&txr->total_packets, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf,
 		    "Queue Packets Transmitted");
 #ifndef IXGBE_LEGACY_TX
 		evcnt_attach_dynamic(&txr->pcq_drops, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf,
 		    "Packets dropped in pcq");
 #endif
 #ifdef LRO
 		struct lro_ctrl *lro = &rxr->lro;
 #endif /* LRO */

 @@ -1,14 +1,14 @@
-.\" $NetBSD: ixg.4,v 1.12 2018/05/09 08:01:16 wiz Exp $
+.\" $NetBSD: ixg.4,v 1.12.4.1 2021/03/11 16:00:24 martin Exp $
 .\"
 .\" Copyright (c) 2001-2008, 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:
 .\"
 .\" 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
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 @@ -23,27 +23,27 @@
 .\" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 .\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" * Other names and brands may be claimed as the property of others.
 .\"
 .\" $FreeBSD: src/share/man/man4/ixgbe.4,v 1.3 2010/12/19 23:54:31 yongari Exp $
 .\"
-.Dd May 9, 2018
+.Dd March 9, 2021
 .Dt IXG 4
 .Os
 .Sh NAME
 .Nm ixg
 .Nd Intel(R) 10Gb Ethernet driver
 .Sh SYNOPSIS
 .Cd "ixg* at pci? dev ? function ?"
 .Sh DESCRIPTION
 The
 .Nm
 driver provides support for PCI 10Gb Ethernet adapters based on
 the Intel(R) 82598EB, 82599, X540 and X550 Ethernet Controllers.
 The driver supports Jumbo Frames, TCP Segmentation Offload (TSO).
 @@ -73,26 +73,46 @@ A fatal initialization error has occurre
 .It "ixg%d: watchdog timeout -- resetting"
 The device has stopped responding to the network, or there is a problem with
 the network connection (cable).
 .El
 .Sh SUPPORT
 For general information and support,
 go to the Intel support website at:
 .Lk http://www.intel.com/support/ .
 .\" .Pp
 .\" If an issue is identified with the released source code on the supported kernel
 .\" with a supported adapter, email the specific information related to the
 .\" issue to
 .\" .Aq freebsdnic@mailbox.intel.com .
 .Sh OPTIONS
 The
 .Nm
 driver doesn't use the common
 .Xr MCLGET 9
 interface and use the driver specific cluster allocation mechanism.
 If it's exhausted, the
 .Xr evcnt 9
 counter "ixgX qY Rx no jumbo mbuf" is incremented.
 If this is observed,
 the number can be changed by the following config parameter:
 .Bl -tag -width IXGBE_JCLNUM_MULTI -offset 3n
 .It Dv IXGBE_JCLNUM_MULTI
 The number of RX jumbo buffers (clusters) per queue is calculated by
 .Dv IXGBE_JCLNUM_MULTI
 * (number of rx descriptors).
 The total number of clusters per queue is available via the
 .Li hw.ixgN.num_jcl_per_queue
 .Xr sysctl 7 .
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ixv 4 ,
 .Xr netintro 4 ,
 .Xr vlan 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The
 .Nm
 device driver comes from
 .Fx ,
 where it is called
 .Nm ixgbe .

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: ixv.4,v 1.4.2.1 2019/09/26 19:07:23 martin Exp $
+.\"	$NetBSD: ixv.4,v 1.4.2.2 2021/03/11 16:00:24 martin Exp $
 .\"
 .\" Copyright (c) 2018 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Masanobu SAITOH.
 .\"
 .\" 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
 @@ -17,42 +17,62 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 5, 2019
+.Dd March 9, 2021
 .Dt IXV 4
 .Os
 .Sh NAME
 .Nm ixv
 .Nd Intel 10 Gigabit Ethernet virtual function
 .Sh SYNOPSIS
 .Cd "ixv* at pci? dev ? function ?"
 .Sh DESCRIPTION
 The
 .Nm
 driver supports Intel 10 Gigabit Ethernet virtual function that 82599 and
 newer chips support.
 It can be used on a
 .Nx
 guest that the host supports SR-IOV.
 .Sh OPTIONS
 The
 .Nm
 driver doesn't use the common
 .Xr MCLGET 9
 interface and use the driver specific cluster allocation mechanism.
 If it's exhausted, the
 .Xr evcnt 9
 counter "ixgX qY Rx no jumbo mbuf" is incremented.
 If this is observed,
 the number can be changed by the following config parameter:
 .Bl -tag -width IXGBE_JCLNUM_MULTI -offset 3n
 .It Dv IXGBE_JCLNUM_MULTI
 The number of RX jumbo buffers (clusters) per queue is calculated by
 .Dv IXGBE_JCLNUM_MULTI
 * (number of rx descriptors).
 The total number of clusters per queue is available with the
 .Li hw.ixgN.num_jcl_per_queue
 .Xr sysctl 7 .
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ixg 4 ,
 .Xr netintro 4 ,
 .Xr vlan 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The
 .Nm
 device driver comes from
 .Fx .
 It first appeared in
 .Nx 8.0 .

 @@ -814,27 +814,27 @@ s32 ixgbe_acquire_swfw_sync_X540(struct
 		 * currently using resource (hwmask), or other software
 		 * thread currently using resource (swmask)
 		 */
 		ixgbe_release_swfw_sync_semaphore(hw);
 		msec_delay(5);
+	}
 	/* If the resource is not released by the FW/HW the SW can assume that
 	 * the FW/HW malfunctions. In that case the SW should set the SW bit(s)
 	 * of the requested resource(s) while ignoring the corresponding FW/HW
 	 * bits in the SW_FW_SYNC register.
 	 */
 	if (ixgbe_get_swfw_sync_semaphore(hw)) {
-		DEBUGOUT("Failed to get NVM sempahore and register semaphore while forcefully ignoring FW sempahore bit(s) and setting SW semaphore bit(s), returning IXGBE_ERR_SWFW_SYNC\n");
+		DEBUGOUT("Failed to get NVM semaphore and register semaphore while forcefully ignoring FW semaphore bit(s) and setting SW semaphore bit(s), returning IXGBE_ERR_SWFW_SYNC\n");
 		return IXGBE_ERR_SWFW_SYNC;
+	}
 	swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC_BY_MAC(hw));
 	if (swfw_sync & (fwmask | hwmask)) {
 		swfw_sync |= swmask;
 		IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC_BY_MAC(hw), swfw_sync);
 		ixgbe_release_swfw_sync_semaphore(hw);
 		msec_delay(5);
 		return IXGBE_SUCCESS;
+	}
 	/* If the resource is not released by other SW the SW can assume that
 	 * the other SW malfunctions. In that case the SW should clear all SW
 	 * flags that it does not own and then repeat the whole process once