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

Commit 38e00438 authored by Vasu Dev's avatar Vasu Dev Committed by David S. Miller
Browse files

i40e: Adds FCoE related code to i40e core driver 



Adds FCoE specific code to existing i40e core driver to:-

1. have separate FCoE VSI with additional FCoE queues pairs.
2. have FCoE related hash defines.
3. have additional FCoE related stats code.
4. export and then re-use existing functions required by FCoE build.

Signed-off-by: default avatarVasu Dev <vasu.dev@intel.com>
Tested-by: default avatarJack <Morgan&lt;jack.morgan@intel.com>
Signed-off-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1a69369

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

+62 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ 
#include <linux/ptp_clock_kernel.h>

#include "i40e_type.h"

#include "i40e_prototype.h"

#ifdef I40E_FCOE

#include "i40e_fcoe.h"

#endif

#include "i40e_virtchnl.h"

#include "i40e_virtchnl_pf.h"

#include "i40e_txrx.h"
@@ -79,6 +82,10 @@ 
#define I40E_MAX_QUEUES_PER_TC        64 /* should be a power of 2 */

#define I40E_FDIR_RING                0

#define I40E_FDIR_RING_COUNT          32

#ifdef I40E_FCOE

#define I40E_DEFAULT_FCOE             8 /* default number of QPs for FCoE */

#define I40E_MINIMUM_FCOE             1 /* minimum number of QPs for FCoE */

#endif /* I40E_FCOE */

#define I40E_MAX_AQ_BUF_SIZE          4096

#define I40E_AQ_LEN                   32

#define I40E_AQ_WORK_LIMIT            16
@@ -225,6 +232,10 @@ struct i40e_pf { 
	u16 num_vmdq_msix;         /* num queue vectors per vmdq pool */

	u16 num_req_vfs;           /* num vfs requested for this vf */

	u16 num_vf_qps;            /* num queue pairs per vf */

#ifdef I40E_FCOE

	u16 num_fcoe_qps;          /* num fcoe queues this pf has set up */

	u16 num_fcoe_msix;         /* num queue vectors per fcoe pool */

#endif /* I40E_FCOE */

	u16 num_lan_qps;           /* num lan queues this pf has set up */

	u16 num_lan_msix;          /* num queue vectors for the base pf vsi */

	int queues_left;           /* queues left unclaimed */
@@ -265,6 +276,9 @@ struct i40e_pf { 
#define I40E_FLAG_VMDQ_ENABLED                 (u64)(1 << 7)

#define I40E_FLAG_FDIR_REQUIRES_REINIT         (u64)(1 << 8)

#define I40E_FLAG_NEED_LINK_UPDATE             (u64)(1 << 9)

#ifdef I40E_FCOE

#define I40E_FLAG_FCOE_ENABLED                 (u64)(1 << 11)

#endif /* I40E_FCOE */

#define I40E_FLAG_IN_NETPOLL                   (u64)(1 << 12)

#define I40E_FLAG_16BYTE_RX_DESC_ENABLED       (u64)(1 << 13)

#define I40E_FLAG_CLEAN_ADMINQ                 (u64)(1 << 14)
@@ -286,6 +300,10 @@ struct i40e_pf { 
	/* tracks features that get auto disabled by errors */

	u64 auto_disable_flags;



#ifdef I40E_FCOE

	struct i40e_fcoe fcoe;



#endif /* I40E_FCOE */

	bool stat_offsets_loaded;

	struct i40e_hw_port_stats stats;

	struct i40e_hw_port_stats stats_offsets;
@@ -408,6 +426,11 @@ struct i40e_vsi { 
	struct rtnl_link_stats64 net_stats_offsets;

	struct i40e_eth_stats eth_stats;

	struct i40e_eth_stats eth_stats_offsets;

#ifdef I40E_FCOE

	struct i40e_fcoe_stats fcoe_stats;

	struct i40e_fcoe_stats fcoe_stats_offsets;

	bool fcoe_stat_offsets_loaded;

#endif

	u32 tx_restart;

	u32 tx_busy;

	u32 rx_buf_failed;
@@ -598,6 +621,11 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, 
int i40e_vsi_release(struct i40e_vsi *vsi);

struct i40e_vsi *i40e_vsi_lookup(struct i40e_pf *pf, enum i40e_vsi_type type,

				 struct i40e_vsi *start_vsi);

#ifdef I40E_FCOE

void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi,

			      struct i40e_vsi_context *ctxt,

			      u8 enabled_tc, bool is_add);

#endif

int i40e_vsi_control_rings(struct i40e_vsi *vsi, bool enable);

int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count);

struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, u16 uplink_seid,
@@ -624,7 +652,21 @@ void i40e_irq_dynamic_enable(struct i40e_vsi *vsi, int vector); 
void i40e_irq_dynamic_disable(struct i40e_vsi *vsi, int vector);

void i40e_irq_dynamic_disable_icr0(struct i40e_pf *pf);

void i40e_irq_dynamic_enable_icr0(struct i40e_pf *pf);

#ifdef I40E_FCOE

struct rtnl_link_stats64 *i40e_get_netdev_stats_struct(

					     struct net_device *netdev,

					     struct rtnl_link_stats64 *storage);

int i40e_set_mac(struct net_device *netdev, void *p);

void i40e_set_rx_mode(struct net_device *netdev);

#endif

int i40e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);

#ifdef I40E_FCOE

void i40e_tx_timeout(struct net_device *netdev);

int i40e_vlan_rx_add_vid(struct net_device *netdev,

			 __always_unused __be16 proto, u16 vid);

int i40e_vlan_rx_kill_vid(struct net_device *netdev,

			  __always_unused __be16 proto, u16 vid);

#endif

int i40e_vsi_open(struct i40e_vsi *vsi);

void i40e_vlan_stripping_disable(struct i40e_vsi *vsi);

int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid);
@@ -634,6 +676,26 @@ struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi, u8 *macaddr, 
bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi);

struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, u8 *macaddr,

				      bool is_vf, bool is_netdev);

#ifdef I40E_FCOE

int i40e_open(struct net_device *netdev);

int i40e_close(struct net_device *netdev);

int i40e_setup_tc(struct net_device *netdev, u8 tc);

void i40e_netpoll(struct net_device *netdev);

int i40e_fcoe_enable(struct net_device *netdev);

int i40e_fcoe_disable(struct net_device *netdev);

int i40e_fcoe_vsi_init(struct i40e_vsi *vsi, struct i40e_vsi_context *ctxt);

u8 i40e_get_fcoe_tc_map(struct i40e_pf *pf);

void i40e_fcoe_config_netdev(struct net_device *netdev, struct i40e_vsi *vsi);

void i40e_fcoe_vsi_setup(struct i40e_pf *pf);

int i40e_init_pf_fcoe(struct i40e_pf *pf);

int i40e_fcoe_setup_ddp_resources(struct i40e_vsi *vsi);

void i40e_fcoe_free_ddp_resources(struct i40e_vsi *vsi);

int i40e_fcoe_handle_offload(struct i40e_ring *rx_ring,

			     union i40e_rx_desc *rx_desc,

			     struct sk_buff *skb);

void i40e_fcoe_handle_status(struct i40e_ring *rx_ring,

			     union i40e_rx_desc *rx_desc, u8 prog_id);

#endif /* I40E_FCOE */

void i40e_vlan_stripping_enable(struct i40e_vsi *vsi);

#ifdef CONFIG_I40E_DCB

void i40e_dcbnl_flush_apps(struct i40e_pf *pf,

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

+27 −0
Original line number Diff line number Diff line
@@ -709,6 +709,33 @@ void i40e_pre_tx_queue_cfg(struct i40e_hw *hw, u32 queue, bool enable) 


	wr32(hw, I40E_GLLAN_TXPRE_QDIS(reg_block), reg_val);

}

#ifdef I40E_FCOE



