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

Commit 119fc60a authored by Mallikarjuna R Chilakala's avatar Mallikarjuna R Chilakala Committed by David S. Miller
Browse files

ixgbe:add support for a new 82599 10G Base-T device 



This adds support for a new copper device for 82599, device id 0x151c.
This 82599 10GBase-T device uses the PHY's internal temperature sensor
to guard against over-temp conditions. In this scenario the PHY will be
put in a low power mode and link will no longer be able to transmit or
receive any data. When this occurs, the over-temp interrupt is latched
and driver logs this error message. A HW reset or power cycle is
required to clear this status.

Signed-off-by: default avatarMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7a9b1492

drivers/net/ixgbe/ixgbe.h

+3 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ struct ixgbe_adapter { 
	u32 flags2;

#define IXGBE_FLAG2_RSC_CAPABLE                 (u32)(1)

#define IXGBE_FLAG2_RSC_ENABLED                 (u32)(1 << 1)

#define IXGBE_FLAG2_TEMP_SENSOR_CAPABLE         (u32)(1 << 2)

/* default to trying for four seconds */

#define IXGBE_TRY_LINK_TIMEOUT (4 * HZ)
@@ -407,6 +408,8 @@ struct ixgbe_adapter { 
	u16 eeprom_version;



	int node;

	struct work_struct check_overtemp_task;

	u32 interrupt_event;



	/* SR-IOV */

	DECLARE_BITMAP(active_vfs, IXGBE_MAX_VF_FUNCTIONS);

drivers/net/ixgbe/ixgbe_82598.c

+1 −0
Original line number Diff line number Diff line
@@ -1236,6 +1236,7 @@ static struct ixgbe_phy_operations phy_ops_82598 = { 
	.setup_link		= &ixgbe_setup_phy_link_generic,

	.setup_link_speed	= &ixgbe_setup_phy_link_speed_generic,

	.read_i2c_eeprom	= &ixgbe_read_i2c_eeprom_82598,

	.check_overtemp   = &ixgbe_tn_check_overtemp,

};



struct ixgbe_info ixgbe_82598_info = {

drivers/net/ixgbe/ixgbe_82599.c

+1 −0
Original line number Diff line number Diff line
@@ -2395,6 +2395,7 @@ static struct ixgbe_phy_operations phy_ops_82599 = { 
	.write_i2c_byte         = &ixgbe_write_i2c_byte_generic,

	.read_i2c_eeprom        = &ixgbe_read_i2c_eeprom_generic,

	.write_i2c_eeprom       = &ixgbe_write_i2c_eeprom_generic,

	.check_overtemp         = &ixgbe_tn_check_overtemp,

};



struct ixgbe_info ixgbe_82599_info = {

drivers/net/ixgbe/ixgbe_main.c

+69 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = { 
	 board_82599 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4),

	 board_82599 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_T3_LOM),

	 board_82599 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_COMBO_BACKPLANE),

	 board_82599 },
@@ -1618,6 +1620,48 @@ static void ixgbe_set_itr_msix(struct ixgbe_q_vector *q_vector) 
	}

}



/**

 * ixgbe_check_overtemp_task - worker thread to check over tempurature

 * @work: pointer to work_struct containing our data

 **/

static void ixgbe_check_overtemp_task(struct work_struct *work)

{

	struct ixgbe_adapter *adapter = container_of(work,

	                                             struct ixgbe_adapter,

	                                             check_overtemp_task);

	struct ixgbe_hw *hw = &adapter->hw;

	u32 eicr = adapter->interrupt_event;



	if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) {

		switch (hw->device_id) {

		case IXGBE_DEV_ID_82599_T3_LOM: {

			u32 autoneg;

			bool link_up = false;



			if (hw->mac.ops.check_link)

				hw->mac.ops.check_link(hw, &autoneg, &link_up, false);



			if (((eicr & IXGBE_EICR_GPI_SDP0) && (!link_up)) ||

			    (eicr & IXGBE_EICR_LSC))

				/* Check if this is due to overtemp */

				if (hw->phy.ops.check_overtemp(hw) == IXGBE_ERR_OVERTEMP)

					break;

			}

			return;

		default:

			if (!(eicr & IXGBE_EICR_GPI_SDP0))

				return;

			break;

		}

		DPRINTK(DRV, ERR, "Network adapter has been stopped because it "

		        "has over heated. Restart the computer. If the problem "

		        "persists, power off the system and replace the "

		        "adapter\n");

		/* write to clear the interrupt */

		IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP0);

	}

}



static void ixgbe_check_fan_failure(struct ixgbe_adapter *adapter, u32 eicr)

