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

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

Merge branch 'cxgb-crypto' 



Hariprasad Shenai says:

====================
crypto/chcr: Add support for Chelsio Crypto Driver

This patch series adds support for Chelsio Crypto driver.

The patch series has been created against net-next tree and includes
patches for Chelsio Low Level Driver(cxgb4) and adds the new crypto
Upper Layer Driver(chcr) under a new directory drivers/crypto/chelsio.

Patch 1/4 ("cxgb4: Add support for dynamic allocation of resources for
ULD") adds support for dynamic allocation of resources for ULD. The
objective of this patch is to provide generic interface for upper layer
drivers to allocate and initialize hardware resources.

The present cxgb4 (network driver) apart from network functionality, also
initializes hardware and thus acts as lower layer driver for other drivers
to use hardware resources. Thus it acts as both a Low level driver for
Upper layer driver's like iw_cxgb4, cxgb4i and cxgb4it and a Network Driver.

Right now the allocation of resources for Upper layer driver's is done
statically. Patch 1/4 adds a new infrastructure for dynamic allocation of
resources. cxgb4 will read the hardware capability through firmware and
allocate/free the queues for Upper layer drivers when the respective
driver's are loaded and freed when unloaded.

Patch 2/3, 3/4 and 4/4 adds support for Chelsio Crypto Driver. The Crypto
driver will act as another ULD on top of cxgb4.

In this patch series, the ULD API framework is used only by crypto and other
ULD's will make use of it in the next series.

This patch series is only for review, if this looks ok we will test it
thoroughly and send request for merge.

We have included all the maintainers of respective drivers. Kindly
review the changes and provide feedback on the same.

V3: - Removed crypto queues from cxgb4 and added support for dynamic
      allocation of resources for Upper layer drivers
    - Dependency fix in Kconfig.

V2: - Some residual code cleanup
    - Adds pr_fmt with chcr (KBUILD_MODNAME) added
    - Changes var name to accomodate them <80 columns in the chcr_register_alg
    - Support for printing the crypto queue stats
    - Fix compile warnings reported by kbuild bot for certain architectures
    - Dependency fix in Kconfig.
    - If the request has the MAY_BACKLOG bit set and hardware queue is
      full the request is queued up else -EBUSY is returned to throttle
      the user. The queue when executed and processed returns -EINPROGRESS
      in completion.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b65b24d4 02038fd6

drivers/crypto/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -550,4 +550,6 @@ config CRYPTO_DEV_ROCKCHIP 
	  This driver interfaces with the hardware crypto accelerator.

	  Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode.



source "drivers/crypto/chelsio/Kconfig"



endif # CRYPTO_HW

drivers/crypto/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -31,3 +31,4 @@ obj-$(CONFIG_CRYPTO_DEV_QCE) += qce/ 
obj-$(CONFIG_CRYPTO_DEV_VMX) += vmx/

obj-$(CONFIG_CRYPTO_DEV_SUN4I_SS) += sunxi-ss/

obj-$(CONFIG_CRYPTO_DEV_ROCKCHIP) += rockchip/

obj-$(CONFIG_CRYPTO_DEV_CHELSIO) += chelsio/

drivers/crypto/chelsio/Kconfig

0 → 100644
+19 −0
Original line number Diff line number Diff line 
config CRYPTO_DEV_CHELSIO

	tristate "Chelsio Crypto Co-processor Driver"

	depends on CHELSIO_T4

	select CRYPTO_SHA1

	select CRYPTO_SHA256

	select CRYPTO_SHA512

	---help---

	  The Chelsio Crypto Co-processor driver for T6 adapters.



	  For general information about Chelsio and our products, visit

	  our website at <http://www.chelsio.com>.



	  For customer support, please visit our customer support page at

	  <http://www.chelsio.com/support.html>.



	  Please send feedback to <linux-bugs@chelsio.com>.



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

	  will be called chcr.

drivers/crypto/chelsio/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4



obj-$(CONFIG_CRYPTO_DEV_CHELSIO) += chcr.o

chcr-objs :=  chcr_core.o chcr_algo.o

drivers/crypto/chelsio/chcr_algo.c

0 → 100644
+1525 −0

File added.

Preview size limit exceeded, changes collapsed.