Module Name: src
Committed By: nonaka
Date: Fri Aug 28 13:20:46 UTC 2015
Modified Files:
src/sys/dev/ic: rtl8169.c rtl81x9reg.h
Log Message:
Add support for Realtek RTL8168H/8111H variant.
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/ic/rtl81x9reg.h
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/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.144 src/sys/dev/ic/rtl8169.c:1.145
--- src/sys/dev/ic/rtl8169.c:1.144 Mon Apr 13 16:33:24 2015
+++ src/sys/dev/ic/rtl8169.c Fri Aug 28 13:20:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.144 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: rtl8169.c,v 1.145 2015/08/28 13:20:46 nonaka Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.144 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.145 2015/08/28 13:20:46 nonaka Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -602,6 +602,8 @@ re_attach(struct rtk_softc *sc)
sc->sc_quirk |= RTKQ_NOJUMBO;
break;
case RTK_HWREV_8168E:
+ case RTK_HWREV_8168H:
+ case RTK_HWREV_8168H_SPIN1:
sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_PHYWAKE_PM |
RTKQ_NOJUMBO;
Index: src/sys/dev/ic/rtl81x9reg.h
diff -u src/sys/dev/ic/rtl81x9reg.h:1.46 src/sys/dev/ic/rtl81x9reg.h:1.47
--- src/sys/dev/ic/rtl81x9reg.h:1.46 Fri Oct 10 17:41:05 2014
+++ src/sys/dev/ic/rtl81x9reg.h Fri Aug 28 13:20:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9reg.h,v 1.46 2014/10/10 17:41:05 christos Exp $ */
+/* $NetBSD: rtl81x9reg.h,v 1.47 2015/08/28 13:20:46 nonaka Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -181,6 +181,8 @@
#define RTK_HWREV_8168C_SPIN2 0x3C400000
#define RTK_HWREV_8168CP 0x3C800000
#define RTK_HWREV_8168F 0x48000000
+#define RTK_HWREV_8168H 0x54000000
+#define RTK_HWREV_8168H_SPIN1 0x54100000
#define RTK_HWREV_8139 0x60000000
#define RTK_HWREV_8139A 0x70000000
#define RTK_HWREV_8139AG 0x70800000