AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-24 21:19:40 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

igc: Remove duplicate code in Tx timestamp handling

Browse Source 
The functions igc_ptp_tx_hang() and igc_ptp_tx_work() have duplicate
code which handles Tx timestamp timeouts. This patch does a trivial
refactoring by moving that code to its own function and reusing it.

Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Andre Guedes 2020-06-03 17:01:01 -07:00 committed by Jeff Kirsher
parent 3a66abe903
commit 29b821fe97
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/net/ethernet/intel/igc/igc_ptp.c
View File

@ -386,11 +386,23 @@ static int igc_ptp_set_timestamp_mode(struct igc_adapter *adapter,
return 0; return 0;
} }
static void igc_ptp_tx_timeout(struct igc_adapter *adapter)
{
struct igc_hw *hw = &adapter->hw;
dev_kfree_skb_any(adapter->ptp_tx_skb);
adapter->ptp_tx_skb = NULL;
adapter->tx_hwtstamp_timeouts++;
clear_bit_unlock(__IGC_PTP_TX_IN_PROGRESS, &adapter->state);
/* Clear the tx valid bit in TSYNCTXCTL register to enable interrupt. */
rd32(IGC_TXSTMPH);
netdev_warn(adapter->netdev, "Tx timestamp timeout\n");
}
void igc_ptp_tx_hang(struct igc_adapter *adapter) void igc_ptp_tx_hang(struct igc_adapter *adapter)
{ {
bool timeout = time_is_before_jiffies(adapter->ptp_tx_start + bool timeout = time_is_before_jiffies(adapter->ptp_tx_start +
IGC_PTP_TX_TIMEOUT); IGC_PTP_TX_TIMEOUT);
struct igc_hw *hw = &adapter->hw;
if (!adapter->ptp_tx_skb) if (!adapter->ptp_tx_skb)
return; return;
@ -404,15 +416,7 @@ void igc_ptp_tx_hang(struct igc_adapter *adapter)
*/ */
if (timeout) { if (timeout) {
cancel_work_sync(&adapter->ptp_tx_work); cancel_work_sync(&adapter->ptp_tx_work);
dev_kfree_skb_any(adapter->ptp_tx_skb); igc_ptp_tx_timeout(adapter);
adapter->ptp_tx_skb = NULL;
clear_bit_unlock(__IGC_PTP_TX_IN_PROGRESS, &adapter->state);
adapter->tx_hwtstamp_timeouts++;
/* Clear the Tx valid bit in TSYNCTXCTL register to enable
* interrupt
*/
rd32(IGC_TXSTMPH);
netdev_warn(adapter->netdev, "Clearing Tx timestamp hang\n");
} }
} }
@ -467,15 +471,7 @@ static void igc_ptp_tx_work(struct work_struct *work)
if (time_is_before_jiffies(adapter->ptp_tx_start + if (time_is_before_jiffies(adapter->ptp_tx_start +
IGC_PTP_TX_TIMEOUT)) { IGC_PTP_TX_TIMEOUT)) {
dev_kfree_skb_any(adapter->ptp_tx_skb); igc_ptp_tx_timeout(adapter);
adapter->ptp_tx_skb = NULL;
clear_bit_unlock(__IGC_PTP_TX_IN_PROGRESS, &adapter->state);
adapter->tx_hwtstamp_timeouts++;
/* Clear the tx valid bit in TSYNCTXCTL register to enable
* interrupt
*/
rd32(IGC_TXSTMPH);
netdev_warn(adapter->netdev, "Clearing Tx timestamp hang\n");
return; return;
} }