ixgbe: Add FCoE feature register defines to 82599
Subsystems (3)
PATCH 1/8 ixgbe: Add FCoE feature register defines to 82599
From: Yi Zou <[email protected]>
This adds FCoE related register defines to 82599.
---
drivers/net/ixgbe/ixgbe_type.h | 84 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe_type.h +84 -0
@@ -478,6 +478,63 @@#define IXGBE_RTTDTECC_NO_BCN 0x00000100#define IXGBE_RTTBCNRC 0x04984 +/* FCoE registers */ +#define IXGBE_FCPTRL 0x02410/* FC User Desc. PTR Low */ +#define IXGBE_FCPTRH 0x02414/* FC USer Desc. PTR High */ +#define IXGBE_FCBUFF 0x02418/* FC Buffer Control */ +#define IXGBE_FCDMARW 0x02420/* FC Receive DMA RW */ +#define IXGBE_FCINVST0 0x03FC0/* FC Invalid DMA Context Status Reg 0 */ +#define IXGBE_FCINVST (_i) (IXGBE_FCINVST0 + ((_i) * 4)) +#define IXGBE_FCBUFF_VALID (1 << 0)/* DMA Context Valid */ +#define IXGBE_FCBUFF_BUFFSIZE (3 << 3)/* User Buffer Size */ +#define IXGBE_FCBUFF_WRCONTX (1 << 7)/* 0: Initiator, 1: Target */ +#define IXGBE_FCBUFF_BUFFCNT 0x0000ff00/* Number of User Buffers */ +#define IXGBE_FCBUFF_OFFSET 0xffff0000/* User Buffer Offset */ +#define IXGBE_FCBUFF_BUFFSIZE_SHIFT 3 +#define IXGBE_FCBUFF_BUFFCNT_SHIFT 8 +#define IXGBE_FCBUFF_OFFSET_SHIFT 16 +#define IXGBE_FCDMARW_WE (1 << 14)/* Write enable */ +#define IXGBE_FCDMARW_RE (1 << 15)/* Read enable */ +#define IXGBE_FCDMARW_FCOESEL 0x000001ff/* FC X_ID: 11 bits */ +#define IXGBE_FCDMARW_LASTSIZE 0xffff0000/* Last User Buffer Size */ +#define IXGBE_FCDMARW_LASTSIZE_SHIFT 16 + +/* FCoE SOF/EOF */ +#define IXGBE_TEOFF 0x04A94/* Tx FC EOF */ +#define IXGBE_TSOFF 0x04A98/* Tx FC SOF */ +#define IXGBE_REOFF 0x05158/* Rx FC EOF */ +#define IXGBE_RSOFF 0x051F8/* Rx FC SOF */ +/* FCoE Filter Context Registers */ +#define IXGBE_FCFLT 0x05108/* FC FLT Context */ +#define IXGBE_FCFLTRW 0x05110/* FC Filter RW Control */ +#define IXGBE_FCPARAM 0x051d8/* FC Offset Parameter */ +#define IXGBE_FCFLT_VALID (1 << 0)/* Filter Context Valid */ +#define IXGBE_FCFLT_FIRST (1 << 1)/* Filter First */ +#define IXGBE_FCFLT_SEQID 0x00ff0000/* Sequence ID */ +#define IXGBE_FCFLT_SEQCNT 0xff000000/* Sequence Count */ +#define IXGBE_FCFLTRW_RVALDT (1 << 13)/* Fast Re-Validation */ +#define IXGBE_FCFLTRW_WE (1 << 14)/* Write Enable */ +#define IXGBE_FCFLTRW_RE (1 << 15)/* Read Enable */ +/* FCoE Receive Control */ +#define IXGBE_FCRXCTRL 0x05100/* FC Receive Control */ +#define IXGBE_FCRXCTRL_FCOELLI (1 << 0)/* Low latency interrupt */ +#define IXGBE_FCRXCTRL_SAVBAD (1 << 1)/* Save Bad Frames */ +#define IXGBE_FCRXCTRL_FRSTRDH (1 << 2)/* EN 1st Read Header */ +#define IXGBE_FCRXCTRL_LASTSEQH (1 << 3)/* EN Last Header in Seq */ +#define IXGBE_FCRXCTRL_ALLH (1 << 4)/* EN All Headers */ +#define IXGBE_FCRXCTRL_FRSTSEQH (1 << 5)/* EN 1st Seq. Header */ +#define IXGBE_FCRXCTRL_ICRC (1 << 6)/* Ignore Bad FC CRC */ +#define IXGBE_FCRXCTRL_FCCRCBO (1 << 7)/* FC CRC Byte Ordering */ +#define IXGBE_FCRXCTRL_FCOEVER 0x00000f00/* FCoE Version: 4 bits */ +#define IXGBE_FCRXCTRL_FCOEVER_SHIFT 8 +/* FCoE Redirection */ +#define IXGBE_FCRECTL 0x0ED00/* FC Redirection Control */ +#define IXGBE_FCRETA0 0x0ED10/* FC Redirection Table 0 */ +#define IXGBE_FCRETA (_i) (IXGBE_FCRETA0 + ((_i) * 4))/* FCoE Redir */ +#define IXGBE_FCRECTL_ENA 0x1/* FCoE Redir Table Enable */ +#define IXGBE_FCRETA_SIZE 8/* Max entries in FCRETA */ +#define IXGBE_FCRETA_ENTRY_MASK 0x0000007f/* 7 bits for the queue index */ +/* Stats registers */ #define IXGBE_CRCERRS 0x04000#define IXGBE_ILLERRC 0x04004
@@ -549,6 +606,13 @@#define IXGBE_QPRDC (_i) (0x01430 + ((_i) * 0x40))/* 16 of these */ #define IXGBE_QBTC_L (_i) (0x08700 + ((_i) * 0x8))/* 16 of these */ #define IXGBE_QBTC_H (_i) (0x08704 + ((_i) * 0x8))/* 16 of these */ +#define IXGBE_FCCRC 0x05118/* Count of Good Eth CRC w/ Bad FC CRC */ +#define IXGBE_FCOERPDC 0x0241C/* FCoE Rx Packets Dropped Count */ +#define IXGBE_FCLAST 0x02424/* FCoE Last Error Count */ +#define IXGBE_FCOEPRC 0x02428/* Number of FCoE Packets Received */ +#define IXGBE_FCOEDWRC 0x0242C/* Number of FCoE DWords Received */ +#define IXGBE_FCOEPTC 0x08784/* Number of FCoE Packets Transmitted */ +#define IXGBE_FCOEDWTC 0x08788/* Number of FCoE DWords Transmitted */ /* Management */ #define IXGBE_MAVTV (_i) (0x05010 + ((_i) * 4))/* 8 of these (0-7) */
@@ -1153,6 +1217,7 @@/* ETYPE Queue Filter/Select Bit Masks */ #define IXGBE_MAX_ETQF_FILTERS 8 +#define IXGBE_ETQF_FCOE 0x08000000/* bit 27 */ #define IXGBE_ETQF_BCN 0x10000000/* bit 28 */ #define IXGBE_ETQF_1588 0x40000000/* bit 30 */ #define IXGBE_ETQF_FILTER_EN 0x80000000/* bit 31 */
@@ -1175,6 +1240,7 @@*/ #define IXGBE_ETQF_FILTER_EAPOL 0#define IXGBE_ETQF_FILTER_BCN 1 +#define IXGBE_ETQF_FILTER_FCOE 2#define IXGBE_ETQF_FILTER_1588 3/* VLAN Control Bit Masks */ #define IXGBE_VLNCTRL_VET 0x0000FFFF/* bits 0-15 */
@@ -1579,6 +1645,8 @@#define IXGBE_RXD_ERR_IPE 0x80/* IP Checksum Error */ #define IXGBE_RXDADV_ERR_MASK 0xfff00000/* RDESC.ERRORS mask */ #define IXGBE_RXDADV_ERR_SHIFT 20/* RDESC.ERRORS shift */ +#define IXGBE_RXDADV_ERR_FCEOFE 0x80000000/* FCoEFe/IPE */ +#define IXGBE_RXDADV_ERR_FCERR 0x00700000/* FCERR/FDIRERR */ #define IXGBE_RXDADV_ERR_HBO 0x00800000/*Header Buffer Overflow */ #define IXGBE_RXDADV_ERR_CE 0x01000000/* CRC Error */ #define IXGBE_RXDADV_ERR_LE 0x02000000/* Length Error */
@@ -1598,6 +1666,12 @@#define IXGBE_RXDADV_STAT_FLM IXGBE_RXD_STAT_FLM/* FDir Match */ #define IXGBE_RXDADV_STAT_VP IXGBE_RXD_STAT_VP/* IEEE VLAN Pkt */ #define IXGBE_RXDADV_STAT_MASK 0x000fffff/* Stat/NEXTP: bit 0-19 */ +#define IXGBE_RXDADV_STAT_FCEOFS 0x00000040/* FCoE EOF/SOF Stat */ +#define IXGBE_RXDADV_STAT_FCSTAT 0x00000030/* FCoE Pkt Stat */ +#define IXGBE_RXDADV_STAT_FCSTAT_NOMTCH 0x00000000/* 00: No Ctxt Match */ +#define IXGBE_RXDADV_STAT_FCSTAT_NODDP 0x00000010/* 01: Ctxt w/o DDP */ +#define IXGBE_RXDADV_STAT_FCSTAT_FCPRSP 0x00000020/* 10: Recv. FCP_RSP */ +#define IXGBE_RXDADV_STAT_FCSTAT_DDP 0x00000030/* 11: Ctxt w/ DDP */ /* PSRTYPE bit definitions */ #define IXGBE_PSRTYPE_TCPHDR 0x00000010
@@ -1831,6 +1905,16 @@ struct ixgbe_adv_tx_context_desc {#define IXGBE_ADVTXD_POPTS_IPSEC 0x00000400/* IPSec offload request */ #define IXGBE_ADVTXD_TUCMD_IPSEC_TYPE_ESP 0x00002000/* IPSec Type ESP */ #define IXGBE_ADVTXD_TUCMD_IPSEC_ENCRYPT_EN 0x00004000/* ESP Encrypt Enable */ +#define IXGBE_ADVTXT_TUCMD_FCOE 0x00008000/* FCoE Frame Type */ +#define IXGBE_ADVTXD_FCOEF_EOF_MASK (0x3 << 10)/* FC EOF index */ +#define IXGBE_ADVTXD_FCOEF_SOF ((1 << 2) << 10)/* FC SOF index */ +#define IXGBE_ADVTXD_FCOEF_PARINC ((1 << 3) << 10)/* Rel_Off in F_CTL */ +#define IXGBE_ADVTXD_FCOEF_ORIE ((1 << 4) << 10)/* Orientation: End */ +#define IXGBE_ADVTXD_FCOEF_ORIS ((1 << 5) << 10)/* Orientation: Start */ +#define IXGBE_ADVTXD_FCOEF_EOF_N (0x0 << 10)/* 00: EOFn */ +#define IXGBE_ADVTXD_FCOEF_EOF_T (0x1 << 10)/* 01: EOFt */ +#define IXGBE_ADVTXD_FCOEF_EOF_NI (0x2 << 10)/* 10: EOFni */ +#define IXGBE_ADVTXD_FCOEF_EOF_A (0x3 << 10)/* 11: EOFa */ #define IXGBE_ADVTXD_L4LEN_SHIFT 8/* Adv ctxt L4LEN shift */ #define IXGBE_ADVTXD_MSS_SHIFT 16/* Adv ctxt MSS shift */
PATCH 2/8 ixgbe: Add FCoE feature header to 82599
From: Yi Zou <[email protected]>
This adds the FCoE feature header ixgbe_fcoe.h to 82599. This header includes the defines and structures required by the ixgbe driver to support various offload features in 82599 for Fiber Channel over Ethernet (FCoE). These offloads features include Fiber Channel CRC calculation, FCoE SOF/EOF auto insertion, FCoE Sequence Offload (FSO) for large send, and Direct Data Placement (DDP) for large receive.
---
drivers/net/ixgbe/ixgbe_fcoe.h | 66 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) create mode 100644 drivers/net/ixgbe/ixgbe_fcoe.h
drivers/net/ixgbe/ixgbe_fcoe.h new file +66 -0
@@ -0,0 +1,66 @@ +/******************************************************************************* + +Intel 10 Gigabit PCI Express Linux driver +Copyright(c) 1999 - 2009 Intel Corporation. + +This program is free software; you can redistribute it and/or modify it +under the terms and conditions of the GNU General Public License, +version 2, as published by the Free Software Foundation. + +This program is distributed in the hope it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + +The full GNU General Public License is included in this distribution in +the file called "COPYING". + +Contact Information: +e1000-devel Mailing List <[email protected]> +Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 + +*******************************************************************************/ + +#ifndef _IXGBE_FCOE_H +#define _IXGBE_FCOE_H + +#include <scsi/fc/fc_fcoe.h> + +/* shift bits within STAT fo FCSTAT */ +#define IXGBE_RXDADV_FCSTAT_SHIFT 4 + +/* ddp user buffer */ +#define IXGBE_BUFFCNT_MAX 256/* 8 bits bufcnt */ +#define IXGBE_FCPTR_ALIGN 16 +#define IXGBE_FCPTR_MAX (IXGBE_BUFFCNT_MAX * sizeof(dma_addr_t)) +#define IXGBE_FCBUFF_4KB 0x0 +#define IXGBE_FCBUFF_8KB 0x1 +#define IXGBE_FCBUFF_16KB 0x2 +#define IXGBE_FCBUFF_64KB 0x3 +#define IXGBE_FCBUFF_MAX 65536/* 64KB max */ +#define IXGBE_FCBUFF_MIN 4096/* 4KB min */ +#define IXGBE_FCOE_DDP_MAX 512/* 9 bits xid */ + +/* fcerr */ +#define IXGBE_FCERR_BADCRC 0x00100000 + +struct ixgbe_fcoe_ddp { +int len; +u32 err; +unsigned int sgc; +struct scatterlist *sgl; +dma_addr_t udp; +unsigned long *udl; +}; + +struct ixgbe_fcoe { +spinlock_t lock; +struct pci_pool *pool; +struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX ]; +}; + +#endif /* _IXGBE_FCOE_H */
Re: [net-next-2.6 PATCH 2/8] ixgbe: Add FCoE feature header to 82599
From: Jeff Kirsher <[email protected]>
Date: Wed, 13 May 2009 16:10:01 -0700
Quoted 11 lines
From: Yi Zou <[email protected]>
This adds the FCoE feature header
ixgbe_fcoe.hto 82599. This header includes the defines and structures required by the ixgbe driver to support various offload features in 82599 for Fiber Channel over Ethernet (FCoE). These offloads features include Fiber Channel CRC calculation, FCoE SOF/EOF auto insertion, FCoE Sequence Offload (FSO) for large send, and Direct Data Placement (DDP) for large receive.Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 3/8 ixgbe: Add FCoE feature code to 82599
In reply to Jeff KirsherFrom: Yi Zou <[email protected]>
This adds the FCoE feature code ixgbe_fcoe.c to 82599. For a start, this patch only adds ixgbe_configure_fcoe() to configure related register for FCoE to 82599. In patches that follow, I will be adding more functions to ixgbe_fcoe.c to add support of FCoE offload features to 82599.
---
drivers/net/ixgbe/ixgbe_fcoe.c | 60 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 drivers/net/ixgbe/ixgbe_fcoe.c
drivers/net/ixgbe/ixgbe_fcoe.c new file +60 -0
@@ -0,0 +1,60 @@ +/******************************************************************************* + +Intel 10 Gigabit PCI Express Linux driver +Copyright(c) 1999 - 2009 Intel Corporation. + +This program is free software; you can redistribute it and/or modify it +under the terms and conditions of the GNU General Public License, +version 2, as published by the Free Software Foundation. + +This program is distributed in the hope it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + +The full GNU General Public License is included in this distribution in +the file called "COPYING". + +Contact Information: +e1000-devel Mailing List <[email protected]> +Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 + +*******************************************************************************/ + + +#include "ixgbe.h" +#include <linux/if_ether.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/fc/fc_fs.h> +#include <scsi/fc/fc_fcoe.h> +#include <scsi/libfc.h> +#include <scsi/libfcoe.h> + +/** +* ixgbe_configure_fcoe - configures registers for fcoe at start +* @adapter: ptr to ixgbe adapter +* +* This sets up FCoE related registers +* +* Returns : none +*/ +void ixgbe_configure_fcoe (struct ixgbe_adapter *adapter) +{ +struct ixgbe_hw *hw = &adapter->hw; + +/* L2 filter for FCoE: default to queue 0 */ +IXGBE_WRITE_REG (hw,IXGBE_ETQF (IXGBE_ETQF_FILTER_FCOE ), + (ETH_P_FCOE |IXGBE_ETQF_FCOE |IXGBE_ETQF_FILTER_EN )); +IXGBE_WRITE_REG (hw,IXGBE_FCRECTL ,0 ); +IXGBE_WRITE_REG (hw,IXGBE_ETQS (IXGBE_ETQF_FILTER_FCOE ), +IXGBE_ETQS_QUEUE_EN ); +IXGBE_WRITE_REG (hw,IXGBE_FCRXCTRL , +IXGBE_FCRXCTRL_FCOELLI | +IXGBE_FCRXCTRL_FCCRCBO | + (FC_FCOE_VER <<IXGBE_FCRXCTRL_FCOEVER_SHIFT )); +}
Re: [net-next-2.6 PATCH 3/8] ixgbe: Add FCoE feature code to 82599
From: Jeff Kirsher <[email protected]>
Date: Wed, 13 May 2009 16:10:21 -0700
Quoted 10 lines
From: Yi Zou <[email protected]>
This adds the FCoE feature code
ixgbe_fcoe.cto 82599. For a start, this patch only addsixgbe_configure_fcoe()to configure related register for FCoE to 82599. In patches that follow, I will be adding more functions toixgbe_fcoe.cto add support of FCoE offload features to 82599.Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 4/8 ixgbe: Add infrastructure code for FCoE large send offload to 82599
In reply to Jeff KirsherFrom: Yi Zou <[email protected]>
This adds infrastructure code for FCoE Tx side offload feature to 82599, including Fiber Channel CRC calculation, auto insertion of the start of frame (SOF) and end of frame (EOF) of FCoE packets, and large send by FCoE Sequence Offload (FSO).
---
drivers/net/ixgbe/ixgbe_fcoe.c | 132 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 132 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe_fcoe.c +132 -0
@@ -36,6 +36,138 @@#include <scsi/libfcoe.h> /** +* ixgbe_fso - ixgbe FCoE Sequence Offload (FSO) +* @adapter: ixgbe adapter +* @tx_ring: tx desc ring +* @skb: associated skb +* @tx_flags: tx flags +* @hdr_len: hdr_len to be returned +* +* This sets up large send offload for FCoE +* +* Returns : 0 indicates no FSO, > 0 for FSO, < 0 for error +*/ +int ixgbe_fso (struct ixgbe_adapter *adapter, +struct ixgbe_ring *tx_ring,struct sk_buff *skb, +u32 tx_flags,u8 *hdr_len) +{ +u8 sof, eof; +u32 vlan_macip_lens; +u32 fcoe_sof_eof; +u32 type_tucmd; +u32 mss_l4len_idx; +int mss =0 ; +unsigned int i; +struct ixgbe_tx_buffer *tx_buffer_info; +struct ixgbe_adv_tx_context_desc *context_desc; +struct fc_frame_header *fh; + +if (skb_is_gso (skb) && (skb_shinfo (skb)->gso_type !=SKB_GSO_FCOE )) { +DPRINTK (DRV ,ERR ,"Wrong gso type %d:expecting SKB_GSO_FCOE\n" , +skb_shinfo (skb)->gso_type); +return -EINVAL ; + } + +/* resets the header to point fcoe/fc */ +skb_set_network_header (skb, skb->mac_len); +skb_set_transport_header (skb, skb->mac_len + +sizeof (struct fcoe_hdr )); + +/* sets up SOF and ORIS */ + fcoe_sof_eof =0 ; + sof = ((struct fcoe_hdr *)skb_network_header (skb))->fcoe_sof; +switch (sof) { +case FC_SOF_I2 : + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_ORIS ; +break ; +case FC_SOF_I3 : + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_SOF ; + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_ORIS ; +break ; +case FC_SOF_N2 : +break ; +case FC_SOF_N3 : + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_SOF ; +break ; +default : +DPRINTK (DRV ,WARNING ,"unknown sof = 0x%x\n" , sof); +return -EINVAL ; + } + +/* the first byte of the last dword is EOF */ +skb_copy_bits (skb, skb->len -4 , &eof,1 ); +/* sets up EOF and ORIE */ +switch (eof) { +case FC_EOF_N : + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_EOF_N ; +break ; +case FC_EOF_T : +/* lso needs ORIE */ +if (skb_is_gso (skb)) { + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_EOF_N ; + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_ORIE ; + }else { + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_EOF_T ; + } +break ; +case FC_EOF_NI : + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_EOF_NI ; +break ; +case FC_EOF_A : + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_EOF_A ; +break ; +default : +DPRINTK (DRV ,WARNING ,"unknown eof = 0x%x\n" , eof); +return -EINVAL ; + } + +/* sets up PARINC indicating data offset */ + fh = (struct fc_frame_header *)skb_transport_header (skb); +if (fh->fh_f_ctl[2 ] &FC_FC_REL_OFF ) + fcoe_sof_eof |=IXGBE_ADVTXD_FCOEF_PARINC ; + +/* hdr_len includes fc_hdr if FCoE lso is enabled */ + *hdr_len =sizeof (struct fcoe_crc_eof ); +if (skb_is_gso (skb)) + *hdr_len += (skb_transport_offset (skb) + +sizeof (struct fc_frame_header )); +/* vlan_macip_lens: HEADLEN, MACLEN, VLAN tag */ + vlan_macip_lens = (skb_transport_offset (skb) + +sizeof (struct fc_frame_header )); + vlan_macip_lens |= ((skb_transport_offset (skb) -4 ) + <<IXGBE_ADVTXD_MACLEN_SHIFT ); + vlan_macip_lens |= (tx_flags &IXGBE_TX_FLAGS_VLAN_MASK ); + +/* type_tycmd and mss: set TUCMD.FCoE to enable offload */ + type_tucmd =IXGBE_TXD_CMD_DEXT |IXGBE_ADVTXD_DTYP_CTXT | +IXGBE_ADVTXT_TUCMD_FCOE ; +if (skb_is_gso (skb)) + mss =skb_shinfo (skb)->gso_size; +/* mss_l4len_id: use 1 for FSO as TSO, no need for L4LEN */ + mss_l4len_idx = (mss <<IXGBE_ADVTXD_MSS_SHIFT ) | + (1 <<IXGBE_ADVTXD_IDX_SHIFT ); + +/* write context desc */ + i = tx_ring->next_to_use; + context_desc =IXGBE_TX_CTXTDESC_ADV (*tx_ring, i); + context_desc->vlan_macip_lens =cpu_to_le32 (vlan_macip_lens); + context_desc->seqnum_seed =cpu_to_le32 (fcoe_sof_eof); + context_desc->type_tucmd_mlhl =cpu_to_le32 (type_tucmd); + context_desc->mss_l4len_idx =cpu_to_le32 (mss_l4len_idx); + + tx_buffer_info = &tx_ring->tx_buffer_info[i]; + tx_buffer_info->time_stamp = jiffies; + tx_buffer_info->next_to_watch = i; + + i++; +if (i == tx_ring->count) + i =0 ; + tx_ring->next_to_use = i; + +return skb_is_gso (skb); +} + +/** * ixgbe_configure_fcoe - configures registers for fcoe at start * @adapter: ptr to ixgbe adapter *
Re: [net-next-2.6 PATCH 4/8] ixgbe: Add infrastructure code for FCoE large send offload to 82599
From: Jeff Kirsher <[email protected]>
Date: Wed, 13 May 2009 16:10:44 -0700
Quoted 9 lines
From: Yi Zou <[email protected]>
This adds infrastructure code for FCoE Tx side offload feature to 82599, including Fiber Channel CRC calculation, auto insertion of the start of frame (SOF) and end of frame (EOF) of FCoE packets, and large send by FCoE Sequence Offload (FSO).
Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 5/8 ixgbe: Implement FCoE Tx side offload features in base driver of 82599
In reply to Jeff KirsherFrom: Yi Zou <[email protected]>
This patch implements the FCoE Tx side offload features in ixgbe_main.c to 82599 using the Tx offload infrastructure code added in the previous patch. This is achieved by the calling the FCoE Sequence Offload (FSO) function ixgbe_fso() on the transmit path of ixgbe.
This patch also includes an EEPROM check to make sure the NIC we're loading on is an offload-enabled SKU.
---
drivers/net/ixgbe/Makefile | 2 + drivers/net/ixgbe/ixgbe.h | 13 +++++ drivers/net/ixgbe/ixgbe_82599.c | 1 drivers/net/ixgbe/ixgbe_main.c | 104 ++++++++++++++++++++++++++++++++------- drivers/net/ixgbe/ixgbe_type.h | 1 5 files changed, 101 insertions(+), 20 deletions(-)
drivers/net/ixgbe/Makefile +2 -0
@@ -37,3 +37,5 @@ ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \ ixgbe-$(CONFIG_IXGBE_DCB) += ixgbe_dcb.o ixgbe_dcb_82598.o \ ixgbe_dcb_82599.o ixgbe_dcb_nl.o + +ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o
drivers/net/ixgbe/ixgbe.h +13 -0
@@ -36,6 +36,10 @@#include "ixgbe_type.h" #include "ixgbe_common.h" #include "ixgbe_dcb.h" +#if defined(CONFIG_FCOE ) || defined(CONFIG_FCOE_MODULE ) +#define IXGBE_FCOE +#include "ixgbe_fcoe.h" +#endif /* CONFIG_FCOE or CONFIG_FCOE_MODULE */ #ifdef CONFIG_IXGBE_DCA #include <linux/dca.h> #endif
@@ -84,6 +88,8 @@#define IXGBE_TX_FLAGS_VLAN (u32)(1 << 1)#define IXGBE_TX_FLAGS_TSO (u32)(1 << 2)#define IXGBE_TX_FLAGS_IPV4 (u32)(1 << 3) +#define IXGBE_TX_FLAGS_FCOE (u32)(1 << 4) +#define IXGBE_TX_FLAGS_FSO (u32)(1 << 5)#define IXGBE_TX_FLAGS_VLAN_MASK 0xffff0000#define IXGBE_TX_FLAGS_VLAN_PRIO_MASK 0x0000e000#define IXGBE_TX_FLAGS_VLAN_SHIFT 16
@@ -298,6 +304,7 @@ struct ixgbe_adapter {#define IXGBE_FLAG_IN_SFP_MOD_TASK (u32)(1 << 25)#define IXGBE_FLAG_RSC_CAPABLE (u32)(1 << 26)#define IXGBE_FLAG_RSC_ENABLED (u32)(1 << 27) +#define IXGBE_FLAG_FCOE_ENABLED (u32)(1 << 29)/* default to trying for four seconds */ #define IXGBE_TRY_LINK_TIMEOUT (4 * HZ)
@@ -371,5 +378,11 @@ extern void ixgbe_update_stats(struct ixgbe_adapter *adapter);extern int ixgbe_init_interrupt_scheme (struct ixgbe_adapter *adapter);extern void ixgbe_clear_interrupt_scheme (struct ixgbe_adapter *adapter);extern void ixgbe_write_eitr (struct ixgbe_adapter *,int ,u32 ); +#ifdef IXGBE_FCOE +extern void ixgbe_configure_fcoe (struct ixgbe_adapter *adapter); +extern int ixgbe_fso (struct ixgbe_adapter *adapter, +struct ixgbe_ring *tx_ring,struct sk_buff *skb, +u32 tx_flags,u8 *hdr_len); +#endif /* IXGBE_FCOE */ #endif /* _IXGBE_H_ */
drivers/net/ixgbe/ixgbe_82599.c +0 -1
@@ -1294,7 +1294,6 @@ s32 ixgbe_get_device_caps_82599(struct ixgbe_hw *hw, u16 *device_caps)return 0 ; } -static struct ixgbe_mac_operations mac_ops_82599 = { .init_hw = &ixgbe_init_hw_generic, .reset_hw = &ixgbe_reset_hw_82599,
drivers/net/ixgbe/ixgbe_main.c +85 -19
198 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_type.h +1 -0
@@ -1483,6 +1483,7 @@#endif #define IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP 0x1 +#define IXGBE_DEVICE_CAPS_FCOE_OFFLOADS 0x2/* PCI Bus Info */ #define IXGBE_PCI_LINK_STATUS 0xB2
Re: [net-next-2.6 PATCH 5/8] ixgbe: Implement FCoE Tx side offload features in base driver of 82599
From: Jeff Kirsher <[email protected]>
Date: Wed, 13 May 2009 16:11:06 -0700
Quoted 7 lines
From: Yi Zou <[email protected]>
This patch implements the FCoE Tx side offload features in
ixgbe_main.cto 82599 using the Tx offload infrastructure code added in the previous patch. This is achieved by the calling the FCoE Sequence Offload (FSO) functionixgbe_fso()on the transmit path of ixgbe.
Quoted 6 lines
This patch also includes an EEPROM check to make sure the NIC we're loading on is an offload-enabled SKU.
Signed-off-by Yi Zou <[email protected]>Signed-off-by Peter P Waskiewicz Jr <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 6/8 ixgbe: Add infrastructure code for FCoE large receive offload to 82599
In reply to Jeff KirsherFrom: Yi Zou <[email protected]>
This adds infrastructure code for FCoE Rx side offload feature to 82599, which provides large receive offload for FCoE by Direct Data Placement (DDP). The ixgbe_fcoe_ddp_get() and ixgbe_fcoe_ddp_put() pair corresponds to the netdev support to FCoE by the function pointers provided in net_device_ops as ndo_fcoe_ddp_setup and ndo_fcoe_ddp_done. The implementation of these in ixgbe is shown in the next patch.
---
drivers/net/ixgbe/ixgbe.h | 3 drivers/net/ixgbe/ixgbe_fcoe.c | 340 ++++++++++++++++++++++++++++++++++++++++ drivers/net/ixgbe/ixgbe_fcoe.h | 2 3 files changed, 344 insertions(+), 1 deletions(-)
drivers/net/ixgbe/ixgbe.h +3 -0
@@ -336,6 +336,9 @@ struct ixgbe_adapter {struct timer_list sfp_timer;struct work_struct multispeed_fiber_task;struct work_struct sfp_config_module_task; +#ifdef IXGBE_FCOE +struct ixgbe_fcoe fcoe; +#endif /* IXGBE_FCOE */ u64 rsc_count;u32 wol;u16 eeprom_version;
drivers/net/ixgbe/ixgbe_fcoe.c +340 -0
356 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_fcoe.h +1 -1
@@ -54,7 +54,7 @@ struct ixgbe_fcoe_ddp {unsigned int sgc;struct scatterlist *sgl;dma_addr_t udp; -unsigned long *udl; +u64 *udl; };struct ixgbe_fcoe {
Re: [net-next-2.6 PATCH 6/8] ixgbe: Add infrastructure code for FCoE large receive offload to 82599
From: Jeff Kirsher <[email protected]>
Date: Wed, 13 May 2009 16:11:29 -0700
Quoted 9 lines
From: Yi Zou <[email protected]>
This adds infrastructure code for FCoE Rx side offload feature to 82599, which provides large receive offload for FCoE by Direct Data Placement (DDP). The
ixgbe_fcoe_ddp_get()andixgbe_fcoe_ddp_put()pair corresponds to the netdev support to FCoE by the function pointers provided innet_device_opsasndo_fcoe_ddp_setupandndo_fcoe_ddp_done. The implementation of these in ixgbe is shown in the next patch.
Quoted 3 lines
Signed-off-by Yi Zou <[email protected]>Signed-off-by Chris Leech <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 7/8 ixgbe: Implement FCoE Rx side large receive offload feature to 82599
In reply to Jeff KirsherFrom: Yi Zou <[email protected]>
This patch implements the FCoE Rx side offload feature in ixgbe_main.c to 82599 using the Rx offload infrastructure code added in the previous patch. The large receive offload by Direct Data Placement (DDP) for FCoE is achieved by implementing the ndo_fcoe_ddp_setup and ndo_fcoe_ddp_done in net_device_ops via netdev. It is up to the ULD, i.e., fcoe and libfc to query and setup large receive offload accordingly through the corresponding netdev upon creating fcoe instances.
---
drivers/net/ixgbe/ixgbe.h | 7 +++++++ drivers/net/ixgbe/ixgbe_main.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe.h +7 -0
@@ -386,6 +386,13 @@ extern void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter);extern int ixgbe_fso (struct ixgbe_adapter *adapter,struct ixgbe_ring *tx_ring,struct sk_buff *skb,u32 tx_flags,u8 *hdr_len); +extern void ixgbe_cleanup_fcoe (struct ixgbe_adapter *adapter); +extern int ixgbe_fcoe_ddp (struct ixgbe_adapter *adapter, +union ixgbe_adv_rx_desc *rx_desc, +struct sk_buff *skb); +extern int ixgbe_fcoe_ddp_get (struct net_device *netdev,u16 xid, +struct scatterlist *sgl,unsigned int sgc); +extern int ixgbe_fcoe_ddp_put (struct net_device *netdev,u16 xid);#endif /* IXGBE_FCOE */ #endif /* _IXGBE_H_ */
drivers/net/ixgbe/ixgbe_main.c +16 -0
@@ -784,6 +784,12 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, total_rx_packets++; skb->protocol =eth_type_trans (skb, adapter->netdev); +#ifdef IXGBE_FCOE +/* if ddp, not passing to ULD unless for FCP_RSP or error */ +if (adapter->flags &IXGBE_FLAG_FCOE_ENABLED ) +if (!ixgbe_fcoe_ddp (adapter, rx_desc, skb)) + goto next_desc; +#endif /* IXGBE_FCOE */ ixgbe_receive_skb (q_vector, skb, staterr, rx_ring, rx_desc); next_desc:
@@ -4822,6 +4828,10 @@ static const struct net_device_ops ixgbe_netdev_ops = {#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = ixgbe_netpoll,#endif +#ifdef IXGBE_FCOE + .ndo_fcoe_ddp_setup = ixgbe_fcoe_ddp_get, + .ndo_fcoe_ddp_done = ixgbe_fcoe_ddp_put, +#endif /* IXGBE_FCOE */ };/**
@@ -5036,6 +5046,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,if (!(device_caps &IXGBE_DEVICE_CAPS_FCOE_OFFLOADS )) { netdev->features |=NETIF_F_FCOE_CRC ; netdev->features |=NETIF_F_FSO ; + netdev->fcoe_ddp_xid =IXGBE_FCOE_DDP_MAX -1 ; }else { adapter->flags &= ~IXGBE_FLAG_FCOE_ENABLED ; }
@@ -5205,6 +5216,11 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) }#endif +#ifdef IXGBE_FCOE +if (adapter->flags &IXGBE_FLAG_FCOE_ENABLED ) +ixgbe_cleanup_fcoe (adapter); + +#endif /* IXGBE_FCOE */ if (netdev->reg_state ==NETREG_REGISTERED )unregister_netdev (netdev);
Re: [net-next-2.6 PATCH 7/8] ixgbe: Implement FCoE Rx side large receive offload feature to 82599
From: Jeff Kirsher <[email protected]>
Date: Wed, 13 May 2009 16:11:53 -0700
Quoted 10 lines
From: Yi Zou <[email protected]>
This patch implements the FCoE Rx side offload feature in
ixgbe_main.cto 82599 using the Rx offload infrastructure code added in the previous patch. The large receive offload by Direct Data Placement (DDP) for FCoE is achieved by implementing thendo_fcoe_ddp_setupandndo_fcoe_ddp_doneinnet_device_opsvia netdev. It is up to the ULD, i.e., fcoe and libfc to query and setup large receive offload accordingly through the corresponding netdev upon creating fcoe instances.
Quoted 3 lines
Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 8/8 ixgbe: Add FCoE related statistics to 82599
In reply to Jeff KirsherFrom: Yi Zou <[email protected]>
This adds FCoE related statistics to 82599, including number Rx-ed and Tx-ed FCoE packets, number of Rx-ed and Tx-ed FCoE packets in dwords, number of bad Fiber Channel CRCs detected in FCoE packets, and number of FCoE packets dropped on the Rx side.
---
drivers/net/ixgbe/ixgbe_ethtool.c | 8 ++++++++ drivers/net/ixgbe/ixgbe_main.c | 8 ++++++++ drivers/net/ixgbe/ixgbe_type.h | 6 ++++++ 3 files changed, 22 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe_ethtool.c +8 -0
@@ -91,6 +91,14 @@ static struct ixgbe_stats ixgbe_gstrings_stats[] = { {"alloc_rx_page_failed", IXGBE_STAT(alloc_rx_page_failed)}, {"alloc_rx_buff_failed", IXGBE_STAT(alloc_rx_buff_failed)}, {"rx_no_dma_resources", IXGBE_STAT(hw_rx_no_dma_resources)}, +#ifdef IXGBE_FCOE + {"fcoe_bad_fccrc", IXGBE_STAT(stats.fccrc)}, + {"rx_fcoe_dropped", IXGBE_STAT(stats.fcoerpdc)}, + {"rx_fcoe_packets", IXGBE_STAT(stats.fcoeprc)}, + {"rx_fcoe_dwords", IXGBE_STAT(stats.fcoedwrc)}, + {"tx_fcoe_packets", IXGBE_STAT(stats.fcoeptc)}, + {"tx_fcoe_dwords", IXGBE_STAT(stats.fcoedwtc)}, +#endif /* IXGBE_FCOE */ };#define IXGBE_QUEUE_STATS_LEN \
drivers/net/ixgbe/ixgbe_main.c +8 -0
@@ -4002,6 +4002,14 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)IXGBE_READ_REG (hw,IXGBE_TORH );/* to clear */ adapter->stats.lxonrxc +=IXGBE_READ_REG (hw,IXGBE_LXONRXCNT ); adapter->stats.lxoffrxc +=IXGBE_READ_REG (hw,IXGBE_LXOFFRXCNT ); +#ifdef IXGBE_FCOE + adapter->stats.fccrc +=IXGBE_READ_REG (hw,IXGBE_FCCRC ); + adapter->stats.fcoerpdc +=IXGBE_READ_REG (hw,IXGBE_FCOERPDC ); + adapter->stats.fcoeprc +=IXGBE_READ_REG (hw,IXGBE_FCOEPRC ); + adapter->stats.fcoeptc +=IXGBE_READ_REG (hw,IXGBE_FCOEPTC ); + adapter->stats.fcoedwrc +=IXGBE_READ_REG (hw,IXGBE_FCOEDWRC ); + adapter->stats.fcoedwtc +=IXGBE_READ_REG (hw,IXGBE_FCOEDWTC ); +#endif /* IXGBE_FCOE */ }else { adapter->stats.lxonrxc +=IXGBE_READ_REG (hw,IXGBE_LXONRXC ); adapter->stats.lxoffrxc +=IXGBE_READ_REG (hw,IXGBE_LXOFFRXC );
drivers/net/ixgbe/ixgbe_type.h +6 -0
@@ -2157,6 +2157,12 @@ struct ixgbe_hw_stats {u64 fdirfstat_fremove;u64 fdirmatch;u64 fdirmiss; +u64 fccrc; +u64 fcoerpdc; +u64 fcoeprc; +u64 fcoeptc; +u64 fcoedwrc; +u64 fcoedwtc; };/* forward declaration */
Re: [net-next-2.6 PATCH 8/8] ixgbe: Add FCoE related statistics to 82599
From: Jeff Kirsher <[email protected]>
Date: Wed, 13 May 2009 16:12:16 -0700
Quoted 10 lines
From: Yi Zou <[email protected]>
This adds FCoE related statistics to 82599, including number Rx-ed and Tx-ed FCoE packets, number of Rx-ed and Tx-ed FCoE packets in dwords, number of bad Fiber Channel CRCs detected in FCoE packets, and number of FCoE packets dropped on the Rx side.
Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Wed, 13 May 2009 16:09:39 -0700
Quoted 7 lines
From: Yi Zou <[email protected]>
This adds FCoE related register defines to 82599.
Signed-off-by Yi Zou <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.