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

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

Merge branch 'libcxgb' 



Varun Prakash says:

====================
common library for Chelsio drivers.

 This patch series adds common library module(libcxgb.ko)
 for Chelsio drivers to remove duplicate code.

 This series moves common iSCSI DDP Page Pod manager
 code from cxgb4.ko to libcxgb.ko, earlier this code
 was used by only cxgbit.ko now it is used by
 three Chelsio iSCSI drivers cxgb3i, cxgb4i, cxgbit.

 In future this module will have common connection
 management and hardware specific code that can
 be shared by multiple Chelsio drivers(cxgb4,
 csiostor, iw_cxgb4, cxgb4i, cxgbit).

 Please review.

 Thanks

-v3
- removed unused module init and exit functions.

-v2
- updated CONFIG_CHELSIO_LIB to an invisible option
- changed libcxgb.ko module license from GPL to Dual BSD/GPL
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9e0b27fe 4665bdd5

drivers/net/ethernet/chelsio/Kconfig

+5 −11
Original line number Diff line number Diff line
@@ -96,17 +96,6 @@ config CHELSIO_T4_DCB 


	  If unsure, say N.



config CHELSIO_T4_UWIRE

	bool "Unified Wire Support for Chelsio T5 cards"

	default n

	depends on CHELSIO_T4

	---help---

	  Enable unified-wire offload features.

	  Say Y here if you want to enable unified-wire over Ethernet

	  in the driver.



	  If unsure, say N.



config CHELSIO_T4_FCOE

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

	default n
@@ -137,4 +126,9 @@ config CHELSIO_T4VF 
	  To compile this driver as a module choose M here; the module

	  will be called cxgb4vf.



config CHELSIO_LIB

	tristate

	---help---

	Common library for Chelsio drivers.



endif # NET_VENDOR_CHELSIO

drivers/net/ethernet/chelsio/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ obj-$(CONFIG_CHELSIO_T1) += cxgb/ 
obj-$(CONFIG_CHELSIO_T3) += cxgb3/

obj-$(CONFIG_CHELSIO_T4) += cxgb4/

obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/

obj-$(CONFIG_CHELSIO_LIB) += libcxgb/

drivers/net/ethernet/chelsio/cxgb4/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,5 +7,4 @@ obj-$(CONFIG_CHELSIO_T4) += cxgb4.o 
cxgb4-objs := cxgb4_main.o l2t.o t4_hw.o sge.o clip_tbl.o cxgb4_ethtool.o

cxgb4-$(CONFIG_CHELSIO_T4_DCB) +=  cxgb4_dcb.o

cxgb4-$(CONFIG_CHELSIO_T4_FCOE) +=  cxgb4_fcoe.o

cxgb4-$(CONFIG_CHELSIO_T4_UWIRE) +=  cxgb4_ppm.o

cxgb4-$(CONFIG_DEBUG_FS) += cxgb4_debugfs.o

drivers/net/ethernet/chelsio/libcxgb/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_CHELSIO_LIB) += libcxgb.o



libcxgb-y := libcxgb_ppm.o

drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.c→drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c

+40 −5
Original line number Diff line number Diff line 
/*

 * cxgb4_ppm.c: Chelsio common library for T4/T5 iSCSI PagePod Manager

 * libcxgb_ppm.c: Chelsio common library for T3/T4/T5 iSCSI PagePod Manager

 *

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 * 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.

 *

 * Written by: Karen Xie (kxie@chelsio.com)

 */



#define DRV_NAME "libcxgb"

#define DRV_VERSION "1.0.0-ko"

#define pr_fmt(fmt) DRV_NAME ": " fmt



#include <linux/kernel.h>

#include <linux/version.h>

#include <linux/module.h>
@@ -22,7 +50,7 @@ 
#include <linux/pci.h>

#include <linux/scatterlist.h>



#include "cxgb4_ppm.h"

#include "libcxgb_ppm.h"



/* Direct Data Placement -

 * Directly place the iSCSI Data-In or Data-Out PDU's payload into
@@ -309,6 +337,7 @@ int cxgbi_ppm_release(struct cxgbi_ppm *ppm) 
	}

	return 1;

}

EXPORT_SYMBOL(cxgbi_ppm_release);



static struct cxgbi_ppm_pool *ppm_alloc_cpu_pool(unsigned int *total,

						 unsigned int *pcpu_ppmax)
@@ -462,3 +491,9 @@ unsigned int cxgbi_tagmask_set(unsigned int ppmax) 


	return 1 << (bits + PPOD_IDX_SHIFT);

}

EXPORT_SYMBOL(cxgbi_tagmask_set);



MODULE_AUTHOR("Chelsio Communications");

MODULE_DESCRIPTION("Chelsio common library");

MODULE_VERSION(DRV_VERSION);

MODULE_LICENSE("Dual BSD/GPL");