Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b1768f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents affd9a8d 226f7cea

arch/sparc/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ config SPARC 
	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRACEHOOK

	select SYSCTL_EXCEPTION_TRACE

	select SYSCTL_EXCEPTION_TRACE

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select RTC_CLASS

	select RTC_CLASS

	select RTC_DRV_M48T59

	select RTC_DRV_M48T59

	select HAVE_IRQ_WORK

	select HAVE_IRQ_WORK

arch/sparc/crypto/Makefile

+8 −8
Original line number Original line Diff line number Diff line
@@ -13,13 +13,13 @@ obj-$(CONFIG_CRYPTO_DES_SPARC64) += camellia-sparc64.o 




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

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





sha1-sparc64-y := sha1_asm.o sha1_glue.o crop_devid.o

sha1-sparc64-y := sha1_asm.o sha1_glue.o

sha256-sparc64-y := sha256_asm.o sha256_glue.o crop_devid.o

sha256-sparc64-y := sha256_asm.o sha256_glue.o

sha512-sparc64-y := sha512_asm.o sha512_glue.o crop_devid.o

sha512-sparc64-y := sha512_asm.o sha512_glue.o

md5-sparc64-y := md5_asm.o md5_glue.o crop_devid.o

md5-sparc64-y := md5_asm.o md5_glue.o





aes-sparc64-y := aes_asm.o aes_glue.o crop_devid.o

aes-sparc64-y := aes_asm.o aes_glue.o

des-sparc64-y := des_asm.o des_glue.o crop_devid.o

des-sparc64-y := des_asm.o des_glue.o

camellia-sparc64-y := camellia_asm.o camellia_glue.o crop_devid.o

camellia-sparc64-y := camellia_asm.o camellia_glue.o





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

arch/sparc/crypto/aes_glue.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -475,3 +475,5 @@ MODULE_LICENSE("GPL"); 
MODULE_DESCRIPTION("AES Secure Hash Algorithm, sparc64 aes opcode accelerated");

MODULE_DESCRIPTION("AES Secure Hash Algorithm, sparc64 aes opcode accelerated");





MODULE_ALIAS("aes");

MODULE_ALIAS("aes");



#include "crop_devid.c"

arch/sparc/crypto/camellia_glue.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -320,3 +320,5 @@ MODULE_LICENSE("GPL"); 
MODULE_DESCRIPTION("Camellia Cipher Algorithm, sparc64 camellia opcode accelerated");

MODULE_DESCRIPTION("Camellia Cipher Algorithm, sparc64 camellia opcode accelerated");





MODULE_ALIAS("aes");

MODULE_ALIAS("aes");



#include "crop_devid.c"

arch/sparc/crypto/crc32c_glue.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -177,3 +177,5 @@ MODULE_LICENSE("GPL"); 
MODULE_DESCRIPTION("CRC32c (Castagnoli), sparc64 crc32c opcode accelerated");

MODULE_DESCRIPTION("CRC32c (Castagnoli), sparc64 crc32c opcode accelerated");





MODULE_ALIAS("crc32c");

MODULE_ALIAS("crc32c");



#include "crop_devid.c"