Commit f6bb76cd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'cxgb4-fcoe' 



Varun Prakash says:

====================
FCoE support in cxgb4 driver

This patch series enables FCoE support in cxgb4 driver, it enables
FCOE_CRC and FCOE_MTU net device features.

This series is created against net-next tree.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ff40217e 241e9247

drivers/net/ethernet/chelsio/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -97,6 +97,17 @@ config CHELSIO_T4_DCB 


	  If unsure, say N.



config CHELSIO_T4_FCOE

	bool "Fibre Channel over Ethernet (FCoE) Support for Chelsio T5 cards"

	default n

	depends on CHELSIO_T4 && CHELSIO_T4_DCB && FCOE

	---help---

	  Enable FCoE offload features.

	  Say Y here if you want to enable Fibre Channel over Ethernet (FCoE) support

	  in the driver.



	  If unsure, say N.



config CHELSIO_T4VF

	tristate "Chelsio Communications T4/T5 Virtual Function Ethernet support"

	depends on PCI

drivers/net/ethernet/chelsio/cxgb4/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,4 +6,5 @@ obj-$(CONFIG_CHELSIO_T4) += cxgb4.o 


cxgb4-objs := cxgb4_main.o l2t.o t4_hw.o sge.o clip_tbl.o

cxgb4-$(CONFIG_CHELSIO_T4_DCB) +=  cxgb4_dcb.o

cxgb4-$(CONFIG_CHELSIO_T4_FCOE) +=  cxgb4_fcoe.o

cxgb4-$(CONFIG_DEBUG_FS) += cxgb4_debugfs.o

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+7 −0
Original line number Diff line number Diff line
@@ -387,6 +387,10 @@ struct sge_rspq; 


#include "cxgb4_dcb.h"



#ifdef CONFIG_CHELSIO_T4_FCOE

#include "cxgb4_fcoe.h"

#endif /* CONFIG_CHELSIO_T4_FCOE */



struct port_info {

	struct adapter *adapter;

	u16    viid;
@@ -406,6 +410,9 @@ struct port_info { 
#ifdef CONFIG_CHELSIO_T4_DCB

	struct port_dcb_info dcb;     /* Data Center Bridging support */

#endif

#ifdef CONFIG_CHELSIO_T4_FCOE

	struct cxgb_fcoe fcoe;

#endif /* CONFIG_CHELSIO_T4_FCOE */

};



struct dentry;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c

0 → 100644
+122 −0
Original line number Diff line number Diff line 
/*

 * This file is part of the Chelsio T4 Ethernet driver for Linux.

 *

 * Copyright (c) 2015 Chelsio Communications, Inc. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#ifdef CONFIG_CHELSIO_T4_FCOE



#include <scsi/fc/fc_fs.h>

#include <scsi/libfcoe.h>

#include "cxgb4.h"



bool cxgb_fcoe_sof_eof_supported(struct adapter *adap, struct sk_buff *skb)

{

	struct fcoe_hdr *fcoeh = (struct fcoe_hdr *)skb_network_header(skb);

	u8 sof = fcoeh->fcoe_sof;

	u8 eof = 0;



	if ((sof != FC_SOF_I3) && (sof != FC_SOF_N3)) {

		dev_err(adap->pdev_dev, "Unsupported SOF 0x%x\n", sof);

		return 0;

	}



	skb_copy_bits(skb, skb->len - 4, &eof, 1);



	if ((eof != FC_EOF_N) && (eof != FC_EOF_T)) {

		dev_err(adap->pdev_dev, "Unsupported EOF 0x%x\n", eof);

		return 0;

	}



	return 1;

}



/**

 * cxgb_fcoe_enable - enable FCoE offload features

 * @netdev: net device

 *

 * Returns 0 on success or -EINVAL on failure.

 */

int cxgb_fcoe_enable(struct net_device *netdev)

{

	struct port_info *pi = netdev_priv(netdev);

	struct adapter *adap = pi->adapter;

	struct cxgb_fcoe *fcoe = &pi->fcoe;



	if (is_t4(adap->params.chip))

		return -EINVAL;



	if (!(adap->flags & FULL_INIT_DONE))

		return -EINVAL;



	dev_info(adap->pdev_dev, "Enabling FCoE offload features\n");



	netdev->features |= NETIF_F_FCOE_CRC;

	netdev->vlan_features |= NETIF_F_FCOE_CRC;

	netdev->features |= NETIF_F_FCOE_MTU;

	netdev->vlan_features |= NETIF_F_FCOE_MTU;



	netdev_features_change(netdev);



	fcoe->flags |= CXGB_FCOE_ENABLED;



	return 0;

}



/**

 * cxgb_fcoe_disable - disable FCoE offload

 * @netdev: net device

 *

 * Returns 0 on success or -EINVAL on failure.

 */

int cxgb_fcoe_disable(struct net_device *netdev)

{

	struct port_info *pi = netdev_priv(netdev);

	struct adapter *adap = pi->adapter;

	struct cxgb_fcoe *fcoe = &pi->fcoe;



	if (!(fcoe->flags & CXGB_FCOE_ENABLED))

		return -EINVAL;



	dev_info(adap->pdev_dev, "Disabling FCoE offload features\n");



	fcoe->flags &= ~CXGB_FCOE_ENABLED;



	netdev->features &= ~NETIF_F_FCOE_CRC;

	netdev->vlan_features &= ~NETIF_F_FCOE_CRC;

	netdev->features &= ~NETIF_F_FCOE_MTU;

	netdev->vlan_features &= ~NETIF_F_FCOE_MTU;



	netdev_features_change(netdev);



	return 0;

}

#endif /* CONFIG_CHELSIO_T4_FCOE */

drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.h

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * This file is part of the Chelsio T4 Ethernet driver for Linux.

 *

 * Copyright (c) 2015 Chelsio Communications, Inc. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#ifndef __CXGB4_FCOE_H__

#define __CXGB4_FCOE_H__



#ifdef CONFIG_CHELSIO_T4_FCOE



#define CXGB_FCOE_TXPKT_CSUM_START	28

#define CXGB_FCOE_TXPKT_CSUM_END	8



/* fcoe flags */

enum {

	CXGB_FCOE_ENABLED     = (1 << 0),

};



struct cxgb_fcoe {

	u8	flags;

};



int cxgb_fcoe_enable(struct net_device *);

int cxgb_fcoe_disable(struct net_device *);

bool cxgb_fcoe_sof_eof_supported(struct adapter *, struct sk_buff *);



#endif /* CONFIG_CHELSIO_T4_FCOE */

#endif /* __CXGB4_FCOE_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE