Commit 9a07a796 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 update from Herbert Xu:
 "API:

   - Crypto self tests can now be disabled at boot/run time.
   - Add async support to algif_aead.

  Algorithms:

   - A large number of fixes to MPI from Nicolai Stange.
   - Performance improvement for HMAC DRBG.

  Drivers:

   - Use generic crypto engine in omap-des.
   - Merge ppc4xx-rng and crypto4xx drivers.
   - Fix lockups in sun4i-ss driver by disabling IRQs.
   - Add DMA engine support to ccp.
   - Reenable talitos hash algorithms.
   - Add support for Hisilicon SoC RNG.
   - Add basic crypto driver for the MXC SCC.

  Others:

   - Do not allocate crypto hash tfm in NORECLAIM context in ecryptfs"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (77 commits)
  crypto: qat - change the adf_ctl_stop_devices to void
  crypto: caam - fix caam_jr_alloc() ret code
  crypto: vmx - comply with ABIs that specify vrsave as reserved.
  crypto: testmgr - Add a flag allowing the self-tests to be disabled at runtime.
  crypto: ccp - constify ccp_actions structure
  crypto: marvell/cesa - Use dma_pool_zalloc
  crypto: qat - make adf_vf_isr.c dependant on IOV config
  crypto: qat - Fix typo in comments
  lib: asn1_decoder - add MODULE_LICENSE("GPL")
  crypto: omap-sham - Use dma_request_chan() for requesting DMA channel
  crypto: omap-des - Use dma_request_chan() for requesting DMA channel
  crypto: omap-aes - Use dma_request_chan() for requesting DMA channel
  crypto: omap-des - Integrate with the crypto engine framework
  crypto: s5p-sss - fix incorrect usage of scatterlists api
  crypto: s5p-sss - Fix missed interrupts when working with 8 kB blocks
  crypto: s5p-sss - Use common BIT macro
  crypto: mxc-scc - fix unwinding in mxc_scc_crypto_register()
  crypto: mxc-scc - signedness bugs in mxc_scc_ablkcipher_req_init()
  crypto: talitos - fix ahash algorithms registration
  crypto: ccp - Ensure all dependencies are specified
  ...
parents 16490980 256b1cfb

Documentation/DocBook/crypto-API.tmpl

+3 −3
Original line number Diff line number Diff line
@@ -1936,9 +1936,9 @@ static int test_skcipher(void) 
	}



	req = skcipher_request_alloc(skcipher, GFP_KERNEL);

	if (IS_ERR(req)) {

		pr_info("could not allocate request queue\n");

		ret = PTR_ERR(req);

	if (!req) {

		pr_info("could not allocate skcipher request\n");

		ret = -ENOMEM;

		goto out;

	}

Documentation/devicetree/bindings/crypto/fsl-imx-scc.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Freescale Security Controller (SCC)



Required properties:

- compatible : Should be "fsl,imx25-scc".

- reg : Should contain register location and length.

- interrupts : Should contain interrupt numbers for SCM IRQ and SMN IRQ.

- interrupt-names : Should specify the names "scm" and "smn" for the

		    SCM IRQ and SMN IRQ.

- clocks: Should contain the clock driving the SCC core.

- clock-names: Should be set to "ipg".



Example:



	scc: crypto@53fac000 {

		compatible = "fsl,imx25-scc";

		reg = <0x53fac000 0x4000>;

		clocks = <&clks 111>;

		clock-names = "ipg";

		interrupts = <49>, <50>;

		interrupt-names = "scm", "smn";

	};

Documentation/devicetree/bindings/crypto/samsung-sss.txt

+2 −4
Original line number Diff line number Diff line
@@ -23,10 +23,8 @@ Required properties: 
  - "samsung,exynos4210-secss" for Exynos4210, Exynos4212, Exynos4412, Exynos5250,

		Exynos5260 and Exynos5420 SoCs.

- reg : Offset and length of the register set for the module

- interrupts : interrupt specifiers of SSS module interrupts, should contain

		following entries:

		- first : feed control interrupt (required for all variants),

		- second : hash interrupt (required only for samsung,s5pv210-secss).

- interrupts : interrupt specifiers of SSS module interrupts (one feed

		control interrupt).



- clocks : list of clock phandle and specifier pairs for all clocks  listed in

		clock-names property.

Documentation/devicetree/bindings/rng/hisi-rng.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Hisilicon Random Number Generator



Required properties:

- compatible : Should be "hisilicon,hip04-rng" or "hisilicon,hip05-rng"

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



Example:



rng@d1010000 {

	compatible = "hisilicon,hip05-rng";

	reg = <0xd1010000 0x100>;

};

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -838,6 +838,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			It will be ignored when crashkernel=X,high is not used

			or memory reserved is below 4G.



	cryptomgr.notests

                        [KNL] Disable crypto self-tests



	cs89x0_dma=	[HW,NET]

			Format: <dma>

CRA Git | Maintained and supported by SUSTech CRA and CCSE