Commit a4a78bc8 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:
 "API:

   - crypto_destroy_tfm now ignores errors as well as NULL pointers

  Algorithms:

   - Add explicit curve IDs in ECDH algorithm names

   - Add NIST P384 curve parameters

   - Add ECDSA

  Drivers:

   - Add support for Green Sardine in ccp

   - Add ecdh/curve25519 to hisilicon/hpre

   - Add support for AM64 in sa2ul"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (184 commits)
  fsverity: relax build time dependency on CRYPTO_SHA256
  fscrypt: relax Kconfig dependencies for crypto API algorithms
  crypto: camellia - drop duplicate "depends on CRYPTO"
  crypto: s5p-sss - consistently use local 'dev' variable in probe()
  crypto: s5p-sss - remove unneeded local variable initialization
  crypto: s5p-sss - simplify getting of_device_id match data
  ccp: ccp - add support for Green Sardine
  crypto: ccp - Make ccp_dev_suspend and ccp_dev_resume void functions
  crypto: octeontx2 - add support for OcteonTX2 98xx CPT block.
  crypto: chelsio/chcr - Remove useless MODULE_VERSION
  crypto: ux500/cryp - Remove duplicate argument
  crypto: chelsio - remove unused function
  crypto: sa2ul - Add support for AM64
  crypto: sa2ul - Support for per channel coherency
  dt-bindings: crypto: ti,sa2ul: Add new compatible for AM64
  crypto: hisilicon - enable new error types for QM
  crypto: hisilicon - add new error type for SEC
  crypto: hisilicon - support new error types for ZIP
  crypto: hisilicon - dynamic configuration 'err_info'
  crypto: doc - fix kernel-doc notation in chacha.c and af_alg.c
  ...
parents ffc766b3 e3a606f2

Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml

+23 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ properties: 
    enum:

      - ti,j721e-sa2ul

      - ti,am654-sa2ul

      - ti,am64-sa2ul



  reg:

    maxItems: 1
@@ -45,6 +46,18 @@ properties: 
    description:

      Address translation for the possible RNG child node for SA2UL



  clocks:

    items:

      - description: Clock used by PKA

      - description: Main Input Clock

      - description: Clock used by rng



  clock-names:

    items:

      - const: pka_in_clk

      - const: x1_clk

      - const: x2_clk



patternProperties:

  "^rng@[a-f0-9]+$":

    type: object
@@ -57,6 +70,15 @@ required: 
  - power-domains

  - dmas

  - dma-names



if:

  properties:

    compatible:

      enum:

        - ti,j721e-sa2ul

        - ti,am654-sa2ul

then:

  required:

    - dma-coherent



additionalProperties: false

Documentation/devicetree/bindings/rng/brcm,bcm2835.yaml

+21 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ properties: 
  clock-names:

    const: ipsec



  resets:

    maxItems: 1



  reset-names:

    const: ipsec



  interrupts:

    maxItems: 1
@@ -35,6 +41,18 @@ required: 
  - compatible

  - reg



if:

  properties:

    compatible:

      enum:

        - brcm,bcm6368-rng

then:

  required:

    - clocks

    - clock-names

    - resets

    - reset-names



additionalProperties: false



examples:
@@ -58,4 +76,7 @@ examples: 


        clocks = <&periph_clk 18>;

        clock-names = "ipsec";



        resets = <&periph_rst 4>;

        reset-names = "ipsec";

    };

arch/arm/crypto/aes-cipher-core.S

+10 −32
Original line number Diff line number Diff line
@@ -99,28 +99,6 @@ 
	__hround	\out2, \out3, \in2, \in1, \in0, \in3, \in1, \in0, 0, \sz, \op, \oldcpsr

	.endm



	.macro		__rev, out, in

	.if		__LINUX_ARM_ARCH__ < 6

	lsl		t0, \in, #24

	and		t1, \in, #0xff00

	and		t2, \in, #0xff0000

	orr		\out, t0, \in, lsr #24

	orr		\out, \out, t1, lsl #8

	orr		\out, \out, t2, lsr #8

	.else

	rev		\out, \in

	.endif

	.endm



	.macro		__adrl, out, sym, c

	.if		__LINUX_ARM_ARCH__ < 7

	ldr\c		\out, =\sym

	.else

	movw\c		\out, #:lower16:\sym

	movt\c		\out, #:upper16:\sym

	.endif

	.endm



	.macro		do_crypt, round, ttab, ltab, bsz

	push		{r3-r11, lr}
