 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe.c,v 1.279 2021/03/09 10:03:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.280 2021/03/31 07:53:53 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
 @@ -1684,37 +1684,40 @@ ixgbe_update_stats_counters(struct adapt
 	/* Hardware workaround, gprc counts missed packets */
 	stats->gprc.ev_count += IXGBE_READ_REG(hw, IXGBE_GPRC) - missed_rx;
 	lxon = IXGBE_READ_REG(hw, IXGBE_LXONTXC);
 	stats->lxontxc.ev_count += lxon;
 	lxoff = IXGBE_READ_REG(hw, IXGBE_LXOFFTXC);
 	stats->lxofftxc.ev_count += lxoff;
 	total = lxon + lxoff;
 	if (hw->mac.type != ixgbe_mac_82598EB) {
 		stats->gorc.ev_count += IXGBE_READ_REG(hw, IXGBE_GORCL) +
 		    ((u64)IXGBE_READ_REG(hw, IXGBE_GORCH) << 32);
 		stats->gotc.ev_count += IXGBE_READ_REG(hw, IXGBE_GOTCL) +
-		    ((u64)IXGBE_READ_REG(hw, IXGBE_GOTCH) << 32) - total * ETHER_MIN_LEN;
+		    ((u64)IXGBE_READ_REG(hw, IXGBE_GOTCH) << 32)
 		    - total * ETHER_MIN_LEN;
 		stats->tor.ev_count += IXGBE_READ_REG(hw, IXGBE_TORL) +
 		    ((u64)IXGBE_READ_REG(hw, IXGBE_TORH) << 32);
 		stats->lxonrxc.ev_count += IXGBE_READ_REG(hw, IXGBE_LXONRXCNT);
-		stats->lxoffrxc.ev_count += IXGBE_READ_REG(hw, IXGBE_LXOFFRXCNT);
+		stats->lxoffrxc.ev_count
 		    += IXGBE_READ_REG(hw, IXGBE_LXOFFRXCNT);
 	} else {
 		stats->lxonrxc.ev_count += IXGBE_READ_REG(hw, IXGBE_LXONRXC);
 		stats->lxoffrxc.ev_count += IXGBE_READ_REG(hw, IXGBE_LXOFFRXC);
 		/* 82598 only has a counter in the high register */
 		stats->gorc.ev_count += IXGBE_READ_REG(hw, IXGBE_GORCH);
-		stats->gotc.ev_count += IXGBE_READ_REG(hw, IXGBE_GOTCH) - total * ETHER_MIN_LEN;
+		stats->gotc.ev_count += IXGBE_READ_REG(hw, IXGBE_GOTCH)
 		    - total * ETHER_MIN_LEN;
 		stats->tor.ev_count += IXGBE_READ_REG(hw, IXGBE_TORH);
+	}
 	/*
 	 * Workaround: mprc hardware is incorrectly counting
 	 * broadcasts, so for now we subtract those.
 	 */
 	bprc = IXGBE_READ_REG(hw, IXGBE_BPRC);
 	stats->bprc.ev_count += bprc;
 	stats->mprc.ev_count += IXGBE_READ_REG(hw, IXGBE_MPRC)
 	    - ((hw->mac.type == ixgbe_mac_82598EB) ? bprc : 0);
 	stats->prc64.ev_count += IXGBE_READ_REG(hw, IXGBE_PRC64);
 @@ -1906,72 +1909,67 @@ ixgbe_add_hw_stats(struct adapter *adapt
 		evcnt_attach_dynamic(&txr->no_desc_avail, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf,
 		    "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,
+		    CTLFLAG_READONLY, CTLTYPE_INT, "rxd_nxck",
-		    CTLTYPE_INT,
+		    SYSCTL_DESCR("Receive Descriptor next to check"),
-		    "rxd_nxck", SYSCTL_DESCR("Receive Descriptor next to check"),
+		    ixgbe_sysctl_next_to_check_handler, 0, (void *)rxr, 0,
 			ixgbe_sysctl_next_to_check_handler, 0, (void *)rxr, 0,
 		    CTL_CREATE, CTL_EOL) != 0)
 			break;
 		if (sysctl_createv(log, 0, &rnode, &cnode,
-		    CTLFLAG_READONLY,
+		    CTLFLAG_READONLY, CTLTYPE_INT, "rxd_head",
-		    CTLTYPE_INT,
+		    SYSCTL_DESCR("Receive Descriptor Head"),
 		    "rxd_head", SYSCTL_DESCR("Receive Descriptor Head"),
 		    ixgbe_sysctl_rdh_handler, 0, (void *)rxr, 0,
 		    CTL_CREATE, CTL_EOL) != 0)
 			break;
 		if (sysctl_createv(log, 0, &rnode, &cnode,
-		    CTLFLAG_READONLY,
+		    CTLFLAG_READONLY, CTLTYPE_INT, "rxd_tail",
-		    CTLTYPE_INT,
+		    SYSCTL_DESCR("Receive Descriptor Tail"),
 		    "rxd_tail", SYSCTL_DESCR("Receive Descriptor Tail"),
 		    ixgbe_sysctl_rdt_handler, 0, (void *)rxr, 0,
 		    CTL_CREATE, CTL_EOL) != 0)
 			break;
 		if (i < __arraycount(stats->qprc)) {
-			evcnt_attach_dynamic(&stats->qprc[i],
+			evcnt_attach_dynamic(&stats->qprc[i], EVCNT_TYPE_MISC,
-			    EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf,
+			    NULL, adapter->queues[i].evnamebuf, "qprc");
-			    "qprc");
+			evcnt_attach_dynamic(&stats->qptc[i], EVCNT_TYPE_MISC,
-			evcnt_attach_dynamic(&stats->qptc[i],
+			    NULL, adapter->queues[i].evnamebuf, "qptc");
-			    EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf,
+			evcnt_attach_dynamic(&stats->qbrc[i], EVCNT_TYPE_MISC,
-			    "qptc");
+			    NULL, adapter->queues[i].evnamebuf, "qbrc");
-			evcnt_attach_dynamic(&stats->qbrc[i],
+			evcnt_attach_dynamic(&stats->qbtc[i], EVCNT_TYPE_MISC,
-			    EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf,
+			    NULL, adapter->queues[i].evnamebuf, "qbtc");
 			    "qbrc");
 			evcnt_attach_dynamic(&stats->qbtc[i],
 			    EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf,
 			    "qbtc");
 			if (hw->mac.type >= ixgbe_mac_82599EB)
 				evcnt_attach_dynamic(&stats->qprdc[i],
 				    EVCNT_TYPE_MISC, NULL,
 				    adapter->queues[i].evnamebuf, "qprdc");
+		}
 		evcnt_attach_dynamic(&rxr->rx_packets, EVCNT_TYPE_MISC,
-		    NULL, adapter->queues[i].evnamebuf, "Queue Packets Received");
+		    NULL, adapter->queues[i].evnamebuf,
 		    "Queue Packets Received");
 		evcnt_attach_dynamic(&rxr->rx_bytes, EVCNT_TYPE_MISC,
-		    NULL, adapter->queues[i].evnamebuf, "Queue Bytes Received");
+		    NULL, adapter->queues[i].evnamebuf,
 		    "Queue Bytes Received");
 		evcnt_attach_dynamic(&rxr->rx_copies, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf, "Copied RX Frames");
 		evcnt_attach_dynamic(&rxr->no_jmbuf, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf, "Rx no jumbo mbuf");
 		evcnt_attach_dynamic(&rxr->rx_discarded, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf, "Rx discarded");
 #ifdef LRO
 		SYSCTL_ADD_INT(ctx, queue_list, OID_AUTO, "lro_queued",
 				CTLFLAG_RD, &lro->lro_queued, 0,
 				"LRO Queued");
 		SYSCTL_ADD_INT(ctx, queue_list, OID_AUTO, "lro_flushed",
 				CTLFLAG_RD, &lro->lro_flushed, 0,
 				"LRO Flushed");
 @@ -3183,40 +3181,46 @@ ixgbe_intr_admin_common(struct adapter *
 		/* Check for over temp condition */
 		if (adapter->feat_en & IXGBE_FEATURE_TEMP_SENSOR) {
 			switch (adapter->hw.mac.type) {
 			case ixgbe_mac_X550EM_a:
 				if (!(eicr & IXGBE_EICR_GPI_SDP0_X550EM_a))
 					break;
 				/* Disable interrupt to prevent log spam */
 				*eims_disable |= IXGBE_EICR_GPI_SDP0_X550EM_a;
 				retval = hw->phy.ops.check_overtemp(hw);
 				if (retval != IXGBE_ERR_OVERTEMP)
 					break;
-				device_printf(adapter->dev, "CRITICAL: OVER TEMP!! PHY IS SHUT DOWN!!\n");
+				device_printf(adapter->dev,
-				device_printf(adapter->dev, "System shutdown required!\n");
+				    "CRITICAL: OVER TEMP!! "
 				    "PHY IS SHUT DOWN!!\n");
 				device_printf(adapter->dev,
 				    "System shutdown required!\n");
 				break;
 			default:
 				if (!(eicr & IXGBE_EICR_TS))
 					break;
 				/* Disable interrupt to prevent log spam */
 				*eims_disable |= IXGBE_EIMS_TS;
 				retval = hw->phy.ops.check_overtemp(hw);
 				if (retval != IXGBE_ERR_OVERTEMP)
 					break;
-				device_printf(adapter->dev, "CRITICAL: OVER TEMP!! PHY IS SHUT DOWN!!\n");
+				device_printf(adapter->dev,
-				device_printf(adapter->dev, "System shutdown required!\n");
+				    "CRITICAL: OVER TEMP!! "
 				    "PHY IS SHUT DOWN!!\n");
 				device_printf(adapter->dev,
 				    "System shutdown required!\n");
 				break;
+			}
+		}
 		/* Check for VF message */
 		if ((adapter->feat_en & IXGBE_FEATURE_SRIOV) &&
 		    (eicr & IXGBE_EICR_MAILBOX)) {
 			task_requests |= IXGBE_REQUEST_TASK_MBX;
 			*eims_disable |= IXGBE_EIMS_MAILBOX;
+		}
+	}
 	/* Check for fan failure */
 @@ -3349,27 +3353,28 @@ ixgbe_add_device_sysctls(struct adapter
 	struct sysctllog **log;
 	const struct sysctlnode *rnode, *cnode;
 	log = &adapter->sysctllog;
 	if ((rnode = ixgbe_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"),
-	    ixgbe_sysctl_debug, 0, (void *)adapter, 0, CTL_CREATE, CTL_EOL) != 0)
+	    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)
 @@ -3403,28 +3408,30 @@ ixgbe_add_device_sysctls(struct adapter
 	/*
 	 * If each "que->txrx_use_workqueue" is changed in sysctl handler,
 	 * it causesflip-flopping softint/workqueue mode in one deferred
 	 * processing. Therefore, preempt_disable()/preempt_enable() are
 	 * required in ixgbe_sched_handle_que() to avoid
 	 * KASSERT(ixgbe_sched_handle_que()) in softint_schedule().
 	 * I think changing "que->txrx_use_workqueue" in interrupt handler
 	 * is lighter than doing preempt_disable()/preempt_enable() in every
 	 * ixgbe_sched_handle_que().
 	 */
 	adapter->txrx_use_workqueue = ixgbe_txrx_workqueue;
 	if (sysctl_createv(log, 0, &rnode, &cnode, CTLFLAG_READWRITE,
-	    CTLTYPE_BOOL, "txrx_workqueue", SYSCTL_DESCR("Use workqueue for packet processing"),
+	    CTLTYPE_BOOL, "txrx_workqueue",
-	    NULL, 0, &adapter->txrx_use_workqueue, 0, CTL_CREATE, CTL_EOL) != 0)
+	    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");
 #ifdef IXGBE_DEBUG
 	/* testing sysctls (for all devices) */
 	if (sysctl_createv(log, 0, &rnode, &cnode, CTLFLAG_READWRITE,
 	    CTLTYPE_INT, "power_state", SYSCTL_DESCR("PCI Power State"),
 	    ixgbe_sysctl_power_state, 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_STRING, "print_rss_config",
 	    SYSCTL_DESCR("Prints RSS Configuration"),
 @@ -3467,27 +3474,28 @@ ixgbe_add_device_sysctls(struct adapter
 			aprint_error_dev(dev, "could not create sysctl\n");
 			return;
+		}
 		if (sysctl_createv(log, 0, &phy_node, &cnode, CTLFLAG_READONLY,
 		    CTLTYPE_INT, "temp",
 		    SYSCTL_DESCR("Current External PHY Temperature (Celsius)"),
 		    ixgbe_sysctl_phy_temp, 0, (void *)adapter, 0, CTL_CREATE,
 		    CTL_EOL) != 0)
 			aprint_error_dev(dev, "could not create sysctl\n");
 		if (sysctl_createv(log, 0, &phy_node, &cnode, CTLFLAG_READONLY,
 		    CTLTYPE_INT, "overtemp_occurred",
-		    SYSCTL_DESCR("External PHY High Temperature Event Occurred"),
+		    SYSCTL_DESCR(
 			    "External PHY High Temperature Event Occurred"),
 		    ixgbe_sysctl_phy_overtemp_occurred, 0, (void *)adapter, 0,
 		    CTL_CREATE, CTL_EOL) != 0)
 			aprint_error_dev(dev, "could not create sysctl\n");
+	}
 	if ((hw->mac.type == ixgbe_mac_X550EM_a)
 	    && (hw->phy.type == ixgbe_phy_fw))
 		if (sysctl_createv(log, 0, &rnode, &cnode, CTLFLAG_READWRITE,
 		    CTLTYPE_BOOL, "force_10_100_autonego",
 		    SYSCTL_DESCR("Force autonego on 10M and 100M"),
 		    NULL, 0, &hw->phy.force_10_100_autonego, 0,
 		    CTL_CREATE, CTL_EOL) != 0)
 			aprint_error_dev(dev, "could not create sysctl\n");
 @@ -5527,28 +5535,27 @@ 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 > 0x3f) {
-		device_printf(dev,
+		device_printf(dev, "Invalid advertised speed; valid modes are 0x0 through 0x3f\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 */
 @@ -6515,27 +6522,28 @@ ixgbe_ioctl(struct ifnet *ifp, u_long co
 /************************************************************************
  * ixgbe_check_fan_failure
  ************************************************************************/
 static int
 ixgbe_check_fan_failure(struct adapter *adapter, u32 reg, bool in_interrupt)
+{
 	u32 mask;
 	mask = (in_interrupt) ? IXGBE_EICR_GPI_SDP1_BY_MAC(&adapter->hw) :
 	    IXGBE_ESDP_SDP1;
 	if (reg & mask) {
-		device_printf(adapter->dev, "\nCRITICAL: FAN FAILURE!! REPLACE IMMEDIATELY!!\n");
+		device_printf(adapter->dev,
 		    "\nCRITICAL: FAN FAILURE!! REPLACE IMMEDIATELY!!\n");
 		return IXGBE_ERR_FAN_FAILURE;
+	}
 	return IXGBE_SUCCESS;
 } /* ixgbe_check_fan_failure */
 /************************************************************************
  * ixgbe_handle_que
  ************************************************************************/
 static void
 ixgbe_handle_que(void *context)
+{
 	struct ix_queue *que = context;
 @@ -6662,27 +6670,28 @@ alloc_retry:
 		adapter->osdep.intrs = NULL;
 		return ENXIO;
+	}
 	aprint_normal_dev(dev, "interrupting at %s\n", intrstr);
 	/*
 	 * Try allocating a fast interrupt and the associated deferred
 	 * processing contexts.
 	 */
 	if (!(adapter->feat_en & IXGBE_FEATURE_LEGACY_TX)) {
 		txr->txr_si =
 		    softint_establish(SOFTINT_NET | IXGBE_SOFTINT_FLAGS,
 			ixgbe_deferred_mq_start, txr);
-		snprintf(wqname, sizeof(wqname), "%sdeferTx", device_xname(dev));
+		snprintf(wqname, sizeof(wqname), "%sdeferTx",
 		    device_xname(dev));
 		defertx_error = workqueue_create(&adapter->txr_wq, wqname,
 		    ixgbe_deferred_mq_start_work, adapter, IXGBE_WORKQUEUE_PRI,
 		    IPL_NET, IXGBE_WORKQUEUE_FLAGS);
 		adapter->txr_wq_enqueued = percpu_alloc(sizeof(u_int));
+	}
 	que->que_si = softint_establish(SOFTINT_NET | IXGBE_SOFTINT_FLAGS,
 	    ixgbe_handle_que, que);
 	snprintf(wqname, sizeof(wqname), "%sTxRx", device_xname(dev));
 	error = workqueue_create(&adapter->que_wq, wqname,
 	    ixgbe_handle_que_work, adapter, IXGBE_WORKQUEUE_PRI, IPL_NET,
 	    IXGBE_WORKQUEUE_FLAGS);
 	if ((!(adapter->feat_en & IXGBE_FEATURE_LEGACY_TX)
 @@ -6832,27 +6841,28 @@ ixgbe_allocate_msix(struct adapter *adap
 			ixgbe_handle_que, que);
 		if (que->que_si == NULL) {
 			aprint_error_dev(dev,
 			    "couldn't establish software interrupt\n");
 			error = ENXIO;
 			goto err_out;
+		}
+	}
 	snprintf(wqname, sizeof(wqname), "%sdeferTx", device_xname(dev));
 	error = workqueue_create(&adapter->txr_wq, wqname,
 	    ixgbe_deferred_mq_start_work, adapter, IXGBE_WORKQUEUE_PRI, IPL_NET,
 	    IXGBE_WORKQUEUE_FLAGS);
 	if (error) {
-		aprint_error_dev(dev, "couldn't create workqueue for deferred Tx\n");
+		aprint_error_dev(dev,
 		    "couldn't create workqueue for deferred Tx\n");
 		goto err_out;
+	}
 	adapter->txr_wq_enqueued = percpu_alloc(sizeof(u_int));
 	snprintf(wqname, sizeof(wqname), "%sTxRx", device_xname(dev));
 	error = workqueue_create(&adapter->que_wq, wqname,
 	    ixgbe_handle_que_work, adapter, IXGBE_WORKQUEUE_PRI, IPL_NET,
 	    IXGBE_WORKQUEUE_FLAGS);
 	if (error) {
 		aprint_error_dev(dev, "couldn't create workqueue for Tx/Rx\n");
 		goto err_out;
+	}

 @@ -1,14 +1,14 @@
-/*$NetBSD: ixv.c,v 1.157 2021/03/31 07:52:14 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.158 2021/03/31 07:53:53 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
 @@ -2545,48 +2545,49 @@ ixv_add_device_sysctls(struct adapter *a
 	struct sysctllog **log;
 	const struct sysctlnode *rnode, *cnode;
 	device_t dev;
 	dev = adapter->dev;
 	log = &adapter->sysctllog;
 	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,
+	    CTLFLAG_READWRITE, CTLTYPE_INT, "debug",
-	    "debug", SYSCTL_DESCR("Debug Info"),
+	    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,
+	    CTLFLAG_READWRITE, CTLTYPE_BOOL, "enable_aim",
-	    "enable_aim", SYSCTL_DESCR("Interrupt Moderation"),
+	    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,
+	    CTLFLAG_READWRITE, CTLTYPE_BOOL, "txrx_workqueue",
-	    "txrx_workqueue", SYSCTL_DESCR("Use workqueue for packet processing"),
+	    SYSCTL_DESCR("Use workqueue for packet processing"),
-		NULL, 0, &adapter->txrx_use_workqueue, 0, CTL_CREATE, CTL_EOL) != 0)
+	    NULL, 0, &adapter->txrx_use_workqueue, 0, CTL_CREATE, CTL_EOL)
 	    != 0)
 		aprint_error_dev(dev, "could not create sysctl\n");
+}
 /************************************************************************
  * ixv_add_stats_sysctls - Add statistic sysctls for the VF.
  ************************************************************************/
 static void
 ixv_add_stats_sysctls(struct adapter *adapter)
+{
 	device_t		dev = adapter->dev;
 	struct tx_ring		*txr = adapter->tx_rings;
 	struct rx_ring		*rxr = adapter->rx_rings;
 	struct ixgbevf_hw_stats *stats = &adapter->stats.vf;
 @@ -2674,53 +2675,52 @@ ixv_add_stats_sysctls(struct adapter *ad
 		    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 */
 		if (sysctl_createv(log, 0, &rnode, &cnode,
-		    CTLFLAG_READONLY,
+		    CTLFLAG_READONLY, CTLTYPE_INT, "rxd_nxck",
-		    CTLTYPE_INT,
+		    SYSCTL_DESCR("Receive Descriptor next to check"),
-		    "rxd_nxck", SYSCTL_DESCR("Receive Descriptor next to check"),
+		    ixv_sysctl_next_to_check_handler, 0, (void *)rxr, 0,
 			ixv_sysctl_next_to_check_handler, 0, (void *)rxr, 0,
 		    CTL_CREATE, CTL_EOL) != 0)
 			break;
 		if (sysctl_createv(log, 0, &rnode, &cnode,
-		    CTLFLAG_READONLY,
+		    CTLFLAG_READONLY, CTLTYPE_INT, "rxd_head",
-		    CTLTYPE_INT,
+		    SYSCTL_DESCR("Receive Descriptor Head"),
 		    "rxd_head", SYSCTL_DESCR("Receive Descriptor Head"),
 		    ixv_sysctl_rdh_handler, 0, (void *)rxr, 0,
 		    CTL_CREATE, CTL_EOL) != 0)
 			break;
 		if (sysctl_createv(log, 0, &rnode, &cnode,
-		    CTLFLAG_READONLY,
+		    CTLFLAG_READONLY, CTLTYPE_INT, "rxd_tail",
-		    CTLTYPE_INT,
+		    SYSCTL_DESCR("Receive Descriptor Tail"),
 		    "rxd_tail", SYSCTL_DESCR("Receive Descriptor Tail"),
 		    ixv_sysctl_rdt_handler, 0, (void *)rxr, 0,
 		    CTL_CREATE, CTL_EOL) != 0)
 			break;
 		evcnt_attach_dynamic(&rxr->rx_packets, EVCNT_TYPE_MISC,
-		    NULL, adapter->queues[i].evnamebuf, "Queue Packets Received");
+		    NULL, adapter->queues[i].evnamebuf,
 		    "Queue Packets Received");
 		evcnt_attach_dynamic(&rxr->rx_bytes, EVCNT_TYPE_MISC,
-		    NULL, adapter->queues[i].evnamebuf, "Queue Bytes Received");
+		    NULL, adapter->queues[i].evnamebuf,
 		    "Queue Bytes Received");
 		evcnt_attach_dynamic(&rxr->rx_copies, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf, "Copied RX Frames");
 		evcnt_attach_dynamic(&rxr->no_jmbuf, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf, "Rx no jumbo mbuf");
 		evcnt_attach_dynamic(&rxr->rx_discarded, EVCNT_TYPE_MISC,
 		    NULL, adapter->queues[i].evnamebuf, "Rx discarded");
 #ifdef LRO
 		SYSCTL_ADD_INT(ctx, queue_list, OID_AUTO, "lro_queued",
 				CTLFLAG_RD, &lro->lro_queued, 0,
 				"LRO Queued");
 		SYSCTL_ADD_INT(ctx, queue_list, OID_AUTO, "lro_flushed",
 				CTLFLAG_RD, &lro->lro_flushed, 0,
 				"LRO Flushed");
 @@ -3338,37 +3338,37 @@ ixv_allocate_msix(struct adapter *adapte
 		que->que_si
 		    = softint_establish(SOFTINT_NET | IXGBE_SOFTINT_FLAGS,
 			ixv_handle_que, que);
 		if (que->que_si == NULL) {
 			aprint_error_dev(dev,
 			    "could not establish software interrupt\n");
+		}
+	}
 	snprintf(wqname, sizeof(wqname), "%sdeferTx", device_xname(dev));
 	error = workqueue_create(&adapter->txr_wq, wqname,
 	    ixgbe_deferred_mq_start_work, adapter, IXGBE_WORKQUEUE_PRI, IPL_NET,
 	    IXGBE_WORKQUEUE_FLAGS);
 	if (error) {
-		aprint_error_dev(dev, "couldn't create workqueue for deferred Tx\n");
+		aprint_error_dev(dev,
 		    "couldn't create workqueue for deferred Tx\n");
+	}
 	adapter->txr_wq_enqueued = percpu_alloc(sizeof(u_int));
 	snprintf(wqname, sizeof(wqname), "%sTxRx", device_xname(dev));
 	error = workqueue_create(&adapter->que_wq, wqname,
 	    ixv_handle_que_work, adapter, IXGBE_WORKQUEUE_PRI, IPL_NET,
 	    IXGBE_WORKQUEUE_FLAGS);
 	if (error) {
-		aprint_error_dev(dev,
+		aprint_error_dev(dev, "couldn't create workqueue for Tx/Rx\n");
 		    "couldn't create workqueue for Tx/Rx\n");
+	}
 	/* and Mailbox */
 	cpu_id++;
 	snprintf(intr_xname, sizeof(intr_xname), "%s link", device_xname(dev));
 	adapter->vector = vector;
 	intrstr = pci_intr_string(pc, adapter->osdep.intrs[vector], intrbuf,
 	    sizeof(intrbuf));
 #ifdef IXGBE_MPSAFE
 	pci_intr_setattr(pc, &adapter->osdep.intrs[vector], PCI_INTR_MPSAFE,
 	    true);
 #endif
 	/* Set the mbx handler function */

 @@ -1,14 +1,14 @@
-/* $NetBSD: ix_txrx.c,v 1.69 2021/03/12 01:54:29 knakahara Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.70 2021/03/31 07:53:53 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
 @@ -192,27 +192,27 @@ ixgbe_legacy_start(struct ifnet *ifp)
+	}
 } /* ixgbe_legacy_start */
 /************************************************************************
  * ixgbe_mq_start - Multiqueue Transmit Entry Point
+ *
  *   (if_transmit function)
  ************************************************************************/
 int
 ixgbe_mq_start(struct ifnet *ifp, struct mbuf *m)
+{
 	struct adapter	*adapter = ifp->if_softc;
 	struct tx_ring	*txr;
-	int 		i;
+	int		i;
 #ifdef RSS
 	uint32_t bucket_id;
 #endif
 	/*
 	 * When doing RSS, map it to the same outbound queue
 	 * as the incoming flow would be mapped to.
+	 *
 	 * If everything is setup correctly, it should be the
 	 * same bucket that the current CPU we're on is.
 	 */
 #ifdef RSS
 	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) {
 @@ -1745,31 +1745,29 @@ ixgbe_rx_input(struct rx_ring *rxr, stru
 } /* ixgbe_rx_input */
 /************************************************************************
  * ixgbe_rx_discard
  ************************************************************************/
 static __inline void
 ixgbe_rx_discard(struct rx_ring *rxr, int i)
+{
 	struct ixgbe_rx_buf *rbuf;
 	rbuf = &rxr->rx_buffers[i];
 	/*
-	 * With advanced descriptors the writeback
+	 * With advanced descriptors the writeback clobbers the buffer addrs,
-	 * clobbers the buffer addrs, so its easier
+	 * so its easier to just free the existing mbufs and take the normal
-	 * to just free the existing mbufs and take
+	 * refresh path to get new buffers and mapping.
 	 * the normal refresh path to get new buffers
 	 * and mapping.
 	 */
 	if (rbuf->fmp != NULL) {/* Partial chain ? */
 		bus_dmamap_sync(rxr->ptag->dt_dmat, rbuf->pmap, 0,
 		    rbuf->buf->m_pkthdr.len, BUS_DMASYNC_POSTREAD);
 		m_freem(rbuf->fmp);
 		rbuf->fmp = NULL;
 		rbuf->buf = NULL; /* rbuf->buf is part of fmp's chain */
 	} else if (rbuf->buf) {
 		bus_dmamap_sync(rxr->ptag->dt_dmat, rbuf->pmap, 0,
 		    rbuf->buf->m_pkthdr.len, BUS_DMASYNC_POSTREAD);
 		m_free(rbuf->buf);
 		rbuf->buf = NULL;