s390 patches for the 3.17-rc5
Subsystems (2)
Hi Linus,
please pull from the 'for-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
to receive the following updates:
A bug fix for the vdso code, the loadparm for booting from SCSI is added and the access permissions for the dasd module parameters are corrected.
Martin Schwidefsky (1):
s390/vdso: remove NULL pointer check from clock_gettime
Michael Holzheu (1):
s390/ipl: Add missing SCSI loadparm attributes to /sys/firmware
Peter Oberparleiter (1):
s390/dasd: Make module parameter visible in sysfs
arch/s390/include/asm/ipl.h | 8 +- arch/s390/kernel/ipl.c | 128 +++++++++++++++++++++----------- arch/s390/kernel/vdso32/clock_gettime.S | 10 +-- arch/s390/kernel/vdso64/clock_gettime.S | 10 +-- drivers/s390/block/dasd_devmap.c | 2 +- 5 files changed, 96 insertions(+), 62 deletions(-)
arch/s390/include/asm/ipl.h +4 -4
@@ -17,12 +17,12 @@#define IPL_PARM_BLK_FCP_LEN (sizeof(struct ipl_list_hdr) + \ sizeof(struct ipl_block_fcp)) -#define IPL_PARM_BLK0_FCP_LEN (sizeof(struct ipl_block_fcp) + 8) +#define IPL_PARM_BLK0_FCP_LEN (sizeof(struct ipl_block_fcp) + 16)#define IPL_PARM_BLK_CCW_LEN (sizeof(struct ipl_list_hdr) + \ sizeof(struct ipl_block_ccw)) -#define IPL_PARM_BLK0_CCW_LEN (sizeof(struct ipl_block_ccw) + 8) +#define IPL_PARM_BLK0_CCW_LEN (sizeof(struct ipl_block_ccw) + 16)#define IPL_MAX_SUPPORTED_VERSION (0)
@@ -38,10 +38,11 @@ struct ipl_list_hdr {u8 pbt;u8 flags;u16 reserved2; +u8 loadparm[8 ]; } __attribute__((packed));struct ipl_block_fcp { -u8 reserved1[313 -1 ]; +u8 reserved1[305 -1 ];u8 opt;u8 reserved2[3 ];u16 reserved3;
@@ -62,7 +63,6 @@ struct ipl_block_fcp { offsetof(struct ipl_block_fcp, scp_data))) struct ipl_block_ccw { -u8 load_parm[8 ]; u8 reserved1[84]; u8 reserved2[2]; u16 devno;
arch/s390/kernel/ipl.c +85 -43
181 lines not on this page · raw message
arch/s390/kernel/vdso32/clock_gettime.S +3 -7
@@ -22,13 +22,11 @@ __kernel_clock_gettime: basr %r5,0 0: al %r5,21f-0b(%r5) /* get &_vdso_data */ chi %r2,__CLOCK_REALTIME - je 10f + je 11f chi %r2,__CLOCK_MONOTONIC jne 19f /* CLOCK_MONOTONIC */ - ltr %r3,%r3 - jz 9f /* tp == NULL */ 1: l %r4,__VDSO_UPD_COUNT+4(%r5) /* load update counter */ tml %r4,0x0001 /* pending update ? loop */ jnz 1b
@@ -67,12 +65,10 @@ __kernel_clock_gettime: j 6b 8: st %r2,0(%r3) /* store tp->tv_sec */ st %r1,4(%r3) /* store tp->tv_nsec */ -9: lhi %r2,0 + lhi %r2,0 br %r14 /* CLOCK_REALTIME */ -10: ltr %r3,%r3 /* tp == NULL */ - jz 18f 11: l %r4,__VDSO_UPD_COUNT+4(%r5) /* load update counter */ tml %r4,0x0001 /* pending update ? loop */ jnz 11b
@@ -111,7 +107,7 @@ __kernel_clock_gettime: j 15b 17: st %r2,0(%r3) /* store tp->tv_sec */ st %r1,4(%r3) /* store tp->tv_nsec */ -18: lhi %r2,0 + lhi %r2,0 br %r14 /* Fallback to system call */
arch/s390/kernel/vdso64/clock_gettime.S +3 -7
@@ -21,7 +21,7 @@ __kernel_clock_gettime: .cfi_startproc larl %r5,_vdso_data cghi %r2,__CLOCK_REALTIME - je 4f + je 5f cghi %r2,__CLOCK_THREAD_CPUTIME_ID je 9f cghi %r2,-2 /* Per-thread CPUCLOCK with PID=0, VIRT=1 */
@@ -30,8 +30,6 @@ __kernel_clock_gettime: jne 12f /* CLOCK_MONOTONIC */ - ltgr %r3,%r3 - jz 3f /* tp == NULL */ 0: lg %r4,__VDSO_UPD_COUNT(%r5) /* load update counter */ tmll %r4,0x0001 /* pending update ? loop */ jnz 0b
@@ -53,12 +51,10 @@ __kernel_clock_gettime: j 1b 2: stg %r0,0(%r3) /* store tp->tv_sec */ stg %r1,8(%r3) /* store tp->tv_nsec */ -3: lghi %r2,0 + lghi %r2,0 br %r14 /* CLOCK_REALTIME */ -4: ltr %r3,%r3 /* tp == NULL */ - jz 8f 5: lg %r4,__VDSO_UPD_COUNT(%r5) /* load update counter */ tmll %r4,0x0001 /* pending update ? loop */ jnz 5b
@@ -80,7 +76,7 @@ __kernel_clock_gettime: j 6b 7: stg %r0,0(%r3) /* store tp->tv_sec */ stg %r1,8(%r3) /* store tp->tv_nsec */ -8: lghi %r2,0 + lghi %r2,0 br %r14 /* CLOCK_THREAD_CPUTIME_ID for this thread */
drivers/s390/block/dasd_devmap.c +1 -1
@@ -77,7 +77,7 @@ EXPORT_SYMBOL_GPL(dasd_nofcx);* strings when running as a module. */ static char *dasd[256 ]; -module_param_array (dasd, charp,NULL ,0 ); +module_param_array (dasd, charp,NULL ,S_IRUGO );/* * Single spinlock to protect devmap and servermap structures and lists.