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

Commit 61d7f75f authored by Richard Cochran's avatar Richard Cochran Committed by Jeff Kirsher
Browse files

igb: refactor time sync interrupt handling 



The code that handles the time sync interrupt is repeated in three
different places. This patch refactors the identical code blocks into
a single helper function.

Signed-off-by: default avatarRichard Cochran <richardcochran@gmail.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ba5b8dcd

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

+19 −30
Original line number Diff line number Diff line
@@ -5384,6 +5384,19 @@ void igb_update_stats(struct igb_adapter *adapter, 
	}

}



static void igb_tsync_interrupt(struct igb_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;

	u32 tsicr = rd32(E1000_TSICR);



	if (tsicr & E1000_TSICR_TXTS) {

		/* acknowledge the interrupt */

		wr32(E1000_TSICR, E1000_TSICR_TXTS);

		/* retrieve hardware timestamp */

		schedule_work(&adapter->ptp_tx_work);

	}

}



static irqreturn_t igb_msix_other(int irq, void *data)

{

	struct igb_adapter *adapter = data;
@@ -5415,16 +5428,8 @@ static irqreturn_t igb_msix_other(int irq, void *data) 
			mod_timer(&adapter->watchdog_timer, jiffies + 1);

	}



	if (icr & E1000_ICR_TS) {

		u32 tsicr = rd32(E1000_TSICR);



		if (tsicr & E1000_TSICR_TXTS) {

			/* acknowledge the interrupt */

			wr32(E1000_TSICR, E1000_TSICR_TXTS);

			/* retrieve hardware timestamp */

			schedule_work(&adapter->ptp_tx_work);

		}

	}

	if (icr & E1000_ICR_TS)

		igb_tsync_interrupt(adapter);



	wr32(E1000_EIMS, adapter->eims_other);
@@ -6203,16 +6208,8 @@ static irqreturn_t igb_intr_msi(int irq, void *data) 
			mod_timer(&adapter->watchdog_timer, jiffies + 1);

	}



	if (icr & E1000_ICR_TS) {

		u32 tsicr = rd32(E1000_TSICR);



		if (tsicr & E1000_TSICR_TXTS) {

			/* acknowledge the interrupt */

			wr32(E1000_TSICR, E1000_TSICR_TXTS);

			/* retrieve hardware timestamp */

			schedule_work(&adapter->ptp_tx_work);

		}

	}

	if (icr & E1000_ICR_TS)

		igb_tsync_interrupt(adapter);



	napi_schedule(&q_vector->napi);
@@ -6257,16 +6254,8 @@ static irqreturn_t igb_intr(int irq, void *data) 
			mod_timer(&adapter->watchdog_timer, jiffies + 1);

	}



	if (icr & E1000_ICR_TS) {

		u32 tsicr = rd32(E1000_TSICR);



		if (tsicr & E1000_TSICR_TXTS) {

			/* acknowledge the interrupt */

			wr32(E1000_TSICR, E1000_TSICR_TXTS);

			/* retrieve hardware timestamp */

			schedule_work(&adapter->ptp_tx_work);

		}

	}

	if (icr & E1000_ICR_TS)

		igb_tsync_interrupt(adapter);



	napi_schedule(&q_vector->napi);