Commit 44fd1c1f authored by Vinay Kumar Yadav's avatar Vinay Kumar Yadav Committed by David S. Miller
Browse files

chelsio/chtls: separate chelsio tls driver from crypto driver 



chelsio inline tls driver(chtls) is mostly overlaps with NIC drivers
but currenty it is part of crypto driver, so move it out to appropriate
directory for better maintenance.

Signed-off-by: default avatarVinay Kumar Yadav <vinay.yadav@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0a84e1f

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -4692,6 +4692,15 @@ S: Supported 
W:	http://www.chelsio.com

F:	drivers/crypto/chelsio









CXGB4 INLINE CRYPTO DRIVER









M:	Ayush Sawal <ayush.sawal@chelsio.com>









M:	Vinay Kumar Yadav <vinay.yadav@chelsio.com>









M:	Rohit Maheshwari <rohitm@chelsio.com>









L:	netdev@vger.kernel.org









S:	Supported









W:	http://www.chelsio.com









F:	drivers/net/ethernet/chelsio/inline_crypto/

















CXGB4 ETHERNET DRIVER (CXGB4)









M:	Vishal Kulkarni <vishal@chelsio.com>









L:	netdev@vger.kernel.org
































drivers/crypto/chelsio/Kconfig



+0
−11






























Original line number
Diff line number
Diff line







@@ -32,17 +32,6 @@ config CHELSIO_IPSEC_INLINE







	help









	  Enable support for IPSec Tx Inline.



















config CRYPTO_DEV_CHELSIO_TLS









	tristate "Chelsio Crypto Inline TLS Driver"









	depends on CHELSIO_T4









	depends on TLS_TOE









	select CRYPTO_DEV_CHELSIO









	help









	  Support Chelsio Inline TLS with Chelsio crypto accelerator.



















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









	  will be called chtls.



















config CHELSIO_TLS_DEVICE









	bool "Chelsio Inline KTLS Offload"









	depends on CHELSIO_T4
































drivers/crypto/chelsio/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -7,4 +7,3 @@ chcr-objs :=  chcr_core.o chcr_algo.o







chcr-objs += chcr_ktls.o









#endif









chcr-$(CONFIG_CHELSIO_IPSEC_INLINE) += chcr_ipsec.o








obj-$(CONFIG_CRYPTO_DEV_CHELSIO_TLS) += chtls/
























drivers/crypto/chelsio/chcr_algo.h



+0
−33






























Original line number
Diff line number
Diff line







@@ -86,39 +86,6 @@







	 KEY_CONTEXT_OPAD_PRESENT_M)









#define KEY_CONTEXT_OPAD_PRESENT_F      KEY_CONTEXT_OPAD_PRESENT_V(1U)



















#define TLS_KEYCTX_RXFLIT_CNT_S 24









#define TLS_KEYCTX_RXFLIT_CNT_V(x) ((x) << TLS_KEYCTX_RXFLIT_CNT_S)



















#define TLS_KEYCTX_RXPROT_VER_S 20









#define TLS_KEYCTX_RXPROT_VER_M 0xf









#define TLS_KEYCTX_RXPROT_VER_V(x) ((x) << TLS_KEYCTX_RXPROT_VER_S)



















#define TLS_KEYCTX_RXCIPH_MODE_S 16









#define TLS_KEYCTX_RXCIPH_MODE_M 0xf









#define TLS_KEYCTX_RXCIPH_MODE_V(x) ((x) << TLS_KEYCTX_RXCIPH_MODE_S)



















#define TLS_KEYCTX_RXAUTH_MODE_S 12









#define TLS_KEYCTX_RXAUTH_MODE_M 0xf









#define TLS_KEYCTX_RXAUTH_MODE_V(x) ((x) << TLS_KEYCTX_RXAUTH_MODE_S)



















#define TLS_KEYCTX_RXCIAU_CTRL_S 11









#define TLS_KEYCTX_RXCIAU_CTRL_V(x) ((x) << TLS_KEYCTX_RXCIAU_CTRL_S)



















#define TLS_KEYCTX_RX_SEQCTR_S 9









#define TLS_KEYCTX_RX_SEQCTR_M 0x3









#define TLS_KEYCTX_RX_SEQCTR_V(x) ((x) << TLS_KEYCTX_RX_SEQCTR_S)



















#define TLS_KEYCTX_RX_VALID_S 8









#define TLS_KEYCTX_RX_VALID_V(x) ((x) << TLS_KEYCTX_RX_VALID_S)



















#define TLS_KEYCTX_RXCK_SIZE_S 3









#define TLS_KEYCTX_RXCK_SIZE_M 0x7









#define TLS_KEYCTX_RXCK_SIZE_V(x) ((x) << TLS_KEYCTX_RXCK_SIZE_S)



