/**

 * i40e_get_san_mac_addr - get SAN MAC address

 * @hw: pointer to the HW structure

 * @mac_addr: pointer to SAN MAC address

 *

 * Reads the adapter's SAN MAC address from NVM

 **/

i40e_status i40e_get_san_mac_addr(struct i40e_hw *hw, u8 *mac_addr)

{

	struct i40e_aqc_mac_address_read_data addrs;

	i40e_status status;

	u16 flags = 0;



	status = i40e_aq_mac_address_read(hw, &flags, &addrs, NULL);

	if (status)

		return status;



	if (flags & I40E_AQC_SAN_ADDR_VALID)

		memcpy(mac_addr, &addrs.pf_san_mac, sizeof(addrs.pf_san_mac));

	else

		status = I40E_ERR_INVALID_MAC_ADDR;



	return status;

}

#endif



/**

 * i40e_get_media_type - Gets media type

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

+19 −0
Original line number Diff line number Diff line
@@ -697,6 +697,25 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
			 vsi->bw_ets_limit_credits[i],

			 vsi->bw_ets_max_quanta[i]);

	}

#ifdef I40E_FCOE

	if (vsi->type == I40E_VSI_FCOE) {

		dev_info(&pf->pdev->dev,

			 "    fcoe_stats: rx_packets = %llu, rx_dwords = %llu, rx_dropped = %llu\n",

			 vsi->fcoe_stats.rx_fcoe_packets,

			 vsi->fcoe_stats.rx_fcoe_dwords,

			 vsi->fcoe_stats.rx_fcoe_dropped);

		dev_info(&pf->pdev->dev,

			 "    fcoe_stats: tx_packets = %llu, tx_dwords = %llu\n",

			 vsi->fcoe_stats.tx_fcoe_packets,

			 vsi->fcoe_stats.tx_fcoe_dwords);

		dev_info(&pf->pdev->dev,

			 "    fcoe_stats: bad_crc = %llu, last_error = %llu\n",

			 vsi->fcoe_stats.fcoe_bad_fccrc,

			 vsi->fcoe_stats.fcoe_last_error);

		dev_info(&pf->pdev->dev, "    fcoe_stats: ddp_count = %llu\n",

			 vsi->fcoe_stats.fcoe_ddp_count);

	}

#endif

}



/**

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

+35 −0
Original line number Diff line number Diff line
@@ -155,6 +155,19 @@ static struct i40e_stats i40e_gstrings_stats[] = { 
	I40E_PF_STAT("rx_lpi_count", stats.rx_lpi_count),

};



#ifdef I40E_FCOE

static const struct i40e_stats i40e_gstrings_fcoe_stats[] = {

	I40E_VSI_STAT("fcoe_bad_fccrc", fcoe_stats.fcoe_bad_fccrc),

	I40E_VSI_STAT("rx_fcoe_dropped", fcoe_stats.rx_fcoe_dropped),

	I40E_VSI_STAT("rx_fcoe_packets", fcoe_stats.rx_fcoe_packets),

	I40E_VSI_STAT("rx_fcoe_dwords", fcoe_stats.rx_fcoe_dwords),

	I40E_VSI_STAT("fcoe_ddp_count", fcoe_stats.fcoe_ddp_count),

	I40E_VSI_STAT("fcoe_last_error", fcoe_stats.fcoe_last_error),

	I40E_VSI_STAT("tx_fcoe_packets", fcoe_stats.tx_fcoe_packets),

	I40E_VSI_STAT("tx_fcoe_dwords", fcoe_stats.tx_fcoe_dwords),

};



#endif /* I40E_FCOE */

