 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.366 2015/10/13 09:03:58 knakahara Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.367 2015/10/13 09:10:01 knakahara Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi 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
 @@ -73,27 +73,27 @@
  * TODO (in order of importance):
+ *
  *	- Check XXX'ed comments
  *	- EEE (Energy Efficiency Ethernet)
  *	- Multi queue
  *	- Image Unique ID
  *	- LPLU other than PCH*
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.366 2015/10/13 09:03:58 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.367 2015/10/13 09:10:01 knakahara Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -4036,26 +4036,83 @@ wm_rxdrain(struct wm_rxqueue *rxq)
 	KASSERT(WM_RX_LOCKED(rxq));
 	for (i = 0; i < WM_NRXDESC; i++) {
 		rxs = &rxq->rxq_soft[i];
 		if (rxs->rxs_mbuf != NULL) {
 			bus_dmamap_unload(sc->sc_dmat, rxs->rxs_dmamap);
 			m_freem(rxs->rxs_mbuf);
 			rxs->rxs_mbuf = NULL;
+		}
+	}
+}
 /*
  * Setup registers for RSS.
+ *
  * XXX not yet VMDq support
  */
 static void
 wm_init_rss(struct wm_softc *sc)
+{
 	uint32_t mrqc, reta_reg;
 	int i;
 	for (i = 0; i < RETA_NUM_ENTRIES; i++) {
 		int qid, reta_ent;
 		qid  = i % sc->sc_nrxqueues;
 		switch(sc->sc_type) {
 		case WM_T_82574:
 			reta_ent = __SHIFTIN(qid,
 			    RETA_ENT_QINDEX_MASK_82574);
 			break;
 		case WM_T_82575:
 			reta_ent = __SHIFTIN(qid,
 			    RETA_ENT_QINDEX1_MASK_82575);
 			break;
 		default:
 			reta_ent = __SHIFTIN(qid, RETA_ENT_QINDEX_MASK);
 			break;
+		}
 		reta_reg = CSR_READ(sc, WMREG_RETA_Q(i));
 		reta_reg &= ~RETA_ENTRY_MASK_Q(i);
 		reta_reg |= __SHIFTIN(reta_ent, RETA_ENTRY_MASK_Q(i));
 		CSR_WRITE(sc, WMREG_RETA_Q(i), reta_reg);
+	}
 	for (i = 0; i < RSSRK_NUM_REGS; i++)
 		CSR_WRITE(sc, WMREG_RSSRK(i), (uint32_t)random());
 	if (sc->sc_type == WM_T_82574)
 		mrqc = MRQC_ENABLE_RSS_MQ_82574;
 	else
 		mrqc = MRQC_ENABLE_RSS_MQ;
 	/* XXXX
 	 * The same as FreeBSD igb.
 	 * Why doesn't use MRQC_RSS_FIELD_IPV6_EX?
 	 */
 	mrqc |= (MRQC_RSS_FIELD_IPV4 | MRQC_RSS_FIELD_IPV4_TCP);
 	mrqc |= (MRQC_RSS_FIELD_IPV6 | MRQC_RSS_FIELD_IPV6_TCP);
 	mrqc |= (MRQC_RSS_FIELD_IPV4_UDP | MRQC_RSS_FIELD_IPV6_UDP);
 	mrqc |= (MRQC_RSS_FIELD_IPV6_UDP_EX | MRQC_RSS_FIELD_IPV6_TCP_EX);
 	CSR_WRITE(sc, WMREG_MRQC, mrqc);
+}
 #ifdef WM_MSI_MSIX
 /*
  * Adjust TX and RX queue numbers which the system actulally uses.
+ *
  * The numbers are affected by below parameters.
  *     - The nubmer of hardware queues
  *     - The number of MSI-X vectors (= "nvectors" argument)
  *     - ncpu
  */
 static void
 wm_adjust_qnum(struct wm_softc *sc, int nvectors)
+{
 	int hw_ntxqueues, hw_nrxqueues;
 	if (nvectors < 3) {
 @@ -4135,82 +4192,26 @@ wm_adjust_qnum(struct wm_softc *sc, int
 	 * As queues more then cpus cannot improve scaling, we limit
 	 * the number of queues used actually.
 	 */
 	if (ncpu < sc->sc_ntxqueues)
 		sc->sc_ntxqueues = ncpu;
 	if (ncpu < sc->sc_nrxqueues)
 		sc->sc_nrxqueues = ncpu;
 	/* XXX Currently, this driver supports RX multiqueue only. */
 	sc->sc_ntxqueues = 1;
+}
 /*
  * Setup registers for RSS.
  * XXX not yet VMDq support
  */
 static void
 wm_init_rss(struct wm_softc *sc)
 	uint32_t mrqc, reta_reg;
 	int i;
 	for (i = 0; i < RETA_NUM_ENTRIES; i++) {
 		int qid, reta_ent;
 		qid  = i % sc->sc_nrxqueues;
 		switch(sc->sc_type) {
 		case WM_T_82574:
 			reta_ent = __SHIFTIN(qid,
 			    RETA_ENT_QINDEX_MASK_82574);
 			break;
 		case WM_T_82575:
 			reta_ent = __SHIFTIN(qid,
 			    RETA_ENT_QINDEX1_MASK_82575);
 			break;
 		default:
 			reta_ent = __SHIFTIN(qid, RETA_ENT_QINDEX_MASK);
 			break;
 		reta_reg = CSR_READ(sc, WMREG_RETA_Q(i));
 		reta_reg &= ~RETA_ENTRY_MASK_Q(i);
 		reta_reg |= __SHIFTIN(reta_ent, RETA_ENTRY_MASK_Q(i));
 		CSR_WRITE(sc, WMREG_RETA_Q(i), reta_reg);
 	for (i = 0; i < RSSRK_NUM_REGS; i++)
 		CSR_WRITE(sc, WMREG_RSSRK(i), (uint32_t)random());
 	if (sc->sc_type == WM_T_82574)
 		mrqc = MRQC_ENABLE_RSS_MQ_82574;
 	else
 		mrqc = MRQC_ENABLE_RSS_MQ;
 	/* XXXX
 	 * The same as FreeBSD igb.
 	 * Why doesn't use MRQC_RSS_FIELD_IPV6_EX?
 	 */
 	mrqc |= (MRQC_RSS_FIELD_IPV4 | MRQC_RSS_FIELD_IPV4_TCP);
 	mrqc |= (MRQC_RSS_FIELD_IPV6 | MRQC_RSS_FIELD_IPV6_TCP);
 	mrqc |= (MRQC_RSS_FIELD_IPV4_UDP | MRQC_RSS_FIELD_IPV6_UDP);
 	mrqc |= (MRQC_RSS_FIELD_IPV6_UDP_EX | MRQC_RSS_FIELD_IPV6_TCP_EX);
 	CSR_WRITE(sc, WMREG_MRQC, mrqc);
 #ifdef WM_MSI_MSIX
 /*
  * Both single interrupt MSI and INTx can use this function.
  */
 static int
 wm_setup_legacy(struct wm_softc *sc)
+{
 	pci_chipset_tag_t pc = sc->sc_pc;
 	const char *intrstr = NULL;
 	char intrbuf[PCI_INTRSTR_LEN];
 	intrstr = pci_intr_string(pc, sc->sc_intrs[0], intrbuf,
 	    sizeof(intrbuf));
 #ifdef WM_MPSAFE
 	pci_intr_setattr(pc, &sc->sc_intrs[0], PCI_INTR_MPSAFE, true);