fm10k: use txqueue parameter in fm10k_tx_timeout

Make use of the new txqueue parameter to the .ndo_tx_timeout function.
In fm10k_tx_timeout, remove the now unnecessary loop to determine which
Tx queue is stuck. Instead, just double check the specified queue

This could be improved further to attempt resetting only the specific
queue that got stuck. However, that is a much larger refactor and has
been left as a future improvement.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index ba2566e2123d594189cec8acb9156dd2b9c6fae6..0637ccadee79059ee20f2f1dcc85dbbd3c4a2a50 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -696,21 +696,24 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 /**
  * fm10k_tx_timeout - Respond to a Tx Hang
  * @netdev: network interface device structure
+ * @txqueue: the index of the Tx queue that timed out
  **/
 static void fm10k_tx_timeout(struct net_device *netdev, unsigned int txqueue)
 {
        struct fm10k_intfc *interface = netdev_priv(netdev);
+       struct fm10k_ring *tx_ring;
        bool real_tx_hang = false;
-       int i;
-
-#define TX_TIMEO_LIMIT 16000
-       for (i = 0; i < interface->num_tx_queues; i++) {
-               struct fm10k_ring *tx_ring = interface->tx_ring[i];
 
-               if (check_for_tx_hang(tx_ring) && fm10k_check_tx_hang(tx_ring))
-                       real_tx_hang = true;
+       if (txqueue >= interface->num_tx_queues) {
+               WARN(1, "invalid Tx queue index %d", txqueue);
+               return;
        }
 
+       tx_ring = interface->tx_ring[txqueue];
+       if (check_for_tx_hang(tx_ring) && fm10k_check_tx_hang(tx_ring))
+               real_tx_hang = true;
+
+#define TX_TIMEO_LIMIT 16000
        if (real_tx_hang) {
                fm10k_tx_timeout_reset(interface);
        } else {