Commit 454cb977 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.14-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto updates from Herbert Xu:
 "API:
   - Remove physical address skcipher walking
   - Fix boot-up self-test race

  Algorithms:
   - Optimisations for x86/aes-gcm
   - Optimisations for x86/aes-xts
   - Remove VMAC
   - Remove keywrap

  Drivers:
   - Remove n2

  Others:
   - Fixes for padata UAF
   - Fix potential rhashtable deadlock by moving schedule_work outside
     lock"

* tag 'v6.14-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (75 commits)
  rhashtable: Fix rhashtable_try_insert test
  dt-bindings: crypto: qcom,inline-crypto-engine: Document the SM8750 ICE
  dt-bindings: crypto: qcom,prng: Document SM8750 RNG
  dt-bindings: crypto: qcom-qce: Document the SM8750 crypto engine
  crypto: asymmetric_keys - Remove unused key_being_used_for[]
  padata: avoid UAF for reorder_work
  padata: fix UAF in padata_reorder
  padata: add pd get/put refcnt helper
  crypto: skcipher - call cond_resched() directly
  crypto: skcipher - optimize initializing skcipher_walk fields
  crypto: skcipher - clean up initialization of skcipher_walk::flags
  crypto: skcipher - fold skcipher_walk_skcipher() into skcipher_walk_virt()
  crypto: skcipher - remove redundant check for SKCIPHER_WALK_SLOW
  crypto: skcipher - remove redundant clamping to page size
  crypto: skcipher - remove unnecessary page alignment of bounce buffer
  crypto: skcipher - document skcipher_walk_done() and rename some vars
  crypto: omap - switch from scatter_walk to plain offset
  crypto: powerpc/p10-aes-gcm - simplify handling of linear associated data
  crypto: bcm - Drop unused setting of local 'ptr' variable
  crypto: hisilicon/qm - support new function communication
  ...
parents ae2d4fc5 9d4f8e54

Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml

+2 −0
Original line number Diff line number Diff line
@@ -13,12 +13,14 @@ properties: 
  compatible:

    items:

      - enum:

          - qcom,qcs8300-inline-crypto-engine

          - qcom,sa8775p-inline-crypto-engine

          - qcom,sc7180-inline-crypto-engine

          - qcom,sc7280-inline-crypto-engine

          - qcom,sm8450-inline-crypto-engine

          - qcom,sm8550-inline-crypto-engine

          - qcom,sm8650-inline-crypto-engine

          - qcom,sm8750-inline-crypto-engine

      - const: qcom,inline-crypto-engine



  reg:

Documentation/devicetree/bindings/crypto/qcom,prng.yaml

+5 −0
Original line number Diff line number Diff line
@@ -17,12 +17,17 @@ properties: 
          - qcom,prng-ee  # 8996 and later using EE

      - items:

          - enum:

              - qcom,ipq5332-trng

              - qcom,ipq5424-trng

              - qcom,ipq9574-trng

              - qcom,qcs8300-trng

              - qcom,sa8255p-trng

              - qcom,sa8775p-trng

              - qcom,sc7280-trng

              - qcom,sm8450-trng

              - qcom,sm8550-trng

              - qcom,sm8650-trng

              - qcom,sm8750-trng

          - const: qcom,trng



  reg:

Documentation/devicetree/bindings/crypto/qcom-qce.yaml

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ properties: 


      - items:

          - enum:

              - qcom,qcs8300-qce

              - qcom,sa8775p-qce

              - qcom,sc7280-qce

              - qcom,sm6350-qce
@@ -53,6 +54,7 @@ properties: 
              - qcom,sm8450-qce

              - qcom,sm8550-qce

              - qcom,sm8650-qce

              - qcom,sm8750-qce

          - const: qcom,sm8150-qce

          - const: qcom,qce

Documentation/driver-api/crypto/iaa/iaa-crypto.rst

+8 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ The available attributes are: 
      echo async_irq > /sys/bus/dsa/drivers/crypto/sync_mode



    Async mode without interrupts (caller must poll) can be enabled by

    writing 'async' to it::

    writing 'async' to it (please see Caveat)::



      echo async > /sys/bus/dsa/drivers/crypto/sync_mode
@@ -283,6 +283,13 @@ The available attributes are: 


    The default mode is 'sync'.



    Caveat: since the only mechanism that iaa_crypto currently implements

    for async polling without interrupts is via the 'sync' mode as

    described earlier, writing 'async' to

    '/sys/bus/dsa/drivers/crypto/sync_mode' will internally enable the

    'sync' mode. This is to ensure correct iaa_crypto behavior until true

    async polling without interrupts is enabled in iaa_crypto.



.. _iaa_default_config:



IAA Default Configuration

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -20164,7 +20164,7 @@ F: net/rfkill/ 
RHASHTABLE

M:	Thomas Graf <tgraf@suug.ch>

M:	Herbert Xu <herbert@gondor.apana.org.au>

L:	netdev@vger.kernel.org

L:	linux-crypto@vger.kernel.org

S:	Maintained

F:	include/linux/rhashtable-types.h

F:	include/linux/rhashtable.h