 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.694 2020/10/30 06:29:47 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.695 2020/11/02 09:21:50 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
 @@ -72,27 +72,27 @@
+ *
  * TODO (in order of importance):
+ *
  *	- Check XXX'ed comments
  *	- TX Multi queue improvement (refine queue selection logic)
  *	- Split header buffer for newer descriptors
  *	- EEE (Energy Efficiency Ethernet) for I354
  *	- 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.694 2020/10/30 06:29:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.695 2020/11/02 09:21:50 knakahara Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #include "opt_if_wm.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>
 @@ -374,27 +374,28 @@ struct wm_txqueue {
 	int txq_fifo_stall;		/* Tx FIFO is stalled */
 	/*
 	 * When ncpu > number of Tx queues, a Tx queue is shared by multiple
 	 * CPUs. This queue intermediate them without block.
 	 */
 	pcq_t *txq_interq;
 	/*
 	 * NEWQUEUE devices must use not ifp->if_flags but txq->txq_flags
 	 * to manage Tx H/W queue's busy flag.
 	 */
 	int txq_flags;			/* flags for H/W queue, see below */
-#define	WM_TXQ_NO_SPACE	0x1
+#define	WM_TXQ_NO_SPACE		0x1
 #define	WM_TXQ_LINKDOWN_DISCARD	0x2
 	bool txq_stopping;
 	bool txq_sending;
 	time_t txq_lastsent;
 	/* Checksum flags used for previous packet */
 	uint32_t 	txq_last_hw_cmd;
 	uint8_t 	txq_last_hw_fields;
 	uint16_t	txq_last_hw_ipcs;
 	uint16_t	txq_last_hw_tucs;
 	uint32_t txq_packets;		/* for AIM */
 @@ -1034,26 +1035,29 @@ static int	wm_lv_phy_workarounds_ich8lan
 static int	wm_k1_workaround_lpt_lp(struct wm_softc *, bool);
 static int	wm_k1_gig_workaround_hv(struct wm_softc *, int);
 static int	wm_k1_workaround_lv(struct wm_softc *);
 static int	wm_link_stall_workaround_hv(struct wm_softc *);
 static int	wm_set_mdio_slow_mode_hv(struct wm_softc *);
 static void	wm_configure_k1_ich8lan(struct wm_softc *, int);
 static void	wm_reset_init_script_82575(struct wm_softc *);
 static void	wm_reset_mdicnfg_82580(struct wm_softc *);
 static bool	wm_phy_is_accessible_pchlan(struct wm_softc *);
 static void	wm_toggle_lanphypc_pch_lpt(struct wm_softc *);
 static int	wm_platform_pm_pch_lpt(struct wm_softc *, bool);
 static int	wm_pll_workaround_i210(struct wm_softc *);
 static void	wm_legacy_irq_quirk_spt(struct wm_softc *);
 static bool	wm_phy_need_linkdown_discard(struct wm_softc *);
 static void	wm_set_linkdown_discard(struct wm_softc *);
 static void	wm_clear_linkdown_discard(struct wm_softc *);
 #ifdef WM_DEBUG
 static int	wm_sysctl_debug(SYSCTLFN_PROTO);
 #endif
 CFATTACH_DECL3_NEW(wm, sizeof(struct wm_softc),
     wm_match, wm_attach, wm_detach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
 /*
  * Devices supported by this driver.
  */
 static const struct wm_product {
 	pci_vendor_id_t		wmp_vendor;
 @@ -3090,26 +3094,29 @@ alloc_retry:
 	    NULL, xname, "tx_xoff");
 	evcnt_attach_dynamic(&sc->sc_ev_tx_xon, EVCNT_TYPE_MISC,
 	    NULL, xname, "tx_xon");
 	evcnt_attach_dynamic(&sc->sc_ev_rx_xoff, EVCNT_TYPE_MISC,
 	    NULL, xname, "rx_xoff");
 	evcnt_attach_dynamic(&sc->sc_ev_rx_xon, EVCNT_TYPE_MISC,
 	    NULL, xname, "rx_xon");
 	evcnt_attach_dynamic(&sc->sc_ev_rx_macctl, EVCNT_TYPE_MISC,
 	    NULL, xname, "rx_macctl");
 #endif /* WM_EVENT_COUNTERS */
 	sc->sc_txrx_use_workqueue = false;
 	if (wm_phy_need_linkdown_discard(sc))
 		wm_set_linkdown_discard(sc);
 	wm_init_sysctls(sc);
 	if (pmf_device_register(self, wm_suspend, wm_resume))
 		pmf_class_network_register(self, ifp);
 	else
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	sc->sc_flags |= WM_F_ATTACHED;
 out:
 	return;
+}
 /* The detach function (ca_detach) */
 @@ -3473,26 +3480,69 @@ ec:
+	}
 	/* ec related updates */
 	wm_set_eee(sc);
 out:
 	if (needreset)
 		rc = ENETRESET;
 	WM_CORE_UNLOCK(sc);
 	return rc;
