[src/trunk]: src/sys/dev/pci PR/49270: Hauke Fath: Samsung NC10 Marvell Yukon...

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

details:   https://anonhg.NetBSD.org/src/rev/ca88e12dd6be
branches:  trunk
changeset: 802986:ca88e12dd6be
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 10 14:23:06 2014 +0000

description:
PR/49270: Hauke Fath: Samsung NC10 Marvell Yukon ethernet not supported

diffstat:

 sys/dev/pci/if_msk.c   |  6 ++++--
 sys/dev/pci/if_skreg.h |  5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r bc5663586dbe -r ca88e12dd6be sys/dev/pci/if_msk.c
--- a/sys/dev/pci/if_msk.c      Fri Oct 10 14:06:40 2014 +0000
+++ b/sys/dev/pci/if_msk.c      Fri Oct 10 14:23:06 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.46 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_msk.c,v 1.47 2014/10/10 14:23:06 christos Exp $ */
 /*     $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
 
 /*
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.46 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.47 2014/10/10 14:23:06 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -165,6 +165,7 @@
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8036 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8038 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8039 },
+       { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8040 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8050 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8052 },
        { PCI_VENDOR_MARVELL,           PCI_PRODUCT_MARVELL_YUKON_8053 },
@@ -948,6 +949,7 @@
        case SK_YUKON_EC_U:
        case SK_YUKON_EC:
        case SK_YUKON_FE:
+       case SK_YUKON_FE_P:
                return (1);
        }
 
diff -r bc5663586dbe -r ca88e12dd6be sys/dev/pci/if_skreg.h
--- a/sys/dev/pci/if_skreg.h    Fri Oct 10 14:06:40 2014 +0000
+++ b/sys/dev/pci/if_skreg.h    Fri Oct 10 14:23:06 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_skreg.h,v 1.14 2011/05/29 13:31:30 phx Exp $ */
+/* $NetBSD: if_skreg.h,v 1.15 2014/10/10 14:23:06 christos Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -390,6 +390,7 @@
 #define SK_YUKON_EC_U          0xB4
 #define SK_YUKON_EC            0xB6
 #define SK_YUKON_FE            0xB7
+#define SK_YUKON_FE_P          0xB8
 #define SK_YUKON_FAMILY(x) ((x) & 0xB0)
 
 #define SK_IS_GENESIS(sc) \
@@ -397,7 +398,7 @@
 #define SK_IS_YUKON(sc) \
     ((sc)->sk_type >= SK_YUKON && (sc)->sk_type <= SK_YUKON_LP)
 #define SK_IS_YUKON2(sc) \
-    ((sc)->sk_type >= SK_YUKON_XL && (sc)->sk_type <= SK_YUKON_FE)
+    ((sc)->sk_type >= SK_YUKON_XL && (sc)->sk_type <= SK_YUKON_FE_P)
 
 /* Known revisions in SK_CONFIG */
 #define SK_YUKON_LITE_REV_A0   0x0 /* invented, see test in skc_attach */