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

Commit 45b6ae76 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Martin Schwidefsky:
 "A couple of bug fixes, minor cleanup and a change to the default
  config"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/dasd: fix failing CUIR assignment under LPAR
  s390/pageattr: handle numpages parameter correctly
  s390/dasd: fix hanging device after clear subchannel
  s390/qdio: avoid reschedule of outbound tasklet once killed
  s390/qdio: remove checks for ccw device internal state
  s390/qdio: fix double return code evaluation
  s390/qdio: get rid of spin_lock_irqsave usage
  s390/cio: remove subchannel_id from ccw_device_private
  s390/qdio: obtain subchannel_id via ccw_device_get_schid()
  s390/cio: stop using subchannel_id from ccw_device_private
  s390/config: make the vector optimized crc function builtin
  s390/lib: fix memcmp and strstr
  s390/crc32-vx: Fix checksum calculation for small sizes
  s390: clarify compressed image code path
parents ae5d68be af775210

arch/s390/boot/compressed/head.S

+8 −3
Original line number Diff line number Diff line
@@ -21,16 +21,21 @@ ENTRY(startup_continue) 
	lg	%r15,.Lstack-.LPG1(%r13)

	aghi	%r15,-160

	brasl	%r14,decompress_kernel

	# setup registers for memory mover & branch to target

	# Set up registers for memory mover. We move the decompressed image to

	# 0x11000, starting at offset 0x11000 in the decompressed image so

	# that code living at 0x11000 in the image will end up at 0x11000 in

	# memory.

	lgr	%r4,%r2

	lg	%r2,.Loffset-.LPG1(%r13)

	la	%r4,0(%r2,%r4)

	lg	%r3,.Lmvsize-.LPG1(%r13)

	lgr	%r5,%r3

	# move the memory mover someplace safe

	# Move the memory mover someplace safe so it doesn't overwrite itself.

	la	%r1,0x200

	mvc	0(mover_end-mover,%r1),mover-.LPG1(%r13)

	# decompress image is started at 0x11000

	# When the memory mover is done we pass control to

	# arch/s390/kernel/head64.S:startup_continue which lives at 0x11000 in

	# the decompressed image.

	lgr	%r6,%r2

	br	%r1

mover:

arch/s390/configs/default_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ CONFIG_CRYPTO_SHA512_S390=m 
CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m

CONFIG_X509_CERTIFICATE_PARSER=m

arch/s390/configs/gcov_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ CONFIG_CRYPTO_SHA512_S390=m 
CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m

CONFIG_X509_CERTIFICATE_PARSER=m

arch/s390/configs/performance_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ CONFIG_CRYPTO_SHA512_S390=m 
CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m

CONFIG_X509_CERTIFICATE_PARSER=m

arch/s390/crypto/crc32-vx.c

+3 −3
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ u32 crc32c_le_vgfm_16(u32 crc, unsigned char const *buf, size_t size); 
		struct kernel_fpu vxstate;				    \

		unsigned long prealign, aligned, remaining;		    \

									    \

		if (datalen < VX_MIN_LEN + VX_ALIGN_MASK)		    \

			return ___crc32_sw(crc, data, datalen);		    \

									    \

		if ((unsigned long)data & VX_ALIGN_MASK) {		    \

			prealign = VX_ALIGNMENT -			    \

				  ((unsigned long)data & VX_ALIGN_MASK);    \
@@ -59,9 +62,6 @@ u32 crc32c_le_vgfm_16(u32 crc, unsigned char const *buf, size_t size); 
			data = (void *)((unsigned long)data + prealign);    \

		}							    \

									    \

		if (datalen < VX_MIN_LEN)				    \

			return ___crc32_sw(crc, data, datalen);		    \

									    \

		aligned = datalen & ~VX_ALIGN_MASK;			    \

		remaining = datalen & VX_ALIGN_MASK;			    \

									    \