Skip to content

Commit 3604a7f

Browse files
torvaldstorvalds
committed
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 ...
2 parents d4013bc + b411b1a commit 3604a7f

File tree

116 files changed

+9048
-2965
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+9048
-2965
lines changed

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/crypto/aspeed,ast2500-hace.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ASPEED HACE hash and crypto Hardware Accelerator Engines
8+
9+
maintainers:
10+
- Neal Liu <neal_liu@aspeedtech.com>
11+
12+
description: |
13+
The Hash and Crypto Engine (HACE) is designed to accelerate the throughput
14+
of hash data digest, encryption, and decryption. Basically, HACE can be
15+
divided into two independently engines - Hash Engine and Crypto Engine.
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- aspeed,ast2500-hace
21+
- aspeed,ast2600-hace
22+
23+
reg:
24+
maxItems: 1
25+
26+
clocks:
27+
maxItems: 1
28+
29+
interrupts:
30+
maxItems: 1
31+
32+
resets:
33+
maxItems: 1
34+
35+
required:
36+
- compatible
37+
- reg
38+
- clocks
39+
- interrupts
40+
- resets
41+
42+
additionalProperties: false
43+
44+
examples:
45+
- |
46+
#include <dt-bindings/clock/ast2600-clock.h>
47+
hace: crypto@1e6d0000 {
48+
compatible = "aspeed,ast2600-hace";
49+
reg = <0x1e6d0000 0x200>;
50+
interrupts = <4>;
51+
clocks = <&syscon ASPEED_CLK_GATE_YCLK>;
52+
resets = <&syscon ASPEED_RESET_HACE>;
53+
};

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,8 @@ context. In a typical workflow, this command should be the first command issued.
8989

9090
The firmware can be initialized either by using its own non-volatile storage or
9191
the OS can manage the NV storage for the firmware using the module parameter
92-
``init_ex_path``. The file specified by ``init_ex_path`` must exist. To create
93-
a new NV storage file allocate the file with 32KB bytes of 0xFF as required by
94-
the SEV spec.
92+
``init_ex_path``. If the file specified by ``init_ex_path`` does not exist or
93+
is invalid, the OS will create or override the file with output from PSP.
9594

9695
Returns: 0 on success, -negative on error
9796

‎MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3237,6 +3237,13 @@ S: Maintained
32373237
F: Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml
32383238
F: drivers/usb/gadget/udc/aspeed_udc.c
32393239

3240+
ASPEED CRYPTO DRIVER
3241+
M: Neal Liu <neal_liu@aspeedtech.com>
3242+
L: linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
3243+
S: Maintained
3244+
F: Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml
3245+
F: drivers/crypto/aspeed/
3246+
32403247
ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
32413248
M: Corentin Chary <corentin.chary@gmail.com>
32423249
L: acpi4asus-user@lists.sourceforge.net

‎arch/arm/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1850,8 +1850,4 @@ config ARCH_HIBERNATION_POSSIBLE
18501850

18511851
endmenu
18521852

1853-
if CRYPTO
1854-
source "arch/arm/crypto/Kconfig"
1855-
endif
1856-
18571853
source "arch/arm/Kconfig.assembler"

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,14 @@
262262
quality = <100>;
263263
};
264264

265+
hace: crypto@1e6e3000 {
266+
compatible = "aspeed,ast2500-hace";
267+
reg = <0x1e6e3000 0x100>;
268+
interrupts = <4>;
269+
clocks = <&syscon ASPEED_CLK_GATE_YCLK>;
270+
resets = <&syscon ASPEED_RESET_HACE>;
271+
};
272+
265273
gfx: display@1e6e6000 {
266274
compatible = "aspeed,ast2500-gfx", "syscon";
267275
reg = <0x1e6e6000 0x1000>;

‎arch/arm/boot/dts/aspeed-g6.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,14 @@
323323
#size-cells = <1>;
324324
ranges;
325325

326+
hace: crypto@1e6d0000 {
327+
compatible = "aspeed,ast2600-hace";
328+
reg = <0x1e6d0000 0x200>;
329+
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
330+
clocks = <&syscon ASPEED_CLK_GATE_YCLK>;
331+
resets = <&syscon ASPEED_RESET_HACE>;
332+
};
333+
326334
syscon: syscon@1e6e2000 {
327335
compatible = "aspeed,ast2600-scu", "syscon", "simple-mfd";
328336
reg = <0x1e6e2000 0x1000>;

‎arch/arm/configs/exynos_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ CONFIG_KERNEL_MODE_NEON=y
3232
CONFIG_PM_DEBUG=y
3333
CONFIG_PM_ADVANCED_DEBUG=y
3434
CONFIG_ENERGY_MODEL=y
35-
CONFIG_ARM_CRYPTO=y
3635
CONFIG_CRYPTO_SHA1_ARM_NEON=m
3736
CONFIG_CRYPTO_SHA256_ARM=m
3837
CONFIG_CRYPTO_SHA512_ARM=m

‎arch/arm/configs/milbeaut_m10v_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ CONFIG_ARM_CPUIDLE=y
4444
CONFIG_VFP=y
4545
CONFIG_NEON=y
4646
CONFIG_KERNEL_MODE_NEON=y
47-
CONFIG_ARM_CRYPTO=y
4847
CONFIG_CRYPTO_SHA1_ARM_NEON=m
4948
CONFIG_CRYPTO_SHA1_ARM_CE=m
5049
CONFIG_CRYPTO_SHA2_ARM_CE=m

‎arch/arm/configs/multi_v7_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ CONFIG_ARM_EXYNOS_CPUIDLE=y
132132
CONFIG_ARM_TEGRA_CPUIDLE=y
133133
CONFIG_ARM_QCOM_SPM_CPUIDLE=y
134134
CONFIG_KERNEL_MODE_NEON=y
135-
CONFIG_ARM_CRYPTO=y
136135
CONFIG_CRYPTO_SHA1_ARM_NEON=m
137136
CONFIG_CRYPTO_SHA1_ARM_CE=m
138137
CONFIG_CRYPTO_SHA2_ARM_CE=m

‎arch/arm/configs/omap2plus_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ CONFIG_CPU_IDLE=y
5353
CONFIG_ARM_CPUIDLE=y
5454
CONFIG_KERNEL_MODE_NEON=y
5555
CONFIG_PM_DEBUG=y
56-
CONFIG_ARM_CRYPTO=y
5756
CONFIG_CRYPTO_SHA1_ARM_NEON=m
5857
CONFIG_CRYPTO_SHA256_ARM=m
5958
CONFIG_CRYPTO_SHA512_ARM=m

‎arch/arm/configs/pxa_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ CONFIG_CPUFREQ_DT=m
3434
CONFIG_ARM_PXA2xx_CPUFREQ=m
3535
CONFIG_CPU_IDLE=y
3636
CONFIG_ARM_CPUIDLE=y
37-
CONFIG_ARM_CRYPTO=y
3837
CONFIG_CRYPTO_SHA1_ARM=m
3938
CONFIG_CRYPTO_SHA256_ARM=m
4039
CONFIG_CRYPTO_SHA512_ARM=m

0 commit comments

Comments
 (0)