Commit 3604a7f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull crypto updates from Herbert Xu:
 "API:
   - Feed untrusted RNGs into /dev/random
   - Allow HWRNG sleeping to be more interruptible
   - Create lib/utils module
   - Setting private keys no longer required for akcipher
   - Remove tcrypt mode=1000
   - Reorganised Kconfig entries

  Algorithms:
   - Load x86/sha512 based on CPU features
   - Add AES-NI/AVX/x86_64/GFNI assembler implementation of aria cipher

  Drivers:
   - Add HACE crypto driver aspeed"

* tag 'v6.1-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (124 commits)
  crypto: aspeed - Remove redundant dev_err call
  crypto: scatterwalk - Remove unused inline function scatterwalk_aligned()
  crypto: aead - Remove unused inline functions from aead
  crypto: bcm - Simplify obtain the name for cipher
  crypto: marvell/octeontx - use sysfs_emit() to instead of scnprintf()
  hwrng: core - start hwrng kthread also for untrusted sources
  crypto: zip - remove the unneeded result variable
  crypto: qat - add limit to linked list parsing
  crypto: octeontx2 - Remove the unneeded result variable
  crypto: ccp - Remove the unneeded result variable
  crypto: aspeed - Fix check for platform_get_irq() errors
  crypto: virtio - fix memory-leak
  crypto: cavium - prevent integer overflow loading firmware
  crypto: marvell/octeontx - prevent integer overflows
  crypto: aspeed - fix build error when only CRYPTO_DEV_ASPEED is enabled
  crypto: hisilicon/qm - fix the qos value initialization
  crypto: sun4i-ss - use DEFINE_SHOW_ATTRIBUTE to simplify sun4i_ss_debugfs
  crypto: tcrypt - add async speed test for aria cipher
  crypto: aria-avx - add AES-NI/AVX/x86_64/GFNI assembler implementation of aria cipher
  crypto: aria - prepare generic module for optimized implementations
  ...
parents d4013bc4 b411b1a0

Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml

0 → 100644
+53 −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/aspeed,ast2500-hace.yaml#

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



title: ASPEED HACE hash and crypto Hardware Accelerator Engines



maintainers:

  - Neal Liu <neal_liu@aspeedtech.com>



description: |

  The Hash and Crypto Engine (HACE) is designed to accelerate the throughput

  of hash data digest, encryption, and decryption. Basically, HACE can be

  divided into two independently engines - Hash Engine and Crypto Engine.



properties:

  compatible:

    enum:

      - aspeed,ast2500-hace

      - aspeed,ast2600-hace



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  interrupts:

    maxItems: 1



  resets:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - interrupts

  - resets



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/ast2600-clock.h>

    hace: crypto@1e6d0000 {

        compatible = "aspeed,ast2600-hace";

        reg = <0x1e6d0000 0x200>;

        interrupts = <4>;

        clocks = <&syscon ASPEED_CLK_GATE_YCLK>;

        resets = <&syscon ASPEED_RESET_HACE>;

    };

Documentation/virt/kvm/x86/amd-memory-encryption.rst

+2 −3
Original line number Diff line number Diff line
@@ -89,9 +89,8 @@ context. In a typical workflow, this command should be the first command issued. 


The firmware can be initialized either by using its own non-volatile storage or

the OS can manage the NV storage for the firmware using the module parameter

``init_ex_path``. The file specified by ``init_ex_path`` must exist. To create

a new NV storage file allocate the file with 32KB bytes of 0xFF as required by

the SEV spec.

``init_ex_path``. If the file specified by ``init_ex_path`` does not exist or

is invalid, the OS will create or override the file with output from PSP.



Returns: 0 on success, -negative on error

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -3237,6 +3237,13 @@ S: Maintained 
F:	Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml

F:	drivers/usb/gadget/udc/aspeed_udc.c









ASPEED CRYPTO DRIVER









M:	Neal Liu <neal_liu@aspeedtech.com>









L:	linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)









S:	Maintained









F:	Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml









F:	drivers/crypto/aspeed/

















ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS









M:	Corentin Chary <corentin.chary@gmail.com>









L:	acpi4asus-user@lists.sourceforge.net
































arch/arm/Kconfig



+0
−4






























Original line number
Diff line number
Diff line







@@ -1850,8 +1850,4 @@ config ARCH_HIBERNATION_POSSIBLE

















endmenu



















if CRYPTO









source "arch/arm/crypto/Kconfig"









endif



















source "arch/arm/Kconfig.assembler"
























arch/arm/boot/dts/aspeed-g5.dtsi



+8
−0






























Original line number
Diff line number
Diff line







@@ -262,6 +262,14 @@







				quality = <100>;









			};



















			hace: crypto@1e6e3000 {









				compatible = "aspeed,ast2500-hace";









				reg = <0x1e6e3000 0x100>;









				interrupts = <4>;









				clocks = <&syscon ASPEED_CLK_GATE_YCLK>;









				resets = <&syscon ASPEED_RESET_HACE>;









			};



















			gfx: display@1e6e6000 {









				compatible = "aspeed,ast2500-gfx", "syscon";









				reg = <0x1e6e6000 0x1000>;