---

yaml --- r: 305900 b: refs/heads/master c: 8a63b19 h: refs/heads/master v: v3
git-mirror · May 4, 2012 · f6555ab · f6555ab
1 parent 528f9ae
commit f6555ab
Show file tree

Hide file tree

Showing 7 changed files with 2,441 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2789c08fffeae270820dda5d096634aecc810af5
+refs/heads/master: 8a63b1994c500d4825ee73dc71502deffe5b135b
diff --git a/trunk/arch/arm/mach-ux500/include/mach/crypto-ux500.h b/trunk/arch/arm/mach-ux500/include/mach/crypto-ux500.h
@@ -8,6 +8,11 @@
 #include <linux/dmaengine.h>
 #include <plat/ste_dma40.h>
 
+struct hash_platform_data {
+	void *mem_to_engine;
+	bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
+};
+
 struct cryp_platform_data {
 	struct stedma40_chan_cfg mem_to_engine;
 	struct stedma40_chan_cfg engine_to_mem;

diff --git a/trunk/drivers/crypto/ux500/Kconfig b/trunk/drivers/crypto/ux500/Kconfig
@@ -12,6 +12,15 @@ config CRYPTO_DEV_UX500_CRYP
         This selects the crypto driver for the UX500_CRYP hardware. It supports
         AES-ECB, CBC and CTR with keys sizes of 128, 192 and 256 bit sizes.
 
+config CRYPTO_DEV_UX500_HASH
+        tristate "UX500 crypto driver for HASH block"
+        depends on CRYPTO_DEV_UX500
+        select CRYPTO_HASH
+        select CRYPTO_HMAC
+        help
+          This selects the hash driver for the UX500_HASH hardware.
+          Depends on UX500/STM DMA if running in DMA mode.
+
 config CRYPTO_DEV_UX500_DEBUG
 	bool "Activate ux500 platform debug-mode for crypto and hash block"
 	depends on CRYPTO_DEV_UX500_CRYP || CRYPTO_DEV_UX500_HASH

diff --git a/trunk/drivers/crypto/ux500/Makefile b/trunk/drivers/crypto/ux500/Makefile
@@ -4,4 +4,5 @@
 # License terms: GNU General Public License (GPL) version 2
 #
 
+obj-$(CONFIG_CRYPTO_DEV_UX500_HASH) += hash/
 obj-$(CONFIG_CRYPTO_DEV_UX500_CRYP) += cryp/
diff --git a/trunk/drivers/crypto/ux500/hash/Makefile b/trunk/drivers/crypto/ux500/hash/Makefile
@@ -0,0 +1,11 @@
+#
+# Copyright (C) ST-Ericsson SA 2010
+# Author: Shujuan Chen (shujuan.chen@stericsson.com)
+# License terms: GNU General Public License (GPL) version 2
+#
+ifdef CONFIG_CRYPTO_DEV_UX500_DEBUG
+CFLAGS_hash_core.o := -DDEBUG -O0
+endif
+
+obj-$(CONFIG_CRYPTO_DEV_UX500_HASH) += ux500_hash.o
+ux500_hash-objs :=  hash_core.o