openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ice: Cleanup ice_tx_timeout() 

Clean up number of formatting issues and a comment that could use
clarification.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Bruce Allan 2018-10-26 11:44:44 -07:00 committed by Jeff Kirsher
parent e0c9fd9b77
commit bc0c6fab8a
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/ethernet/intel/ice/ice_main.c
View File

@ -3702,35 +3702,31 @@ static void ice_tx_timeout(struct net_device *netdev)
pf->tx_timeout_count++; pf->tx_timeout_count++;
/* find the stopped queue the same way the stack does */ /* find the stopped queue the same way dev_watchdog() does */
for (i = 0; i < netdev->num_tx_queues; i++) { for (i = 0; i < netdev->num_tx_queues; i++) {
struct netdev_queue *q;
unsigned long trans_start; unsigned long trans_start;
struct netdev_queue *q;
q = netdev_get_tx_queue(netdev, i); q = netdev_get_tx_queue(netdev, i);
trans_start = q->trans_start; trans_start = q->trans_start;
if (netif_xmit_stopped(q) && if (netif_xmit_stopped(q) &&
time_after(jiffies, time_after(jiffies,
(trans_start + netdev->watchdog_timeo))) { trans_start + netdev->watchdog_timeo)) {
hung_queue = i; hung_queue = i;
break; break;
} }
} }
if (i == netdev->num_tx_queues) { if (i == netdev->num_tx_queues)
netdev_info(netdev, "tx_timeout: no netdev hung queue found\n"); netdev_info(netdev, "tx_timeout: no netdev hung queue found\n");
} else { else
/* now that we have an index, find the tx_ring struct */ /* now that we have an index, find the tx_ring struct */
for (i = 0; i < vsi->num_txq; i++) { for (i = 0; i < vsi->num_txq; i++)
if (vsi->tx_rings[i] && vsi->tx_rings[i]->desc) { if (vsi->tx_rings[i] && vsi->tx_rings[i]->desc)
if (hung_queue == if (hung_queue == vsi->tx_rings[i]->q_index) {
vsi->tx_rings[i]->q_index) {
tx_ring = vsi->tx_rings[i]; tx_ring = vsi->tx_rings[i];
break; break;
} }
}
}
}
/* Reset recovery level if enough time has elapsed after last timeout. /* Reset recovery level if enough time has elapsed after last timeout.
* Also ensure no new reset action happens before next timeout period. * Also ensure no new reset action happens before next timeout period.
@ -3751,7 +3747,7 @@ static void ice_tx_timeout(struct net_device *netdev)
if (test_bit(ICE_FLAG_MSIX_ENA, pf->flags)) if (test_bit(ICE_FLAG_MSIX_ENA, pf->flags))
val = rd32(hw, val = rd32(hw,
GLINT_DYN_CTL(tx_ring->q_vector->v_idx + GLINT_DYN_CTL(tx_ring->q_vector->v_idx +
tx_ring->vsi->hw_base_vector)); tx_ring->vsi->hw_base_vector));
netdev_info(netdev, "tx_timeout: VSI_num: %d, Q %d, NTC: 0x%x, HW_HEAD: 0x%x, NTU: 0x%x, INT: 0x%x\n", netdev_info(netdev, "tx_timeout: VSI_num: %d, Q %d, NTC: 0x%x, HW_HEAD: 0x%x, NTU: 0x%x, INT: 0x%x\n",
vsi->vsi_num, hung_queue, tx_ring->next_to_clean, vsi->vsi_num, hung_queue, tx_ring->next_to_clean,