s390 patches for 2.6.30-rc2
Subsystems (5)
Hi Linus,
please pull from 'for-linus' branch of
git://git390.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
Christian Ehrhardt (1):
[S390] s390: move machine flags to lowcore
Cornelia Huck (1):
[S390] dasd: Use the new async framework for autoonlining.
Gerald Schaefer (1):
[S390] appldata: Use new mod_virt_timer_periodic() function.
Heiko Carstens (3):
[S390] wire up preadv/pwritev system calls [S390] call nmi_enter/nmi_exit on machine checks [S390] smp: fix cpu_possible_map initialization
Jan Glauber (2):
[S390] extend virtual timer interface by mod_virt_timer_periodic [S390] qdio: remove dead timeout handler
Martin Schwidefsky (5):
[S390] stp synchronization retry timer
[S390] fix idle time accounting
[S390] cpu hotplug and accounting values
[S390] add read_persistent_clock
[S390] boot cputime accounting
Stefan Weinhuber (1):
[S390] dasd: fix idaw boundary checking for track based ccw
arch/s390/appldata/appldata_base.c | 2 +- arch/s390/include/asm/cpuid.h | 25 +++++++++++ arch/s390/include/asm/kvm_host.h | 1 + arch/s390/include/asm/lowcore.h | 12 ++++-- arch/s390/include/asm/processor.h | 17 +------ arch/s390/include/asm/ptrace.h | 2 - arch/s390/include/asm/setup.h | 24 +++++----- arch/s390/include/asm/thread_info.h | 3 +- arch/s390/include/asm/timer.h | 1 + arch/s390/include/asm/timex.h | 5 ++ arch/s390/include/asm/unistd.h | 4 +- arch/s390/kernel/asm-offsets.c | 2 + arch/s390/kernel/compat_wrapper.S | 18 ++++++++ arch/s390/kernel/early.c | 19 +++++++++ arch/s390/kernel/entry.S | 13 ++++++ arch/s390/kernel/entry64.S | 13 ++++++ arch/s390/kernel/head.S | 15 +++++- arch/s390/kernel/nmi.c | 5 +- arch/s390/kernel/setup.c | 12 ++++- arch/s390/kernel/smp.c | 4 +- arch/s390/kernel/syscalls.S | 2 + arch/s390/kernel/time.c | 77 +++++++++++++++++++++++------------ arch/s390/kernel/vtime.c | 67 ++++++++++++++++-------------- drivers/s390/block/dasd.c | 37 +++++++++++----- drivers/s390/block/dasd_eckd.c | 16 +++++-- drivers/s390/cio/qdio_main.c | 43 +------------------ 26 files changed, 280 insertions(+), 159 deletions(-) create mode 100644 arch/s390/include/asm/cpuid.h
arch/s390/appldata/appldata_base.c +1 -1
@@ -176,7 +176,7 @@ static void __appldata_mod_vtimer_wrap(void *p) {struct vtimer_list *timer;u64 expires; } *args = p; -mod_virt_timer (args->timer, args->expires); +mod_virt_timer_periodic (args->timer, args->expires); }#define APPLDATA_ADD_TIMER 0
arch/s390/include/asm/cpuid.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Copyright IBM Corp. 2000,2009 +* Author(s): Hartmut Penner <[email protected]>, +* Martin Schwidefsky <[email protected]> +* Christian Ehrhardt <[email protected]> +*/ + +#ifndef _ASM_S390_CPUID_H_ +#define _ASM_S390_CPUID_H_ + +/* +* CPU type and hardware bug flags. Kept separately for each CPU. +* Members of this structure are referenced in head.S, so think twice +* before touching them. [mj] +*/ + +typedef struct +{ +unsigned int version :8 ; +unsigned int ident :24 ; +unsigned int machine :16 ; +unsigned int unused :16 ; +} __attribute__ ((packed))cpuid_t ; + +#endif /* _ASM_S390_CPUID_H_ */
arch/s390/include/asm/kvm_host.h +1 -0
@@ -15,6 +15,7 @@#define ASM_KVM_HOST_H #include <linux/kvm_host.h> #include <asm/debug.h> +#include <asm/cpuid.h> #define KVM_MAX_VCPUS 64#define KVM_MEMORY_SLOTS 32
arch/s390/include/asm/lowcore.h +8 -4
@@ -66,6 +66,7 @@#define __LC_USER_EXEC_ASCE 0x02ac#define __LC_CPUID 0x02b0#define __LC_INT_CLOCK 0x02c8 +#define __LC_MACHINE_FLAGS 0x02d8#define __LC_IRB 0x0300#define __LC_PFAULT_INTPARM 0x0080#define __LC_CPU_TIMER_SAVE_AREA 0x00d8
@@ -110,6 +111,7 @@#define __LC_CPUID 0x0320#define __LC_INT_CLOCK 0x0340#define __LC_VDSO_PER_CPU 0x0350 +#define __LC_MACHINE_FLAGS 0x0358#define __LC_IRB 0x0380#define __LC_PASTE 0x03c0#define __LC_PFAULT_INTPARM 0x11b8
@@ -127,9 +129,9 @@#ifndef __ASSEMBLY__ -#include <asm/processor.h> +#include <asm/cpuid.h> +#include <asm/ptrace.h> #include <linux/types.h> -#include <asm/sigp.h> void restart_int_handler (void );void ext_int_handler (void );
@@ -277,7 +279,8 @@ struct _lowcore__u32 ext_call_fast;/* 0x02c4 */ __u64 int_clock;/* 0x02c8 */ __u64 clock_comparator;/* 0x02d0 */ -__u8 pad_0x02d8[0x0300 -0x02d8 ];/* 0x02d8 */ +__u32 machine_flags;/* 0x02d8 */ +__u8 pad_0x02dc[0x0300 -0x02dc ];/* 0x02dc */ /* Interrupt response block */ __u8 irb[64 ];/* 0x0300 */
@@ -381,7 +384,8 @@ struct _lowcore__u64 int_clock;/* 0x0340 */ __u64 clock_comparator;/* 0x0348 */ __u64 vdso_per_cpu_data;/* 0x0350 */ -__u8 pad_0x0358[0x0380 -0x0358 ];/* 0x0358 */ +__u64 machine_flags;/* 0x0358 */ +__u8 pad_0x0360[0x0380 -0x0360 ];/* 0x0360 */ /* Interrupt response block. */ __u8 irb[64 ];/* 0x0380 */
arch/s390/include/asm/processor.h +3 -14
@@ -14,7 +14,10 @@#define __ASM_S390_PROCESSOR_H#include <linux/linkage.h> +#include <asm/cpuid.h> +#include <asm/page.h> #include <asm/ptrace.h> +#include <asm/setup.h> #ifdef __KERNEL__/*
@@ -23,20 +26,6 @@*/ #define current_text_addr () ({ void *pc; asm("basr %0,0" : "=a" (pc)); pc; }) -/* -* CPU type and hardware bug flags. Kept separately for each CPU. -* Members of this structure are referenced in head.S, so think twice -* before touching them. [mj] -*/ - -typedef struct -{ -unsigned int version :8 ; -unsigned int ident :24 ; -unsigned int machine :16 ; -unsigned int unused :16 ; -} __attribute__ ((packed))cpuid_t ; -static inline void get_cpu_id (cpuid_t *ptr) { asmvolatile ("stidp 0(%1)" :"=m" (*ptr) :"a" (ptr));
arch/s390/include/asm/ptrace.h +0 -2
@@ -313,8 +313,6 @@ typedef struct#ifdef __KERNEL__ -#include <asm/setup.h> -#include <asm/page.h> /* * The pt_regs struct defines the way the registers are stored on
arch/s390/include/asm/setup.h +12 -12
@@ -14,6 +14,7 @@#ifdef __KERNEL__ +#include <asm/lowcore.h> #include <asm/types.h> #define PARMAREA 0x10400
@@ -63,7 +64,6 @@ extern unsigned int s390_noexec;/* * Machine features detected in head.S */ -extern unsigned long machine_flags;#define MACHINE_FLAG_VM (1UL << 0)#define MACHINE_FLAG_IEEE (1UL << 1)
@@ -77,28 +77,28 @@ extern unsigned long machine_flags;#define MACHINE_FLAG_HPAGE (1UL << 10)#define MACHINE_FLAG_PFMF (1UL << 11) -#define MACHINE_IS_VM (machine_flags & MACHINE_FLAG_VM) -#define MACHINE_IS_KVM (machine_flags & MACHINE_FLAG_KVM) -#define MACHINE_HAS_DIAG9C (machine_flags & MACHINE_FLAG_DIAG9C) +#define MACHINE_IS_VM (S390_lowcore.machine_flags & MACHINE_FLAG_VM) +#define MACHINE_IS_KVM (S390_lowcore.machine_flags & MACHINE_FLAG_KVM) +#define MACHINE_HAS_DIAG9C (S390_lowcore.machine_flags & MACHINE_FLAG_DIAG9C)#ifndef __s390x__ -#define MACHINE_HAS_IEEE (machine_flags & MACHINE_FLAG_IEEE) -#define MACHINE_HAS_CSP (machine_flags & MACHINE_FLAG_CSP) +#define MACHINE_HAS_IEEE (S390_lowcore.machine_flags & MACHINE_FLAG_IEEE) +#define MACHINE_HAS_CSP (S390_lowcore.machine_flags & MACHINE_FLAG_CSP)#define MACHINE_HAS_IDTE (0)#define MACHINE_HAS_DIAG44 (1) -#define MACHINE_HAS_MVPG (machine_flags & MACHINE_FLAG_MVPG) +#define MACHINE_HAS_MVPG (S390_lowcore.machine_flags & MACHINE_FLAG_MVPG)#define MACHINE_HAS_MVCOS (0)#define MACHINE_HAS_HPAGE (0)#define MACHINE_HAS_PFMF (0)#else /* __s390x__ */ #define MACHINE_HAS_IEEE (1)#define MACHINE_HAS_CSP (1) -#define MACHINE_HAS_IDTE (machine_flags & MACHINE_FLAG_IDTE) -#define MACHINE_HAS_DIAG44 (machine_flags & MACHINE_FLAG_DIAG44) +#define MACHINE_HAS_IDTE (S390_lowcore.machine_flags & MACHINE_FLAG_IDTE) +#define MACHINE_HAS_DIAG44 (S390_lowcore.machine_flags & MACHINE_FLAG_DIAG44)#define MACHINE_HAS_MVPG (1) -#define MACHINE_HAS_MVCOS (machine_flags & MACHINE_FLAG_MVCOS) -#define MACHINE_HAS_HPAGE (machine_flags & MACHINE_FLAG_HPAGE) -#define MACHINE_HAS_PFMF (machine_flags & MACHINE_FLAG_PFMF) +#define MACHINE_HAS_MVCOS (S390_lowcore.machine_flags & MACHINE_FLAG_MVCOS) +#define MACHINE_HAS_HPAGE (S390_lowcore.machine_flags & MACHINE_FLAG_HPAGE) +#define MACHINE_HAS_PFMF (S390_lowcore.machine_flags & MACHINE_FLAG_PFMF)#endif /* __s390x__ */ #define ZFCPDUMP_HSA_SIZE (32UL<<20)
arch/s390/include/asm/thread_info.h +2 -1
@@ -31,8 +31,9 @@#define ASYNC_SIZE (PAGE_SIZE << ASYNC_ORDER)#ifndef __ASSEMBLY__ -#include <asm/processor.h> #include <asm/lowcore.h> +#include <asm/page.h> +#include <asm/processor.h> /* * low level task data that entry.S needs immediate access to
arch/s390/include/asm/timer.h +1 -0
@@ -41,6 +41,7 @@ extern void init_virt_timer(struct vtimer_list *timer);extern void add_virt_timer (void *new);extern void add_virt_timer_periodic (void *new);extern int mod_virt_timer (struct vtimer_list *timer,__u64 expires); +extern int mod_virt_timer_periodic (struct vtimer_list *timer,__u64 expires);extern int del_virt_timer (struct vtimer_list *timer);extern void init_cpu_vtimer (void );
arch/s390/include/asm/timex.h +5 -0
@@ -11,6 +11,9 @@#ifndef _ASM_S390_TIMEX_H#define _ASM_S390_TIMEX_H +/* The value of the TOD clock for 1.1.1970. */ +#define TOD_UNIX_EPOCH 0x7d91048bca000000ULL +/* Inline functions for clock register access. */ static inline int set_clock (__u64 time) {
@@ -85,4 +88,6 @@ int get_sync_clock(unsigned long long *clock);void init_cpu_timer (void );unsigned long long monotonic_clock (void ); +extern u64 sched_clock_base_cc; +#endif
arch/s390/include/asm/unistd.h +3 -1
@@ -265,7 +265,9 @@#define __NR_pipe2 325#define __NR_dup3 326#define __NR_epoll_create1 327 -#define NR_syscalls 328 +#define __NR_preadv 328 +#define __NR_pwritev 329 +#define NR_syscalls 330/* * There are some system calls that are not present on 64 bit, some
arch/s390/kernel/asm-offsets.c +2 -0
@@ -27,6 +27,8 @@ int main(void)DEFINE (__TI_flags, offsetof(struct thread_info , flags));DEFINE (__TI_cpu, offsetof(struct thread_info , cpu));DEFINE (__TI_precount, offsetof(struct thread_info , preempt_count)); +DEFINE (__TI_user_timer, offsetof(struct thread_info , user_timer)); +DEFINE (__TI_system_timer, offsetof(struct thread_info , system_timer));BLANK ();DEFINE (__PT_ARGS, offsetof(struct pt_regs , args));DEFINE (__PT_PSW, offsetof(struct pt_regs , psw));
arch/s390/kernel/compat_wrapper.S +18 -0
@@ -1805,3 +1805,21 @@ compat_sys_keyctl_wrapper: llgfr %r5,%r5 # u32 llgfr %r6,%r6 # u32 jg compat_sys_keyctl # branch to system call + + .globl compat_sys_preadv_wrapper +compat_sys_preadv_wrapper: + llgfr %r2,%r2 # unsigned long + llgtr %r3,%r3 # compat_iovec * + llgfr %r4,%r4 # unsigned long + llgfr %r5,%r5 # u32 + llgfr %r6,%r6 # u32 + jg compat_sys_preadv # branch to system call + + .globl compat_sys_pwritev_wrapper +compat_sys_pwritev_wrapper: + llgfr %r2,%r2 # unsigned long + llgtr %r3,%r3 # compat_iovec * + llgfr %r4,%r4 # unsigned long + llgfr %r5,%r5 # u32 + llgfr %r6,%r6 # u32 + jg compat_sys_pwritev # branch to system call
arch/s390/kernel/early.c +19 -0
@@ -34,8 +34,25 @@char kernel_nss_name[NSS_NAME_SIZE +1 ]; +static unsigned long machine_flags; +static void __init setup_boot_command_line (void ); +/* +* Get the TOD clock running. +*/ +static void __init reset_tod_clock (void ) +{ +u64 time; + +if (store_clock (&time) ==0 ) +return ; +/* TOD clock not running. Set the clock to Unix Epoch. */ +if (set_clock (TOD_UNIX_EPOCH ) !=0 ||store_clock (&time) !=0 ) +disabled_wait (0 ); + + sched_clock_base_cc =TOD_UNIX_EPOCH ; +}#ifdef CONFIG_SHARED_KERNEL int __init savesys_ipl_nss (char *cmd,const int cmdlen);
@@ -370,6 +387,7 @@ static void __init setup_boot_command_line(void)*/ void __init startup_init (void ) { +reset_tod_clock ();ipl_save_parameters ();rescue_initrd ();clear_bss_section ();
@@ -391,5 +409,6 @@ void __init startup_init(void)setup_hpage ();sclp_facilities_detect ();detect_memory_layout (memory_chunk); + S390_lowcore.machine_flags = machine_flags;lockdep_on (); }
arch/s390/kernel/entry.S +13 -0
@@ -837,16 +837,29 @@ mcck_return: __CPUINIT .globl restart_int_handler restart_int_handler: + basr %r1,0 +restart_base: + spt restart_vtime-restart_base(%r1) + stck __LC_LAST_UPDATE_CLOCK + mvc __LC_LAST_UPDATE_TIMER(8),restart_vtime-restart_base(%r1) + mvc __LC_EXIT_TIMER(8),restart_vtime-restart_base(%r1) l %r15,__LC_SAVE_AREA+60 # load ksp lctl %c0,%c15,__LC_CREGS_SAVE_AREA # get new ctl regs lam %a0,%a15,__LC_AREGS_SAVE_AREA lm %r6,%r15,__SF_GPRS(%r15) # load registers from clone + l %r1,__LC_THREAD_INFO + mvc __LC_USER_TIMER(8),__TI_user_timer(%r1) + mvc __LC_SYSTEM_TIMER(8),__TI_system_timer(%r1) + xc __LC_STEAL_TIMER(8),__LC_STEAL_TIMER stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on basr %r14,0 l %r14,restart_addr-.(%r14) br %r14 # branch to start_secondary restart_addr: .long start_secondary + .align 8 +restart_vtime: + .long 0x7fffffff,0xffffffff .previous #else /*
arch/s390/kernel/entry64.S +13 -0
@@ -831,14 +831,27 @@ mcck_return: __CPUINIT .globl restart_int_handler restart_int_handler: + basr %r1,0 +restart_base: + spt restart_vtime-restart_base(%r1) + stck __LC_LAST_UPDATE_CLOCK + mvc __LC_LAST_UPDATE_TIMER(8),restart_vtime-restart_base(%r1) + mvc __LC_EXIT_TIMER(8),restart_vtime-restart_base(%r1) lg %r15,__LC_SAVE_AREA+120 # load ksp lghi %r10,__LC_CREGS_SAVE_AREA lctlg %c0,%c15,0(%r10) # get new ctl regs lghi %r10,__LC_AREGS_SAVE_AREA lam %a0,%a15,0(%r10) lmg %r6,%r15,__SF_GPRS(%r15) # load registers from clone + lg %r1,__LC_THREAD_INFO + mvc __LC_USER_TIMER(8),__TI_user_timer(%r1) + mvc __LC_SYSTEM_TIMER(8),__TI_system_timer(%r1) + xc __LC_STEAL_TIMER(8),__LC_STEAL_TIMER stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on jg start_secondary + .align 8 +restart_vtime: + .long 0x7fffffff,0xffffffff .previous #else /*
arch/s390/kernel/head.S +12 -3
@@ -471,7 +471,12 @@ startup:basr %r13,0 # get base .LPG0: xc 0x200(256),0x200 # partially clear lowcore xc 0x300(256),0x300 - + l %r1,5f-.LPG0(%r13) + stck 0(%r1) + spt 6f-.LPG0(%r13) + mvc __LC_LAST_UPDATE_CLOCK(8),0(%r1) + mvc __LC_LAST_UPDATE_TIMER(8),6f-.LPG0(%r13) + mvc __LC_EXIT_TIMER(8),5f-.LPG0(%r13) #ifndef CONFIG_MARCH_G5 # check processor version against MARCH_{G5,Z900,Z990,Z9_109,Z10} stidp __LC_CPUID # store cpuid
@@ -496,9 +501,13 @@ startup:basr %r13,0 # get base brct %r0,0b #endif - l %r13,0f-.LPG0(%r13) + l %r13,4f-.LPG0(%r13) b 0(%r13) -0: .long startup_continue + .align 4 +4: .long startup_continue +5: .long sched_clock_base_cc + .align 8 +6: .long 0x7fffffff,0xffffffff # # params at 10400 (setup.h)
arch/s390/kernel/nmi.c +3 -2
@@ -10,6 +10,7 @@#include <linux/init.h> #include <linux/errno.h> +#include <linux/hardirq.h> #include <linux/time.h> #include <linux/module.h> #include <asm/lowcore.h>
@@ -253,7 +254,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs)struct mci *mci;int umode; -lockdep_off (); +nmi_enter ();s390_idle_check (); mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
@@ -363,7 +364,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs) mcck->warning =1 ;set_thread_flag (TIF_MCCK_PENDING ); } -lockdep_on (); +nmi_exit (); }static int __init machine_check_init (void )
arch/s390/kernel/setup.c +9 -3
@@ -82,9 +82,6 @@ EXPORT_SYMBOL(console_devno);unsigned int console_irq =-1 ;EXPORT_SYMBOL (console_irq); -unsigned long machine_flags; -EXPORT_SYMBOL (machine_flags); -unsigned long elf_hwcap =0 ;char elf_platform[ELF_PLATFORM_SIZE ];
@@ -426,6 +423,7 @@ setup_lowcore(void)__alloc_bootmem (PAGE_SIZE ,PAGE_SIZE ,0 ) +PAGE_SIZE ; lc->current_task = (unsigned long ) init_thread_union.thread_info.task; lc->thread_info = (unsigned long ) &init_thread_union; + lc->machine_flags = S390_lowcore.machine_flags;#ifndef CONFIG_64BIT if (MACHINE_HAS_IEEE ) { lc->extended_save_area_addr = (__u32)
@@ -436,6 +434,14 @@ setup_lowcore(void)#else lc->vdso_per_cpu_data = (unsigned long ) &lc->paste[0 ];#endif + lc->sync_enter_timer = S390_lowcore.sync_enter_timer; + lc->async_enter_timer = S390_lowcore.async_enter_timer; + lc->exit_timer = S390_lowcore.exit_timer; + lc->user_timer = S390_lowcore.user_timer; + lc->system_timer = S390_lowcore.system_timer; + lc->steal_timer = S390_lowcore.steal_timer; + lc->last_update_timer = S390_lowcore.last_update_timer; + lc->last_update_clock = S390_lowcore.last_update_clock;set_prefix ((u32 )(unsigned long ) lc); lowcore_ptr[0 ] = lc; }
arch/s390/kernel/smp.c +3 -1
@@ -571,6 +571,7 @@ int __cpuinit __cpu_up(unsigned int cpu) cpu_lowcore->current_task = (unsigned long ) idle; cpu_lowcore->cpu_nr = cpu; cpu_lowcore->kernel_asce = S390_lowcore.kernel_asce; + cpu_lowcore->machine_flags = S390_lowcore.machine_flags;eieio ();while (signal_processor (cpu, sigp_restart) == sigp_busy)
@@ -590,7 +591,8 @@ static int __init setup_possible_cpus(char *s)int pcpus, cpu; pcpus =simple_strtoul (s,NULL ,0 ); -for (cpu =0 ; cpu < pcpus && cpu < nr_cpu_ids; cpu++) +init_cpu_possible (cpumask_of (0 )); +for (cpu =1 ; cpu < pcpus && cpu < nr_cpu_ids; cpu++)set_cpu_possible (cpu, true);return 0 ; }
arch/s390/kernel/syscalls.S +2 -0
@@ -336,3 +336,5 @@ SYSCALL(sys_inotify_init1,sys_inotify_init1,sys_inotify_init1_wrapper) SYSCALL(sys_pipe2,sys_pipe2,sys_pipe2_wrapper) /* 325 */ SYSCALL(sys_dup3,sys_dup3,sys_dup3_wrapper) SYSCALL(sys_epoll_create1,sys_epoll_create1,sys_epoll_create1_wrapper) +SYSCALL(sys_preadv,sys_preadv,compat_sys_preadv_wrapper) +SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev_wrapper)
arch/s390/kernel/time.c +51 -26
148 lines not on this page · raw message
arch/s390/kernel/vtime.c +35 -32
122 lines not on this page · raw message
drivers/s390/block/dasd.c +25 -12
@@ -20,6 +20,7 @@#include <linux/slab.h> #include <linux/buffer_head.h> #include <linux/hdreg.h> +#include <linux/async.h> #include <asm/ccwdev.h> #include <asm/ebcdic.h>
@@ -480,8 +481,10 @@ static void dasd_change_state(struct dasd_device *device)if (rc && rc != -EAGAIN ) device->target = device->state; -if (device->state == device->target) +if (device->state == device->target) {wake_up (&dasd_init_waitq); +dasd_put_device (device); + }/* let user-space know that the device status changed */ kobject_uevent (&device->cdev->dev.kobj,KOBJ_CHANGE );
@@ -513,12 +516,15 @@ void dasd_kick_device(struct dasd_device *device)*/ void dasd_set_target_state (struct dasd_device *device,int target) { +dasd_get_device (device);/* If we are in probeonly mode stop at DASD_STATE_READY. */ if (dasd_probeonly && target >DASD_STATE_READY ) target =DASD_STATE_READY ;if (device->target != target) { -if (device->state == target) +if (device->state == target) {wake_up (&dasd_init_waitq); +dasd_put_device (device); + } device->target = target; }if (device->state != device->target)
@@ -2148,6 +2154,22 @@ dasd_exit(void)* SECTION: common functions for ccw_driver use */ +static void dasd_generic_auto_online (void *data,async_cookie_t cookie) +{ +struct ccw_device *cdev = data; +int ret; + + ret =ccw_device_set_online (cdev); +if (ret) +pr_warning ("%s: Setting the DASD online failed with rc=%d\n" , +dev_name (&cdev->dev), ret); +else { +struct dasd_device *device =dasd_device_from_cdev (cdev); +wait_event (dasd_init_waitq,_wait_for_device (device)); +dasd_put_device (device); + } +} +/* * Initial attempt at a probe function. this can be simplified once * the other detection code is gone.
@@ -2180,10 +2202,7 @@ int dasd_generic_probe(struct ccw_device *cdev,*/ if ((dasd_get_feature (cdev,DASD_FEATURE_INITIAL_ONLINE ) >0 ) || (dasd_autodetect &&dasd_busid_known (dev_name (&cdev->dev)) !=0 )) - ret =ccw_device_set_online (cdev); -if (ret) -pr_warning ("%s: Setting the DASD online failed with rc=%d\n" , -dev_name (&cdev->dev), ret); +async_schedule (dasd_generic_auto_online, cdev);return 0 ; }
@@ -2290,13 +2309,7 @@ int dasd_generic_set_online(struct ccw_device *cdev, }else pr_debug ("dasd_generic device %s found\n" ,dev_name (&cdev->dev)); - -/* FIXME: we have to wait for the root device but we don't want -* to wait for each single device but for all at once. */ -wait_event (dasd_init_waitq,_wait_for_device (device)); -dasd_put_device (device); -return rc; }
drivers/s390/block/dasd_eckd.c +12 -4
@@ -2019,15 +2019,23 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track( ccw++; recid += count; new_track =0 ; +/* first idaw for a ccw may start anywhere */ +if (!idaw_dst) + idaw_dst = dst; } -/* If we start a new idaw, everything is fine and the -* start of the new idaw is the start of this segment. +/* If we start a new idaw, we must make sure that it +* starts on an IDA_BLOCK_SIZE boundary. * If we continue an idaw, we must make sure that the * current segment begins where the so far accumulated * idaw ends */ -if (!idaw_dst) - idaw_dst = dst; +if (!idaw_dst) { +if (__pa (dst) & (IDA_BLOCK_SIZE -1 )) { +dasd_sfree_request (cqr, startdev); +return ERR_PTR (-ERANGE ); + }else + idaw_dst = dst; + }if ((idaw_dst + idaw_len) != dst) {dasd_sfree_request (cqr, startdev);return ERR_PTR (-ERANGE );
drivers/s390/cio/qdio_main.c +2 -41
61 lines not on this page · raw message