Commit e60b9a03 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 updates from Martin Schwidefsky:
 "Just a random collection of bug-fixes and cleanups, nothing new in
  this merge request."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (46 commits)
  s390/ap: Fix wrong or missing comments
  s390/ap: move receive callback to message struct
  s390/dasd: re-prioritize partition detection message
  s390/qeth: reshuffle initialization
  s390/qeth: cleanup drv attr usage
  s390/claw: cleanup drv attr usage
  s390/lcs: cleanup drv attr usage
  s390/ctc: cleanup drv attr usage
  s390/ccwgroup: remove ccwgroup_create_from_string
  s390/qeth: stop using struct ccwgroup driver for discipline callbacks
  s390/qeth: switch to ccwgroup_create_dev
  s390/claw: switch to ccwgroup_create_dev
  s390/lcs: switch to ccwgroup_create_dev
  s390/ctcm: switch to ccwgroup_create_dev
  s390/ccwgroup: exploit ccwdev_by_dev_id
  s390/ccwgroup: introduce ccwgroup_create_dev
  s390: fix race on TIF_MCCK_PENDING
  s390/barrier: make use of fast-bcr facility
  s390/barrier: cleanup barrier functions
  s390/claw: remove "eieio" calls
  ...
parents 9daeaa37 a7475afd

arch/s390/Kconfig

+26 −29
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ config COMPAT 
	def_bool y

	prompt "Kernel support for 31 bit emulation"

	depends on 64BIT

	select COMPAT_BINFMT_ELF

	select COMPAT_BINFMT_ELF if BINFMT_ELF

	select ARCH_WANT_OLD_COMPAT_IPC

	help

	  Select this option if you want to enable your system kernel to
@@ -234,6 +234,25 @@ config KEYS_COMPAT 
config AUDIT_ARCH

	def_bool y



config HAVE_MARCH_Z900_FEATURES

	def_bool n



config HAVE_MARCH_Z990_FEATURES

	def_bool n

	select HAVE_MARCH_Z900_FEATURES



config HAVE_MARCH_Z9_109_FEATURES

	def_bool n

	select HAVE_MARCH_Z990_FEATURES



config HAVE_MARCH_Z10_FEATURES

	def_bool n

	select HAVE_MARCH_Z9_109_FEATURES



config HAVE_MARCH_Z196_FEATURES

	def_bool n

	select HAVE_MARCH_Z10_FEATURES



comment "Code generation options"



choice
@@ -249,6 +268,7 @@ config MARCH_G5 


config MARCH_Z900

	bool "IBM zSeries model z800 and z900"

	select HAVE_MARCH_Z900_FEATURES if 64BIT

	help

	  Select this to enable optimizations for model z800/z900 (2064 and

	  2066 series). This will enable some optimizations that are not
@@ -256,6 +276,7 @@ config MARCH_Z900 


config MARCH_Z990

	bool "IBM zSeries model z890 and z990"

	select HAVE_MARCH_Z990_FEATURES if 64BIT

	help

	  Select this to enable optimizations for model z890/z990 (2084 and

	  2086 series). The kernel will be slightly faster but will not work
@@ -263,6 +284,7 @@ config MARCH_Z990 


config MARCH_Z9_109

	bool "IBM System z9"

	select HAVE_MARCH_Z9_109_FEATURES if 64BIT

	help

	  Select this to enable optimizations for IBM System z9 (2094 and

	  2096 series). The kernel will be slightly faster but will not work
@@ -270,6 +292,7 @@ config MARCH_Z9_109 


config MARCH_Z10

	bool "IBM System z10"

	select HAVE_MARCH_Z10_FEATURES if 64BIT

	help

	  Select this to enable optimizations for IBM System z10 (2097 and

	  2098 series). The kernel will be slightly faster but will not work
@@ -277,6 +300,7 @@ config MARCH_Z10 


config MARCH_Z196

	bool "IBM zEnterprise 114 and 196"

	select HAVE_MARCH_Z196_FEATURES if 64BIT

	help

	  Select this to enable optimizations for IBM zEnterprise 114 and 196

	  (2818 and 2817 series). The kernel will be slightly faster but will
@@ -406,33 +430,6 @@ config CHSC_SCH 


comment "Misc"



config IPL

	def_bool y

	prompt "Builtin IPL record support"

	help

	  If you want to use the produced kernel to IPL directly from a

	  device, you have to merge a bootsector specific to the device

	  into the first bytes of the kernel. You will have to select the

	  IPL device.



choice

	prompt "IPL method generated into head.S"

	depends on IPL

	default IPL_VM

	help

	  Select "tape" if you want to IPL the image from a Tape.



	  Select "vm_reader" if you are running under VM/ESA and want

	  to IPL the image from the emulated card reader.



config IPL_TAPE

	bool "tape"



config IPL_VM

	bool "vm_reader"



endchoice



source "fs/Kconfig.binfmt"



config FORCE_MAX_ZONEORDER
@@ -569,7 +566,7 @@ config KEXEC 


config CRASH_DUMP

	bool "kernel crash dumps"

	depends on 64BIT

	depends on 64BIT && SMP

	select KEXEC

	help

	  Generate crash dump after being started by kexec.

arch/s390/boot/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
image

bzImage

arch/s390/boot/compressed/.gitignore

0 → 100644
+3 −0
Original line number Diff line number Diff line 
sizes.h

vmlinux

vmlinux.lds

arch/s390/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ CONFIG_CRYPTO_BLOWFISH=m 
CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m

arch/s390/include/asm/barrier.h

+20 −17
Original line number Diff line number Diff line
@@ -11,17 +11,20 @@ 
 * Force strict CPU ordering.

 * And yes, this is required on UP too when we're talking

 * to devices.

 *

 * This is very similar to the ppc eieio/sync instruction in that is

 * does a checkpoint syncronisation & makes sure that 

 * all memory ops have completed wrt other CPU's ( see 7-15 POP  DJB ).

 */



#define eieio()	asm volatile("bcr 15,0" : : : "memory")

#define SYNC_OTHER_CORES(x)   eieio()

#define mb()    eieio()

#define rmb()   eieio()

#define wmb()   eieio()

static inline void mb(void)

{

#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES

	/* Fast-BCR without checkpoint synchronization */

	asm volatile("bcr 14,0" : : : "memory");

#else

	asm volatile("bcr 15,0" : : : "memory");

#endif

}



#define rmb()				mb()

#define wmb()				mb()

#define read_barrier_depends()		do { } while(0)

#define smp_mb()			mb()

#define smp_rmb()			rmb()

CRA Git | Maintained and supported by SUSTech CRA and CCSE