Commit e0758387 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:

====================
i40e: House-keeping and clean-up

Ivan Vecera says:

The series makes some house-keeping tasks on i40e driver:

Patch 1: Removes unnecessary back pointer from i40e_hw
Patch 2: Moves I40E_MASK macro to i40e_register.h where is used
Patch 3: Refactors I40E_MDIO_CLAUSE* to use the common macro
Patch 4: Add header dependencies to <linux/avf/virtchnl.h>
Patch 5: Simplifies memory alloction functions
Patch 6: Moves mem alloc structures to i40e_alloc.h
Patch 7: Splits i40e_osdep.h to i40e_debug.h and i40e_io.h
Patch 8: Removes circular header deps, fixes and cleans headers
Patch 9: Moves DDP specific macros and structs to i40e_ddp.c

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  i40e: Move DDP specific macros and structures to i40e_ddp.c
  i40e: Remove circular header dependencies and fix headers
  i40e: Split i40e_osdep.h
  i40e: Move memory allocation structures to i40e_alloc.h
  i40e: Simplify memory allocation functions
  virtchnl: Add header dependencies
  i40e: Refactor I40E_MDIO_CLAUSE* macros
  i40e: Move I40E_MASK macro to i40e_register.h
  i40e: Remove back pointer from i40e_hw structure
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9814ec70 190c3ad6

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

+18 −58
Original line number Diff line number Diff line
@@ -4,47 +4,19 @@ 
#ifndef _I40E_H_

#define _I40E_H_



#include <net/tcp.h>

#include <net/udp.h>

#include <linux/types.h>

#include <linux/errno.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/netdevice.h>

#include <linux/ioport.h>

#include <linux/iommu.h>

#include <linux/slab.h>

#include <linux/list.h>

#include <linux/hashtable.h>

#include <linux/string.h>

#include <linux/in.h>

#include <linux/ip.h>

#include <linux/sctp.h>

#include <linux/pkt_sched.h>

#include <linux/ipv6.h>

#include <net/checksum.h>

#include <net/ip6_checksum.h>

#include <linux/ethtool.h>

#include <linux/if_vlan.h>

#include <linux/if_macvlan.h>

#include <linux/if_bridge.h>

#include <linux/clocksource.h>

#include <linux/net_tstamp.h>

#include <linux/ptp_clock_kernel.h>

#include <linux/types.h>

#include <linux/avf/virtchnl.h>

#include <linux/net/intel/i40e_client.h>

#include <net/pkt_cls.h>

#include <net/pkt_sched.h>

#include <net/tc_act/tc_gact.h>

#include <net/tc_act/tc_mirred.h>

#include <net/udp_tunnel.h>

#include <net/xdp_sock.h>

#include <linux/bitfield.h>

#include "i40e_type.h"

#include "i40e_dcb.h"

#include "i40e_debug.h"

#include "i40e_io.h"

#include "i40e_prototype.h"

#include <linux/net/intel/i40e_client.h>

#include <linux/avf/virtchnl.h>

#include "i40e_virtchnl_pf.h"

#include "i40e_register.h"

#include "i40e_txrx.h"

#include "i40e_dcb.h"



/* Useful i40e defaults */

#define I40E_MAX_VEB			16
@@ -323,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) & \
@@ -1321,4 +1270,15 @@ static inline u32 i40e_is_tc_mqprio_enabled(struct i40e_pf *pf) 
	return pf->flags & I40E_FLAG_TC_MQPRIO;

}



/**

 * i40e_hw_to_pf - get pf pointer from the hardware structure

 * @hw: pointer to the device HW structure

 **/

static inline struct i40e_pf *i40e_hw_to_pf(struct i40e_hw *hw)

{

	return container_of(hw, struct i40e_pf, hw);

}



struct device *i40e_hw_to_dev(struct i40e_hw *hw);



#endif /* _I40E_H_ */

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

+2 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2013 - 2018 Intel Corporation. */



#include "i40e_type.h"

#include <linux/delay.h>

#include "i40e_alloc.h"

#include "i40e_register.h"

#include "i40e_adminq.h"

