ixgbe: Disallow SFP 1G modules in the SFP+ cages for 82598 and 82599
Subsystems (2)
PATCH 1/1 ixgbe: Disallow SFP 1G modules in the SFP+ cages for 82598 and 82599
From: Waskiewicz Jr, Peter P <[email protected]>
82598 and 82599 do not support SFP 1G modules. Instead of allowing the driver to load, but never get link, rejecting the module and displaying a useful message is more preferrable. The framework for displaying the failure message already exists, now we just need to detect and reject the SFP modules.
---
drivers/net/ixgbe/ixgbe_phy.c | 22 +++++++++++++++++----- drivers/net/ixgbe/ixgbe_type.h | 1 + 2 files changed, 18 insertions(+), 5 deletions(-)
drivers/net/ixgbe/ixgbe_phy.c +17 -5
@@ -673,11 +673,22 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)break ; } } -if (hw->mac.type == ixgbe_mac_82598EB || - (hw->phy.sfp_type != ixgbe_sfp_type_sr && - hw->phy.sfp_type != ixgbe_sfp_type_lr && - hw->phy.sfp_type != ixgbe_sfp_type_srlr_core0 && - hw->phy.sfp_type != ixgbe_sfp_type_srlr_core1)) { + +/* All DA cables are supported */ +if (transmission_media &IXGBE_SFF_TWIN_AX_CAPABLE ) { + status =0 ; + goto out; + } + +/* 1G SFP modules are not supported */ +if (comp_codes_10g ==0 ) { + hw->phy.type = ixgbe_phy_sfp_unsupported; + status =IXGBE_ERR_SFP_NOT_SUPPORTED ; + goto out; + } + +/* Anything else 82598-based is supported */ +if (hw->mac.type == ixgbe_mac_82598EB) { status =0 ; goto out; }
@@ -690,6 +701,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) status =0 ; }else {hw_dbg (hw,"SFP+ module not supported\n" ); + hw->phy.type = ixgbe_phy_sfp_unsupported; status =IXGBE_ERR_SFP_NOT_SUPPORTED ; } }else {
drivers/net/ixgbe/ixgbe_type.h +1 -0
@@ -1904,6 +1904,7 @@ enum ixgbe_phy_type { ixgbe_phy_sfp_ftl, ixgbe_phy_sfp_unknown, ixgbe_phy_sfp_intel, + ixgbe_phy_sfp_unsupported, ixgbe_phy_generic };
From: Jeff Kirsher <[email protected]>
Date: Thu, 23 Apr 2009 14:31:37 -0700
Quoted 8 lines
82598 and 82599 do not support SFP 1G modules. Instead of allowing the driver to load, but never get link, rejecting the module and displaying a useful message is more preferrable. The framework for displaying the failure message already exists, now we just need to detect and reject the SFP modules.
Signed-off-by Peter P Waskiewicz Jr <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.