Commit 13c789a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto update from Herbert Xu:
 "Here is the crypto update for 3.14:

   - Improved crypto_memneq helper
   - Use cyprto_memneq in arch-specific crypto code
   - Replaced orphaned DCP driver with Freescale MXS DCP driver
   - Added AVX/AVX2 version of AESNI-GCM encode and decode
   - Added AMD Cryptographic Coprocessor (CCP) driver
   - Misc fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (41 commits)
  crypto: aesni - fix build on x86 (32bit)
  crypto: mxs - Fix sparse non static symbol warning
  crypto: ccp - CCP device enabled/disabled changes
  crypto: ccp - Cleanup hash invocation calls
  crypto: ccp - Change data length declarations to u64
  crypto: ccp - Check for caller result area before using it
  crypto: ccp - Cleanup scatterlist usage
  crypto: ccp - Apply appropriate gfp_t type to memory allocations
  crypto: drivers - Sort drivers/crypto/Makefile
  ARM: mxs: dts: Enable DCP for MXS
  crypto: mxs - Add Freescale MXS DCP driver
  crypto: mxs - Remove the old DCP driver
  crypto: ahash - Fully restore ahash request before completing
  crypto: aesni - fix build on x86 (32bit)
  crypto: talitos - Remove redundant dev_set_drvdata
  crypto: ccp - Remove redundant dev_set_drvdata
  crypto: crypto4xx - Remove redundant dev_set_drvdata
  crypto: caam - simplify and harden key parsing
  crypto: omap-sham - Fix Polling mode for larger blocks
  crypto: tcrypt - Added speed tests for AEAD crypto alogrithms in tcrypt test suite
  ...
parents 6dd9158a 79ba451d

Documentation/devicetree/bindings/crypto/fsl-dcp.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Freescale DCP (Data Co-Processor) found on i.MX23/i.MX28 .



Required properties:

- compatible : Should be "fsl,<soc>-dcp"

- reg : Should contain MXS DCP registers location and length

- interrupts : Should contain MXS DCP interrupt numbers, VMI IRQ and DCP IRQ

               must be supplied, optionally Secure IRQ can be present, but

	       is currently not implemented and not used.



Example:



dcp@80028000 {

	compatible = "fsl,imx28-dcp", "fsl,imx23-dcp";

	reg = <0x80028000 0x2000>;

	interrupts = <52 53>;

	status = "okay";

};

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -538,6 +538,13 @@ F: drivers/tty/serial/altera_jtaguart.c 
F:	include/linux/altera_uart.h

F:	include/linux/altera_jtaguart.h



AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER

M:	Tom Lendacky <thomas.lendacky@amd.com>

L:	linux-crypto@vger.kernel.org

S:	Supported

F:	drivers/crypto/ccp/

F:	include/linux/ccp.h



AMD FAM15H PROCESSOR POWER MONITORING DRIVER

M:	Andreas Herrmann <herrmann.der.user@googlemail.com>

L:	lm-sensors@lm-sensors.org

arch/arm/boot/dts/imx23.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -337,8 +337,10 @@ 
			};



			dcp@80028000 {

				compatible = "fsl,imx23-dcp";

				reg = <0x80028000 0x2000>;

				status = "disabled";

				interrupts = <53 54>;

				status = "okay";

			};



			pxp@8002a000 {

arch/arm/boot/dts/imx28.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -813,9 +813,10 @@ 
			};



			dcp: dcp@80028000 {

				compatible = "fsl,imx28-dcp", "fsl,imx23-dcp";

				reg = <0x80028000 0x2000>;

				interrupts = <52 53 54>;

				compatible = "fsl-dcp";

				status = "okay";

			};



			pxp: pxp@8002a000 {

arch/s390/crypto/des_s390.c

+3 −3
Original line number Diff line number Diff line
@@ -237,8 +237,8 @@ static int des3_setkey(struct crypto_tfm *tfm, const u8 *key, 
	struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);

	u32 *flags = &tfm->crt_flags;



	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&

	    memcmp(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2],

	if (!(crypto_memneq(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&

	    crypto_memneq(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2],

			  DES_KEY_SIZE)) &&

	    (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {

		*flags |= CRYPTO_TFM_RES_WEAK_KEY;

CRA Git | Maintained and supported by SUSTech CRA and CCSE