s390 patches for 2.6.29 #2
Subsystems (7)
Hi Linus,
please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
Heiko Carstens (5):
[S390] ptrace: no extern declarations for userspace [S390] types: add/fix types.h include in header files [S390] remove code for oldselect system call [S390] vdso: compile fix
[S390] Use unsigned long long for u64 on 64bit.
Hendrik Brueckner (6):
[S390] hvc_iucv: Change IUCV term id and use one device as default [S390] hvc_iucv: Limit rate of outgoing IUCV messages [S390] hvc_iucv: Update function documentation
[S390] hvc_iucv: Refactor console and device initialization [S390] hvc_iucv: Special handling of IUCV HVC devices [S390] update documentation for hvc_iucv kernel parameter.
Holger Smolinski (1):
[S390] dasd: add device attribute to disable blocking on lost paths
Huang Weiyi (1):
[S390] gettimeofday.S: removed duplicated #includes
Jan Glauber (1):
[S390] qdio: fix broken pointer in case of CONFIG_DEBUG_FS is disabled
Kamalesh Babulal (1):
[S390] tape block: fix dependencies
Mike Frysinger (1):
[S390] asm-s390/posix_types.h: drop __USE_ALL usage
Stefan Weinhuber (1):
[S390] dasd: send change uevents for dasd block devices
Documentation/kernel-parameters.txt | 4 +- arch/s390/include/asm/chpid.h | 2 +- arch/s390/include/asm/chsc.h | 1 + arch/s390/include/asm/cmb.h | 3 + arch/s390/include/asm/dasd.h | 2 + arch/s390/include/asm/kvm.h | 2 +- arch/s390/include/asm/posix_types.h | 4 - arch/s390/include/asm/ptrace.h | 7 +- arch/s390/include/asm/qeth.h | 1 + arch/s390/include/asm/schid.h | 2 + arch/s390/include/asm/swab.h | 2 +- arch/s390/include/asm/types.h | 6 +- arch/s390/kernel/entry.h | 2 - arch/s390/kernel/smp.c | 3 +- arch/s390/kernel/sys_s390.c | 19 -- arch/s390/kernel/vdso.c | 3 +- arch/s390/kernel/vdso32/gettimeofday.S | 4 - arch/s390/kvm/diag.c | 2 +- arch/s390/kvm/interrupt.c | 6 +- arch/s390/kvm/priv.c | 2 +- drivers/char/hvc_iucv.c | 420 ++++++++++++++++++++------------ drivers/s390/block/dasd.c | 21 ++- drivers/s390/block/dasd_devmap.c | 48 ++++ drivers/s390/block/dasd_diag.c | 3 +- drivers/s390/block/dasd_eckd.c | 3 +- drivers/s390/block/dasd_fba.c | 3 +- drivers/s390/char/Kconfig | 2 +- drivers/s390/cio/qdio_debug.c | 2 + 28 files changed, 376 insertions(+), 203 deletions(-)
Documentation/kernel-parameters.txt +2 -2
@@ -829,8 +829,8 @@ and is between 256 and 4096 characters. It is defined in the file hlt [BUGS=ARM,SH] - hvc_iucv= [S390] Number of z/VM IUCV Hypervisor console (HVC) - back-ends. Valid parameters: 0..8 + hvc_iucv= [S390] Number of z/VM IUCV hypervisor console (HVC) + terminal devices. Valid values: 0..8 i8042.debug [HW] Toggle i8042 debug mode i8042.direct [HW] Put keyboard port into non-translated mode
arch/s390/include/asm/chpid.h +1 -1
@@ -9,7 +9,7 @@#define _ASM_S390_CHPID_H _ASM_S390_CHPID_H#include <linux/string.h> -#include <asm/types.h> +#include <linux/types.h> #define __MAX_CHPID 255
arch/s390/include/asm/chsc.h +1 -0
@@ -8,6 +8,7 @@#ifndef _ASM_CHSC_H#define _ASM_CHSC_H +#include <linux/types.h> #include <asm/chpid.h> #include <asm/schid.h>
arch/s390/include/asm/cmb.h +3 -0
@@ -1,5 +1,8 @@#ifndef S390_CMB_H #define S390_CMB_H + +#include <linux/types.h> +/** * struct cmbdata - channel measurement block data for user space * @size: size of the stored data
arch/s390/include/asm/dasd.h +2 -0
@@ -14,6 +14,7 @@#ifndef DASD_H #define DASD_H +#include <linux/types.h> #include <linux/ioctl.h> #define DASD_IOCTL_LETTER 'D'
@@ -78,6 +79,7 @@ typedef struct dasd_information2_t {#define DASD_FEATURE_USEDIAG 0x02#define DASD_FEATURE_INITIAL_ONLINE 0x04#define DASD_FEATURE_ERPLOG 0x08 +#define DASD_FEATURE_FAILFAST 0x10#define DASD_PARTN_BITS 2
arch/s390/include/asm/kvm.h +1 -1
@@ -13,7 +13,7 @@* Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]> */ -#include <asm/types.h> +#include <linux/types.h> /* for KVM_GET_IRQCHIP and KVM_SET_IRQCHIP */ struct kvm_pic_state {
arch/s390/include/asm/posix_types.h +0 -4
@@ -68,11 +68,7 @@ typedef unsigned short __kernel_old_dev_t;#endif /* __s390x__ */ typedef struct { -#if defined(__KERNEL__) || defined(__USE_ALL)int val[2 ]; -#else /* !defined(__KERNEL__) && !defined(__USE_ALL)*/ -int __val[2 ]; -#endif /* !defined(__KERNEL__) && !defined(__USE_ALL)*/ }__kernel_fsid_t ;
arch/s390/include/asm/ptrace.h +5 -2
@@ -272,12 +272,15 @@ typedef struct#define PSW_ASC_SECONDARY 0x0000800000000000UL#define PSW_ASC_HOME 0x0000C00000000000UL -extern long psw_user32_bits; -#endif /* __s390x__ */ +#ifdef __KERNEL__extern long psw_kernel_bits;extern long psw_user_bits; +#ifdef CONFIG_64BIT +extern long psw_user32_bits; +#endif +#endif /* This macro merges a NEW PSW mask specified by the user into the currently active PSW mask CURRENT, modifying only those
arch/s390/include/asm/qeth.h +1 -0
@@ -10,6 +10,7 @@*/ #ifndef __ASM_S390_QETH_IOCTL_H__#define __ASM_S390_QETH_IOCTL_H__ +#include <linux/types.h> #include <linux/ioctl.h> #define SIOC_QETH_ARP_SET_NO_ENTRIES (SIOCDEVPRIVATE)
arch/s390/include/asm/schid.h +2 -0
@@ -1,6 +1,8 @@ #ifndef ASM_SCHID_H #define ASM_SCHID_H +#include <linux/types.h> + struct subchannel_id { __u32 cssid : 8; __u32 : 4;
arch/s390/include/asm/swab.h +1 -1
@@ -9,7 +9,7 @@* Author(s): Martin Schwidefsky ([email protected]) */ -#include <asm/types.h> +#include <linux/types.h> #ifndef __s390x__# define __SWAB_64_THRU_32__
arch/s390/include/asm/types.h +1 -5
@@ -9,11 +9,7 @@#ifndef _S390_TYPES_H#define _S390_TYPES_H -#ifndef __s390x__ -# include <asm-generic/int-ll64.h> -#else -# include <asm-generic/int-l64.h> -#endif +#include <asm-generic/int-ll64.h> #ifndef __ASSEMBLY__
arch/s390/kernel/entry.h +0 -2
@@ -54,7 +54,5 @@ long sys_sigreturn(void);long sys_rt_sigreturn (void );long sys32_sigreturn (void );long sys32_rt_sigreturn (void ); -long old_select (struct sel_arg_struct __user *arg); -long sys_ptrace (long request,long pid,long addr,long data);#endif /* _ENTRY_H */
arch/s390/kernel/smp.c +2 -1
@@ -685,7 +685,8 @@ void __init smp_prepare_cpus(unsigned int max_cpus)if (MACHINE_HAS_IEEE ) lowcore->extended_save_area_addr = (u32 ) save_area;#else -BUG_ON (vdso_alloc_per_cpu (smp_processor_id (), lowcore)); +if (vdso_alloc_per_cpu (smp_processor_id (), lowcore)) +BUG ();#endif set_prefix ((u32 )(unsigned long ) lowcore);local_mcck_enable ();
arch/s390/kernel/sys_s390.c +0 -19
@@ -103,25 +103,6 @@ out:return error; } -#ifndef CONFIG_64BIT -struct sel_arg_struct { -unsigned long n; -fd_set __user *inp, *outp, *exp; -struct timeval __user *tvp; -}; - -asmlinkage long old_select (struct sel_arg_struct __user *arg) -{ -struct sel_arg_struct a; - -if (copy_from_user (&a, arg,sizeof (a))) -return -EFAULT ; -/* sys_select() does the appropriate kernel locking */ -return sys_select (a.n, a.inp, a.outp, a.exp, a.tvp); - -} -#endif /* CONFIG_64BIT */ -/* * sys_ipc() is the de-multiplexer for the SysV IPC calls.. *
arch/s390/kernel/vdso.c +2 -1
@@ -322,7 +322,8 @@ static int __init vdso_init(void) vdso64_pagelist[vdso64_pages -1 ] =virt_to_page (vdso_data); vdso64_pagelist[vdso64_pages] =NULL ;#ifndef CONFIG_SMP -BUG_ON (vdso_alloc_per_cpu (0 , S390_lowcore)); +if (vdso_alloc_per_cpu (0 , &S390_lowcore)) +BUG ();#endif vdso_init_cr5 ();#endif /* CONFIG_64BIT */
arch/s390/kernel/vdso32/gettimeofday.S +0 -4
@@ -13,10 +13,6 @@ #include <asm/asm-offsets.h> #include <asm/unistd.h> -#include <asm/vdso.h> -#include <asm/asm-offsets.h> -#include <asm/unistd.h> - .text .align 4 .globl __kernel_gettimeofday
arch/s390/kvm/diag.c +1 -1
@@ -47,7 +47,7 @@ static int __diag_ipl_functions(struct kvm_vcpu *vcpu) vcpu->run->s390_reset_flags |=KVM_S390_RESET_IPL ; vcpu->run->s390_reset_flags |=KVM_S390_RESET_CPU_INIT ; vcpu->run->exit_reason =KVM_EXIT_S390_RESET ; -VCPU_EVENT (vcpu,3 ,"requesting userspace resets %lx" , +VCPU_EVENT (vcpu,3 ,"requesting userspace resets %llx" , vcpu->run->s390_reset_flags);return -EREMOTE ; }
arch/s390/kvm/interrupt.c +3 -3
@@ -160,7 +160,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu,break ;case KVM_S390_INT_VIRTIO : -VCPU_EVENT (vcpu,4 ,"interrupt: virtio parm:%x,parm64:%lx" , +VCPU_EVENT (vcpu,4 ,"interrupt: virtio parm:%x,parm64:%llx" , inti->ext.ext_params, inti->ext.ext_params2); vcpu->stat.deliver_virtio_interrupt++; rc =put_guest_u16 (vcpu, __LC_EXT_INT_CODE,0x2603 );
@@ -360,7 +360,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) vcpu->arch.ckc_timer.expires = jiffies + sltime;add_timer (&vcpu->arch.ckc_timer); -VCPU_EVENT (vcpu,5 ,"enabled wait timer:%lx jiffies" , sltime); +VCPU_EVENT (vcpu,5 ,"enabled wait timer:%llx jiffies" , sltime); no_timer:spin_lock_bh (&vcpu->arch.local_int.float_int->lock);spin_lock_bh (&vcpu->arch.local_int.lock);
@@ -491,7 +491,7 @@ int kvm_s390_inject_vm(struct kvm *kvm,switch (s390int->type) {case KVM_S390_INT_VIRTIO : -VM_EVENT (kvm,5 ,"inject: virtio parm:%x,parm64:%lx" , +VM_EVENT (kvm,5 ,"inject: virtio parm:%x,parm64:%llx" , s390int->parm, s390int->parm64); inti->type = s390int->type; inti->ext.ext_params = s390int->parm;
arch/s390/kvm/priv.c +1 -1
@@ -118,7 +118,7 @@ static int handle_store_cpu_address(struct kvm_vcpu *vcpu) goto out; } -VCPU_EVENT (vcpu,5 ,"storing cpu address to %lx" , useraddr); +VCPU_EVENT (vcpu,5 ,"storing cpu address to %llx" , useraddr); out:return 0 ; }
drivers/char/hvc_iucv.c +270 -150
808 lines not on this page · raw message
drivers/s390/block/dasd.c +20 -1
@@ -336,6 +336,9 @@ static int dasd_state_ready_to_online(struct dasd_device * device) {int rc; +struct gendisk *disk; +struct disk_part_iter piter; +struct hd_struct *part;if (device->discipline->ready_to_online) { rc = device->discipline->ready_to_online (device);
@@ -343,8 +346,14 @@ dasd_state_ready_to_online(struct dasd_device * device)return rc; } device->state =DASD_STATE_ONLINE ; -if (device->block) +if (device->block) {dasd_schedule_block_bh (device->block); + disk = device->block->bdev->bd_disk; +disk_part_iter_init (&piter, disk,DISK_PITER_INCL_PART0 ); +while ((part =disk_part_iter_next (&piter))) +kobject_uevent (&part_to_dev (part)->kobj,KOBJ_CHANGE ); +disk_part_iter_exit (&piter); + }return 0 ; }
@@ -354,6 +363,9 @@ dasd_state_ready_to_online(struct dasd_device * device)static int dasd_state_online_to_ready (struct dasd_device *device) {int rc; +struct gendisk *disk; +struct disk_part_iter piter; +struct hd_struct *part;if (device->discipline->online_to_ready) { rc = device->discipline->online_to_ready (device);
@@ -361,6 +373,13 @@ static int dasd_state_online_to_ready(struct dasd_device *device)return rc; } device->state =DASD_STATE_READY ; +if (device->block) { + disk = device->block->bdev->bd_disk; +disk_part_iter_init (&piter, disk,DISK_PITER_INCL_PART0 ); +while ((part =disk_part_iter_next (&piter))) +kobject_uevent (&part_to_dev (part)->kobj,KOBJ_CHANGE ); +disk_part_iter_exit (&piter); + }return 0 ; }
drivers/s390/block/dasd_devmap.c +48 -0
66 lines not on this page · raw message
drivers/s390/block/dasd_diag.c +2 -1
@@ -544,7 +544,8 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev, } cqr->retries =DIAG_MAX_RETRIES ; cqr->buildclk =get_clock (); -if (blk_noretry_request (req)) +if (blk_noretry_request (req) || + block->base->features &DASD_FEATURE_FAILFAST )set_bit (DASD_CQR_FLAGS_FAILFAST , &cqr->flags); cqr->startdev = memdev; cqr->memdev = memdev;
drivers/s390/block/dasd_eckd.c +2 -1
@@ -1700,7 +1700,8 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev, recid++; } } -if (blk_noretry_request (req)) +if (blk_noretry_request (req) || + block->base->features &DASD_FEATURE_FAILFAST )set_bit (DASD_CQR_FLAGS_FAILFAST , &cqr->flags); cqr->startdev = startdev; cqr->memdev = startdev;
drivers/s390/block/dasd_fba.c +2 -1
@@ -355,7 +355,8 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev, recid++; } } -if (blk_noretry_request (req)) +if (blk_noretry_request (req) || + block->base->features &DASD_FEATURE_FAILFAST )set_bit (DASD_CQR_FLAGS_FAILFAST , &cqr->flags); cqr->startdev = memdev; cqr->memdev = memdev;
drivers/s390/char/Kconfig +1 -1
@@ -100,7 +100,7 @@ comment "S/390 tape interface support" config S390_TAPE_BLOCK bool "Support for tape block devices" - depends on S390_TAPE + depends on S390_TAPE && BLOCK help Select this option if you want to access your channel-attached tape devices using the block device interface. This interface is similar
drivers/s390/cio/qdio_debug.c +2 -0
@@ -169,6 +169,8 @@ static void setup_debugfs_entry(struct qdio_q *q, struct ccw_device *cdev) q->nr); debugfs_queues[i] =debugfs_create_file (name,S_IFREG |S_IRUGO |S_IWUSR , debugfs_root, q, &debugfs_fops); +if (IS_ERR (debugfs_queues[i])) + debugfs_queues[i] =NULL ; }void qdio_setup_debug_entries (struct qdio_irq *irq_ptr,struct ccw_device *cdev)