[src/trunk]: src/sys/dev/pci Improve flow control.

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7097123d87c2
branches:  trunk
changeset: 1005925:7097123d87c2
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Dec 26 15:32:37 2019 +0000

description:
Improve flow control.

diffstat:

 sys/dev/pci/if_stge.c |  21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diffs (53 lines):

diff -r 27137af8d39a -r 7097123d87c2 sys/dev/pci/if_stge.c
--- a/sys/dev/pci/if_stge.c     Thu Dec 26 15:26:58 2019 +0000
+++ b/sys/dev/pci/if_stge.c     Thu Dec 26 15:32:37 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_stge.c,v 1.74 2019/12/26 15:26:58 msaitoh Exp $     */
+/*     $NetBSD: if_stge.c,v 1.75 2019/12/26 15:32:37 msaitoh Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.74 2019/12/26 15:26:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.75 2019/12/26 15:32:37 msaitoh Exp $");
 
 
 #include <sys/param.h>
@@ -1498,11 +1498,11 @@
 
        /*
         * Send a PAUSE frame when we reach 29,696 bytes in the Rx
-        * FIFO, and send an un-PAUSE frame when the FIFO is totally
-        * empty again.
+        * FIFO, and send an un-PAUSE frame when we reach 3056 bytes
+        * in the Rx FIFO.
         */
        bus_space_write_2(st, sh, STGE_FlowOnTresh, 29696 / 16);
-       bus_space_write_2(st, sh, STGE_FlowOffThresh, 0);
+       bus_space_write_2(st, sh, STGE_FlowOffThresh, 3056 / 16);
 
        /*
         * Set the maximum frame size.
@@ -1857,12 +1857,15 @@
 {
        struct stge_softc *sc = ifp->if_softc;
 
+       sc->sc_MACCtrl &= ~(MC_DuplexSelect | MC_RxFlowControlEnable |
+           MC_TxFlowControlEnable);
+
        if (sc->sc_mii.mii_media_active & IFM_FDX)
                sc->sc_MACCtrl |= MC_DuplexSelect;
-       else
-               sc->sc_MACCtrl &= ~MC_DuplexSelect;
-
-       /* XXX 802.1x flow-control? */
+       if ((sc->sc_mii.mii_media_active & IFM_ETH_RXPAUSE) != 0)
+               sc->sc_MACCtrl |= MC_RxFlowControlEnable;
+       if ((sc->sc_mii.mii_media_active & IFM_ETH_TXPAUSE) != 0)
+               sc->sc_MACCtrl |= MC_TxFlowControlEnable;
 
        bus_space_write_4(sc->sc_st, sc->sc_sh, STGE_MACCtrl, sc->sc_MACCtrl);
 }