Commit 1c78eb87 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-06-22 (iavf)

This series contains updates to iavf driver only.

Przemek defers removing, previous, primary MAC address until after
getting result of adding its replacement. He also does some cleanup by
removing unused functions and making applicable functions static.

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  iavf: make functions static where possible
  iavf: remove some unused functions and pointless wrappers
  iavf: fix err handling for MAC replace
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6a11af7c a4aadf0f

drivers/net/ethernet/intel/iavf/iavf.h

+0 −10
Original line number Diff line number Diff line
@@ -523,9 +523,6 @@ void iavf_schedule_request_stats(struct iavf_adapter *adapter); 
void iavf_reset(struct iavf_adapter *adapter);

void iavf_set_ethtool_ops(struct net_device *netdev);

void iavf_update_stats(struct iavf_adapter *adapter);

void iavf_reset_interrupt_capability(struct iavf_adapter *adapter);

int iavf_init_interrupt_scheme(struct iavf_adapter *adapter);

void iavf_irq_enable_queues(struct iavf_adapter *adapter);

void iavf_free_all_tx_resources(struct iavf_adapter *adapter);

void iavf_free_all_rx_resources(struct iavf_adapter *adapter);
@@ -579,17 +576,10 @@ void iavf_enable_vlan_stripping_v2(struct iavf_adapter *adapter, u16 tpid); 
void iavf_disable_vlan_stripping_v2(struct iavf_adapter *adapter, u16 tpid);

void iavf_enable_vlan_insertion_v2(struct iavf_adapter *adapter, u16 tpid);

void iavf_disable_vlan_insertion_v2(struct iavf_adapter *adapter, u16 tpid);

int iavf_replace_primary_mac(struct iavf_adapter *adapter,

			     const u8 *new_mac);

void

iavf_set_vlan_offload_features(struct iavf_adapter *adapter,

			       netdev_features_t prev_features,

			       netdev_features_t features);

void iavf_add_fdir_filter(struct iavf_adapter *adapter);

void iavf_del_fdir_filter(struct iavf_adapter *adapter);

void iavf_add_adv_rss_cfg(struct iavf_adapter *adapter);

void iavf_del_adv_rss_cfg(struct iavf_adapter *adapter);

struct iavf_mac_filter *iavf_add_filter(struct iavf_adapter *adapter,

					const u8 *macaddr);

int iavf_lock_timeout(struct mutex *lock, unsigned int msecs);

#endif /* _IAVF_H_ */

drivers/net/ethernet/intel/iavf/iavf_alloc.h

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ enum iavf_status iavf_free_dma_mem(struct iavf_hw *hw, 
				   struct iavf_dma_mem *mem);

enum iavf_status iavf_allocate_virt_mem(struct iavf_hw *hw,

					struct iavf_virt_mem *mem, u32 size);

enum iavf_status iavf_free_virt_mem(struct iavf_hw *hw,

				    struct iavf_virt_mem *mem);

void iavf_free_virt_mem(struct iavf_hw *hw, struct iavf_virt_mem *mem);



#endif /* _IAVF_ALLOC_H_ */

drivers/net/ethernet/intel/iavf/iavf_common.c

+0 −45
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ enum iavf_status iavf_set_mac_type(struct iavf_hw *hw) 
		status = IAVF_ERR_DEVICE_NOT_SUPPORTED;

	}



	hw_dbg(hw, "found mac: %d, returns: %d\n", hw->mac.type, status);

	return status;

}
@@ -397,23 +396,6 @@ static enum iavf_status iavf_aq_get_set_rss_lut(struct iavf_hw *hw, 
	return status;

}



/**

 * iavf_aq_get_rss_lut

 * @hw: pointer to the hardware structure

 * @vsi_id: vsi fw index

 * @pf_lut: for PF table set true, for VSI table set false

 * @lut: pointer to the lut buffer provided by the caller

 * @lut_size: size of the lut buffer

 *

 * get the RSS lookup table, PF or VSI type

 **/

enum iavf_status iavf_aq_get_rss_lut(struct iavf_hw *hw, u16 vsi_id,

				     bool pf_lut, u8 *lut, u16 lut_size)

{

	return iavf_aq_get_set_rss_lut(hw, vsi_id, pf_lut, lut, lut_size,

				       false);

}



