Commit 5ef2702a authored by David S. Miller's avatar David S. Miller
Browse files

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



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-01-13 (ixgbe)

This series contains updates to ixgbe driver only.

Jesse resolves warning for RCU pointer by no longer restoring old
pointer.

Sebastian adds waiting for updating of link info on devices utilizing
crosstalk fix to avoid false link state.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b27401a3 6f8179c1

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

+18 −3
Original line number Diff line number Diff line
@@ -3292,13 +3292,14 @@ static bool ixgbe_need_crosstalk_fix(struct ixgbe_hw *hw) 
s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,

				 bool *link_up, bool link_up_wait_to_complete)

{

	bool crosstalk_fix_active = ixgbe_need_crosstalk_fix(hw);

	u32 links_reg, links_orig;

	u32 i;



	/* If Crosstalk fix enabled do the sanity check of making sure

	 * the SFP+ cage is full.

	 */

	if (ixgbe_need_crosstalk_fix(hw)) {

	if (crosstalk_fix_active) {

		u32 sfp_cage_full;



		switch (hw->mac.type) {
@@ -3346,11 +3347,25 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed, 
			links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);

		}

	} else {

		if (links_reg & IXGBE_LINKS_UP)

		if (links_reg & IXGBE_LINKS_UP) {

			if (crosstalk_fix_active) {

				/* Check the link state again after a delay

				 * to filter out spurious link up

				 * notifications.

				 */

				mdelay(5);

				links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);

				if (!(links_reg & IXGBE_LINKS_UP)) {

					*link_up = false;

					*speed = IXGBE_LINK_SPEED_UNKNOWN;

					return 0;

				}

			}

			*link_up = true;

		else

		} else {

			*link_up = false;

		}

	}



	switch (links_reg & IXGBE_LINKS_SPEED_82599) {

	case IXGBE_LINKS_SPEED_10G_82599:

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

+6 −7
Original line number Diff line number Diff line
@@ -6647,7 +6647,7 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter, 
			     rx_ring->queue_index, ixgbe_rx_napi_id(rx_ring)) < 0)

		goto err;



	rx_ring->xdp_prog = adapter->xdp_prog;

	WRITE_ONCE(rx_ring->xdp_prog, adapter->xdp_prog);



	return 0;

err:
@@ -10297,15 +10297,14 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog) 
			synchronize_rcu();

		err = ixgbe_setup_tc(dev, adapter->hw_tcs);



		if (err) {

			rcu_assign_pointer(adapter->xdp_prog, old_prog);

		if (err)

			return -EINVAL;

		}

	} else {

		for (i = 0; i < adapter->num_rx_queues; i++)

			(void)xchg(&adapter->rx_ring[i]->xdp_prog,

		for (i = 0; i < adapter->num_rx_queues; i++) {

			WRITE_ONCE(adapter->rx_ring[i]->xdp_prog,

				   adapter->xdp_prog);

		}

	}



	if (old_prog)

		bpf_prog_put(old_prog);