Commit 31caf8b2 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:
   - Restrict crypto_cipher to internal API users only.

  Algorithms:
   - Add x86 aesni acceleration for cts.
   - Improve x86 aesni acceleration for xts.
   - Remove x86 acceleration of some uncommon algorithms.
   - Remove RIPE-MD, Tiger and Salsa20.
   - Remove tnepres.
   - Add ARM acceleration for BLAKE2s and BLAKE2b.

  Drivers:
   - Add Keem Bay OCS HCU driver.
   - Add Marvell OcteonTX2 CPT PF driver.
   - Remove PicoXcell driver.
   - Remove mediatek driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (154 commits)
  hwrng: timeriomem - Use device-managed registration API
  crypto: hisilicon/qm - fix printing format issue
  crypto: hisilicon/qm - do not reset hardware when CE happens
  crypto: hisilicon/qm - update irqflag
  crypto: hisilicon/qm - fix the value of 'QM_SQC_VFT_BASE_MASK_V2'
  crypto: hisilicon/qm - fix request missing error
  crypto: hisilicon/qm - removing driver after reset
  crypto: octeontx2 - fix -Wpointer-bool-conversion warning
  crypto: hisilicon/hpre - enable Elliptic curve cryptography
  crypto: hisilicon - PASID fixed on Kunpeng 930
  crypto: hisilicon/qm - fix use of 'dma_map_single'
  crypto: hisilicon/hpre - tiny fix
  crypto: hisilicon/hpre - adapt the number of clusters
  crypto: cpt - remove casting dma_alloc_coherent
  crypto: keembay-ocs-aes - Fix 'q' assignment during CCM B0 generation
  crypto: xor - Fix typo of optimization
  hwrng: optee - Use device-managed registration API
  crypto: arm64/crc-t10dif - move NEON yield to C code
  crypto: arm64/aes-ce-mac - simplify NEON yield
  crypto: arm64/aes-neonbs - remove NEON yield calls
  ...
parents a2b095e0 0de9dc80

.mailmap

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ Juha Yrjola <at solidboot.com> 
Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Kamil Konieczny <k.konieczny@samsung.com> <k.konieczny@partner.samsung.com>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>

Kees Cook <keescook@chromium.org> <keescook@google.com>

Documentation/admin-guide/device-mapper/dm-integrity.rst

+2 −2
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ recalculate 
journal_crypt:algorithm(:key)	(the key is optional)

	Encrypt the journal using given algorithm to make sure that the

	attacker can't read the journal. You can use a block cipher here

	(such as "cbc(aes)") or a stream cipher (for example "chacha20",

	"salsa20" or "ctr(aes)").

	(such as "cbc(aes)") or a stream cipher (for example "chacha20"

	or "ctr(aes)").



	The journal contains history of last writes to the block device,

	an attacker reading the journal could see the last sector numbers

Documentation/crypto/api-skcipher.rst

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ Symmetric Key Cipher Request Handle 
Single Block Cipher API

-----------------------



.. kernel-doc:: include/linux/crypto.h

.. kernel-doc:: include/crypto/internal/cipher.h

   :doc: Single Block Cipher API



.. kernel-doc:: include/linux/crypto.h

.. kernel-doc:: include/crypto/internal/cipher.h

   :functions: crypto_alloc_cipher crypto_free_cipher crypto_has_cipher crypto_cipher_blocksize crypto_cipher_setkey crypto_cipher_encrypt_one crypto_cipher_decrypt_one

Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml

0 → 100644
+46 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/crypto/intel,keembay-ocs-hcu.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Intel Keem Bay OCS HCU Device Tree Bindings



maintainers:

  - Declan Murphy <declan.murphy@intel.com>

  - Daniele Alessandrelli <daniele.alessandrelli@intel.com>



description:

  The Intel Keem Bay Offload and Crypto Subsystem (OCS) Hash Control Unit (HCU)

  provides hardware-accelerated hashing and HMAC.



properties:

  compatible:

    const: intel,keembay-ocs-hcu



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    crypto@3000b000 {

      compatible = "intel,keembay-ocs-hcu";

      reg = <0x3000b000 0x1000>;

      interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;

      clocks = <&scmi_clk 94>;

    };

Documentation/devicetree/bindings/crypto/samsung-slimsss.yaml

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ title: Samsung Exynos SoC SlimSSS (Slim Security SubSystem) module 


maintainers:

  - Krzysztof Kozlowski <krzk@kernel.org>

  - Kamil Konieczny <k.konieczny@partner.samsung.com>



description: |+

  The SlimSSS module in Exynos5433 SoC supports the following: