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

Commit 6d095fa8 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

igb: move TX hang check flag into ring->flags 



This change moves the Tx hang check into the ring flags.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 5faf030c

drivers/net/ethernet/intel/igb/igb.h

+0 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ struct igb_ring { 
			struct igb_tx_queue_stats tx_stats;

			struct u64_stats_sync tx_syncp;

			struct u64_stats_sync tx_syncp2;

			bool detect_tx_hung;

		};

		/* RX */

		struct {

drivers/net/ethernet/intel/igb/igb_main.c

+3 −3
Original line number Diff line number Diff line
@@ -3754,7 +3754,7 @@ static void igb_watchdog_task(struct work_struct *work) 
		}



		/* Force detection of hung controller every watchdog period */

		tx_ring->detect_tx_hung = true;

		set_bit(IGB_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags);

	}



	/* Cause software interrupt to ensure rx ring is cleaned */
@@ -5721,14 +5721,14 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector) 
	q_vector->tx.total_bytes += total_bytes;

	q_vector->tx.total_packets += total_packets;



	if (tx_ring->detect_tx_hung) {

	if (test_bit(IGB_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags)) {

		struct e1000_hw *hw = &adapter->hw;



		eop_desc = tx_buffer->next_to_watch;



		/* Detect a transmit hang in hardware, this serializes the

		 * check with the clearing of time_stamp and movement of i */

		tx_ring->detect_tx_hung = false;

		clear_bit(IGB_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags);

		if (eop_desc &&

		    time_after(jiffies, tx_buffer->time_stamp +

			       (adapter->tx_timeout_factor * HZ)) &&