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

Commit 9a858178 authored by Filip Sadowski's avatar Filip Sadowski Committed by Jeff Kirsher
Browse files

i40e: Display error message if module does not meet thermal requirements 



This patch causes error message to be displayed when NIC detects
insertion of module that does not meet thermal requirements.

Signed-off-by: default avatarFilip Sadowski <filip.sadowski@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 7f661822

drivers/net/ethernet/intel/i40e/i40e.h

+1 −0
Original line number Diff line number Diff line
@@ -451,6 +451,7 @@ struct i40e_pf { 
#define I40E_FLAG_CLIENT_RESET			BIT_ULL(54)

#define I40E_FLAG_TEMP_LINK_POLLING		BIT_ULL(55)

#define I40E_FLAG_CLIENT_L2_CHANGE		BIT_ULL(56)

#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED	BIT_ULL(57)

#define I40E_FLAG_LEGACY_RX			BIT_ULL(58)

#define I40E_FLAG_SOURCE_PRUNING_DISABLED	BIT_ULL(59)

drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -1772,6 +1772,7 @@ enum i40e_aq_phy_type { 
	I40E_PHY_TYPE_25GBASE_SR		= 0x21,

	I40E_PHY_TYPE_25GBASE_LR		= 0x22,

	I40E_PHY_TYPE_MAX,

	I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP	= 0xFD,

	I40E_PHY_TYPE_EMPTY			= 0xFE,

	I40E_PHY_TYPE_DEFAULT			= 0xFF,

};

drivers/net/ethernet/intel/i40e/i40e_main.c

+19 −5
Original line number Diff line number Diff line
@@ -6558,12 +6558,26 @@ static void i40e_handle_link_event(struct i40e_pf *pf, 
	 */

	i40e_link_event(pf);



	/* check for unqualified module, if link is down */

	/* Check if module meets thermal requirements */

	if (status->phy_type == I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP) {

		dev_err(&pf->pdev->dev,

			"Rx/Tx is disabled on this device because the module does not meet thermal requirements.\n");

		dev_err(&pf->pdev->dev,

			"Refer to the Intel(R) Ethernet Adapters and Devices User Guide for a list of supported modules.\n");

	} else {

		/* check for unqualified module, if link is down, suppress

		 * the message if link was forced to be down.

		 */

		if ((status->link_info & I40E_AQ_MEDIA_AVAILABLE) &&

		    (!(status->an_info & I40E_AQ_QUALIFIED_MODULE)) &&

	    (!(status->link_info & I40E_AQ_LINK_UP)))

		    (!(status->link_info & I40E_AQ_LINK_UP)) &&

		    (!(pf->flags & I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED))) {

			dev_err(&pf->pdev->dev,

			"The driver failed to link because an unqualified module was detected.\n");

				"Rx/Tx is disabled on this device because an unsupported SFP module type was detected.\n");

			dev_err(&pf->pdev->dev,

				"Refer to the Intel(R) Ethernet Adapters and Devices User Guide for a list of supported modules.\n");

		}

	}

}



/**

drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -1768,6 +1768,7 @@ enum i40e_aq_phy_type { 
	I40E_PHY_TYPE_25GBASE_SR		= 0x21,

	I40E_PHY_TYPE_25GBASE_LR		= 0x22,

	I40E_PHY_TYPE_MAX,

	I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP	= 0xFD,

	I40E_PHY_TYPE_EMPTY			= 0xFE,

	I40E_PHY_TYPE_DEFAULT			= 0xFF,

};