2c2fcbd2e0
Manually merged: hack-5.4 230-openwrt_lzma_options.patch bcm27xx 950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch x86 011-tune_lzma_options.patch Remove upstreamed patches in collaboration with Ansuel Smith: ipq806x 093-1-v5.8-ipq806x-PCI-qcom-Add-missing-ipq806x-clocks-in-PCIe-driver.patch 093-2-v5.8-ipq806x-PCI-qcom-Change-duplicate-PCI-reset-to-phy-reset.patch 093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch All other modifications made by update_kernel.sh Build-tested: bcm27xx/bcm2708, ipq806x, x86/64 Run-tested: ipq806x (R7800), x86/64 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [update commit message/tested] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
27 lines
988 B
Diff
27 lines
988 B
Diff
--- a/drivers/crypto/inside-secure/safexcel.h
|
|
+++ b/drivers/crypto/inside-secure/safexcel.h
|
|
@@ -722,6 +722,9 @@ enum safexcel_eip_version {
|
|
/* Priority we use for advertising our algorithms */
|
|
#define SAFEXCEL_CRA_PRIORITY 300
|
|
|
|
+/* System cache line size */
|
|
+#define SYSTEM_CACHELINE_SIZE 64
|
|
+
|
|
/* SM3 digest result for zero length message */
|
|
#define EIP197_SM3_ZEROM_HASH "\x1A\xB2\x1D\x83\x55\xCF\xA1\x7F" \
|
|
"\x8E\x61\x19\x48\x31\xE8\x1A\x8F" \
|
|
--- a/drivers/crypto/inside-secure/safexcel_hash.c
|
|
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
|
|
@@ -57,9 +57,9 @@ struct safexcel_ahash_req {
|
|
u8 block_sz; /* block size, only set once */
|
|
u8 digest_sz; /* output digest size, only set once */
|
|
__le32 state[SHA3_512_BLOCK_SIZE /
|
|
- sizeof(__le32)] __aligned(sizeof(__le32));
|
|
+ sizeof(__le32)] __aligned(SYSTEM_CACHELINE_SIZE);
|
|
|
|
- u64 len;
|
|
+ u64 len __aligned(SYSTEM_CACHELINE_SIZE);
|
|
u64 processed;
|
|
|
|
u8 cache[HASH_CACHE_SIZE] __aligned(sizeof(u32));
|