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

Commit c08bac03 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/jkirsher/next-queue 



Jeff Kirsher says:

====================
10GbE Intel Wired LAN Driver Updates 2017-04-29

This series contains updates to ixgbe and ixgbevf only, most notable is
the addition of XDP support to our 10GbE drivers.

Paul fixes ixgbe to acquire the PHY semaphore before accessing PHY
registers when issuing a device reset.

John adds XDP support (yeah!) for ixgbe.

Emil fixes an issue by flushing the MACVLAN filters on VF reset to avoid
conflicts with other VFs that may end up using the same MAC address.  Also
fixed a bug where ethtool -S displayed some empty fields for ixgbevf
because it was using ixgbe_stats instead ixgbevf_stats for
IXGBEVF_QUEUE_STATS_LEN.

Tony adds the ability to specify a zero MAC address in order to clear the
VF's MAC address from the RAR table.  Also adds support for a new
1000Base-T device based on x550EM_X MAC type.  Fixed an issue where the
RSS key specified by the user would be over-written with a pre-existing
value, so change the rss_key to a pointer so we can check to see if the
key has a value set before attempting to set it.  Fixed the logic for
mailbox support for getting RETA and RSS values, which are only supported
by 82599 and x540 devices.

v2: fixed up patches #2 and #3 based on feedback from Jakub and to
    address build issues when page sizes are larger than 4k
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4c042a80 e60ae003

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+24 −3
Original line number Diff line number Diff line
@@ -235,7 +235,11 @@ struct vf_macvlans { 
struct ixgbe_tx_buffer {

	union ixgbe_adv_tx_desc *next_to_watch;

	unsigned long time_stamp;

	union {

		struct sk_buff *skb;

		/* XDP uses address ptr on irq_clean */

		void *data;

	};

	unsigned int bytecount;

	unsigned short gso_segs;

	__be16 protocol;
@@ -288,6 +292,7 @@ enum ixgbe_ring_state_t { 
	__IXGBE_TX_XPS_INIT_DONE,

	__IXGBE_TX_DETECT_HANG,

	__IXGBE_HANG_CHECK_ARMED,

	__IXGBE_TX_XDP_RING,

};



#define ring_uses_build_skb(ring) \
@@ -314,10 +319,17 @@ struct ixgbe_fwd_adapter { 
	set_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)

#define clear_ring_rsc_enabled(ring) \

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

#define ring_is_xdp(ring) \

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

#define set_ring_xdp(ring) \

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

#define clear_ring_xdp(ring) \

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

struct ixgbe_ring {

	struct ixgbe_ring *next;	/* pointer to next ring in q_vector */

	struct ixgbe_q_vector *q_vector; /* backpointer to host q_vector */

	struct net_device *netdev;	/* netdev ring belongs to */

	struct bpf_prog *xdp_prog;

	struct device *dev;		/* device for DMA mapping */

	struct ixgbe_fwd_adapter *l2_accel_priv;

	void *desc;			/* descriptor ring memory */
@@ -379,6 +391,7 @@ enum ixgbe_ring_f_enum { 
#define IXGBE_MAX_FCOE_INDICES		8

#define MAX_RX_QUEUES			(IXGBE_MAX_FDIR_INDICES + 1)

#define MAX_TX_QUEUES			(IXGBE_MAX_FDIR_INDICES + 1)

#define MAX_XDP_QUEUES			(IXGBE_MAX_FDIR_INDICES + 1)

#define IXGBE_MAX_L2A_QUEUES		4

#define IXGBE_BAD_L2A_QUEUE		3

#define IXGBE_MAX_MACVLANS		31
@@ -555,6 +568,7 @@ struct ixgbe_adapter { 
	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	/* OS defined structs */

	struct net_device *netdev;

	struct bpf_prog *xdp_prog;

	struct pci_dev *pdev;



	unsigned long state;
@@ -621,6 +635,10 @@ struct ixgbe_adapter { 
	__be16 vxlan_port;

	__be16 geneve_port;



	/* XDP */

	int num_xdp_queues;

	struct ixgbe_ring *xdp_ring[MAX_XDP_QUEUES];



	/* TX */

	struct ixgbe_ring *tx_ring[MAX_TX_QUEUES] ____cacheline_aligned_in_smp;
@@ -667,6 +685,7 @@ struct ixgbe_adapter { 


	u64 tx_busy;

	unsigned int tx_ring_count;

	unsigned int xdp_ring_count;

	unsigned int rx_ring_count;



	u32 link_speed;
@@ -750,7 +769,7 @@ struct ixgbe_adapter { 
	u8 rss_indir_tbl[IXGBE_MAX_RETA_ENTRIES];



#define IXGBE_RSS_KEY_SIZE     40  /* size of RSS Hash Key in bytes */

	u32 rss_key[IXGBE_RSS_KEY_SIZE / sizeof(u32)];

	u32 *rss_key;

};



static inline u8 ixgbe_max_rss_indices(struct ixgbe_adapter *adapter)
@@ -807,6 +826,7 @@ enum ixgbe_boards { 
	board_X540,

	board_X550,

	board_X550EM_x,

	board_x550em_x_fw,

	board_x550em_a,

	board_x550em_a_fw,

};
@@ -816,6 +836,7 @@ extern const struct ixgbe_info ixgbe_82599_info; 
extern const struct ixgbe_info ixgbe_X540_info;

extern const struct ixgbe_info ixgbe_X550_info;

extern const struct ixgbe_info ixgbe_X550EM_x_info;

extern const struct ixgbe_info ixgbe_x550em_x_fw_info;

extern const struct ixgbe_info ixgbe_x550em_a_info;

extern const struct ixgbe_info ixgbe_x550em_a_fw_info;

#ifdef CONFIG_IXGBE_DCB
@@ -835,7 +856,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter); 
void ixgbe_reinit_locked(struct ixgbe_adapter *adapter);

void ixgbe_reset(struct ixgbe_adapter *adapter);

void ixgbe_set_ethtool_ops(struct net_device *netdev);

int ixgbe_setup_rx_resources(struct ixgbe_ring *);

int ixgbe_setup_rx_resources(struct ixgbe_adapter *, struct ixgbe_ring *);

int ixgbe_setup_tx_resources(struct ixgbe_ring *);

void ixgbe_free_rx_resources(struct ixgbe_ring *);

void ixgbe_free_tx_resources(struct ixgbe_ring *);

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

+28 −5
Original line number Diff line number Diff line
@@ -1071,15 +1071,19 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
	if (!netif_running(adapter->netdev)) {

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

			adapter->tx_ring[i]->count = new_tx_count;

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

			adapter->xdp_ring[i]->count = new_tx_count;

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

			adapter->rx_ring[i]->count = new_rx_count;

		adapter->tx_ring_count = new_tx_count;

		adapter->xdp_ring_count = new_tx_count;

		adapter->rx_ring_count = new_rx_count;

		goto clear_reset;

	}



	/* allocate temporary buffer to store rings in */

	i = max_t(int, adapter->num_tx_queues, adapter->num_rx_queues);

	i = max_t(int, i, adapter->num_xdp_queues);

	temp_ring = vmalloc(i * sizeof(struct ixgbe_ring));



	if (!temp_ring) {
@@ -1111,12 +1115,33 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
			}

		}



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

			memcpy(&temp_ring[i], adapter->xdp_ring[i],

			       sizeof(struct ixgbe_ring));



			temp_ring[i].count = new_tx_count;

			err = ixgbe_setup_tx_resources(&temp_ring[i]);

			if (err) {

				while (i) {

					i--;

					ixgbe_free_tx_resources(&temp_ring[i]);

				}

				goto err_setup;

			}

		}



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

			ixgbe_free_tx_resources(adapter->tx_ring[i]);



			memcpy(adapter->tx_ring[i], &temp_ring[i],

			       sizeof(struct ixgbe_ring));

		}

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

			ixgbe_free_tx_resources(adapter->xdp_ring[i]);



			memcpy(adapter->xdp_ring[i], &temp_ring[i],

			       sizeof(struct ixgbe_ring));

		}



		adapter->tx_ring_count = new_tx_count;

	}
@@ -1128,7 +1153,7 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
			       sizeof(struct ixgbe_ring));



			temp_ring[i].count = new_rx_count;

			err = ixgbe_setup_rx_resources(&temp_ring[i]);

			err = ixgbe_setup_rx_resources(adapter, &temp_ring[i]);

			if (err) {

				while (i) {

					i--;
@@ -1761,7 +1786,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 
	rx_ring->netdev = adapter->netdev;

	rx_ring->reg_idx = adapter->rx_ring[0]->reg_idx;



	err = ixgbe_setup_rx_resources(rx_ring);

	err = ixgbe_setup_rx_resources(adapter, rx_ring);

	if (err) {

		ret_val = 4;

		goto err_nomem;
@@ -2942,9 +2967,7 @@ static int ixgbe_rss_indir_tbl_max(struct ixgbe_adapter *adapter) 


static u32 ixgbe_get_rxfh_key_size(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);



	return sizeof(adapter->rss_key);

	return IXGBE_RSS_KEY_SIZE;

}



static u32 ixgbe_rss_indir_size(struct net_device *netdev)

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

+65 −10
Original line number Diff line number Diff line
@@ -267,12 +267,14 @@ static bool ixgbe_cache_ring_sriov(struct ixgbe_adapter *adapter) 
 **/

static bool ixgbe_cache_ring_rss(struct ixgbe_adapter *adapter)

{

	int i;

	int i, reg_idx;



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

		adapter->rx_ring[i]->reg_idx = i;

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

		adapter->tx_ring[i]->reg_idx = i;

	for (i = 0, reg_idx = 0; i < adapter->num_tx_queues; i++, reg_idx++)

		adapter->tx_ring[i]->reg_idx = reg_idx;

	for (i = 0; i < adapter->num_xdp_queues; i++, reg_idx++)

		adapter->xdp_ring[i]->reg_idx = reg_idx;



	return true;

}
@@ -308,6 +310,11 @@ static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) 
	ixgbe_cache_ring_rss(adapter);

}



