Page MenuHomeFreeBSD
Files F108445474

D47352.diff
No OneTemporary
Actions

D47352.diff
View Options

diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c
--- a/sys/dev/ixgbe/if_ix.c
+++ b/sys/dev/ixgbe/if_ix.c
@@ -1315,9 +1315,11 @@
}
if (layer & IXGBE_PHYSICAL_LAYER_SFP_PLUS_CU ||
- layer & IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA)
+ layer & IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA) {
ifmedia_add(sc->media, IFM_ETHER | IFM_10G_TWINAX, 0,
NULL);
+ ifmedia_add(sc->media, IFM_ETHER | IFM_1000_KX, 0, NULL);
+ }
if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_LR) {
ifmedia_add(sc->media, IFM_ETHER | IFM_10G_LR, 0, NULL);
@@ -2323,6 +2325,9 @@
case IXGBE_LINK_SPEED_10GB_FULL:
ifmr->ifm_active |= IFM_10G_TWINAX | IFM_FDX;
break;
+ case IXGBE_LINK_SPEED_1GB_FULL:
+ ifmr->ifm_active |= IFM_1000_KX | IFM_FDX;
+ break;
}
if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_LR)
switch (sc->link_speed) {
diff --git a/sys/dev/ixgbe/ixgbe_82599.c b/sys/dev/ixgbe/ixgbe_82599.c
--- a/sys/dev/ixgbe/ixgbe_82599.c
+++ b/sys/dev/ixgbe/ixgbe_82599.c
@@ -441,6 +441,17 @@
goto out;
}
+ if (hw->phy.sfp_type == ixgbe_sfp_type_da_cu_core0 ||
+ hw->phy.sfp_type == ixgbe_sfp_type_da_cu_core1) {
+ *speed = IXGBE_LINK_SPEED_10GB_FULL;
+ *autoneg = true;
+
+ if (hw->phy.multispeed_fiber)
+ *speed |= IXGBE_LINK_SPEED_1GB_FULL;
+
+ goto out;
+ }
+
/*
* Determine link capabilities based on the stored value of AUTOC,
* which represents EEPROM defaults. If AUTOC value has not
diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c
--- a/sys/dev/ixgbe/ixgbe_phy.c
+++ b/sys/dev/ixgbe/ixgbe_phy.c
@@ -1436,7 +1436,8 @@
if (((comp_codes_1g & IXGBE_SFF_1GBASESX_CAPABLE) &&
(comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)) ||
((comp_codes_1g & IXGBE_SFF_1GBASELX_CAPABLE) &&
- (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)))
+ (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)) ||
+ (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE))
hw->phy.multispeed_fiber = true;
/* Determine PHY vendor */

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 25, 8:29 PM (19 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16162256
Default Alt Text
D47352.diff (1 KB)

Event Timeline