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

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



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2017-04-05

This series contains updates to fm10k only.

Phil Turnbull from Oracle fixes an issue where the argument provided to
FM10K_REMOVED macro was not what was expecting.

Jake modifies the driver to replace the bitwise operators and defines with
a BITMAP and enumeration values to avoid race conditions.  Also future
proof the driver so that developers do not have to remember to re-size the
bitmaps when adding new values.  Fixed the wording of a code comment to
avoid stating that we return a value for a void function.

Ngai-Mint makes sure that when configuring the receive ring, we make sure
the receive queue is disabled.  Fixed an issue where interfaces were
resetting because the transmit mailbox FIFO was becoming full since the
host was not ready, so ensure the host is ready before queueing up
mailbox messages.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6d2d34a9 7d4fe0d1

drivers/net/ethernet/intel/fm10k/fm10k.h

+44 −24
Original line number Diff line number Diff line 
/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 Intel Corporation.

 * Copyright(c) 2013 - 2017 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -65,14 +65,16 @@ enum fm10k_ring_state_t { 
	__FM10K_TX_DETECT_HANG,

	__FM10K_HANG_CHECK_ARMED,

	__FM10K_TX_XPS_INIT_DONE,

	/* This must be last and is used to calculate BITMAP size */

	__FM10K_TX_STATE_SIZE__,

};



#define check_for_tx_hang(ring) \

	test_bit(__FM10K_TX_DETECT_HANG, &(ring)->state)

	test_bit(__FM10K_TX_DETECT_HANG, (ring)->state)

#define set_check_for_tx_hang(ring) \

	set_bit(__FM10K_TX_DETECT_HANG, &(ring)->state)

	set_bit(__FM10K_TX_DETECT_HANG, (ring)->state)

#define clear_check_for_tx_hang(ring) \

	clear_bit(__FM10K_TX_DETECT_HANG, &(ring)->state)

	clear_bit(__FM10K_TX_DETECT_HANG, (ring)->state)



struct fm10k_tx_buffer {

	struct fm10k_tx_desc *next_to_watch;
@@ -126,7 +128,7 @@ struct fm10k_ring { 
		struct fm10k_rx_buffer *rx_buffer;

	};

	u32 __iomem *tail;

	unsigned long state;

	DECLARE_BITMAP(state, __FM10K_TX_STATE_SIZE__);

	dma_addr_t dma;			/* phys. address of descriptor ring */