static int ixgbe_xdp_queues(struct ixgbe_adapter *adapter)

{

	return adapter->xdp_prog ? nr_cpu_ids : 0;

}



#define IXGBE_RSS_64Q_MASK	0x3F

#define IXGBE_RSS_16Q_MASK	0xF

#define IXGBE_RSS_8Q_MASK	0x7
@@ -382,6 +389,7 @@ static bool ixgbe_set_dcb_sriov_queues(struct ixgbe_adapter *adapter) 
	adapter->num_rx_queues_per_pool = tcs;



	adapter->num_tx_queues = vmdq_i * tcs;

	adapter->num_xdp_queues = 0;

	adapter->num_rx_queues = vmdq_i * tcs;



#ifdef IXGBE_FCOE
@@ -479,6 +487,7 @@ static bool ixgbe_set_dcb_queues(struct ixgbe_adapter *adapter) 
		netdev_set_tc_queue(dev, i, rss_i, rss_i * i);



	adapter->num_tx_queues = rss_i * tcs;

	adapter->num_xdp_queues = 0;

	adapter->num_rx_queues = rss_i * tcs;



	return true;
@@ -549,6 +558,7 @@ static bool ixgbe_set_sriov_queues(struct ixgbe_adapter *adapter) 


	adapter->num_rx_queues = vmdq_i * rss_i;

	adapter->num_tx_queues = vmdq_i * rss_i;

	adapter->num_xdp_queues = 0;



	/* disable ATR as it is not supported when VMDq is enabled */

	adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