{

	struct ixgbe_hw *hw = &adapter->hw;
@@ -1689,6 +1733,10 @@ static irqreturn_t ixgbe_msix_lsc(int irq, void *data) 


	if (hw->mac.type == ixgbe_mac_82599EB) {

		ixgbe_check_sfp_event(adapter, eicr);

		adapter->interrupt_event = eicr;

		if ((adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) &&

		    ((eicr & IXGBE_EICR_GPI_SDP0) || (eicr & IXGBE_EICR_LSC)))

			schedule_work(&adapter->check_overtemp_task);



		/* Handle Flow Director Full threshold interrupt */

		if (eicr & IXGBE_EICR_FLOW_DIR) {
@@ -2190,6 +2238,8 @@ static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter) 
	u32 mask;



	mask = (IXGBE_EIMS_ENABLE_MASK & ~IXGBE_EIMS_RTX_QUEUE);

	if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE)

		mask |= IXGBE_EIMS_GPI_SDP0;

	if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE)

		mask |= IXGBE_EIMS_GPI_SDP1;

	if (adapter->hw.mac.type == ixgbe_mac_82599EB) {
@@ -2250,6 +2300,9 @@ static irqreturn_t ixgbe_intr(int irq, void *data) 
		ixgbe_check_sfp_event(adapter, eicr);



	ixgbe_check_fan_failure(adapter, eicr);

	if ((adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) &&

	    ((eicr & IXGBE_EICR_GPI_SDP0) || (eicr & IXGBE_EICR_LSC)))

		schedule_work(&adapter->check_overtemp_task);



	if (napi_schedule_prep(&(q_vector->napi))) {

		adapter->tx_ring[0]->total_packets = 0;
@@ -3265,6 +3318,13 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter) 
		IXGBE_WRITE_REG(hw, IXGBE_EIAM, IXGBE_EICS_RTX_QUEUE);

	}



	/* Enable Thermal over heat sensor interrupt */

	if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) {

		gpie = IXGBE_READ_REG(hw, IXGBE_GPIE);

		gpie |= IXGBE_SDP0_GPIEN;

		IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);

	}



	/* Enable fan failure interrupt if media type is copper */

	if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE) {

		gpie = IXGBE_READ_REG(hw, IXGBE_GPIE);
@@ -3666,6 +3726,9 @@ void ixgbe_down(struct ixgbe_adapter *adapter) 
	    adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)

		cancel_work_sync(&adapter->fdir_reinit_task);



	if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE)

		cancel_work_sync(&adapter->check_overtemp_task);



	/* disable transmits in the hardware now that interrupts are off */

	for (i = 0; i < adapter->num_tx_queues; i++) {

		j = adapter->tx_ring[i]->reg_idx;
@@ -4645,6 +4708,8 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) 
		adapter->max_msix_q_vectors = MAX_MSIX_Q_VECTORS_82599;

		adapter->flags2 |= IXGBE_FLAG2_RSC_CAPABLE;

		adapter->flags2 |= IXGBE_FLAG2_RSC_ENABLED;

		if (hw->device_id == IXGBE_DEV_ID_82599_T3_LOM)

			adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_CAPABLE;

		if (dev->features & NETIF_F_NTUPLE) {

			/* Flow Director perfect filter enabled */

			adapter->flags |= IXGBE_FLAG_FDIR_PERFECT_CAPABLE;
@@ -6561,7 +6626,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	}



	/* reset_hw fills in the perm_addr as well */

	hw->phy.reset_if_overtemp = true;

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

	hw->phy.reset_if_overtemp = false;

	if (err == IXGBE_ERR_SFP_NOT_PRESENT &&

	    hw->mac.type == ixgbe_mac_82598EB) {

		/*
@@ -6730,6 +6797,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	    adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)

		INIT_WORK(&adapter->fdir_reinit_task, ixgbe_fdir_reinit_task);



	if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE)

		INIT_WORK(&adapter->check_overtemp_task, ixgbe_check_overtemp_task);

#ifdef CONFIG_IXGBE_DCA

	if (dca_add_requester(&pdev->dev) == 0) {

		adapter->flags |= IXGBE_FLAG_DCA_ENABLED;

drivers/net/ixgbe/ixgbe_phy.c

+30 −0
Original line number Diff line number Diff line
@@ -135,6 +135,11 @@ static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id) 
 **/

s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw)

{

	/* Don't reset PHY if it's shut down due to overtemp. */

	if (!hw->phy.reset_if_overtemp &&

	    (IXGBE_ERR_OVERTEMP == hw->phy.ops.check_overtemp(hw)))

		return 0;



	/*

	 * Perform soft PHY reset to the PHY_XS.

	 * This will cause a soft reset to the PHY
@@ -1345,3 +1350,28 @@ s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw, 
	return status;

}



/**

 *  ixgbe_tn_check_overtemp - Checks if an overtemp occured.

 *  @hw: pointer to hardware structure

 *

 *  Checks if the LASI temp alarm status was triggered due to overtemp

 **/

s32 ixgbe_tn_check_overtemp(struct ixgbe_hw *hw)

{

	s32 status = 0;

	u16 phy_data = 0;



	if (hw->device_id != IXGBE_DEV_ID_82599_T3_LOM)

		goto out;



	/* Check that the LASI temp alarm status was triggered */

	hw->phy.ops.read_reg(hw, IXGBE_TN_LASI_STATUS_REG,

	                     MDIO_MMD_PMAPMD, &phy_data);



	if (!(phy_data & IXGBE_TN_LASI_STATUS_TEMP_ALARM))

		goto out;



	status = IXGBE_ERR_OVERTEMP;

out:

	return status;

}