	unsigned int size;		/* length in bytes */
@@ -249,18 +251,46 @@ struct fm10k_udp_port { 
/* one work queue for entire driver */

extern struct workqueue_struct *fm10k_workqueue;



/* The following enumeration contains flags which indicate or enable modified

 * driver behaviors. To avoid race conditions, the flags are stored in

 * a BITMAP in the fm10k_intfc structure. The BITMAP should be accessed using

 * atomic *_bit() operations.

 */

enum fm10k_flags_t {

	FM10K_FLAG_RESET_REQUESTED,

	FM10K_FLAG_RSS_FIELD_IPV4_UDP,

	FM10K_FLAG_RSS_FIELD_IPV6_UDP,

	FM10K_FLAG_SWPRI_CONFIG,

	/* __FM10K_FLAGS_SIZE__ is used to calculate the size of

	 * interface->flags and must be the last value in this

	 * enumeration.

	 */

	__FM10K_FLAGS_SIZE__

};



enum fm10k_state_t {

	__FM10K_RESETTING,

	__FM10K_DOWN,

	__FM10K_SERVICE_SCHED,

	__FM10K_SERVICE_REQUEST,

	__FM10K_SERVICE_DISABLE,

	__FM10K_MBX_LOCK,

	__FM10K_LINK_DOWN,

	__FM10K_UPDATING_STATS,

	/* This value must be last and determines the BITMAP size */

	__FM10K_STATE_SIZE__,

};



struct fm10k_intfc {

	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	struct net_device *netdev;

	struct fm10k_l2_accel *l2_accel; /* pointer to L2 acceleration list */

	struct pci_dev *pdev;

	unsigned long state;

	DECLARE_BITMAP(state, __FM10K_STATE_SIZE__);



	/* Access flag values using atomic *_bit() operations */

	DECLARE_BITMAP(flags, __FM10K_FLAGS_SIZE__);



	u32 flags;

#define FM10K_FLAG_RESET_REQUESTED		(u32)(BIT(0))

#define FM10K_FLAG_RSS_FIELD_IPV4_UDP		(u32)(BIT(1))

#define FM10K_FLAG_RSS_FIELD_IPV6_UDP		(u32)(BIT(2))

#define FM10K_FLAG_SWPRI_CONFIG			(u32)(BIT(3))

	int xcast_mode;



	/* Tx fast path data */
@@ -352,22 +382,12 @@ struct fm10k_intfc { 
	u16 vid;

};



enum fm10k_state_t {

	__FM10K_RESETTING,

	__FM10K_DOWN,

	__FM10K_SERVICE_SCHED,

	__FM10K_SERVICE_DISABLE,

	__FM10K_MBX_LOCK,

	__FM10K_LINK_DOWN,

	__FM10K_UPDATING_STATS,

};



static inline void fm10k_mbx_lock(struct fm10k_intfc *interface)

{

	/* busy loop if we cannot obtain the lock as some calls

	 * such as ndo_set_rx_mode may be made in atomic context

	 */

	while (test_and_set_bit(__FM10K_MBX_LOCK, &interface->state))

	while (test_and_set_bit(__FM10K_MBX_LOCK, interface->state))

		udelay(20);

}
@@ -375,12 +395,12 @@ static inline void fm10k_mbx_unlock(struct fm10k_intfc *interface) 
{

	/* flush memory to make sure state is correct */

	smp_mb__before_atomic();

	clear_bit(__FM10K_MBX_LOCK, &interface->state);

	clear_bit(__FM10K_MBX_LOCK, interface->state);

}



static inline int fm10k_mbx_trylock(struct fm10k_intfc *interface)

{

	return !test_and_set_bit(__FM10K_MBX_LOCK, &interface->state);

	return !test_and_set_bit(__FM10K_MBX_LOCK, interface->state);

}



/* fm10k_test_staterr - test bits in Rx descriptor status and error fields */

drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c

+44 −24
Original line number Diff line number Diff line 
/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 Intel Corporation.

 * Copyright(c) 2013 - 2017 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -562,7 +562,7 @@ static int fm10k_set_ringparam(struct net_device *netdev, 
		return 0;

	}



	while (test_and_set_bit(__FM10K_RESETTING, &interface->state))

	while (test_and_set_bit(__FM10K_RESETTING, interface->state))

		usleep_range(1000, 2000);



	if (!netif_running(interface->netdev)) {
@@ -648,7 +648,7 @@ err_setup: 
	fm10k_up(interface);

	vfree(temp_ring);

clear_reset:

	clear_bit(__FM10K_RESETTING, &interface->state);

	clear_bit(__FM10K_RESETTING, interface->state);

	return err;

}
@@ -716,7 +716,8 @@ static int fm10k_get_rss_hash_opts(struct fm10k_intfc *interface, 
		cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;

		/* fall through */

	case UDP_V4_FLOW:

		if (interface->flags & FM10K_FLAG_RSS_FIELD_IPV4_UDP)

		if (test_bit(FM10K_FLAG_RSS_FIELD_IPV4_UDP,

			     interface->flags))

			cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;

		/* fall through */

	case SCTP_V4_FLOW:
@@ -732,7 +733,8 @@ static int fm10k_get_rss_hash_opts(struct fm10k_intfc *interface, 
		cmd->data |= RXH_IP_SRC | RXH_IP_DST;

		break;

	case UDP_V6_FLOW:

		if (interface->flags & FM10K_FLAG_RSS_FIELD_IPV6_UDP)

		if (test_bit(FM10K_FLAG_RSS_FIELD_IPV6_UDP,

			     interface->flags))

			cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;

		cmd->data |= RXH_IP_SRC | RXH_IP_DST;

		break;
@@ -764,12 +766,13 @@ static int fm10k_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd, 
	return ret;

}



#define UDP_RSS_FLAGS (FM10K_FLAG_RSS_FIELD_IPV4_UDP | \

		       FM10K_FLAG_RSS_FIELD_IPV6_UDP)

static int fm10k_set_rss_hash_opt(struct fm10k_intfc *interface,

				  struct ethtool_rxnfc *nfc)

{

	u32 flags = interface->flags;

	int rss_ipv4_udp = test_bit(FM10K_FLAG_RSS_FIELD_IPV4_UDP,

				    interface->flags);

	int rss_ipv6_udp = test_bit(FM10K_FLAG_RSS_FIELD_IPV6_UDP,

				    interface->flags);



	/* RSS does not support anything other than hashing

	 * to queues on src and dst IPs and ports
@@ -793,10 +796,12 @@ static int fm10k_set_rss_hash_opt(struct fm10k_intfc *interface, 
			return -EINVAL;

		switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {

		case 0:

			flags &= ~FM10K_FLAG_RSS_FIELD_IPV4_UDP;

			clear_bit(FM10K_FLAG_RSS_FIELD_IPV4_UDP,

				  interface->flags);

			break;

		case (RXH_L4_B_0_1 | RXH_L4_B_2_3):

			flags |= FM10K_FLAG_RSS_FIELD_IPV4_UDP;

			set_bit(FM10K_FLAG_RSS_FIELD_IPV4_UDP,

				interface->flags);

			break;

		default:

			return -EINVAL;
@@ -808,10 +813,12 @@ static int fm10k_set_rss_hash_opt(struct fm10k_intfc *interface, 
			return -EINVAL;

		switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {

		case 0:

			flags &= ~FM10K_FLAG_RSS_FIELD_IPV6_UDP;

			clear_bit(FM10K_FLAG_RSS_FIELD_IPV6_UDP,

				  interface->flags);

			break;

		case (RXH_L4_B_0_1 | RXH_L4_B_2_3):

			flags |= FM10K_FLAG_RSS_FIELD_IPV6_UDP;

			set_bit(FM10K_FLAG_RSS_FIELD_IPV6_UDP,

				interface->flags);

			break;

		default:

			return -EINVAL;
@@ -835,28 +842,41 @@ static int fm10k_set_rss_hash_opt(struct fm10k_intfc *interface, 
		return -EINVAL;

	}



	/* if we changed something we need to update flags */

	if (flags != interface->flags) {

	/* If something changed we need to update the MRQC register. Note that

	 * test_bit() is guaranteed to return strictly 0 or 1, so testing for

	 * equality is safe.

	 */

	if ((rss_ipv4_udp != test_bit(FM10K_FLAG_RSS_FIELD_IPV4_UDP,

				      interface->flags)) ||

	    (rss_ipv6_udp != test_bit(FM10K_FLAG_RSS_FIELD_IPV6_UDP,

				      interface->flags))) {

		struct fm10k_hw *hw = &interface->hw;

		bool warn = false;

		u32 mrqc;



		if ((flags & UDP_RSS_FLAGS) &&

		    !(interface->flags & UDP_RSS_FLAGS))

			netif_warn(interface, drv, interface->netdev,

				   "enabling UDP RSS: fragmented packets may arrive out of order to the stack above\n");



		interface->flags = flags;



		/* Perform hash on these packet types */

		mrqc = FM10K_MRQC_IPV4 |

		       FM10K_MRQC_TCP_IPV4 |

		       FM10K_MRQC_IPV6 |

		       FM10K_MRQC_TCP_IPV6;



		if (flags & FM10K_FLAG_RSS_FIELD_IPV4_UDP)

		if (test_bit(FM10K_FLAG_RSS_FIELD_IPV4_UDP,

			     interface->flags)) {

			mrqc |= FM10K_MRQC_UDP_IPV4;

		if (flags & FM10K_FLAG_RSS_FIELD_IPV6_UDP)

			warn = true;

		}

		if (test_bit(FM10K_FLAG_RSS_FIELD_IPV6_UDP,

			     interface->flags)) {

			mrqc |= FM10K_MRQC_UDP_IPV6;

			warn = true;

		}



		/* If we enable UDP RSS display a warning that this may cause

		 * fragmented UDP packets to arrive out of order.

		 */

		if (warn)

			netif_warn(interface, drv, interface->netdev,

				   "enabling UDP RSS: fragmented packets may arrive out of order to the stack above\n");



		fm10k_write_reg(hw, FM10K_MRQC(0), mrqc);

	}
@@ -939,7 +959,7 @@ static void fm10k_self_test(struct net_device *dev, 


	memset(data, 0, sizeof(*data) * FM10K_TEST_LEN);



	if (FM10K_REMOVED(hw)) {

	if (FM10K_REMOVED(hw->hw_addr)) {

		netif_err(interface, drv, dev,

			  "Interface removed - test blocked\n");

		eth_test->flags |= ETH_TEST_FL_FAILED;

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+8 −8
Original line number Diff line number Diff line 
/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 Intel Corporation.

 * Copyright(c) 2013 - 2017 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -34,7 +34,7 @@ const char fm10k_driver_version[] = DRV_VERSION; 
char fm10k_driver_name[] = "fm10k";

static const char fm10k_driver_string[] = DRV_SUMMARY;

static const char fm10k_copyright[] =

	"Copyright (c) 2013 - 2016 Intel Corporation.";

	"Copyright(c) 2013 - 2017 Intel Corporation.";



MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");

MODULE_DESCRIPTION(DRV_SUMMARY);
@@ -1175,13 +1175,13 @@ bool fm10k_check_tx_hang(struct fm10k_ring *tx_ring) 
		/* update completed stats and continue */

		tx_ring->tx_stats.tx_done_old = tx_done;

		/* reset the countdown */

		clear_bit(__FM10K_HANG_CHECK_ARMED, &tx_ring->state);

		clear_bit(__FM10K_HANG_CHECK_ARMED, tx_ring->state);



		return false;

	}



	/* make sure it is true for two checks in a row */

	return test_and_set_bit(__FM10K_HANG_CHECK_ARMED, &tx_ring->state);

	return test_and_set_bit(__FM10K_HANG_CHECK_ARMED, tx_ring->state);

}



/**
@@ -1191,9 +1191,9 @@ bool fm10k_check_tx_hang(struct fm10k_ring *tx_ring) 
void fm10k_tx_timeout_reset(struct fm10k_intfc *interface)

{

	/* Do the reset outside of interrupt context */

	if (!test_bit(__FM10K_DOWN, &interface->state)) {

	if (!test_bit(__FM10K_DOWN, interface->state)) {

		interface->tx_timeout_count++;

		interface->flags |= FM10K_FLAG_RESET_REQUESTED;

		set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);

		fm10k_service_event_schedule(interface);

	}

}
@@ -1214,7 +1214,7 @@ static bool fm10k_clean_tx_irq(struct fm10k_q_vector *q_vector, 
	unsigned int budget = q_vector->tx.work_limit;

	unsigned int i = tx_ring->next_to_clean;



	if (test_bit(__FM10K_DOWN, &interface->state))

	if (test_bit(__FM10K_DOWN, interface->state))

		return true;



	tx_buffer = &tx_ring->tx_buffer[i];
@@ -1344,7 +1344,7 @@ static bool fm10k_clean_tx_irq(struct fm10k_q_vector *q_vector, 
		smp_mb();

		if (__netif_subqueue_stopped(tx_ring->netdev,

					     tx_ring->queue_index) &&

		    !test_bit(__FM10K_DOWN, &interface->state)) {

		    !test_bit(__FM10K_DOWN, interface->state)) {

			netif_wake_subqueue(tx_ring->netdev,

					    tx_ring->queue_index);

			++tx_ring->tx_stats.restart_queue;

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

+85 −30
Original line number Diff line number Diff line 
/* Intel(R) Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2016 Intel Corporation.

 * Copyright(c) 2013 - 2017 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -737,6 +737,23 @@ static void fm10k_tx_timeout(struct net_device *netdev) 
	}

}



/**

 * fm10k_host_mbx_ready - Check PF interface's mailbox readiness

 * @interface: board private structure

 *

 * This function checks if the PF interface's mailbox is ready before queueing

 * mailbox messages for transmission. This will prevent filling the TX mailbox

 * queue when the receiver is not ready. VF interfaces are exempt from this

 * check since it will block all PF-VF mailbox messages from being sent from

 * the VF to the PF at initialization.

 **/

static bool fm10k_host_mbx_ready(struct fm10k_intfc *interface)

{

	struct fm10k_hw *hw = &interface->hw;



	return (hw->mac.type == fm10k_mac_vf || interface->host_ready);

}



static int fm10k_uc_vlan_unsync(struct net_device *netdev,

				const unsigned char *uc_addr)

{
@@ -745,12 +762,15 @@ static int fm10k_uc_vlan_unsync(struct net_device *netdev, 
	u16 glort = interface->glort;

	u16 vid = interface->vid;

	bool set = !!(vid / VLAN_N_VID);

	int err;

	int err = -EHOSTDOWN;



	/* drop any leading bits on the VLAN ID */

	vid &= VLAN_N_VID - 1;



	err = hw->mac.ops.update_uc_addr(hw, glort, uc_addr, vid, set, 0);

	if (fm10k_host_mbx_ready(interface))

		err = hw->mac.ops.update_uc_addr(hw, glort, uc_addr,

						 vid, set, 0);



	if (err)

		return err;
@@ -766,12 +786,14 @@ static int fm10k_mc_vlan_unsync(struct net_device *netdev, 
	u16 glort = interface->glort;

	u16 vid = interface->vid;

	bool set = !!(vid / VLAN_N_VID);

	int err;

	int err = -EHOSTDOWN;



	/* drop any leading bits on the VLAN ID */

	vid &= VLAN_N_VID - 1;



	if (fm10k_host_mbx_ready(interface))

		err = hw->mac.ops.update_mc_addr(hw, glort, mc_addr, vid, set);



	if (err)

		return err;
@@ -822,7 +844,7 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set) 
	/* Do not throw an error if the interface is down. We will sync once

	 * we come up

	 */

	if (test_bit(__FM10K_DOWN, &interface->state))

	if (test_bit(__FM10K_DOWN, interface->state))

		return 0;



	fm10k_mbx_lock(interface);
@@ -834,9 +856,13 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set) 
			goto err_out;

	}



	/* update our base MAC address */

	err = hw->mac.ops.update_uc_addr(hw, interface->glort, hw->mac.addr,

					 vid, set, 0);

	/* update our base MAC address if host's mailbox is ready */

	if (fm10k_host_mbx_ready(interface))

		err = hw->mac.ops.update_uc_addr(hw, interface->glort,

						 hw->mac.addr, vid, set, 0);

	else

		err = -EHOSTDOWN;



	if (err)

		goto err_out;
@@ -907,7 +933,10 @@ static int __fm10k_uc_sync(struct net_device *dev, 
	if (!is_valid_ether_addr(addr))

		return -EADDRNOTAVAIL;



	/* update table with current entries */

	/* update table with current entries if host's mailbox is ready */

	if (!fm10k_host_mbx_ready(interface))

		return -EHOSTDOWN;



	for (vid = hw->mac.default_vid ? fm10k_find_next_vlan(interface, 0) : 1;

	     vid < VLAN_N_VID;

	     vid = fm10k_find_next_vlan(interface, vid)) {
@@ -970,7 +999,10 @@ static int __fm10k_mc_sync(struct net_device *dev, 
	struct fm10k_hw *hw = &interface->hw;

	u16 vid, glort = interface->glort;



	/* update table with current entries */

	/* update table with current entries if host's mailbox is ready */

	if (!fm10k_host_mbx_ready(interface))

		return 0;



	for (vid = hw->mac.default_vid ? fm10k_find_next_vlan(interface, 0) : 1;

	     vid < VLAN_N_VID;

	     vid = fm10k_find_next_vlan(interface, vid)) {
@@ -1018,8 +1050,10 @@ static void fm10k_set_rx_mode(struct net_device *dev) 
		if (interface->xcast_mode == FM10K_XCAST_MODE_PROMISC)

			fm10k_clear_unused_vlans(interface);



		/* update xcast mode */

		hw->mac.ops.update_xcast_mode(hw, interface->glort, xcast_mode);

		/* update xcast mode if host's mailbox is ready */

		if (fm10k_host_mbx_ready(interface))

			hw->mac.ops.update_xcast_mode(hw, interface->glort,

						      xcast_mode);



		/* record updated xcast mode state */

		interface->xcast_mode = xcast_mode;
@@ -1054,8 +1088,10 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface) 


	fm10k_mbx_lock(interface);



	/* Enable logical port */

	hw->mac.ops.update_lport_state(hw, glort, interface->glort_count, true);

	/* Enable logical port if host's mailbox is ready */

	if (fm10k_host_mbx_ready(interface))

		hw->mac.ops.update_lport_state(hw, glort,

					       interface->glort_count, true);



	/* update VLAN table */

	hw->mac.ops.update_vlan(hw, FM10K_VLAN_ALL, 0,
@@ -1069,11 +1105,17 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface) 
	     vid < VLAN_N_VID;

	     vid = fm10k_find_next_vlan(interface, vid)) {

		hw->mac.ops.update_vlan(hw, vid, 0, true);



		/* Update unicast entries if host's mailbox is ready */

		if (fm10k_host_mbx_ready(interface))

			hw->mac.ops.update_uc_addr(hw, glort, hw->mac.addr,

						   vid, true, 0);

	}



	/* update xcast mode before synchronizing addresses */

	/* update xcast mode before synchronizing addresses if host's mailbox

	 * is ready

	 */

	if (fm10k_host_mbx_ready(interface))

		hw->mac.ops.update_xcast_mode(hw, glort, xcast_mode);



	/* synchronize all of the addresses */
@@ -1096,7 +1138,10 @@ void fm10k_reset_rx_state(struct fm10k_intfc *interface) 


	fm10k_mbx_lock(interface);



	/* clear the logical port state on lower device */

	/* clear the logical port state on lower device if host's mailbox is

	 * ready

	 */

	if (fm10k_host_mbx_ready(interface))

		hw->mac.ops.update_lport_state(hw, interface->glort,

					       interface->glort_count, false);
@@ -1115,8 +1160,8 @@ void fm10k_reset_rx_state(struct fm10k_intfc *interface) 
 * @netdev: network interface device structure

 * @stats: storage space for 64bit statistics

 *

 * Returns 64bit statistics, for use in the ndo_get_stats64 callback. This

 * function replaces fm10k_get_stats for kernels which support it.

 * Obtain 64bit statistics in a way that is safe for both 32bit and 64bit

 * architectures.

 */

static void fm10k_get_stats64(struct net_device *netdev,

			      struct rtnl_link_stats64 *stats)
@@ -1207,7 +1252,7 @@ int fm10k_setup_tc(struct net_device *dev, u8 tc) 
		goto err_open;



	/* flag to indicate SWPRI has yet to be updated */

	interface->flags |= FM10K_FLAG_SWPRI_CONFIG;

	set_bit(FM10K_FLAG_SWPRI_CONFIG, interface->flags);



	return 0;

err_open:
@@ -1319,8 +1364,13 @@ static void *fm10k_dfwd_add_station(struct net_device *dev, 
	fm10k_mbx_lock(interface);



	glort = l2_accel->dglort + 1 + i;

	hw->mac.ops.update_xcast_mode(hw, glort, FM10K_XCAST_MODE_MULTI);

	hw->mac.ops.update_uc_addr(hw, glort, sdev->dev_addr, 0, true, 0);



	if (fm10k_host_mbx_ready(interface)) {

		hw->mac.ops.update_xcast_mode(hw, glort,

					      FM10K_XCAST_MODE_MULTI);

		hw->mac.ops.update_uc_addr(hw, glort, sdev->dev_addr,

					   0, true, 0);

	}



	fm10k_mbx_unlock(interface);
@@ -1354,8 +1404,13 @@ static void fm10k_dfwd_del_station(struct net_device *dev, void *priv) 
	fm10k_mbx_lock(interface);



	glort = l2_accel->dglort + 1 + i;

	hw->mac.ops.update_xcast_mode(hw, glort, FM10K_XCAST_MODE_NONE);

	hw->mac.ops.update_uc_addr(hw, glort, sdev->dev_addr, 0, false, 0);



	if (fm10k_host_mbx_ready(interface)) {

		hw->mac.ops.update_xcast_mode(hw, glort,

					      FM10K_XCAST_MODE_NONE);

		hw->mac.ops.update_uc_addr(hw, glort, sdev->dev_addr,

					   0, false, 0);

	}



	fm10k_mbx_unlock(interface);

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

+58 −47

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE