Commit ef332fe1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2022-08-24 (ixgbe, i40e)

This series contains updates to ixgbe and i40e drivers.

Jake stops incorrect resetting of SYSTIME registers when starting
cyclecounter for ixgbe.

Sylwester corrects a check on source IP address when validating destination
for i40e.

* '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  i40e: Fix incorrect address type for IPv6 flow rules
  ixgbe: stop resetting SYSTIME in ixgbe_ptp_start_cyclecounter
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 92df825a bcf3a156

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -4485,7 +4485,7 @@ static int i40e_check_fdir_input_set(struct i40e_vsi *vsi, 
				    (struct in6_addr *)&ipv6_full_mask))

			new_mask |= I40E_L3_V6_DST_MASK;

		else if (ipv6_addr_any((struct in6_addr *)

				       &usr_ip6_spec->ip6src))

				       &usr_ip6_spec->ip6dst))

			new_mask &= ~I40E_L3_V6_DST_MASK;

		else

			return -EOPNOTSUPP;

drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

+46 −13
Original line number Diff line number Diff line
@@ -1214,7 +1214,6 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter) 
	struct cyclecounter cc;

	unsigned long flags;

	u32 incval = 0;

	u32 tsauxc = 0;

	u32 fuse0 = 0;



	/* For some of the boards below this mask is technically incorrect.
@@ -1249,18 +1248,6 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter) 
	case ixgbe_mac_x550em_a:

	case ixgbe_mac_X550:

		cc.read = ixgbe_ptp_read_X550;



		/* enable SYSTIME counter */

		IXGBE_WRITE_REG(hw, IXGBE_SYSTIMR, 0);

		IXGBE_WRITE_REG(hw, IXGBE_SYSTIML, 0);

		IXGBE_WRITE_REG(hw, IXGBE_SYSTIMH, 0);

		tsauxc = IXGBE_READ_REG(hw, IXGBE_TSAUXC);

		IXGBE_WRITE_REG(hw, IXGBE_TSAUXC,

				tsauxc & ~IXGBE_TSAUXC_DISABLE_SYSTIME);

		IXGBE_WRITE_REG(hw, IXGBE_TSIM, IXGBE_TSIM_TXTS);

		IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMS_TIMESYNC);



		IXGBE_WRITE_FLUSH(hw);

		break;

	case ixgbe_mac_X540:

		cc.read = ixgbe_ptp_read_82599;
@@ -1292,6 +1279,50 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter) 
	spin_unlock_irqrestore(&adapter->tmreg_lock, flags);

}



/**

 * ixgbe_ptp_init_systime - Initialize SYSTIME registers

 * @adapter: the ixgbe private board structure

 *

 * Initialize and start the SYSTIME registers.

 */

static void ixgbe_ptp_init_systime(struct ixgbe_adapter *adapter)

{

	struct ixgbe_hw *hw = &adapter->hw;

	u32 tsauxc;



	switch (hw->mac.type) {

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

	case ixgbe_mac_X550:

		tsauxc = IXGBE_READ_REG(hw, IXGBE_TSAUXC);



		/* Reset SYSTIME registers to 0 */

		IXGBE_WRITE_REG(hw, IXGBE_SYSTIMR, 0);

		IXGBE_WRITE_REG(hw, IXGBE_SYSTIML, 0);

		IXGBE_WRITE_REG(hw, IXGBE_SYSTIMH, 0);



		/* Reset interrupt settings */

		IXGBE_WRITE_REG(hw, IXGBE_TSIM, IXGBE_TSIM_TXTS);

		IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMS_TIMESYNC);



		/* Activate the SYSTIME counter */

		IXGBE_WRITE_REG(hw, IXGBE_TSAUXC,

				tsauxc & ~IXGBE_TSAUXC_DISABLE_SYSTIME);

		break;

	case ixgbe_mac_X540:

	case ixgbe_mac_82599EB:

		/* Reset SYSTIME registers to 0 */

		IXGBE_WRITE_REG(hw, IXGBE_SYSTIML, 0);

		IXGBE_WRITE_REG(hw, IXGBE_SYSTIMH, 0);

		break;

	default:

		/* Other devices aren't supported */

		return;

	};



	IXGBE_WRITE_FLUSH(hw);

}



/**

 * ixgbe_ptp_reset

 * @adapter: the ixgbe private board structure
@@ -1318,6 +1349,8 @@ void ixgbe_ptp_reset(struct ixgbe_adapter *adapter) 


	ixgbe_ptp_start_cyclecounter(adapter);



	ixgbe_ptp_init_systime(adapter);



	spin_lock_irqsave(&adapter->tmreg_lock, flags);

	timecounter_init(&adapter->hw_tc, &adapter->hw_cc,

			 ktime_to_ns(ktime_get_real()));