+}
 static bool
 wm_phy_need_linkdown_discard(struct wm_softc *sc)
+{
 	switch(sc->sc_phytype) {
 	case WMPHY_82577: /* ihphy */
 	case WMPHY_82578: /* atphy */
 	case WMPHY_82579: /* ihphy */
 	case WMPHY_I217: /* ihphy */
 	case WMPHY_82580: /* ihphy */
 	case WMPHY_I350: /* ihphy */
 		return true;
 	default:
 		return false;
+	}
+}
 static void
 wm_set_linkdown_discard(struct wm_softc *sc)
+{
 	for (int i = 0; i < sc->sc_nqueues; i++) {
 		struct wm_txqueue *txq = &sc->sc_queue[i].wmq_txq;
 		mutex_enter(txq->txq_lock);
 		txq->txq_flags |= WM_TXQ_LINKDOWN_DISCARD;
 		mutex_exit(txq->txq_lock);
+	}
+}
 static void
 wm_clear_linkdown_discard(struct wm_softc *sc)
+{
 	for (int i = 0; i < sc->sc_nqueues; i++) {
 		struct wm_txqueue *txq = &sc->sc_queue[i].wmq_txq;
 		mutex_enter(txq->txq_lock);
 		txq->txq_flags &= ~WM_TXQ_LINKDOWN_DISCARD;
 		mutex_exit(txq->txq_lock);
+	}
+}
 /*
  * wm_ioctl:		[ifnet interface function]
+ *
  *	Handle control requests from the operator.
  */
 static int
 wm_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct wm_softc *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *)data;
 	struct ifaddr *ifa = (struct ifaddr *)data;
 	struct sockaddr_dl *sdl;
 	int s, error;
 @@ -3510,42 +3560,57 @@ wm_ioctl(struct ifnet *ifp, u_long cmd,
 		if (IFM_SUBTYPE(ifr->ifr_media) == IFM_AUTO ||
 		    (ifr->ifr_media & IFM_FDX) == 0)
 			ifr->ifr_media &= ~IFM_ETH_FMASK;
 		if (IFM_SUBTYPE(ifr->ifr_media) != IFM_AUTO) {
 			if ((ifr->ifr_media & IFM_ETH_FMASK) == IFM_FLOW) {
 				/* We can do both TXPAUSE and RXPAUSE. */
 				ifr->ifr_media |=
 				    IFM_ETH_TXPAUSE | IFM_ETH_RXPAUSE;
+			}
 			sc->sc_flowflags = ifr->ifr_media & IFM_ETH_FMASK;
+		}
 		WM_CORE_UNLOCK(sc);
 		error = ifmedia_ioctl(ifp, ifr, &sc->sc_mii.mii_media, cmd);
 		if (error == 0 && wm_phy_need_linkdown_discard(sc)) {
 			if (IFM_SUBTYPE(ifr->ifr_media) == IFM_NONE)
 				wm_set_linkdown_discard(sc);
 			else
 				wm_clear_linkdown_discard(sc);
+		}
 		break;
 	case SIOCINITIFADDR:
 		WM_CORE_LOCK(sc);
 		if (ifa->ifa_addr->sa_family == AF_LINK) {
 			sdl = satosdl(ifp->if_dl->ifa_addr);
 			(void)sockaddr_dl_setaddr(sdl, sdl->sdl_len,
 			    LLADDR(satosdl(ifa->ifa_addr)), ifp->if_addrlen);
 			/* Unicast address is the first multicast entry */
 			wm_set_filter(sc);
 			error = 0;
 			WM_CORE_UNLOCK(sc);
 			break;
+		}
 		WM_CORE_UNLOCK(sc);
 		if (((ifp->if_flags & IFF_UP) == 0) && wm_phy_need_linkdown_discard(sc))
 			wm_clear_linkdown_discard(sc);
 		/*FALLTHROUGH*/
 	default:
 		if (cmd == SIOCSIFFLAGS && wm_phy_need_linkdown_discard(sc)) {
 			if (((ifp->if_flags & IFF_UP) == 0) && ((ifr->ifr_flags & IFF_UP) != 0)) {
 				wm_clear_linkdown_discard(sc);
 			} else if (((ifp->if_flags & IFF_UP) != 0) && ((ifr->ifr_flags & IFF_UP) == 0)) {
 				wm_set_linkdown_discard(sc);
+			}
+		}
 #ifdef WM_MPSAFE
 		s = splnet();
 #endif
 		/* It may call wm_start, so unlock here */
 		error = ether_ioctl(ifp, cmd, data);
 #ifdef WM_MPSAFE
 		splx(s);
 #endif
 		if (error != ENETRESET)
 			break;
 		error = 0;
 @@ -7664,26 +7729,36 @@ static inline int
 wm_select_txqueue(struct ifnet *ifp, struct mbuf *m)
+{
 	struct wm_softc *sc = ifp->if_softc;
 	u_int cpuid = cpu_index(curcpu());
 	/*
 	 * Currently, simple distribute strategy.
 	 * TODO:
 	 * distribute by flowid(RSS has value).
 	 */
 	return ((cpuid + ncpu - sc->sc_affinity_offset) % ncpu) % sc->sc_nqueues;
+}
 static inline bool
 wm_linkdown_discard(struct wm_txqueue *txq)
+{
 	if ((txq->txq_flags & WM_TXQ_LINKDOWN_DISCARD) != 0)
 		return true;
 	return false;
+}
 /*
  * wm_start:		[ifnet interface function]
+ *
  *	Start packet transmission on the interface.
  */
 static void
 wm_start(struct ifnet *ifp)
+{
 	struct wm_softc *sc = ifp->if_softc;
 	struct wm_txqueue *txq = &sc->sc_queue[0].wmq_txq;
 #ifdef WM_MPSAFE
 	KASSERT(if_is_mpsafe(ifp));
 @@ -7757,26 +7832,43 @@ wm_send_common_locked(struct ifnet *ifp,
 	bus_addr_t curaddr;
 	bus_size_t seglen, curlen;
 	uint32_t cksumcmd;
 	uint8_t cksumfields;
 	bool remap = true;
 	KASSERT(mutex_owned(txq->txq_lock));
 	if ((ifp->if_flags & IFF_RUNNING) == 0)
 		return;
 	if ((txq->txq_flags & WM_TXQ_NO_SPACE) != 0)
 		return;
 	if (__predict_false(wm_linkdown_discard(txq))) {
 		do {
 			if (is_transmit)
 				m0 = pcq_get(txq->txq_interq);
 			else
 				IFQ_DEQUEUE(&ifp->if_snd, m0);
 			/*
 			 * increment successed packet counter as in the case
 			 * which the packet is discarded by link down PHY.
 			 */
 			if (m0 != NULL)
 				if_statinc(ifp, if_opackets);
 			m_freem(m0);
 		} while (m0 != NULL);
 		return;
+	}
 	/* Remember the previous number of free descriptors. */
 	ofree = txq->txq_free;
 	/*
 	 * Loop through the send queue, setting up transmit descriptors
 	 * until we drain the queue, or use up all available transmit
 	 * descriptors.
 	 */
 	for (;;) {
 		m0 = NULL;
 		/* Get a work queue entry. */
 		if (txq->txq_sfree < WM_TXQUEUE_GC(txq)) {
 @@ -8357,26 +8449,43 @@ wm_nq_send_common_locked(struct ifnet *i
 	struct wm_txsoft *txs;
 	bus_dmamap_t dmamap;
 	int error, nexttx, lasttx = -1, seg, segs_needed;
 	bool do_csum, sent;
 	bool remap = true;
 	KASSERT(mutex_owned(txq->txq_lock));
 	if ((ifp->if_flags & IFF_RUNNING) == 0)
 		return;
 	if ((txq->txq_flags & WM_TXQ_NO_SPACE) != 0)
 		return;
 	if (__predict_false(wm_linkdown_discard(txq))) {
 		do {
 			if (is_transmit)
 				m0 = pcq_get(txq->txq_interq);
 			else
 				IFQ_DEQUEUE(&ifp->if_snd, m0);
 			/*
 			 * increment successed packet counter as in the case
 			 * which the packet is discarded by link down PHY.
 			 */
 			if (m0 != NULL)
 				if_statinc(ifp, if_opackets);
 			m_freem(m0);
 		} while (m0 != NULL);
 		return;
+	}
 	sent = false;
 	/*
 	 * Loop through the send queue, setting up transmit descriptors
 	 * until we drain the queue, or use up all available transmit
 	 * descriptors.
 	 */
 	for (;;) {
 		m0 = NULL;
 		/* Get a work queue entry. */
 		if (txq->txq_sfree < WM_TXQUEUE_GC(txq)) {
 			wm_txeof(txq, UINT_MAX);
 @@ -9224,29 +9333,33 @@ wm_linkintr_gmii(struct wm_softc *sc, ui
 			DPRINTF(sc, WM_DEBUG_LINK,
 			    ("%s: LINK Receive sequence error\n",
 				device_xname(dev)));
 		return;
+	}
 	/* Link status changed */
 	status = CSR_READ(sc, WMREG_STATUS);
 	link = status & STATUS_LU;
 	if (link) {
 		DPRINTF(sc, WM_DEBUG_LINK, ("%s: LINK: LSC -> up %s\n",
 			device_xname(dev),
 			(status & STATUS_FD) ? "FDX" : "HDX"));
 		if (wm_phy_need_linkdown_discard(sc))
 			wm_clear_linkdown_discard(sc);
 	} else {
 		DPRINTF(sc, WM_DEBUG_LINK, ("%s: LINK: LSC -> down\n",
 			device_xname(dev)));
 		if (wm_phy_need_linkdown_discard(sc))
 			wm_set_linkdown_discard(sc);
+	}
 	if ((sc->sc_type == WM_T_ICH8) && (link == false))
 		wm_gig_downshift_workaround_ich8lan(sc);
 	if ((sc->sc_type == WM_T_ICH8)
 	    && (sc->sc_phytype == WMPHY_IGP_3)) {
 		wm_kmrn_lock_loss_workaround_ich8lan(sc);
+	}
 	DPRINTF(sc, WM_DEBUG_LINK, ("%s: LINK: LSC -> mii_pollstat\n",
 		device_xname(dev)));
 	mii_pollstat(&sc->sc_mii);
 	if (sc->sc_type == WM_T_82543) {
 		int miistatus, active;