@@ -669,6 +679,7 @@ static bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter) 
#endif /* IXGBE_FCOE */

	adapter->num_rx_queues = rss_i;

	adapter->num_tx_queues = rss_i;

	adapter->num_xdp_queues = ixgbe_xdp_queues(adapter);



	return true;

}
@@ -689,6 +700,7 @@ static void ixgbe_set_num_queues(struct ixgbe_adapter *adapter) 
	/* Start with base case */

	adapter->num_rx_queues = 1;

	adapter->num_tx_queues = 1;

	adapter->num_xdp_queues = 0;

	adapter->num_rx_pools = adapter->num_rx_queues;

	adapter->num_rx_queues_per_pool = 1;
@@ -719,8 +731,11 @@ static int ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter) 
	struct ixgbe_hw *hw = &adapter->hw;

	int i, vectors, vector_threshold;



	/* We start by asking for one vector per queue pair */

	/* We start by asking for one vector per queue pair with XDP queues

	 * being stacked with TX queues.

	 */

	vectors = max(adapter->num_rx_queues, adapter->num_tx_queues);

	vectors = max(vectors, adapter->num_xdp_queues);



	/* It is easy to be greedy for MSI-X vectors. However, it really

	 * doesn't do much good if we have a lot more vectors than CPUs. We'll
@@ -800,6 +815,8 @@ static void ixgbe_add_ring(struct ixgbe_ring *ring, 
 * @v_idx: index of vector in adapter struct

 * @txr_count: total number of Tx rings to allocate

 * @txr_idx: index of first Tx ring to allocate

 * @xdp_count: total number of XDP rings to allocate

 * @xdp_idx: index of first XDP ring to allocate

 * @rxr_count: total number of Rx rings to allocate

 * @rxr_idx: index of first Rx ring to allocate

 *
@@ -808,6 +825,7 @@ static void ixgbe_add_ring(struct ixgbe_ring *ring, 
static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter,

				int v_count, int v_idx,

				int txr_count, int txr_idx,

				int xdp_count, int xdp_idx,

				int rxr_count, int rxr_idx)

{

	struct ixgbe_q_vector *q_vector;
@@ -817,7 +835,7 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, 
	int ring_count, size;

	u8 tcs = netdev_get_num_tc(adapter->netdev);



	ring_count = txr_count + rxr_count;

	ring_count = txr_count + rxr_count + xdp_count;

	size = sizeof(struct ixgbe_q_vector) +

	       (sizeof(struct ixgbe_ring) * ring_count);
@@ -909,6 +927,33 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, 
		ring++;

	}



	while (xdp_count) {

		/* assign generic ring traits */

		ring->dev = &adapter->pdev->dev;

		ring->netdev = adapter->netdev;



		/* configure backlink on ring */

		ring->q_vector = q_vector;



		/* update q_vector Tx values */

		ixgbe_add_ring(ring, &q_vector->tx);



		/* apply Tx specific ring traits */

		ring->count = adapter->tx_ring_count;

		ring->queue_index = xdp_idx;

		set_ring_xdp(ring);



		/* assign ring to adapter */

		adapter->xdp_ring[xdp_idx] = ring;



		/* update count and index */

		xdp_count--;

		xdp_idx++;



		/* push pointer to next ring */

		ring++;

	}



	while (rxr_count) {

		/* assign generic ring traits */

		ring->dev = &adapter->pdev->dev;
@@ -1002,17 +1047,18 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter) 
	int q_vectors = adapter->num_q_vectors;

	int rxr_remaining = adapter->num_rx_queues;

	int txr_remaining = adapter->num_tx_queues;

	int rxr_idx = 0, txr_idx = 0, v_idx = 0;

	int xdp_remaining = adapter->num_xdp_queues;

	int rxr_idx = 0, txr_idx = 0, xdp_idx = 0, v_idx = 0;

	int err;



	/* only one q_vector if MSI-X is disabled. */

	if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED))

		q_vectors = 1;



	if (q_vectors >= (rxr_remaining + txr_remaining)) {

	if (q_vectors >= (rxr_remaining + txr_remaining + xdp_remaining)) {

		for (; rxr_remaining; v_idx++) {

			err = ixgbe_alloc_q_vector(adapter, q_vectors, v_idx,

						   0, 0, 1, rxr_idx);

						   0, 0, 0, 0, 1, rxr_idx);



			if (err)

				goto err_out;
@@ -1026,8 +1072,11 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter) 
	for (; v_idx < q_vectors; v_idx++) {

		int rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors - v_idx);

		int tqpv = DIV_ROUND_UP(txr_remaining, q_vectors - v_idx);

		int xqpv = DIV_ROUND_UP(xdp_remaining, q_vectors - v_idx);



		err = ixgbe_alloc_q_vector(adapter, q_vectors, v_idx,

					   tqpv, txr_idx,

					   xqpv, xdp_idx,

					   rqpv, rxr_idx);



		if (err)
@@ -1036,14 +1085,17 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter) 
		/* update counts and index */

		rxr_remaining -= rqpv;

		txr_remaining -= tqpv;

		xdp_remaining -= xqpv;

		rxr_idx++;

		txr_idx++;

		xdp_idx += xqpv;

	}



	return 0;



