Module Name: src
Committed By: martin
Date: Fri Sep 3 10:23:18 UTC 2021
Modified Files:
src/sys/dev/pci [netbsd-8]: if_vte.c
Log Message:
Pull up following revision(s) (requested by andvar in ticket #1693):
sys/dev/pci/if_vte.c: revision 1.32
Restore original MDC speed control register value after MAC reset, if
it wasn't default. Fixes PR port-i386/53494.
ok riastradh
To generate a diff of this commit:
cvs rdiff -u -r1.17.2.2 -r1.17.2.3 src/sys/dev/pci/if_vte.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.17.2.2 src/sys/dev/pci/if_vte.c:1.17.2.3
--- src/sys/dev/pci/if_vte.c:1.17.2.2 Wed Nov 6 10:04:47 2019
+++ src/sys/dev/pci/if_vte.c Fri Sep 3 10:23:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.17.2.2 2019/11/06 10:04:47 martin Exp $ */
+/* $NetBSD: if_vte.c,v 1.17.2.3 2021/09/03 10:23:17 martin Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.17.2.2 2019/11/06 10:04:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.17.2.3 2021/09/03 10:23:17 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1194,9 +1194,10 @@ vte_tick(void *arg)
static void
vte_reset(struct vte_softc *sc)
{
- uint16_t mcr;
+ uint16_t mcr, mdcsc;
int i;
+ mdcsc = CSR_READ_2(sc, VTE_MDCSC);
mcr = CSR_READ_2(sc, VTE_MCR1);
CSR_WRITE_2(sc, VTE_MCR1, mcr | MCR1_MAC_RESET);
for (i = VTE_RESET_TIMEOUT; i > 0; i--) {
@@ -1214,6 +1215,14 @@ vte_reset(struct vte_softc *sc)
CSR_WRITE_2(sc, VTE_MACSM, 0x0002);
CSR_WRITE_2(sc, VTE_MACSM, 0);
DELAY(5000);
+
+ /*
+ * On some SoCs (like Vortex86DX3) MDC speed control register value
+ * needs to be restored to original value instead of default one,
+ * otherwise some PHY registers may fail to be read.
+ */
+ if (mdcsc != MDCSC_DEFAULT)
+ CSR_WRITE_2(sc, VTE_MDCSC, mdcsc);
}
