Commit 190c3ad6 authored by Ivan Vecera's avatar Ivan Vecera Committed by Tony Nguyen
Browse files

i40e: Move DDP specific macros and structures to i40e_ddp.c 



Move several DDP related macros and structures from i40e.h header
to i40e_ddp.c where are privately used. Make static i40e_ddp_load()
function that is also used only in i40e_ddp and move declaration of
i40e_ddp_flash() used by i40e_ethtool.c to i40e_prototype.h

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 56df3459

drivers/net/ethernet/intel/i40e/i40e.h

+0 −24
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#ifndef _I40E_H_

#define _I40E_H_



#include <linux/ethtool.h>

#include <linux/pci.h>

#include <linux/ptp_clock_kernel.h>

#include <linux/types.h>
@@ -296,29 +295,6 @@ struct i40e_udp_port_config { 
	u8 filter_index;

};



#define I40_DDP_FLASH_REGION 100

#define I40E_PROFILE_INFO_SIZE 48

#define I40E_MAX_PROFILE_NUM 16

#define I40E_PROFILE_LIST_SIZE \

	(I40E_PROFILE_INFO_SIZE * I40E_MAX_PROFILE_NUM + 4)

#define I40E_DDP_PROFILE_PATH "intel/i40e/ddp/"

#define I40E_DDP_PROFILE_NAME_MAX 64



int i40e_ddp_load(struct net_device *netdev, const u8 *data, size_t size,

		  bool is_add);

int i40e_ddp_flash(struct net_device *netdev, struct ethtool_flash *flash);



struct i40e_ddp_profile_list {

	u32 p_count;

	struct i40e_profile_info p_info[];

};



struct i40e_ddp_old_profile_list {

	struct list_head list;

	size_t old_ddp_size;

	u8 old_ddp_buf[];

};



/* macros related to FLX_PIT */

#define I40E_FLEX_SET_FSIZE(fsize) (((fsize) << \

				    I40E_PRTQF_FLX_PIT_FSIZE_SHIFT) & \

drivers/net/ethernet/intel/i40e/i40e_ddp.c

+20 −2
Original line number Diff line number Diff line
@@ -4,6 +4,24 @@ 
#include <linux/firmware.h>

#include "i40e.h"



#define I40_DDP_FLASH_REGION		100

#define I40E_PROFILE_INFO_SIZE		48

#define I40E_MAX_PROFILE_NUM		16

#define I40E_PROFILE_LIST_SIZE		\

	(I40E_PROFILE_INFO_SIZE * I40E_MAX_PROFILE_NUM + 4)

#define I40E_DDP_PROFILE_PATH		"intel/i40e/ddp/"

#define I40E_DDP_PROFILE_NAME_MAX	64



struct i40e_ddp_profile_list {

	u32 p_count;

	struct i40e_profile_info p_info[];

};



struct i40e_ddp_old_profile_list {

	struct list_head list;

	size_t old_ddp_size;

	u8 old_ddp_buf[];

};



/**

 * i40e_ddp_profiles_eq - checks if DDP profiles are the equivalent
@@ -261,7 +279,7 @@ static bool i40e_ddp_is_pkg_hdr_valid(struct net_device *netdev, 
 * Checks correctness and loads DDP profile to the NIC. The function is

 * also used for rolling back previously loaded profile.

 **/

int i40e_ddp_load(struct net_device *netdev, const u8 *data, size_t size,

static int i40e_ddp_load(struct net_device *netdev, const u8 *data, size_t size,

			 bool is_add)

{

	u8 profile_info_sec[sizeof(struct i40e_profile_section_header) +

drivers/net/ethernet/intel/i40e/i40e_prototype.h

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#ifndef _I40E_PROTOTYPE_H_

#define _I40E_PROTOTYPE_H_



#include <linux/ethtool.h>

#include <linux/avf/virtchnl.h>

#include "i40e_debug.h"

#include "i40e_type.h"
@@ -497,4 +498,8 @@ int 
i40e_add_pinfo_to_list(struct i40e_hw *hw,

		       struct i40e_profile_segment *profile,

		       u8 *profile_info_sec, u32 track_id);



/* i40e_ddp */

int i40e_ddp_flash(struct net_device *netdev, struct ethtool_flash *flash);



#endif /* _I40E_PROTOTYPE_H_ */