#include "i40e_prototype.h"



static void i40e_resume_aq(struct i40e_hw *hw);
@@ -51,7 +51,6 @@ static int i40e_alloc_adminq_asq_ring(struct i40e_hw *hw) 
	int ret_code;



	ret_code = i40e_allocate_dma_mem(hw, &hw->aq.asq.desc_buf,

					 i40e_mem_atq_ring,

					 (hw->aq.num_asq_entries *

					 sizeof(struct i40e_aq_desc)),

					 I40E_ADMINQ_DESC_ALIGNMENT);
@@ -78,7 +77,6 @@ static int i40e_alloc_adminq_arq_ring(struct i40e_hw *hw) 
	int ret_code;



	ret_code = i40e_allocate_dma_mem(hw, &hw->aq.arq.desc_buf,

					 i40e_mem_arq_ring,

					 (hw->aq.num_arq_entries *

					 sizeof(struct i40e_aq_desc)),

					 I40E_ADMINQ_DESC_ALIGNMENT);
@@ -136,7 +134,6 @@ static int i40e_alloc_arq_bufs(struct i40e_hw *hw) 
	for (i = 0; i < hw->aq.num_arq_entries; i++) {

		bi = &hw->aq.arq.r.arq_bi[i];

		ret_code = i40e_allocate_dma_mem(hw, bi,

						 i40e_mem_arq_buf,

						 hw->aq.arq_buf_size,

						 I40E_ADMINQ_DESC_ALIGNMENT);

		if (ret_code)
@@ -198,7 +195,6 @@ static int i40e_alloc_asq_bufs(struct i40e_hw *hw) 
	for (i = 0; i < hw->aq.num_asq_entries; i++) {

		bi = &hw->aq.asq.r.asq_bi[i];

		ret_code = i40e_allocate_dma_mem(hw, bi,

						 i40e_mem_asq_buf,

						 hw->aq.asq_buf_size,

						 I40E_ADMINQ_DESC_ALIGNMENT);

		if (ret_code)

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

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 
#ifndef _I40E_ADMINQ_H_

#define _I40E_ADMINQ_H_



#include "i40e_osdep.h"

#include <linux/mutex.h>

#include "i40e_alloc.h"

#include "i40e_adminq_cmd.h"



#define I40E_ADMINQ_DESC(R, i)   \

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

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#ifndef _I40E_ADMINQ_CMD_H_

#define _I40E_ADMINQ_CMD_H_



#include <linux/bits.h>



/* This header file defines the i40e Admin Queue commands and is shared between

 * i40e Firmware and Software.

 *

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

+12 −12
Original line number Diff line number Diff line
@@ -4,25 +4,25 @@ 
#ifndef _I40E_ALLOC_H_

#define _I40E_ALLOC_H_



#include <linux/types.h>



struct i40e_hw;



/* Memory allocation types */

enum i40e_memory_type {

	i40e_mem_arq_buf = 0,		/* ARQ indirect command buffer */

	i40e_mem_asq_buf = 1,

	i40e_mem_atq_buf = 2,		/* ATQ indirect command buffer */

	i40e_mem_arq_ring = 3,		/* ARQ descriptor ring */

	i40e_mem_atq_ring = 4,		/* ATQ descriptor ring */

	i40e_mem_pd = 5,		/* Page Descriptor */

	i40e_mem_bp = 6,		/* Backing Page - 4KB */

	i40e_mem_bp_jumbo = 7,		/* Backing Page - > 4KB */

	i40e_mem_reserved

/* memory allocation tracking */

struct i40e_dma_mem {

	void *va;

	dma_addr_t pa;

	u32 size;

};



struct i40e_virt_mem {

	void *va;

	u32 size;

};



/* prototype for functions used for dynamic memory allocation */

int i40e_allocate_dma_mem(struct i40e_hw *hw,

			  struct i40e_dma_mem *mem,

			  enum i40e_memory_type type,

			  u64 size, u32 alignment);

int i40e_free_dma_mem(struct i40e_hw *hw,

		      struct i40e_dma_mem *mem);