#define TLS_KEYCTX_RXMK_SIZE_S 0









#define TLS_KEYCTX_RXMK_SIZE_M 0x7









#define TLS_KEYCTX_RXMK_SIZE_V(x) ((x) << TLS_KEYCTX_RXMK_SIZE_S)



















#define CHCR_HASH_MAX_DIGEST_SIZE 64









#define CHCR_MAX_SHA_DIGEST_SIZE 64










































drivers/crypto/chelsio/chcr_core.h



+0
−53






























Original line number
Diff line number
Diff line







@@ -72,54 +72,6 @@ struct _key_ctx {







	unsigned char key[];









};



















#define KEYCTX_TX_WR_IV_S  55









#define KEYCTX_TX_WR_IV_M  0x1ffULL









#define KEYCTX_TX_WR_IV_V(x) ((x) << KEYCTX_TX_WR_IV_S)









#define KEYCTX_TX_WR_IV_G(x) \









	(((x) >> KEYCTX_TX_WR_IV_S) & KEYCTX_TX_WR_IV_M)



















#define KEYCTX_TX_WR_AAD_S 47









#define KEYCTX_TX_WR_AAD_M 0xffULL









#define KEYCTX_TX_WR_AAD_V(x) ((x) << KEYCTX_TX_WR_AAD_S)









#define KEYCTX_TX_WR_AAD_G(x) (((x) >> KEYCTX_TX_WR_AAD_S) & \









				KEYCTX_TX_WR_AAD_M)



















#define KEYCTX_TX_WR_AADST_S 39









#define KEYCTX_TX_WR_AADST_M 0xffULL









#define KEYCTX_TX_WR_AADST_V(x) ((x) << KEYCTX_TX_WR_AADST_S)









#define KEYCTX_TX_WR_AADST_G(x) \









	(((x) >> KEYCTX_TX_WR_AADST_S) & KEYCTX_TX_WR_AADST_M)



















#define KEYCTX_TX_WR_CIPHER_S 30









#define KEYCTX_TX_WR_CIPHER_M 0x1ffULL









#define KEYCTX_TX_WR_CIPHER_V(x) ((x) << KEYCTX_TX_WR_CIPHER_S)









#define KEYCTX_TX_WR_CIPHER_G(x) \









	(((x) >> KEYCTX_TX_WR_CIPHER_S) & KEYCTX_TX_WR_CIPHER_M)



















#define KEYCTX_TX_WR_CIPHERST_S 23









#define KEYCTX_TX_WR_CIPHERST_M 0x7f









#define KEYCTX_TX_WR_CIPHERST_V(x) ((x) << KEYCTX_TX_WR_CIPHERST_S)









#define KEYCTX_TX_WR_CIPHERST_G(x) \









	(((x) >> KEYCTX_TX_WR_CIPHERST_S) & KEYCTX_TX_WR_CIPHERST_M)



















#define KEYCTX_TX_WR_AUTH_S 14









#define KEYCTX_TX_WR_AUTH_M 0x1ff









#define KEYCTX_TX_WR_AUTH_V(x) ((x) << KEYCTX_TX_WR_AUTH_S)









#define KEYCTX_TX_WR_AUTH_G(x) \









	(((x) >> KEYCTX_TX_WR_AUTH_S) & KEYCTX_TX_WR_AUTH_M)



















#define KEYCTX_TX_WR_AUTHST_S 7









#define KEYCTX_TX_WR_AUTHST_M 0x7f









#define KEYCTX_TX_WR_AUTHST_V(x) ((x) << KEYCTX_TX_WR_AUTHST_S)









#define KEYCTX_TX_WR_AUTHST_G(x) \









	(((x) >> KEYCTX_TX_WR_AUTHST_S) & KEYCTX_TX_WR_AUTHST_M)



















#define KEYCTX_TX_WR_AUTHIN_S 0









#define KEYCTX_TX_WR_AUTHIN_M 0x7f









#define KEYCTX_TX_WR_AUTHIN_V(x) ((x) << KEYCTX_TX_WR_AUTHIN_S)









#define KEYCTX_TX_WR_AUTHIN_G(x) \









	(((x) >> KEYCTX_TX_WR_AUTHIN_S) & KEYCTX_TX_WR_AUTHIN_M)



















#define WQ_RETRY	5









struct chcr_driver_data {









	struct list_head act_dev;








@@ -157,11 +109,6 @@ struct uld_ctx {







	struct chcr_dev dev;









};



















struct sge_opaque_hdr {









	void *dev;









	dma_addr_t addr[MAX_SKB_FRAGS + 1];









};



















struct chcr_ipsec_req {









	struct ulp_txpkt ulptx;









	struct ulptx_idata sc_imm;