Commit a8c16e8e authored by Rohit Maheshwari's avatar Rohit Maheshwari Committed by David S. Miller
Browse files

crypto/chcr: move nic TLS functionality to drivers/net 



This patch moves complete nic tls offload (kTLS) code from crypto
directory to drivers/net/ethernet/chelsio/inline_crypto/ch_ktls
directory. nic TLS is made a separate ULD of cxgb4.

Signed-off-by: default avatarRohit Maheshwari <rohitm@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b5525c8

drivers/crypto/chelsio/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -21,14 +21,3 @@ config CRYPTO_DEV_CHELSIO 


	  To compile this driver as a module, choose M here: the module

	  will be called chcr.
 


config CHELSIO_TLS_DEVICE

	bool "Chelsio Inline KTLS Offload"

	depends on CHELSIO_T4

	depends on TLS_DEVICE

	select CRYPTO_DEV_CHELSIO

	default y

	help

	  This flag enables support for kernel tls offload over Chelsio T6

	  crypto accelerator. CONFIG_CHELSIO_TLS_DEVICE flag can be enabled

	  only if CONFIG_TLS and CONFIG_TLS_DEVICE flags are enabled.

drivers/crypto/chelsio/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -3,6 +3,3 @@ ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4 


obj-$(CONFIG_CRYPTO_DEV_CHELSIO) += chcr.o

chcr-objs :=  chcr_core.o chcr_algo.o
 
#ifdef CONFIG_CHELSIO_TLS_DEVICE

chcr-objs += chcr_ktls.o

#endif

drivers/crypto/chelsio/chcr_core.c

+0 −24
Original line number Diff line number Diff line
@@ -33,19 +33,8 @@ static int cpl_fw6_pld_handler(struct adapter *adap, unsigned char *input); 
static void *chcr_uld_add(const struct cxgb4_lld_info *lld);

static int chcr_uld_state_change(void *handle, enum cxgb4_state state);



#if defined(CONFIG_CHELSIO_TLS_DEVICE)

static const struct tlsdev_ops chcr_ktls_ops = {

	.tls_dev_add = chcr_ktls_dev_add,

	.tls_dev_del = chcr_ktls_dev_del,

};

#endif



static chcr_handler_func work_handlers[NUM_CPL_CMDS] = {

	[CPL_FW6_PLD] = cpl_fw6_pld_handler,

#ifdef CONFIG_CHELSIO_TLS_DEVICE

	[CPL_ACT_OPEN_RPL] = chcr_ktls_cpl_act_open_rpl,

	[CPL_SET_TCB_RPL] = chcr_ktls_cpl_set_tcb_rpl,

#endif

};



static struct cxgb4_uld_info chcr_uld_info = {
@@ -56,10 +45,6 @@ static struct cxgb4_uld_info chcr_uld_info = { 
	.add = chcr_uld_add,

	.state_change = chcr_uld_state_change,

	.rx_handler = chcr_uld_rx_handler,

#if defined(CONFIG_CHELSIO_TLS_DEVICE)

	.tx_handler = chcr_uld_tx_handler,

	.tlsdev_ops = &chcr_ktls_ops,

#endif

};



static void detach_work_fn(struct work_struct *work)
@@ -235,15 +220,6 @@ int chcr_uld_rx_handler(void *handle, const __be64 *rsp, 
	return 0;

}



#if defined(CONFIG_CHELSIO_TLS_DEVICE)

int chcr_uld_tx_handler(struct sk_buff *skb, struct net_device *dev)

{

	if (skb->decrypted)

		return chcr_ktls_xmit(skb, dev);

	return 0;

}

#endif /* CONFIG_CHELSIO_IPSEC_INLINE || CONFIG_CHELSIO_TLS_DEVICE */



static void chcr_detach_device(struct uld_ctx *u_ctx)

{

	struct chcr_dev *dev = &u_ctx->dev;

drivers/crypto/chelsio/chcr_core.h

+0 −12
Original line number Diff line number Diff line
@@ -139,16 +139,4 @@ int chcr_handle_resp(struct crypto_async_request *req, unsigned char *input, 
		     int err);

int chcr_ipsec_xmit(struct sk_buff *skb, struct net_device *dev);

void chcr_add_xfrmops(const struct cxgb4_lld_info *lld);

#ifdef CONFIG_CHELSIO_TLS_DEVICE

int chcr_ktls_cpl_act_open_rpl(struct adapter *adap, unsigned char *input);

int chcr_ktls_cpl_set_tcb_rpl(struct adapter *adap, unsigned char *input);

int chcr_ktls_xmit(struct sk_buff *skb, struct net_device *dev);

extern int chcr_ktls_dev_add(struct net_device *netdev, struct sock *sk,

			     enum tls_offload_ctx_dir direction,

			     struct tls_crypto_info *crypto_info,

			     u32 start_offload_tcp_sn);

extern void chcr_ktls_dev_del(struct net_device *netdev,

			      struct tls_context *tls_ctx,

			      enum tls_offload_ctx_dir direction);

#endif

#endif /* __CHCR_CORE_H__ */

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

+4 −1
Original line number Diff line number Diff line
@@ -1201,6 +1201,9 @@ struct adapter { 
	struct cxgb4_tc_u32_table *tc_u32;

	struct chcr_ktls chcr_ktls;

	struct chcr_stats_debug chcr_stats;

#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)

	struct ch_ktls_stats_debug ch_ktls_stats;

#endif

#if IS_ENABLED(CONFIG_CHELSIO_IPSEC_INLINE)

	struct ch_ipsec_stats_debug ch_ipsec_stats;

#endif
@@ -2177,7 +2180,7 @@ void cxgb4_enable_rx(struct adapter *adap, struct sge_rspq *q); 
void cxgb4_quiesce_rx(struct sge_rspq *q);

int cxgb4_port_mirror_alloc(struct net_device *dev);

void cxgb4_port_mirror_free(struct net_device *dev);

#ifdef CONFIG_CHELSIO_TLS_DEVICE

#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)

int cxgb4_set_ktls_feature(struct adapter *adap, bool enable);

#endif

#endif /* __CXGB4_H__ */