/**

 * iavf_aq_set_rss_lut

 * @hw: pointer to the hardware structure
@@ -472,19 +454,6 @@ iavf_status iavf_aq_get_set_rss_key(struct iavf_hw *hw, u16 vsi_id, 
	return status;

}



/**

 * iavf_aq_get_rss_key

 * @hw: pointer to the hw struct

 * @vsi_id: vsi fw index

 * @key: pointer to key info struct

 *

 **/

enum iavf_status iavf_aq_get_rss_key(struct iavf_hw *hw, u16 vsi_id,

				     struct iavf_aqc_get_set_rss_key_data *key)

{

	return iavf_aq_get_set_rss_key(hw, vsi_id, key, false);

}



/**

 * iavf_aq_set_rss_key

 * @hw: pointer to the hw struct
@@ -828,17 +797,3 @@ void iavf_vf_parse_hw_config(struct iavf_hw *hw, 
		vsi_res++;

	}

}
 


/**

 * iavf_vf_reset

 * @hw: pointer to the hardware structure

 *

 * Send a VF_RESET message to the PF. Does not wait for response from PF

 * as none will be forthcoming. Immediately after calling this function,

 * the admin queue should be shut down and (optionally) reinitialized.

 **/

enum iavf_status iavf_vf_reset(struct iavf_hw *hw)

{

	return iavf_aq_send_msg_to_pf(hw, VIRTCHNL_OP_RESET_VF,

				      0, NULL, 0, NULL);

}

drivers/net/ethernet/intel/iavf/iavf_main.c

+33 −45
Original line number Diff line number Diff line
@@ -192,12 +192,11 @@ enum iavf_status iavf_allocate_dma_mem_d(struct iavf_hw *hw, 
}



/**

 * iavf_free_dma_mem_d - OS specific memory free for shared code

 * iavf_free_dma_mem - wrapper for DMA memory freeing

 * @hw:   pointer to the HW structure

 * @mem:  ptr to mem struct to free

 **/

enum iavf_status iavf_free_dma_mem_d(struct iavf_hw *hw,

				     struct iavf_dma_mem *mem)

enum iavf_status iavf_free_dma_mem(struct iavf_hw *hw, struct iavf_dma_mem *mem)

{

