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

Commit e627078a 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:
 "There is only one new feature in this pull for the 4.4 merge window,
  most of it is small enhancements, cleanup and bug fixes:

   - Add the s390 backend for the software dirty bit tracking.  This
     adds two new pgtable functions pte_clear_soft_dirty and
     pmd_clear_soft_dirty which is why there is a hit to
     arch/x86/include/asm/pgtable.h in this pull request.

   - A series of cleanup patches for the AP bus, this includes the
     removal of the support for two outdated crypto cards (PCICC and
     PCICA).

   - The irq handling / signaling on buffer full in the runtime
     instrumentation code is dropped.

   - Some micro optimizations: remove unnecessary memory barriers for a
     couple of functions: [smb_]rmb, [smb_]wmb, atomics, bitops, and for
     spin_unlock.  Use the builtin bswap if available and make
     test_and_set_bit_lock more cache friendly.

   - Statistics and a tracepoint for the diagnose calls to the
     hypervisor.

   - The CPU measurement facility support to sample KVM guests is
     improved.

   - The vector instructions are now always enabled for user space
     processes if the hardware has the vector facility.  This simplifies
     the FPU handling code.  The fpu-internal.h header is split into fpu
     internals, api and types just like x86.

   - Cleanup and improvements for the common I/O layer.

   - Rework udelay to solve a problem with kprobe.  udelay has busy loop
     semantics but still uses an idle processor state for the wait"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (66 commits)
  s390: remove runtime instrumentation interrupts
  s390/cio: de-duplicate subchannel validation
  s390/css: unneeded initialization in for_each_subchannel
  s390/Kconfig: use builtin bswap
  s390/dasd: fix disconnected device with valid path mask
  s390/dasd: fix invalid PAV assignment after suspend/resume
  s390/dasd: fix double free in dasd_eckd_read_conf
  s390/kernel: fix ptrace peek/poke for floating point registers
  s390/cio: move ccw_device_stlck functions
  s390/cio: move ccw_device_call_handler
  s390/topology: reduce per_cpu() invocations
  s390/nmi: reduce size of percpu variable
  s390/nmi: fix terminology
  s390/nmi: remove casts
  s390/nmi: remove pointless error strings
  s390: don't store registers on disabled wait anymore
  s390: get rid of __set_psw_mask()
  s390/fpu: split fpu-internal.h into fpu internals, api, and type headers
  s390/dasd: fix list_del corruption after lcu changes
  s390/spinlock: remove unneeded serializations at unlock
  ...
parents 14c79092 b38feccd

arch/s390/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ config S390 
	select ARCH_SAVE_PAGE_KEYS if HIBERNATION

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_NUMA_BALANCING

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_WANTS_PROT_NUMA_PROT_NONE

	select ARCH_WANT_IPC_PARSE_VERSION
@@ -118,6 +119,7 @@ config S390 
	select HAVE_ARCH_EARLY_PFN_TO_NID

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_SOFT_DIRTY

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE

	select HAVE_BPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES

arch/s390/hypfs/hypfs_diag.c

+9 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/string.h>

#include <linux/vmalloc.h>

#include <linux/mm.h>

#include <asm/diag.h>

#include <asm/ebcdic.h>

#include "hypfs.h"
@@ -336,7 +337,7 @@ static inline __u64 phys_cpu__ctidx(enum diag204_format type, void *hdr) 


/* Diagnose 204 functions */



static int diag204(unsigned long subcode, unsigned long size, void *addr)

static inline int __diag204(unsigned long subcode, unsigned long size, void *addr)

{

	register unsigned long _subcode asm("0") = subcode;

	register unsigned long _size asm("1") = size;
@@ -351,6 +352,12 @@ static int diag204(unsigned long subcode, unsigned long size, void *addr) 
	return _size;

}



static int diag204(unsigned long subcode, unsigned long size, void *addr)

{

	diag_stat_inc(DIAG_STAT_X204);

	return __diag204(subcode, size, addr);

}



/*

 * For the old diag subcode 4 with simple data format we have to use real

 * memory. If we use subcode 6 or 7 with extended data format, we can (and
@@ -505,6 +512,7 @@ static int diag224(void *ptr) 
{

	int rc = -EOPNOTSUPP;



	diag_stat_inc(DIAG_STAT_X224);

	asm volatile(

		"	diag	%1,%2,0x224\n"

		"0:	lhi	%0,0x0\n"

arch/s390/hypfs/hypfs_diag0c.c

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/slab.h>

#include <linux/cpu.h>

#include <asm/diag.h>

#include <asm/hypfs.h>

#include "hypfs.h"
@@ -18,6 +19,7 @@ 
 */

static void diag0c(struct hypfs_diag0c_entry *entry)

{

	diag_stat_inc(DIAG_STAT_X00C);

	asm volatile (

		"	sam31\n"

		"	diag	%0,%0,0x0c\n"

arch/s390/hypfs/hypfs_sprp.c

+8 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/types.h>

#include <linux/uaccess.h>

#include <asm/compat.h>

#include <asm/diag.h>

#include <asm/sclp.h>

#include "hypfs.h"
@@ -22,7 +23,7 @@ 


#define DIAG304_CMD_MAX		2



static unsigned long hypfs_sprp_diag304(void *data, unsigned long cmd)

static inline unsigned long __hypfs_sprp_diag304(void *data, unsigned long cmd)

{

	register unsigned long _data asm("2") = (unsigned long) data;

	register unsigned long _rc asm("3");
@@ -34,6 +35,12 @@ static unsigned long hypfs_sprp_diag304(void *data, unsigned long cmd) 
	return _rc;

}



static unsigned long hypfs_sprp_diag304(void *data, unsigned long cmd)

{

	diag_stat_inc(DIAG_STAT_X304);

	return __hypfs_sprp_diag304(data, cmd);

}



static void hypfs_sprp_free(const void *data)

{

	free_page((unsigned long) data);

arch/s390/hypfs/hypfs_vm.c

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/errno.h>

#include <linux/string.h>

#include <linux/vmalloc.h>

#include <asm/diag.h>

#include <asm/ebcdic.h>

#include <asm/timex.h>

#include "hypfs.h"
@@ -66,6 +67,7 @@ static int diag2fc(int size, char* query, void *addr) 
	memset(parm_list.aci_grp, 0x40, NAME_LEN);

	rc = -1;



	diag_stat_inc(DIAG_STAT_X2FC);

	asm volatile(

		"	diag    %0,%1,0x2fc\n"

		"0:\n"