err_out:

	adapter->num_tx_queues = 0;

	adapter->num_xdp_queues = 0;

	adapter->num_rx_queues = 0;

	adapter->num_q_vectors = 0;
@@ -1066,6 +1118,7 @@ static void ixgbe_free_q_vectors(struct ixgbe_adapter *adapter) 
	int v_idx = adapter->num_q_vectors;



	adapter->num_tx_queues = 0;

	adapter->num_xdp_queues = 0;

	adapter->num_rx_queues = 0;

	adapter->num_q_vectors = 0;
@@ -1172,9 +1225,10 @@ int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter) 


	ixgbe_cache_ring_register(adapter);



	e_dev_info("Multiqueue %s: Rx Queue count = %u, Tx Queue count = %u\n",

	e_dev_info("Multiqueue %s: Rx Queue count = %u, Tx Queue count = %u XDP Queue count = %u\n",

		   (adapter->num_rx_queues > 1) ? "Enabled" : "Disabled",

		   adapter->num_rx_queues, adapter->num_tx_queues);

		   adapter->num_rx_queues, adapter->num_tx_queues,

		   adapter->num_xdp_queues);



	set_bit(__IXGBE_DOWN, &adapter->state);
@@ -1195,6 +1249,7 @@ int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter) 
void ixgbe_clear_interrupt_scheme(struct ixgbe_adapter *adapter)

