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

Commit 563988dc authored by Stefan Assmann's avatar Stefan Assmann Committed by Jeff Kirsher
Browse files

igb: introduce igb_thermal_sensor_event for sensor checking 



The code for thermal sensor checking should be wrapped into a function.

Signed-off-by: default avatarStefan Assmann <sassmann@kpanic.de>
Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 34a0326e

drivers/net/igb/igb_main.c

+34 −33
Original line number Diff line number Diff line
@@ -3532,6 +3532,25 @@ bool igb_has_link(struct igb_adapter *adapter) 
	return link_active;

}



static bool igb_thermal_sensor_event(struct e1000_hw *hw, u32 event)

{

	bool ret = false;

	u32 ctrl_ext, thstat;



	/* check for thermal sensor event on i350, copper only */

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

		thstat = rd32(E1000_THSTAT);

		ctrl_ext = rd32(E1000_CTRL_EXT);



		if ((hw->phy.media_type == e1000_media_type_copper) &&

		    !(ctrl_ext & E1000_CTRL_EXT_LINK_MODE_SGMII)) {

			ret = !!(thstat & event);

		}

	}



	return ret;

}



/**

 * igb_watchdog - Timer Call-back

 * @data: pointer to adapter cast into an unsigned long
@@ -3550,7 +3569,7 @@ static void igb_watchdog_task(struct work_struct *work) 
                                                   watchdog_task);

	struct e1000_hw *hw = &adapter->hw;

	struct net_device *netdev = adapter->netdev;

	u32 link, ctrl_ext, thstat;

	u32 link;

	int i;



	link = igb_has_link(adapter);
@@ -3574,25 +3593,14 @@ static void igb_watchdog_task(struct work_struct *work) 
			       ((ctrl & E1000_CTRL_RFCE) ?  "RX" :

			       ((ctrl & E1000_CTRL_TFCE) ?  "TX" : "None")));



			/* check for thermal sensor event on i350,

			 * copper only */

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

				thstat = rd32(E1000_THSTAT);

				ctrl_ext = rd32(E1000_CTRL_EXT);

				if ((hw->phy.media_type ==

				     e1000_media_type_copper) && !(ctrl_ext &

				     E1000_CTRL_EXT_LINK_MODE_SGMII)) {

					if (thstat &

					    E1000_THSTAT_LINK_THROTTLE) {

						printk(KERN_INFO "igb: %s The "

						       "network adapter link "

						       "speed was downshifted "

						       "because it "

						       "overheated.\n",

			/* check for thermal sensor event */

			if (igb_thermal_sensor_event(hw, E1000_THSTAT_LINK_THROTTLE)) {

				printk(KERN_INFO "igb: %s The network adapter "

						 "link speed was downshifted "

						 "because it overheated.\n",

						 netdev->name);

			}

				}

			}



			/* adjust timeout factor according to speed/duplex */

			adapter->tx_timeout_factor = 1;

			switch (adapter->link_speed) {
@@ -3618,22 +3626,15 @@ static void igb_watchdog_task(struct work_struct *work) 
		if (netif_carrier_ok(netdev)) {

			adapter->link_speed = 0;

			adapter->link_duplex = 0;

			/* check for thermal sensor event on i350

			 * copper only*/

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

				thstat = rd32(E1000_THSTAT);

				ctrl_ext = rd32(E1000_CTRL_EXT);

				if ((hw->phy.media_type ==

				     e1000_media_type_copper) && !(ctrl_ext &

				     E1000_CTRL_EXT_LINK_MODE_SGMII)) {

					if (thstat & E1000_THSTAT_PWR_DOWN) {

						printk(KERN_ERR "igb: %s The "

						"network adapter was stopped "

						"because it overheated.\n",



			/* check for thermal sensor event */

			if (igb_thermal_sensor_event(hw, E1000_THSTAT_PWR_DOWN)) {

				printk(KERN_ERR "igb: %s The network adapter "

						"was stopped because it "

						"overheated.\n",

						netdev->name);

			}

				}

			}



			/* Links status message must follow this format */

			printk(KERN_INFO "igb: %s NIC Link is Down\n",

			       netdev->name);