[src/trunk]: src/sys/dev/pci/ixgbe Add 82599EN_SFP and 82599_SFP_SF_QP. Not t...

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

details:   https://anonhg.NetBSD.org/src/rev/332d84eb3123
branches:  trunk
changeset: 336291:332d84eb3123
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Feb 24 14:49:28 2015 +0000

description:
Add 82599EN_SFP and 82599_SFP_SF_QP. Not tested.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c       |  6 ++++--
 sys/dev/pci/ixgbe/ixgbe_82599.c |  4 +++-
 sys/dev/pci/ixgbe/ixgbe_api.c   |  6 ++++--
 sys/dev/pci/ixgbe/ixgbe_type.h  |  6 ++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diffs (94 lines):

diff -r 6ac452856772 -r 332d84eb3123 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Tue Feb 24 14:14:50 2015 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Tue Feb 24 14:49:28 2015 +0000
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/
-/*$NetBSD: ixgbe.c,v 1.20 2015/02/24 14:14:50 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.21 2015/02/24 14:49:28 msaitoh Exp $*/
 
 #include "opt_inet.h"
 
@@ -106,8 +106,10 @@
        {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_T3_LOM, 0, 0, 0},
        {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_COMBO_BACKPLANE, 0, 0, 0},
        {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_BACKPLANE_FCOE, 0, 0, 0},
+       {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_SF2, 0, 0, 0},
        {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_FCOE, 0, 0, 0},
-       {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_SF2, 0, 0, 0},
+       {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599EN_SFP, 0, 0, 0},
+       {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_SF_QP, 0, 0, 0},
        /* required last entry */
        {0, 0, 0, 0, 0}
 };
diff -r 6ac452856772 -r 332d84eb3123 sys/dev/pci/ixgbe/ixgbe_82599.c
--- a/sys/dev/pci/ixgbe/ixgbe_82599.c   Tue Feb 24 14:14:50 2015 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_82599.c   Tue Feb 24 14:49:28 2015 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe_82599.c,v 1.6 2011/01/19 19:36:27 jfv Exp $*/
-/*$NetBSD: ixgbe_82599.c,v 1.4 2015/02/24 14:14:50 msaitoh Exp $*/
+/*$NetBSD: ixgbe_82599.c,v 1.5 2015/02/24 14:49:28 msaitoh Exp $*/
 
 #include "ixgbe_type.h"
 #include "ixgbe_api.h"
@@ -435,6 +435,8 @@
        case IXGBE_DEV_ID_82599_SFP:
        case IXGBE_DEV_ID_82599_SFP_FCOE:
        case IXGBE_DEV_ID_82599_SFP_SF2:
+       case IXGBE_DEV_ID_82599_SFP_SF_QP:
+       case IXGBE_DEV_ID_82599EN_SFP:
                media_type = ixgbe_media_type_fiber;
                break;
        case IXGBE_DEV_ID_82599_CX4:
diff -r 6ac452856772 -r 332d84eb3123 sys/dev/pci/ixgbe/ixgbe_api.c
--- a/sys/dev/pci/ixgbe/ixgbe_api.c     Tue Feb 24 14:14:50 2015 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_api.c     Tue Feb 24 14:49:28 2015 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe_api.c,v 1.11 2010/11/26 22:46:32 jfv Exp $*/
-/*$NetBSD: ixgbe_api.c,v 1.3 2015/02/24 14:14:50 msaitoh Exp $*/
+/*$NetBSD: ixgbe_api.c,v 1.4 2015/02/24 14:49:28 msaitoh Exp $*/
 
 #include "ixgbe_api.h"
 #include "ixgbe_common.h"
@@ -117,9 +117,11 @@
                case IXGBE_DEV_ID_82599_SFP:
                case IXGBE_DEV_ID_82599_BACKPLANE_FCOE:
                case IXGBE_DEV_ID_82599_SFP_FCOE:
+               case IXGBE_DEV_ID_82599_SFP_SF2:
+               case IXGBE_DEV_ID_82599_SFP_SF_QP:
+               case IXGBE_DEV_ID_82599EN_SFP:
                case IXGBE_DEV_ID_82599_CX4:
                case IXGBE_DEV_ID_82599_T3_LOM:
-               case IXGBE_DEV_ID_82599_SFP_SF2:
                        hw->mac.type = ixgbe_mac_82599EB;
                        break;
                case IXGBE_DEV_ID_82599_VF:
diff -r 6ac452856772 -r 332d84eb3123 sys/dev/pci/ixgbe/ixgbe_type.h
--- a/sys/dev/pci/ixgbe/ixgbe_type.h    Tue Feb 24 14:14:50 2015 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_type.h    Tue Feb 24 14:49:28 2015 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe_type.h,v 1.12 2011/01/19 19:36:27 jfv Exp $*/
-/*$NetBSD: ixgbe_type.h,v 1.6 2015/02/24 14:14:50 msaitoh Exp $*/
+/*$NetBSD: ixgbe_type.h,v 1.7 2015/02/24 14:49:28 msaitoh Exp $*/
 
 #ifndef _IXGBE_TYPE_H_
 #define _IXGBE_TYPE_H_
@@ -70,8 +70,10 @@
 #define IXGBE_SUBDEV_ID_82599_SFP              0x11A9
 #define IXGBE_DEV_ID_82599_BACKPLANE_FCOE      0x152A
 #define IXGBE_DEV_ID_82599_SFP_FCOE            0x1529
+#define IXGBE_DEV_ID_82599_SFP_SF2             0x154D
+#define IXGBE_DEV_ID_82599_SFP_SF_QP           0x154A
+#define IXGBE_DEV_ID_82599EN_SFP               0x1557
 #define IXGBE_DEV_ID_82599_XAUI_LOM            PCI_PRODUCT_INTEL_82599_XAUI_LOM
-#define IXGBE_DEV_ID_82599_SFP_SF2             0x154D
 #define IXGBE_DEV_ID_82599_T3_LOM              0x151C
 #define IXGBE_DEV_ID_82599_VF                  0x10ED