{

	adapter->num_tx_queues = 0;

	adapter->num_xdp_queues = 0;

	adapter->num_rx_queues = 0;



	ixgbe_free_q_vectors(adapter);

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

+413 −64

File changed.

Preview size limit exceeded, changes collapsed.

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

+72 −63
Original line number Diff line number Diff line
@@ -677,58 +677,6 @@ static void ixgbe_clear_vf_vlans(struct ixgbe_adapter *adapter, u32 vf) 
	}

}



static inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)

{

	struct ixgbe_hw *hw = &adapter->hw;

	struct vf_data_storage *vfinfo = &adapter->vfinfo[vf];

	u8 num_tcs = netdev_get_num_tc(adapter->netdev);



	/* remove VLAN filters beloning to this VF */

	ixgbe_clear_vf_vlans(adapter, vf);



	/* add back PF assigned VLAN or VLAN 0 */

	ixgbe_set_vf_vlan(adapter, true, vfinfo->pf_vlan, vf);



	/* reset offloads to defaults */

	ixgbe_set_vmolr(hw, vf, !vfinfo->pf_vlan);



	/* set outgoing tags for VFs */

	if (!vfinfo->pf_vlan && !vfinfo->pf_qos && !num_tcs) {

		ixgbe_clear_vmvir(adapter, vf);

	} else {

		if (vfinfo->pf_qos || !num_tcs)

			ixgbe_set_vmvir(adapter, vfinfo->pf_vlan,

					vfinfo->pf_qos, vf);

		else

			ixgbe_set_vmvir(adapter, vfinfo->pf_vlan,

					adapter->default_up, vf);



		if (vfinfo->spoofchk_enabled)

			hw->mac.ops.set_vlan_anti_spoofing(hw, true, vf);

	}



	/* reset multicast table array for vf */

	adapter->vfinfo[vf].num_vf_mc_hashes = 0;



	/* Flush and reset the mta with the new values */

	ixgbe_set_rx_mode(adapter->netdev);



	ixgbe_del_mac_filter(adapter, adapter->vfinfo[vf].vf_mac_addresses, vf);



	/* reset VF api back to unknown */

	adapter->vfinfo[vf].vf_api = ixgbe_mbox_api_10;

}



static int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,

			    int vf, unsigned char *mac_addr)

{

	ixgbe_del_mac_filter(adapter, adapter->vfinfo[vf].vf_mac_addresses, vf);

	memcpy(adapter->vfinfo[vf].vf_mac_addresses, mac_addr, ETH_ALEN);

	ixgbe_add_mac_filter(adapter, adapter->vfinfo[vf].vf_mac_addresses, vf);



	return 0;

}



static int ixgbe_set_vf_macvlan(struct ixgbe_adapter *adapter,

				int vf, int index, unsigned char *mac_addr)

{
@@ -784,6 +732,59 @@ static int ixgbe_set_vf_macvlan(struct ixgbe_adapter *adapter, 
	return 0;

}



static inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)