	struct iavf_adapter *adapter = (struct iavf_adapter *)hw->back;
@@ -209,12 +208,12 @@ enum iavf_status iavf_free_dma_mem_d(struct iavf_hw *hw, 
}



/**

 * iavf_allocate_virt_mem_d - OS specific memory alloc for shared code

 * iavf_allocate_virt_mem - virt memory alloc wrapper

 * @hw:   pointer to the HW structure

 * @mem:  ptr to mem struct to fill out

 * @size: size of memory requested

 **/

enum iavf_status iavf_allocate_virt_mem_d(struct iavf_hw *hw,

enum iavf_status iavf_allocate_virt_mem(struct iavf_hw *hw,

					struct iavf_virt_mem *mem, u32 size)

{

	if (!mem)
@@ -230,20 +229,13 @@ enum iavf_status iavf_allocate_virt_mem_d(struct iavf_hw *hw, 
}



/**

 * iavf_free_virt_mem_d - OS specific memory free for shared code

 * iavf_free_virt_mem - virt memory free wrapper

 * @hw:   pointer to the HW structure

 * @mem:  ptr to mem struct to free

 **/

enum iavf_status iavf_free_virt_mem_d(struct iavf_hw *hw,

				      struct iavf_virt_mem *mem)

void iavf_free_virt_mem(struct iavf_hw *hw, struct iavf_virt_mem *mem)

{

	if (!mem)

		return IAVF_ERR_PARAM;



	/* it's ok to kfree a NULL pointer */

	kfree(mem->va);



	return 0;

}



/**
@@ -253,7 +245,7 @@ enum iavf_status iavf_free_virt_mem_d(struct iavf_hw *hw, 
 *

 * Returns 0 on success, negative on failure

 **/

int iavf_lock_timeout(struct mutex *lock, unsigned int msecs)

static int iavf_lock_timeout(struct mutex *lock, unsigned int msecs)

{

	unsigned int wait, delay = 10;
@@ -362,7 +354,7 @@ static void iavf_irq_disable(struct iavf_adapter *adapter) 
 * iavf_irq_enable_queues - Enable interrupt for all queues

 * @adapter: board private structure

 **/

void iavf_irq_enable_queues(struct iavf_adapter *adapter)

static void iavf_irq_enable_queues(struct iavf_adapter *adapter)

{

	struct iavf_hw *hw = &adapter->hw;

	int i;
@@ -1003,45 +995,41 @@ struct iavf_mac_filter *iavf_add_filter(struct iavf_adapter *adapter, 
 *

 * Do not call this with mac_vlan_list_lock!

 **/

int iavf_replace_primary_mac(struct iavf_adapter *adapter,

static int iavf_replace_primary_mac(struct iavf_adapter *adapter,

				    const u8 *new_mac)

{

	struct iavf_hw *hw = &adapter->hw;

	struct iavf_mac_filter *f;

	struct iavf_mac_filter *new_f;

	struct iavf_mac_filter *old_f;



	spin_lock_bh(&adapter->mac_vlan_list_lock);



	list_for_each_entry(f, &adapter->mac_filter_list, list) {

		f->is_primary = false;

	new_f = iavf_add_filter(adapter, new_mac);

	if (!new_f) {

		spin_unlock_bh(&adapter->mac_vlan_list_lock);

		return -ENOMEM;

	}



	f = iavf_find_filter(adapter, hw->mac.addr);

	if (f) {

		f->remove = true;

	old_f = iavf_find_filter(adapter, hw->mac.addr);

	if (old_f) {

		old_f->is_primary = false;

		old_f->remove = true;

		adapter->aq_required |= IAVF_FLAG_AQ_DEL_MAC_FILTER;

	}



	f = iavf_add_filter(adapter, new_mac);



	if (f) {

		/* Always send the request to add if changing primary MAC

	/* Always send the request to add if changing primary MAC,

	 * even if filter is already present on the list

	 */

		f->is_primary = true;

		f->add = true;

	new_f->is_primary = true;

	new_f->add = true;

	adapter->aq_required |= IAVF_FLAG_AQ_ADD_MAC_FILTER;

	ether_addr_copy(hw->mac.addr, new_mac);

	}



	spin_unlock_bh(&adapter->mac_vlan_list_lock);



	/* schedule the watchdog task to immediately process the request */

	if (f) {

	mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);

	return 0;

}

	return -ENOMEM;

}



/**

 * iavf_is_mac_set_handled - wait for a response to set MAC from PF
@@ -1863,7 +1851,7 @@ static void iavf_free_q_vectors(struct iavf_adapter *adapter) 
 * @adapter: board private structure

 *

 **/

void iavf_reset_interrupt_capability(struct iavf_adapter *adapter)

static void iavf_reset_interrupt_capability(struct iavf_adapter *adapter)

{

	if (!adapter->msix_entries)

		return;
@@ -1878,7 +1866,7 @@ void iavf_reset_interrupt_capability(struct iavf_adapter *adapter) 
 * @adapter: board private structure to initialize

 *

 **/

int iavf_init_interrupt_scheme(struct iavf_adapter *adapter)

static int iavf_init_interrupt_scheme(struct iavf_adapter *adapter)

{

	int err;
@@ -2176,7 +2164,7 @@ static int iavf_process_aq_command(struct iavf_adapter *adapter) 
 * the watchdog if any changes are requested to expedite the request via

 * virtchnl.

 **/

void

static void

iavf_set_vlan_offload_features(struct iavf_adapter *adapter,

			       netdev_features_t prev_features,

			       netdev_features_t features)

drivers/net/ethernet/intel/iavf/iavf_osdep.h

+0 −9
Original line number Diff line number Diff line
@@ -13,12 +13,6 @@ 
/* get readq/writeq support for 32 bit kernels, use the low-first version */

#include <linux/io-64-nonatomic-lo-hi.h>



/* File to be the magic between shared code and

 * actual OS primitives

 */



#define hw_dbg(hw, S, A...)	do {} while (0)



#define wr32(a, reg, value)	writel((value), ((a)->hw_addr + (reg)))

#define rd32(a, reg)		readl((a)->hw_addr + (reg))
@@ -35,14 +29,11 @@ struct iavf_dma_mem { 


#define iavf_allocate_dma_mem(h, m, unused, s, a) \

	iavf_allocate_dma_mem_d(h, m, s, a)

#define iavf_free_dma_mem(h, m) iavf_free_dma_mem_d(h, m)



struct iavf_virt_mem {

	void *va;

	u32 size;

};

#define iavf_allocate_virt_mem(h, m, s) iavf_allocate_virt_mem_d(h, m, s)

#define iavf_free_virt_mem(h, m) iavf_free_virt_mem_d(h, m)



#define iavf_debug(h, m, s, ...)				\

do {								\