Commit b855bcde authored by Przemek Kitszel's avatar Przemek Kitszel Committed by Tony Nguyen
Browse files

iavf: remove some unused functions and pointless wrappers 



Remove iavf_aq_get_rss_lut(), iavf_aq_get_rss_key(), iavf_vf_reset().

Remove some "OS specific memory free for shared code" wrappers ;)

Signed-off-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 61f723e6

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

+7 −15
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;

}



/**

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 {								\

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

+0 −5
Original line number Diff line number Diff line
@@ -40,12 +40,8 @@ enum iavf_status iavf_aq_queue_shutdown(struct iavf_hw *hw, bool unloading); 
const char *iavf_aq_str(struct iavf_hw *hw, enum iavf_admin_queue_err aq_err);

const char *iavf_stat_str(struct iavf_hw *hw, enum iavf_status stat_err);



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

				     bool pf_lut, u8 *lut, u16 lut_size);

enum iavf_status iavf_aq_set_rss_lut(struct iavf_hw *hw, u16 seid,

				     bool pf_lut, u8 *lut, u16 lut_size);

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

				     struct iavf_aqc_get_set_rss_key_data *key);

enum iavf_status iavf_aq_set_rss_key(struct iavf_hw *hw, u16 seid,

				     struct iavf_aqc_get_set_rss_key_data *key);
@@ -60,7 +56,6 @@ static inline struct iavf_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype) 


void iavf_vf_parse_hw_config(struct iavf_hw *hw,

			     struct virtchnl_vf_resource *msg);

enum iavf_status iavf_vf_reset(struct iavf_hw *hw);

enum iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,

					enum virtchnl_ops v_opcode,

					enum iavf_status v_retval,