Commit e1b28147 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 second s390 update from Martin Schwidefsky:
 "The big thing in this pull request is the UAPI patch from David, and
  worth mentioning is the page table dumper.  The rest are small
  improvements and bug fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/entry: fix svc number for TIF_SYSCALL system call restart
  s390/mm,vmem: fix vmem_add_mem()/vmem_remove_range()
  s390/vmalloc: have separate modules area
  s390/zcrypt: remove duplicated include from zcrypt_pcixcc.c
  s390/css_chars: remove superfluous ifdef
  s390/chsc: make headers usable
  s390/mm: let kernel text section always begin at 1MB
  s390/mm: fix mapping of read-only kernel text section
  s390/mm: add page table dumper
  s390: add support to start the kernel in 64 bit mode.
  s390/mm,pageattr: remove superfluous EXPORT_SYMBOLs
  s390/mm,pageattr: add more page table walk sanity checks
  s390/mm: fix pmd_huge() usage for kernel mapping
  s390/dcssblk: cleanup device attribute usage
  s390/mm: use pfmf instruction to initialize storage keys
  s390/facilities: cleanup PFMF and HPAGE machine facility detection
  UAPI: (Scripted) Disintegrate arch/s390/include/asm
parents ba706765 ab08ff34

arch/s390/Kconfig.debug

+12 −0
Original line number Diff line number Diff line
@@ -31,6 +31,18 @@ config DEBUG_STRICT_USER_COPY_CHECKS 


	  If unsure, or if you run an older (pre 4.4) gcc, say N.



config S390_PTDUMP

	bool "Export kernel pagetable layout to userspace via debugfs"

	depends on DEBUG_KERNEL

	select DEBUG_FS

	---help---

	  Say Y here if you want to show the kernel pagetable layout in a

	  debugfs file. This information is only useful for kernel developers

	  who are working in architecture specific areas of the kernel.

	  It is probably not a good idea to enable this feature in a production

	  kernel.

	  If in doubt, say "N"



config DEBUG_SET_MODULE_RONX

	def_bool y

	depends on MODULES

arch/s390/include/asm/Kbuild

+0 −14
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += chpid.h

header-y += chsc.h

header-y += cmb.h

header-y += dasd.h

header-y += debug.h

header-y += kvm_virtio.h

header-y += monwriter.h

header-y += qeth.h

header-y += schid.h

header-y += tape390.h

header-y += ucontext.h

header-y += vtoc.h

header-y += zcrypt.h



generic-y += clkdev.h

arch/s390/include/asm/chpid.h

+2 −17
Original line number Diff line number Diff line 
/*

 *    Copyright IBM Corp. 2007

 *    Copyright IBM Corp. 2007, 2012

 *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>

 */



#ifndef _ASM_S390_CHPID_H

#define _ASM_S390_CHPID_H



#include <linux/string.h>

#include <linux/types.h>



#define __MAX_CHPID 255



struct chp_id {

	u8 reserved1;

	u8 cssid;

	u8 reserved2;

	u8 id;

} __attribute__((packed));



#ifdef __KERNEL__

#include <uapi/asm/chpid.h>

#include <asm/cio.h>



static inline void chp_id_init(struct chp_id *chpid)
@@ -49,6 +36,4 @@ static inline int chp_id_is_valid(struct chp_id *chpid) 


#define chp_id_for_each(c) \

	for (chp_id_init(c); chp_id_is_valid(c); chp_id_next(c))

#endif /* __KERNEL */



#endif /* _ASM_S390_CHPID_H */

arch/s390/include/asm/cmb.h

+1 −50
Original line number Diff line number Diff line 
#ifndef S390_CMB_H

#define S390_CMB_H



#include <linux/types.h>

#include <uapi/asm/cmb.h>



/**

 * struct cmbdata - channel measurement block data for user space

 * @size: size of the stored data

 * @elapsed_time: time since last sampling

 * @ssch_rsch_count: number of ssch and rsch

 * @sample_count: number of samples

 * @device_connect_time: time of device connect

 * @function_pending_time: time of function pending

 * @device_disconnect_time: time of device disconnect

 * @control_unit_queuing_time: time of control unit queuing

 * @device_active_only_time: time of device active only

 * @device_busy_time: time of device busy (ext. format)

 * @initial_command_response_time: initial command response time (ext. format)

 *

 * All values are stored as 64 bit for simplicity, especially

 * in 32 bit emulation mode. All time values are normalized to

 * nanoseconds.

 * Currently, two formats are known, which differ by the size of

 * this structure, i.e. the last two members are only set when

 * the extended channel measurement facility (first shipped in

 * z990 machines) is activated.

 * Potentially, more fields could be added, which would result in a

 * new ioctl number.

 */

struct cmbdata {

	__u64 size;

	__u64 elapsed_time;

 /* basic and exended format: */

	__u64 ssch_rsch_count;

	__u64 sample_count;

	__u64 device_connect_time;

	__u64 function_pending_time;

	__u64 device_disconnect_time;

	__u64 control_unit_queuing_time;

	__u64 device_active_only_time;

 /* extended format only: */

	__u64 device_busy_time;

	__u64 initial_command_response_time;

};



/* enable channel measurement */

#define BIODASDCMFENABLE	_IO(DASD_IOCTL_LETTER, 32)

/* enable channel measurement */

#define BIODASDCMFDISABLE	_IO(DASD_IOCTL_LETTER, 33)

/* read channel measurement data */

#define BIODASDREADALLCMB	_IOWR(DASD_IOCTL_LETTER, 33, struct cmbdata)



#ifdef __KERNEL__

struct ccw_device;

extern int enable_cmf(struct ccw_device *cdev);

extern int disable_cmf(struct ccw_device *cdev);

extern u64 cmf_read(struct ccw_device *cdev, int index);

extern int cmf_readall(struct ccw_device *cdev, struct cmbdata *data);



#endif /* __KERNEL__ */

#endif /* S390_CMB_H */

arch/s390/include/asm/css_chars.h

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


#include <linux/types.h>



#ifdef __KERNEL__



struct css_general_char {

	u64 : 12;

	u32 dynio : 1;	 /* bit 12 */
@@ -35,5 +33,4 @@ struct css_general_char { 


extern struct css_general_char css_general_characteristics;



#endif /* __KERNEL__ */

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE