Commit 9665e03a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2021-12-28

This series contains updates to igc driver only.

Vinicius disables support for crosstimestamp on i225-V as lockups are being
observed.

James McLaughlin fixes Tx timestamping support on non-MSI-X platforms.

* '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  igc: Fix TX timestamp support for non-MSI-X platforms
  igc: Do not enable crosstimestamping for i225-V models
====================

Link: https://lore.kernel.org/r/20211228182421.340354-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 140c7bc7 f85846bb

drivers/net/ethernet/intel/igc/igc_main.c

+6 −0
Original line number Diff line number Diff line
@@ -5467,6 +5467,9 @@ static irqreturn_t igc_intr_msi(int irq, void *data) 
			mod_timer(&adapter->watchdog_timer, jiffies + 1);

	}



	if (icr & IGC_ICR_TS)

		igc_tsync_interrupt(adapter);



	napi_schedule(&q_vector->napi);



	return IRQ_HANDLED;
@@ -5510,6 +5513,9 @@ static irqreturn_t igc_intr(int irq, void *data) 
			mod_timer(&adapter->watchdog_timer, jiffies + 1);

	}



	if (icr & IGC_ICR_TS)

		igc_tsync_interrupt(adapter);



	napi_schedule(&q_vector->napi);



	return IRQ_HANDLED;

drivers/net/ethernet/intel/igc/igc_ptp.c

+14 −1
Original line number Diff line number Diff line
@@ -768,7 +768,20 @@ int igc_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr) 
 */

static bool igc_is_crosststamp_supported(struct igc_adapter *adapter)

{

	return IS_ENABLED(CONFIG_X86_TSC) ? pcie_ptm_enabled(adapter->pdev) : false;

	if (!IS_ENABLED(CONFIG_X86_TSC))

		return false;



	/* FIXME: it was noticed that enabling support for PCIe PTM in

	 * some i225-V models could cause lockups when bringing the

	 * interface up/down. There should be no downsides to

	 * disabling crosstimestamping support for i225-V, as it

	 * doesn't have any PTP support. That way we gain some time

	 * while root causing the issue.

	 */

	if (adapter->pdev->device == IGC_DEV_ID_I225_V)

		return false;



	return pcie_ptm_enabled(adapter->pdev);

}



static struct system_counterval_t igc_device_tstamp_to_system(u64 tstamp)