#define I40E_QUEUE_STATS_LEN(n) \

	(((struct i40e_netdev_priv *)netdev_priv((n)))->vsi->num_queue_pairs \

	    * 2 /* Tx and Rx together */                                     \
@@ -162,9 +175,17 @@ static struct i40e_stats i40e_gstrings_stats[] = { 
#define I40E_GLOBAL_STATS_LEN	ARRAY_SIZE(i40e_gstrings_stats)

#define I40E_NETDEV_STATS_LEN   ARRAY_SIZE(i40e_gstrings_net_stats)

#define I40E_MISC_STATS_LEN	ARRAY_SIZE(i40e_gstrings_misc_stats)

#ifdef I40E_FCOE

#define I40E_FCOE_STATS_LEN	ARRAY_SIZE(i40e_gstrings_fcoe_stats)

#define I40E_VSI_STATS_LEN(n)	(I40E_NETDEV_STATS_LEN + \

				 I40E_FCOE_STATS_LEN + \

				 I40E_MISC_STATS_LEN + \

				 I40E_QUEUE_STATS_LEN((n)))

#else

#define I40E_VSI_STATS_LEN(n)   (I40E_NETDEV_STATS_LEN + \

				 I40E_MISC_STATS_LEN + \

				 I40E_QUEUE_STATS_LEN((n)))

#endif /* I40E_FCOE */

#define I40E_PFC_STATS_LEN ( \

		(FIELD_SIZEOF(struct i40e_pf, stats.priority_xoff_rx) + \

		 FIELD_SIZEOF(struct i40e_pf, stats.priority_xon_rx) + \
@@ -1112,6 +1133,13 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, 
		data[i++] = (i40e_gstrings_misc_stats[j].sizeof_stat ==

			    sizeof(u64)) ? *(u64 *)p : *(u32 *)p;

	}

#ifdef I40E_FCOE

	for (j = 0; j < I40E_FCOE_STATS_LEN; j++) {

		p = (char *)vsi + i40e_gstrings_fcoe_stats[j].stat_offset;

		data[i++] = (i40e_gstrings_fcoe_stats[j].sizeof_stat ==

			sizeof(u64)) ? *(u64 *)p : *(u32 *)p;

	}

#endif

	rcu_read_lock();

	for (j = 0; j < vsi->num_queue_pairs; j++) {

		tx_ring = ACCESS_ONCE(vsi->tx_rings[j]);
@@ -1193,6 +1221,13 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset, 
				 i40e_gstrings_misc_stats[i].stat_string);

			p += ETH_GSTRING_LEN;

		}

#ifdef I40E_FCOE

		for (i = 0; i < I40E_FCOE_STATS_LEN; i++) {

			snprintf(p, ETH_GSTRING_LEN, "%s",

				 i40e_gstrings_fcoe_stats[i].stat_string);

			p += ETH_GSTRING_LEN;

		}

#endif

		for (i = 0; i < vsi->num_queue_pairs; i++) {

			snprintf(p, ETH_GSTRING_LEN, "tx-%u.tx_packets", i);

			p += ETH_GSTRING_LEN;

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

+1 −8
Original line number Diff line number Diff line
@@ -1363,8 +1363,6 @@ static netdev_tx_t i40e_fcoe_xmit_frame(struct sk_buff *skb, 
	struct i40e_vsi *vsi = np->vsi;

	struct i40e_ring *tx_ring = vsi->tx_rings[skb->queue_mapping];

	struct i40e_tx_buffer *first;

	__be16 protocol = skb->protocol;



	u32 tx_flags = 0;

	u8 hdr_len = 0;

	u8 sof = 0;
@@ -1384,13 +1382,8 @@ static netdev_tx_t i40e_fcoe_xmit_frame(struct sk_buff *skb, 
	/* record the location of the first descriptor for this packet */

	first = &tx_ring->tx_bi[tx_ring->next_to_use];



	if (protocol == htons(ETH_P_8021Q)) {

		struct vlan_ethhdr *veth = (struct vlan_ethhdr *)eth_hdr(skb);



		protocol = veth->h_vlan_encapsulated_proto;

	}

	/* FIP is a regular L2 traffic w/o offload */

	if (protocol == htons(ETH_P_FIP))

	if (skb->protocol == htons(ETH_P_FIP))

		goto out_send;



	/* check sof and eof, only supports FC Class 2 or 3 */