Skip to content

Commit 2b1768f

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller: "Several build/bug fixes for sparc, including: 1) Configuring a mix of static vs. modular sparc64 crypto modules didn't work, remove an ill-conceived attempt to only have to build the device match table for these drivers once to fix the problem. Reported by Meelis Roos. 2) Make the montgomery multiple/square and mpmul instructions actually usable in 32-bit tasks. Essentially this involves providing 32-bit userspace with a way to use a 64-bit stack when it needs to. 3) Our sparc64 atomic backoffs don't yield cpu strands properly on Niagara chips. Use pause instruction when available to achieve this, otherwise use a benign instruction we know blocks the strand for some time. 4) Wire up kcmp 5) Fix the build of various drivers by removing the unnecessary blocking of OF_GPIO when SPARC. 6) Fix unintended regression wherein of_address_to_resource stopped being provided. Fix from Andreas Larsson. 7) Fix NULL dereference in leon_handle_ext_irq(), also from Andreas Larsson." * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Fix build with mix of modular vs. non-modular crypto drivers. sparc: Support atomic64_dec_if_positive properly. of/address: sparc: Declare of_address_to_resource() as an extern function for sparc again sparc32, leon: Check for existent irq_map entry in leon_handle_ext_irq sparc: Add sparc support for platform_get_irq() sparc: Allow OF_GPIO on sparc. qlogicpti: Fix build warning. sparc: Wire up sys_kcmp. sparc64: Improvde documentation and readability of atomic backoff code. sparc64: Use pause instruction when available. sparc64: Fix cpu strand yielding. sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.
2 parents affd9a8 + 226f7ce commit 2b1768f

38 files changed

+291
-97
lines changed

arch/sparc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ config SPARC
2020
select HAVE_ARCH_TRACEHOOK
2121
select SYSCTL_EXCEPTION_TRACE
2222
select ARCH_WANT_OPTIONAL_GPIOLIB
23+
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
2324
select RTC_CLASS
2425
select RTC_DRV_M48T59
2526
select HAVE_IRQ_WORK

arch/sparc/crypto/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ obj-$(CONFIG_CRYPTO_DES_SPARC64) += camellia-sparc64.o
1313

1414
obj-$(CONFIG_CRYPTO_CRC32C_SPARC64) += crc32c-sparc64.o
1515

16-
sha1-sparc64-y := sha1_asm.o sha1_glue.o crop_devid.o
17-
sha256-sparc64-y := sha256_asm.o sha256_glue.o crop_devid.o
18-
sha512-sparc64-y := sha512_asm.o sha512_glue.o crop_devid.o
19-
md5-sparc64-y := md5_asm.o md5_glue.o crop_devid.o
16+
sha1-sparc64-y := sha1_asm.o sha1_glue.o
17+
sha256-sparc64-y := sha256_asm.o sha256_glue.o
18+
sha512-sparc64-y := sha512_asm.o sha512_glue.o
19+
md5-sparc64-y := md5_asm.o md5_glue.o
2020

21-
aes-sparc64-y := aes_asm.o aes_glue.o crop_devid.o
22-
des-sparc64-y := des_asm.o des_glue.o crop_devid.o
23-
camellia-sparc64-y := camellia_asm.o camellia_glue.o crop_devid.o
21+
aes-sparc64-y := aes_asm.o aes_glue.o
22+
des-sparc64-y := des_asm.o des_glue.o
23+
camellia-sparc64-y := camellia_asm.o camellia_glue.o
2424

25-
crc32c-sparc64-y := crc32c_asm.o crc32c_glue.o crop_devid.o
25+
crc32c-sparc64-y := crc32c_asm.o crc32c_glue.o

arch/sparc/crypto/aes_glue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,3 +475,5 @@ MODULE_LICENSE("GPL");
475475
MODULE_DESCRIPTION("AES Secure Hash Algorithm, sparc64 aes opcode accelerated");
476476

477477
MODULE_ALIAS("aes");
478+
479+
#include "crop_devid.c"

arch/sparc/crypto/camellia_glue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,3 +320,5 @@ MODULE_LICENSE("GPL");
320320
MODULE_DESCRIPTION("Camellia Cipher Algorithm, sparc64 camellia opcode accelerated");
321321

322322
MODULE_ALIAS("aes");
323+
324+
#include "crop_devid.c"

arch/sparc/crypto/crc32c_glue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,5 @@ MODULE_LICENSE("GPL");
177177
MODULE_DESCRIPTION("CRC32c (Castagnoli), sparc64 crc32c opcode accelerated");
178178

179179
MODULE_ALIAS("crc32c");
180+
181+
#include "crop_devid.c"

arch/sparc/crypto/des_glue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,3 +527,5 @@ MODULE_LICENSE("GPL");
527527
MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms, sparc64 des opcode accelerated");
528528

529529
MODULE_ALIAS("des");
530+
531+
#include "crop_devid.c"

arch/sparc/crypto/md5_glue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,3 +186,5 @@ MODULE_LICENSE("GPL");
186186
MODULE_DESCRIPTION("MD5 Secure Hash Algorithm, sparc64 md5 opcode accelerated");
187187

188188
MODULE_ALIAS("md5");
189+
190+
#include "crop_devid.c"

arch/sparc/crypto/sha1_glue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,5 @@ MODULE_LICENSE("GPL");
181181
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, sparc64 sha1 opcode accelerated");
182182

183183
MODULE_ALIAS("sha1");
184+
185+
#include "crop_devid.c"

arch/sparc/crypto/sha256_glue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,5 @@ MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm, sparc64 sha256 op
239239

240240
MODULE_ALIAS("sha224");
241241
MODULE_ALIAS("sha256");
242+
243+
#include "crop_devid.c"

arch/sparc/crypto/sha512_glue.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,3 +224,5 @@ MODULE_DESCRIPTION("SHA-384 and SHA-512 Secure Hash Algorithm, sparc64 sha512 op
224224

225225
MODULE_ALIAS("sha384");
226226
MODULE_ALIAS("sha512");
227+
228+
#include "crop_devid.c"

0 commit comments

Comments
 (0)