{

	struct ixgbe_hw *hw = &adapter->hw;

	struct vf_data_storage *vfinfo = &adapter->vfinfo[vf];

	u8 num_tcs = netdev_get_num_tc(adapter->netdev);



	/* remove VLAN filters beloning to this VF */

	ixgbe_clear_vf_vlans(adapter, vf);



	/* add back PF assigned VLAN or VLAN 0 */

	ixgbe_set_vf_vlan(adapter, true, vfinfo->pf_vlan, vf);



	/* reset offloads to defaults */

	ixgbe_set_vmolr(hw, vf, !vfinfo->pf_vlan);



	/* set outgoing tags for VFs */

	if (!vfinfo->pf_vlan && !vfinfo->pf_qos && !num_tcs) {

		ixgbe_clear_vmvir(adapter, vf);

	} else {

		if (vfinfo->pf_qos || !num_tcs)

			ixgbe_set_vmvir(adapter, vfinfo->pf_vlan,

					vfinfo->pf_qos, vf);

		else

			ixgbe_set_vmvir(adapter, vfinfo->pf_vlan,

					adapter->default_up, vf);



		if (vfinfo->spoofchk_enabled)

			hw->mac.ops.set_vlan_anti_spoofing(hw, true, vf);

	}



	/* reset multicast table array for vf */

	adapter->vfinfo[vf].num_vf_mc_hashes = 0;



	/* Flush and reset the mta with the new values */

	ixgbe_set_rx_mode(adapter->netdev);



	ixgbe_del_mac_filter(adapter, adapter->vfinfo[vf].vf_mac_addresses, vf);

	ixgbe_set_vf_macvlan(adapter, vf, 0, NULL);



	/* reset VF api back to unknown */

	adapter->vfinfo[vf].vf_api = ixgbe_mbox_api_10;

}



static int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,

			    int vf, unsigned char *mac_addr)

{

	ixgbe_del_mac_filter(adapter, adapter->vfinfo[vf].vf_mac_addresses, vf);

	memcpy(adapter->vfinfo[vf].vf_mac_addresses, mac_addr, ETH_ALEN);

	ixgbe_add_mac_filter(adapter, adapter->vfinfo[vf].vf_mac_addresses, vf);



	return 0;

}



int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask)

{

	struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
@@ -1112,7 +1113,7 @@ static int ixgbe_get_vf_rss_key(struct ixgbe_adapter *adapter, 
		return -EOPNOTSUPP;

	}



	memcpy(rss_key, adapter->rss_key, sizeof(adapter->rss_key));

	memcpy(rss_key, adapter->rss_key, IXGBE_RSS_KEY_SIZE);



	return 0;

}
@@ -1346,18 +1347,26 @@ void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter) 
int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	if (!is_valid_ether_addr(mac) || (vf >= adapter->num_vfs))



	if (vf >= adapter->num_vfs)

		return -EINVAL;



	if (is_zero_ether_addr(mac)) {

		adapter->vfinfo[vf].pf_set_mac = false;

		dev_info(&adapter->pdev->dev, "removing MAC on VF %d\n", vf);

	} else if (is_valid_ether_addr(mac)) {

		adapter->vfinfo[vf].pf_set_mac = true;

	dev_info(&adapter->pdev->dev, "setting MAC %pM on VF %d\n", mac, vf);

	dev_info(&adapter->pdev->dev, "Reload the VF driver to make this"

				      " change effective.");

		dev_info(&adapter->pdev->dev, "setting MAC %pM on VF %d\n",

			 mac, vf);

		dev_info(&adapter->pdev->dev, "Reload the VF driver to make this change effective.");

		if (test_bit(__IXGBE_DOWN, &adapter->state)) {

		dev_warn(&adapter->pdev->dev, "The VF MAC address has been set,"

			 " but the PF device is not up.\n");

		dev_warn(&adapter->pdev->dev, "Bring the PF device up before"

			 " attempting to use the VF device.\n");

			dev_warn(&adapter->pdev->dev, "The VF MAC address has been set, but the PF device is not up.\n");

			dev_warn(&adapter->pdev->dev, "Bring the PF device up before attempting to use the VF device.\n");

		}

	} else {

		return -EINVAL;

	}



	return ixgbe_set_vf_mac(adapter, vf, mac);

}