Module Name: src
Committed By: christos
Date: Fri Oct 10 14:23:06 UTC 2014
Modified Files:
src/sys/dev/pci: if_msk.c if_skreg.h
Log Message:
PR/49270: Hauke Fath: Samsung NC10 Marvell Yukon ethernet not supported
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/if_skreg.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/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.46 src/sys/dev/pci/if_msk.c:1.47
--- src/sys/dev/pci/if_msk.c:1.46 Sun Aug 10 12:44:36 2014
+++ src/sys/dev/pci/if_msk.c Fri Oct 10 10:23:06 2014
@@ -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 @@ static const struct msk_product {
{ 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 @@ msk_probe(device_t parent, cfdata_t matc
case SK_YUKON_EC_U:
case SK_YUKON_EC:
case SK_YUKON_FE:
+ case SK_YUKON_FE_P:
return (1);
}
Index: src/sys/dev/pci/if_skreg.h
diff -u src/sys/dev/pci/if_skreg.h:1.14 src/sys/dev/pci/if_skreg.h:1.15
--- src/sys/dev/pci/if_skreg.h:1.14 Sun May 29 09:31:30 2011
+++ src/sys/dev/pci/if_skreg.h Fri Oct 10 10:23:06 2014
@@ -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 */
