[src/trunk]: src/sys/dev/pci/ixgbe Show 2.5GBASE-T and 5GBASE-T correctly on ...

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

details:   https://anonhg.NetBSD.org/src/rev/2d2e15e3318e
branches:  trunk
changeset: 827098:2d2e15e3318e
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Oct 13 08:17:44 2017 +0000

description:
Show 2.5GBASE-T and 5GBASE-T correctly on ixv(4). Tested on a virtual function
on X550 T1.

diffstat:

 sys/dev/pci/ixgbe/ixgbe_common.c |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_vf.c     |  4 ++--
 sys/dev/pci/ixgbe/ixv.c          |  8 +++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diffs (58 lines):

diff -r 8043c7d7129a -r 2d2e15e3318e sys/dev/pci/ixgbe/ixgbe_common.c
--- a/sys/dev/pci/ixgbe/ixgbe_common.c  Fri Oct 13 07:04:58 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_common.c  Fri Oct 13 08:17:44 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_common.c,v 1.14 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_common.c,v 1.15 2017/10/13 08:17:44 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -4248,7 +4248,7 @@
                break;
        case IXGBE_LINKS_SPEED_100_82599:
                *speed = IXGBE_LINK_SPEED_100_FULL;
-               if (hw->mac.type == ixgbe_mac_X550) {
+               if (hw->mac.type >= ixgbe_mac_X550) {
                        if (links_reg & IXGBE_LINKS_SPEED_NON_STD)
                                *speed = IXGBE_LINK_SPEED_5GB_FULL;
                }
diff -r 8043c7d7129a -r 2d2e15e3318e sys/dev/pci/ixgbe/ixgbe_vf.c
--- a/sys/dev/pci/ixgbe/ixgbe_vf.c      Fri Oct 13 07:04:58 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_vf.c      Fri Oct 13 08:17:44 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe_vf.c,v 1.13 2017/08/30 08:49:18 msaitoh Exp $ */
+/* $NetBSD: ixgbe_vf.c,v 1.14 2017/10/13 08:17:44 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -630,7 +630,7 @@
                break;
        case IXGBE_LINKS_SPEED_100_82599:
                *speed = IXGBE_LINK_SPEED_100_FULL;
-               if (hw->mac.type == ixgbe_mac_X550) {
+               if (hw->mac.type >= ixgbe_mac_X550) {
                        if (links_reg & IXGBE_LINKS_SPEED_NON_STD)
                                *speed = IXGBE_LINK_SPEED_5GB_FULL;
                }
diff -r 8043c7d7129a -r 2d2e15e3318e sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Fri Oct 13 07:04:58 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Fri Oct 13 08:17:44 2017 +0000
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.70 2017/10/13 04:52:40 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.71 2017/10/13 08:17:44 msaitoh Exp $*/
 
 /******************************************************************************
 
@@ -955,6 +955,12 @@
                case IXGBE_LINK_SPEED_10GB_FULL:
                        ifmr->ifm_active |= IFM_10G_T | IFM_FDX;
                        break;
+               case IXGBE_LINK_SPEED_5GB_FULL:
+                       ifmr->ifm_active |= IFM_5000_T | IFM_FDX;
+                       break;
+               case IXGBE_LINK_SPEED_2_5GB_FULL:
+                       ifmr->ifm_active |= IFM_2500_T | IFM_FDX;
+                       break;
                case IXGBE_LINK_SPEED_1GB_FULL:
                        ifmr->ifm_active |= IFM_1000_T | IFM_FDX;
                        break;