Commit 80cee03b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

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

  API:
   - Defer scompress scratch buffer allocation to first use.
   - Add __crypto_xor that takes separte src and dst operands.
   - Add ahash multiple registration interface.
   - Revamped aead/skcipher algif code to fix async IO properly.

  Drivers:
   - Add non-SIMD fallback code path on ARM for SVE.
   - Add AMD Security Processor framework for ccp.
   - Add support for RSA in ccp.
   - Add XTS-AES-256 support for CCP version 5.
   - Add support for PRNG in sun4i-ss.
   - Add support for DPAA2 in caam.
   - Add ARTPEC crypto support.
   - Add Freescale RNGC hwrng support.
   - Add Microchip / Atmel ECC driver.
   - Add support for STM32 HASH module"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (116 commits)
  crypto: af_alg - get_page upon reassignment to TX SGL
  crypto: cavium/nitrox - Fix an error handling path in 'nitrox_probe()'
  crypto: inside-secure - fix an error handling path in safexcel_probe()
  crypto: rockchip - Don't dequeue the request when device is busy
  crypto: cavium - add release_firmware to all return case
  crypto: sahara - constify platform_device_id
  MAINTAINERS: Add ARTPEC crypto maintainer
  crypto: axis - add ARTPEC-6/7 crypto accelerator driver
  crypto: hash - add crypto_(un)register_ahashes()
  dt-bindings: crypto: add ARTPEC crypto
  crypto: algif_aead - fix comment regarding memory layout
  crypto: ccp - use dma_mapping_error to check map error
  lib/mpi: fix build with clang
  crypto: sahara - Remove leftover from previous used spinlock
  crypto: sahara - Fix dma unmap direction
  crypto: af_alg - consolidation of duplicate code
  crypto: caam - Remove unused dentry members
  crypto: ccp - select CONFIG_CRYPTO_RSA
  crypto: ccp - avoid uninitialized variable warning
  crypto: serpent - improve __serpent_setkey with UBSAN
  ...
parents aae3dbb4 2d45a7e8

Documentation/devicetree/bindings/crypto/artpec6-crypto.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
Axis crypto engine with PDMA interface.



Required properties:

- compatible : Should be one of the following strings:

	"axis,artpec6-crypto" for the version in the Axis ARTPEC-6 SoC

	"axis,artpec7-crypto" for the version in the Axis ARTPEC-7 SoC.

- reg: Base address and size for the PDMA register area.

- interrupts: Interrupt handle for the PDMA interrupt line.



Example:



crypto@f4264000 {

	compatible = "axis,artpec6-crypto";

	reg = <0xf4264000 0x1000>;

	interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;

};

Documentation/devicetree/bindings/crypto/atmel-crypto.txt

+13 −0
Original line number Diff line number Diff line
@@ -66,3 +66,16 @@ sha@f8034000 { 
	dmas = <&dma1 2 17>;

	dma-names = "tx";

};



* Eliptic Curve Cryptography (I2C)



Required properties:

- compatible : must be "atmel,atecc508a".

- reg: I2C bus address of the device.

- clock-frequency: must be present in the i2c controller node.



Example:

atecc508a@C0 {

	compatible = "atmel,atecc508a";

	reg = <0xC0>;

};

Documentation/devicetree/bindings/crypto/st,stm32-hash.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
* STMicroelectronics STM32 HASH



Required properties:

- compatible: Should contain entries for this and backward compatible

  HASH versions:

  - "st,stm32f456-hash" for stm32 F456.

  - "st,stm32f756-hash" for stm32 F756.

- reg: The address and length of the peripheral registers space

- interrupts: the interrupt specifier for the HASH

- clocks: The input clock of the HASH instance



Optional properties:

- resets: The input reset of the HASH instance

- dmas: DMA specifiers for the HASH. See the DMA client binding,

	 Documentation/devicetree/bindings/dma/dma.txt

- dma-names: DMA request name. Should be "in" if a dma is present.

- dma-maxburst: Set number of maximum dma burst supported



Example:



hash1: hash@50060400 {

	compatible = "st,stm32f756-hash";

	reg = <0x50060400 0x400>;

	interrupts = <80>;

	clocks = <&rcc 0 STM32F7_AHB2_CLOCK(HASH)>;

	resets = <&rcc STM32F7_AHB2_RESET(HASH)>;

	dmas = <&dma2 7 2 0x400 0x0>;

	dma-names = "in";

	dma-maxburst = <0>;

};

Documentation/devicetree/bindings/rng/imx-rngc.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Freescale RNGC (Random Number Generator Version C)



The driver also supports version B, which is mostly compatible

to version C.



Required properties:

- compatible : should be one of

               "fsl,imx25-rngb"

               "fsl,imx35-rngc"

- reg : offset and length of the register set of this block

- interrupts : the interrupt number for the RNGC block

- clocks : the RNGC clk source



Example:



rng@53fb0000 {

	compatible = "fsl,imx25-rngb";

	reg = <0x53fb0000 0x4000>;

	interrupts = <22>;

	clocks = <&trng_clk>;

};

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -1162,6 +1162,7 @@ L: linux-arm-kernel@axis.com 
F:	arch/arm/mach-artpec

F:	arch/arm/boot/dts/artpec6*

F:	drivers/clk/axis

F:	drivers/crypto/axis

F:	drivers/pinctrl/pinctrl-artpec*

F:	Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
@@ -8770,6 +8771,12 @@ F: drivers/dma/at_hdmac.c 
F:	drivers/dma/at_hdmac_regs.h

F:	include/linux/platform_data/dma-atmel.h



MICROCHIP / ATMEL ECC DRIVER

M:	Tudor Ambarus <tudor.ambarus@microchip.com>

L:	linux-crypto@vger.kernel.org

S:	Maintained

F:	drivers/crypto/atmel-ecc.*



MICROCHIP / ATMEL ISC DRIVER

M:	Songjun Wu <songjun.wu@microchip.com>

L:	linux-media@vger.kernel.org

CRA Git | Maintained and supported by SUSTech CRA and CCSE