Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ef78adc authored by Peter P Waskiewicz Jr's avatar Peter P Waskiewicz Jr Committed by David S. Miller
Browse files

ixgbe: Add module parameter to allow untested and unsafe SFP+ modules 



The X520 family of network devices, with the 82599 chip, support a
small number of Intel-verified SFP+ modules on their NICs.  To maintain
stability and quality, the current devices restrict untested 3rd party
SFP+ modules.

This patch introduces a module parameter for ixgbe to allow these untested
modules at the user's peril.  It also includes a warning to the syslog
alerting users that the modules aren't supported, and results may
vary.

CC: Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f706245

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+8 −0
Original line number Diff line number Diff line
@@ -131,6 +131,11 @@ MODULE_PARM_DESC(max_vfs, 
		 "Maximum number of virtual functions to allocate per physical function");

#endif /* CONFIG_PCI_IOV */



static unsigned int allow_unsupported_sfp;

module_param(allow_unsupported_sfp, uint, 0);

MODULE_PARM_DESC(allow_unsupported_sfp,

		 "Allow unsupported and untested SFP+ modules on 82599-based adapters");



MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");

MODULE_DESCRIPTION("Intel(R) 10 Gigabit PCI Express Network Driver");

MODULE_LICENSE("GPL");
@@ -7489,6 +7494,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
			e_crit(probe, "Fan has stopped, replace the adapter\n");

	}



	if (allow_unsupported_sfp)

		hw->allow_unsupported_sfp = allow_unsupported_sfp;



	/* reset_hw fills in the perm_addr as well */

	hw->phy.reset_if_overtemp = true;

	err = hw->mac.ops.reset_hw(hw);

drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

+11 −3
Original line number Diff line number Diff line
@@ -834,6 +834,7 @@ out: 
 **/

s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)

{

	struct ixgbe_adapter *adapter = hw->back;

	s32 status = IXGBE_ERR_PHY_ADDR_INVALID;

	u32 vendor_oui = 0;

	enum ixgbe_sfp_type stored_sfp_type = hw->phy.sfp_type;
@@ -1068,10 +1069,17 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) 
			if (hw->phy.type == ixgbe_phy_sfp_intel) {

				status = 0;

			} else {

				hw_dbg(hw, "SFP+ module not supported\n");

				hw->phy.type = ixgbe_phy_sfp_unsupported;

				if (hw->allow_unsupported_sfp) {

					e_warn(drv, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics.  Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter.  Intel Corporation is not responsible for any harm caused by using untested modules.");

					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 {

			status = 0;

		}

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+1 −0
Original line number Diff line number Diff line
@@ -2892,6 +2892,7 @@ struct ixgbe_hw { 
	u8				revision_id;

	bool				adapter_stopped;

	bool				force_full_reset;

	bool				allow_unsupported_sfp;

};



struct ixgbe_info {