@@ -133,10 +111,10 @@ 
	ldr		r7, [in, #12]



#ifdef CONFIG_CPU_BIG_ENDIAN

	__rev		r4, r4

	__rev		r5, r5

	__rev		r6, r6

	__rev		r7, r7

	rev_l		r4, t0

	rev_l		r5, t0

	rev_l		r6, t0

	rev_l		r7, t0

#endif



	eor		r4, r4, r8
@@ -144,7 +122,7 @@ 
	eor		r6, r6, r10

	eor		r7, r7, r11



	__adrl		ttab, \ttab

	mov_l		ttab, \ttab

	/*

	 * Disable interrupts and prefetch the 1024-byte 'ft' or 'it' table into

	 * L1 cache, assuming cacheline size >= 32.  This is a hardening measure
@@ -180,7 +158,7 @@ 
2:	.ifb		\ltab

	add		ttab, ttab, #1

	.else

	__adrl		ttab, \ltab

	mov_l		ttab, \ltab

	// Prefetch inverse S-box for final round; see explanation above

	.set		i, 0

	.rept		256 / 64
@@ -194,10 +172,10 @@ 
	\round		r4, r5, r6, r7, r8, r9, r10, r11, \bsz, b, rounds



#ifdef CONFIG_CPU_BIG_ENDIAN

	__rev		r4, r4

	__rev		r5, r5

	__rev		r6, r6

	__rev		r7, r7

	rev_l		r4, t0

	rev_l		r5, t0

	rev_l		r6, t0

	rev_l		r7, t0

#endif



	ldr		out, [sp]

arch/arm/crypto/blake2b-neon-glue.c

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int __init blake2b_neon_mod_init(void) 


static void __exit blake2b_neon_mod_exit(void)

{

	return crypto_unregister_shashes(blake2b_neon_algs,

	crypto_unregister_shashes(blake2b_neon_algs,

				  ARRAY_SIZE(blake2b_neon_algs));

}

arch/arm/crypto/blake2s-core.S

+21 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/linkage.h>

#include <asm/assembler.h>



	// Registers used to hold message words temporarily.  There aren't

	// enough ARM registers to hold the whole message block, so we have to
@@ -38,6 +39,23 @@ 
#endif

.endm



.macro _le32_bswap	a, tmp

#ifdef __ARMEB__

	rev_l		\a, \tmp

#endif

.endm



.macro _le32_bswap_8x	a, b, c, d, e, f, g, h,  tmp

	_le32_bswap	\a, \tmp

	_le32_bswap	\b, \tmp

	_le32_bswap	\c, \tmp

	_le32_bswap	\d, \tmp

	_le32_bswap	\e, \tmp

	_le32_bswap	\f, \tmp

	_le32_bswap	\g, \tmp

	_le32_bswap	\h, \tmp

.endm



// Execute a quarter-round of BLAKE2s by mixing two columns or two diagonals.

// (a0, b0, c0, d0) and (a1, b1, c1, d1) give the registers containing the two

// columns/diagonals.  s0-s1 are the word offsets to the message words the first
@@ -180,8 +198,10 @@ ENTRY(blake2s_compress_arch) 
	tst		r1, #3

	bne		.Lcopy_block_misaligned

	ldmia		r1!, {r2-r9}

	_le32_bswap_8x	r2, r3, r4, r5, r6, r7, r8, r9,  r14

	stmia		r12!, {r2-r9}

	ldmia		r1!, {r2-r9}

	_le32_bswap_8x	r2, r3, r4, r5, r6, r7, r8, r9,  r14

	stmia		r12, {r2-r9}

.Lcopy_block_done:

	str		r1, [sp, #68]		// Update message pointer
@@ -268,6 +288,7 @@ ENTRY(blake2s_compress_arch) 
1:

#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS

	ldr		r3, [r1], #4

	_le32_bswap	r3, r4

#else

	ldrb		r3, [r1, #0]

	ldrb		r4, [r1, #1]