s390 patches for 2.6.31
Subsystems (8)
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:
Felix Beck (1):
[S390] ap/zcrypt: Suspend/Resume ap bus and zcrypt
Heiko Carstens (7):
[S390] time: convert from bootmem to slab [S390] 3215 console: convert from bootmem to slab [S390] 3270 console: convert from bootmem to slab [S390] sclp console: convert from bootmem to slab [S390] vt220 console: convert from bootmem to slab [S390] pm: fix build error for !SMP [S390] kprobes: defer setting of ctlblk state
Jan Glauber (6):
[S390] qdio: move adapter interrupt tasklet code [S390] qdio: fix check for running under z/VM [S390] qdio: extract all primed SBALs at once [S390] qdio: merge AI tasklet into interrupt handler [S390] qdio: leave inbound SBALs primed [S390] qdio: Sanitize do_QDIO sanity checks
Martin Schwidefsky (4):
[S390] driver_data access
[S390] lockless idle time accounting [S390] Enable tick based perf_counter on s390. [S390] Update default configuration.
Michael Holzheu (1):
[S390] Use del_timer instead of del_timer_sync
Pekka Enberg (1):
[S390] s390: remove DEBUG_MALLOC
Sebastian Ott (1):
[S390] dasd: fix refcounting in dasd_change_state
Stefan Haberland (1):
[S390] dasd_pm: fix stop flag handling
arch/s390/Kconfig | 1 + arch/s390/defconfig | 72 +++++++++++++---- arch/s390/include/asm/cputime.h | 2 +- arch/s390/include/asm/debug.h | 9 -- arch/s390/include/asm/perf_counter.h | 8 ++ arch/s390/include/asm/qdio.h | 2 +- arch/s390/kernel/kprobes.c | 18 ++--- arch/s390/kernel/smp.c | 28 +++++-- arch/s390/kernel/time.c | 16 +--- arch/s390/kernel/vtime.c | 27 ++++--- arch/s390/power/swsusp_asm64.S | 6 +- drivers/s390/block/dasd.c | 20 ++++- drivers/s390/block/dasd_eckd.c | 10 +-- drivers/s390/char/con3215.c | 22 ++--- drivers/s390/char/con3270.c | 13 +-- drivers/s390/char/monreader.c | 6 +- drivers/s390/char/raw3270.c | 36 +-------- drivers/s390/char/sclp_con.c | 7 +- drivers/s390/char/sclp_vt220.c | 18 +--- drivers/s390/char/tape_core.c | 2 +- drivers/s390/char/vmlogrdr.c | 4 +- drivers/s390/char/vmur.c | 2 +- drivers/s390/cio/qdio.h | 11 +-- drivers/s390/cio/qdio_debug.c | 3 +- drivers/s390/cio/qdio_main.c | 144 +++++++++++++++++---------------- drivers/s390/cio/qdio_thinint.c | 114 ++++----------------------- drivers/s390/crypto/ap_bus.c | 85 +++++++++++++++++++- drivers/s390/net/netiucv.c | 4 +- tools/perf/perf.h | 6 ++ 29 files changed, 350 insertions(+), 346 deletions(-) create mode 100644 arch/s390/include/asm/perf_counter.h
arch/s390/Kconfig +1 -0
@@ -94,6 +94,7 @@ config S390 select HAVE_KVM if 64BIT select HAVE_ARCH_TRACEHOOK select INIT_ALL_POSSIBLE + select HAVE_PERF_COUNTERS source "init/Kconfig"
arch/s390/defconfig +54 -18
198 lines not on this page · raw message
arch/s390/include/asm/cputime.h +1 -1
@@ -178,7 +178,7 @@ cputime64_to_clock_t(cputime64_t cputime) }struct s390_idle_data { -spinlock_t lock; +unsigned int sequence;unsigned long long idle_count;unsigned long long idle_enter;unsigned long long idle_time;
arch/s390/include/asm/debug.h +0 -9
@@ -248,14 +248,5 @@ int debug_unregister_view(debug_info_t* id, struct debug_view* view); #define PRINT_FATAL(x...) printk ( KERN_DEBUG PRINTK_HEADER x )#endif /* DASD_DEBUG */ -#undef DEBUG_MALLOC -#ifdef DEBUG_MALLOC -void *b; -#define kmalloc(x...) (PRINT_INFO(" kmalloc %p\n",b=kmalloc(x)),b) -#define kfree (x) PRINT_INFO(" kfree %p\n",x);kfree(x) -#define get_zeroed_page(x...) (PRINT_INFO(" gfp %p\n",b=get_zeroed_page(x)),b) -#define __get_free_pages(x...) (PRINT_INFO(" gfps %p\n",b=__get_free_pages(x)),b) -#endif /* DEBUG_MALLOC */ -#endif /* __KERNEL__ */ #endif /* DEBUG_H */
arch/s390/include/asm/perf_counter.h new file +8 -0
@@ -0,0 +1,8 @@ +/* +* Performance counter support - s390 specific definitions. +* +* Copyright 2009 Martin Schwidefsky, IBM Corporation. +*/ + +static inline void set_perf_counter_pending (void ) {} +static inline void clear_perf_counter_pending (void ) {}
arch/s390/include/asm/qdio.h +1 -1
@@ -380,7 +380,7 @@ extern int qdio_establish(struct qdio_initialize *);extern int qdio_activate (struct ccw_device *);extern int do_QDIO (struct ccw_device *cdev,unsigned int callflags, -int q_nr,int bufnr,int count); +int q_nr,unsigned int bufnr,unsigned int count);extern int qdio_cleanup (struct ccw_device *,int );extern int qdio_shutdown (struct ccw_device *,int );extern int qdio_free (struct ccw_device *);
arch/s390/kernel/kprobes.c +7 -11
@@ -154,39 +154,35 @@ void __kprobes get_instruction_type(struct arch_specific_insn *ainsn)static int __kprobes swap_instruction (void *aref) { +struct kprobe_ctlblk *kcb =get_kprobe_ctlblk (); +unsigned long status = kcb->kprobe_status;struct ins_replace_args *args = aref; +int rc; -return probe_kernel_write (args->ptr, &args->new,sizeof (args->new)); + kcb->kprobe_status =KPROBE_SWAP_INST ; + rc =probe_kernel_write (args->ptr, &args->new,sizeof (args->new)); + kcb->kprobe_status = status; +return rc; }void __kprobes arch_arm_kprobe (struct kprobe *p) { -struct kprobe_ctlblk *kcb =get_kprobe_ctlblk (); -unsigned long status = kcb->kprobe_status;struct ins_replace_args args; args.ptr = p->addr; args.old = p->opcode; args.new =BREAKPOINT_INSTRUCTION ; - - kcb->kprobe_status =KPROBE_SWAP_INST ;stop_machine (swap_instruction, &args,NULL ); - kcb->kprobe_status = status; }void __kprobes arch_disarm_kprobe (struct kprobe *p) { -struct kprobe_ctlblk *kcb =get_kprobe_ctlblk (); -unsigned long status = kcb->kprobe_status;struct ins_replace_args args; args.ptr = p->addr; args.old =BREAKPOINT_INSTRUCTION ; args.new = p->opcode; - - kcb->kprobe_status =KPROBE_SWAP_INST ;stop_machine (swap_instruction, &args,NULL ); - kcb->kprobe_status = status; }void __kprobes arch_remove_kprobe (struct kprobe *p)
arch/s390/kernel/smp.c +19 -9
@@ -856,13 +856,20 @@ static ssize_t show_idle_count(struct sys_device *dev, {struct s390_idle_data *idle;unsigned long long idle_count; +unsigned int sequence; idle = &per_cpu (s390_idle, dev->id); -spin_lock (&idle->lock); +repeat: + sequence = idle->sequence; +smp_rmb (); +if (sequence &1 ) + goto repeat; idle_count = idle->idle_count;if (idle->idle_enter) idle_count++; -spin_unlock (&idle->lock); +smp_rmb (); +if (idle->sequence != sequence) + goto repeat;return sprintf (buf,"%llu\n" , idle_count); } static SYSDEV_ATTR(idle_count, 0444, show_idle_count, NULL);
@@ -872,15 +879,22 @@ static ssize_t show_idle_time(struct sys_device *dev, {struct s390_idle_data *idle;unsigned long long now, idle_time, idle_enter; +unsigned int sequence; idle = &per_cpu (s390_idle, dev->id); -spin_lock (&idle->lock); now =get_clock (); +repeat: + sequence = idle->sequence; +smp_rmb (); +if (sequence &1 ) + goto repeat; idle_time = idle->idle_time; idle_enter = idle->idle_enter;if (idle_enter !=0ULL && idle_enter < now) idle_time += now - idle_enter; -spin_unlock (&idle->lock); +smp_rmb (); +if (idle->sequence != sequence) + goto repeat;return sprintf (buf,"%llu\n" , idle_time >>12 ); } static SYSDEV_ATTR(idle_time_us, 0444, show_idle_time, NULL);
@@ -908,11 +922,7 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,case CPU_ONLINE :case CPU_ONLINE_FROZEN : idle = &per_cpu (s390_idle, cpu); -spin_lock_irq (&idle->lock); - idle->idle_enter =0 ; - idle->idle_time =0 ; - idle->idle_count =0 ; -spin_unlock_irq (&idle->lock); +memset (idle,0 ,sizeof (struct s390_idle_data ));if (sysfs_create_group (&s->kobj, &cpu_online_attr_group))return NOTIFY_BAD ;break ;
arch/s390/kernel/time.c +4 -12
@@ -36,7 +36,6 @@#include <linux/notifier.h> #include <linux/clocksource.h> #include <linux/clockchips.h> -#include <linux/bootmem.h> #include <asm/uaccess.h> #include <asm/delay.h> #include <asm/s390_ext.h>
@@ -62,9 +61,6 @@u64 sched_clock_base_cc =-1 ;/* Force to data section. */ -static ext_int_info_t ext_int_info_cc; -static ext_int_info_t ext_int_etr_cc; - static DEFINE_PER_CPU(struct clock_event_device, comparators);/*
@@ -255,15 +251,11 @@ void __init time_init(void)stp_reset ();/* request the clock comparator external interrupt */ -if (register_early_external_interrupt (0x1004 , - clock_comparator_interrupt, - &ext_int_info_cc) !=0 ) +if (register_external_interrupt (0x1004 , clock_comparator_interrupt))panic ("Couldn't request external interrupt 0x1004" );/* request the timing alert external interrupt */ -if (register_early_external_interrupt (0x1406 , - timing_alert_interrupt, - &ext_int_etr_cc) !=0 ) +if (register_external_interrupt (0x1406 , timing_alert_interrupt))panic ("Couldn't request external interrupt 0x1406" );if (clocksource_register (&clocksource_tod) !=0 )
@@ -1445,14 +1437,14 @@ static void __init stp_reset(void) {int rc; - stp_page =alloc_bootmem_pages (PAGE_SIZE ); + stp_page = (void *)get_zeroed_page (GFP_ATOMIC ); rc =chsc_sstpc (stp_page,STP_OP_CTRL ,0x0000 );if (rc ==0 )set_bit (CLOCK_SYNC_HAS_STP , &clock_sync_flags);else if (stp_online) {pr_warning ("The real or virtual hardware system does " "not provide an STP interface\n" ); -free_bootmem ((unsigned long ) stp_page,PAGE_SIZE ); +free_page ((unsigned long ) stp_page); stp_page =NULL ; stp_online =0 ; }
arch/s390/kernel/vtime.c +16 -11
@@ -25,13 +25,9 @@#include <asm/irq_regs.h> #include <asm/cputime.h> -static ext_int_info_t ext_int_info_timer; - static DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer); -DEFINE_PER_CPU (struct s390_idle_data ,s390_idle ) = { - .lock =__SPIN_LOCK_UNLOCKED (s390_idle.lock) -}; +DEFINE_PER_CPU (struct s390_idle_data , s390_idle);static inline __u64 get_vtimer (void ) {
@@ -153,11 +149,13 @@ void vtime_start_cpu(void) vq->elapsed -= vq->idle - S390_lowcore.async_enter_timer; } -spin_lock (&idle->lock); + idle->sequence++; +smp_wmb (); idle->idle_time += idle_time; idle->idle_enter =0ULL ; idle->idle_count++; -spin_unlock (&idle->lock); +smp_wmb (); + idle->sequence++; }void vtime_stop_cpu (void )
@@ -244,15 +242,23 @@ cputime64_t s390_get_idle_time(int cpu) {struct s390_idle_data *idle;unsigned long long now, idle_time, idle_enter; +unsigned int sequence; idle = &per_cpu (s390_idle, cpu); -spin_lock (&idle->lock); + now =get_clock (); +repeat: + sequence = idle->sequence; +smp_rmb (); +if (sequence &1 ) + goto repeat; idle_time =0 ; idle_enter = idle->idle_enter;if (idle_enter !=0ULL && idle_enter < now) idle_time = now - idle_enter; -spin_unlock (&idle->lock); +smp_rmb (); +if (idle->sequence != sequence) + goto repeat;return idle_time; }
@@ -557,8 +563,7 @@ void init_cpu_vtimer(void)void __init vtime_init (void ) {/* request the cpu timer external interrupt */ -if (register_early_external_interrupt (0x1005 , do_cpu_timer_interrupt, - &ext_int_info_timer) !=0 ) +if (register_external_interrupt (0x1005 , do_cpu_timer_interrupt))panic ("Couldn't request external interrupt 0x1005" );/* Enable cpu timer interrupts on the boot cpu. */
arch/s390/power/swsusp_asm64.S +4 -2
@@ -109,10 +109,11 @@ swsusp_arch_resume: aghi %r15,-STACK_FRAME_OVERHEAD stg %r1,__SF_BACKCHAIN(%r15) +#ifdef CONFIG_SMP /* Save boot cpu number */ brasl %r14,smp_get_phys_cpu_id lgr %r10,%r2 - +#endif /* Deactivate DAT */ stnsm __SF_EMPTY(%r15),0xfb
@@ -177,11 +178,12 @@ swsusp_arch_resume: /* Pointer to save arae */ lghi %r13,0x1000 +#ifdef CONFIG_SMP /* Switch CPUs */ lgr %r2,%r10 /* get cpu id */ llgf %r3,0x318(%r13) brasl %r14,smp_switch_boot_cpu_in_resume - +#endif /* Restore prefix register */ spx 0x318(%r13)
drivers/s390/block/dasd.c +16 -4
@@ -470,7 +470,7 @@ static int dasd_decrease_state(struct dasd_device *device)*/ static void dasd_change_state (struct dasd_device *device) { -int rc; +int rc;if (device->state == device->target)/* Already where we want to go today... */
@@ -479,8 +479,10 @@ static void dasd_change_state(struct dasd_device *device) rc =dasd_increase_state (device); else rc =dasd_decrease_state (device); -if (rc && rc != -EAGAIN ) - device->target = device->state; +if (rc == -EAGAIN ) +return ; +if (rc) + device->target = device->state;if (device->state == device->target) {wake_up (&dasd_init_waitq);
@@ -2503,15 +2505,25 @@ int dasd_generic_restore_device(struct ccw_device *cdev)if (IS_ERR (device))return PTR_ERR (device); +/* allow new IO again */ + device->stopped &= ~DASD_STOPPED_PM ; + device->stopped &= ~DASD_UNRESUMED_PM ; +dasd_schedule_device_bh (device);if (device->block)dasd_schedule_block_bh (device->block);if (device->discipline->restore) rc = device->discipline->restore (device); +if (rc) +/* +* if the resume failed for the DASD we put it in +* an UNRESUMED stop state +*/ + device->stopped |=DASD_UNRESUMED_PM ;dasd_put_device (device); -return rc; +return 0 ; }EXPORT_SYMBOL_GPL (dasd_generic_restore_device);
drivers/s390/block/dasd_eckd.c +1 -9
@@ -3243,9 +3243,6 @@ int dasd_eckd_restore_device(struct dasd_device *device)int is_known, rc;struct dasd_uid temp_uid; -/* allow new IO again */ - device->stopped &= ~DASD_STOPPED_PM ; - private = (struct dasd_eckd_private *) device->private;/* Read Configuration Data */
@@ -3295,12 +3292,7 @@ int dasd_eckd_restore_device(struct dasd_device *device)return 0 ; out_err: -/* -* if the resume failed for the DASD we put it in -* an UNRESUMED stop state -*/ - device->stopped |=DASD_UNRESUMED_PM ; -return 0 ; +return -1 ; }static struct ccw_driver dasd_eckd_driver = {
drivers/s390/char/con3215.c +9 -13
@@ -20,10 +20,7 @@#include <linux/interrupt.h> #include <linux/err.h> #include <linux/reboot.h> -#include <linux/slab.h> -#include <linux/bootmem.h> -#include <asm/ccwdev.h> #include <asm/cio.h> #include <asm/io.h>
@@ -735,7 +732,7 @@ static int raw3215_pm_stop(struct ccw_device *cdev)unsigned long flags;/* Empty the output buffer, then prevent new I/O. */ - raw = cdev->dev.driver_data; + raw =dev_get_drvdata (&cdev->dev);spin_lock_irqsave (get_ccwdev_lock (raw->cdev), flags);raw3215_make_room (raw,RAW3215_BUFFER_SIZE ); raw->flags |=RAW3215_FROZEN ;
@@ -749,7 +746,7 @@ static int raw3215_pm_start(struct ccw_device *cdev)unsigned long flags;/* Allow I/O again and flush output buffer. */ - raw = cdev->dev.driver_data; + raw =dev_get_drvdata (&cdev->dev);spin_lock_irqsave (get_ccwdev_lock (raw->cdev), flags); raw->flags &= ~RAW3215_FROZEN ; raw->flags |=RAW3215_FLUSHING ;
@@ -883,7 +880,7 @@ static int __init con3215_init(void) raw3215_freelist =NULL ;spin_lock_init (&raw3215_freelist_lock);for (i =0 ; i <NR_3215_REQ ; i++) { - req = (struct raw3215_req *)alloc_bootmem_low (sizeof (struct raw3215_req )); + req =kzalloc (sizeof (struct raw3215_req ),GFP_KERNEL |GFP_DMA ); req->next = raw3215_freelist; raw3215_freelist = req; }
@@ -893,10 +890,9 @@ static int __init con3215_init(void)return -ENODEV ; raw3215[0 ] = raw = (struct raw3215_info *) -alloc_bootmem_low (sizeof (struct raw3215_info )); -memset (raw,0 ,sizeof (struct raw3215_info )); - raw->buffer = (char *)alloc_bootmem_low (RAW3215_BUFFER_SIZE ); - raw->inbuf = (char *)alloc_bootmem_low (RAW3215_INBUF_SIZE ); +kzalloc (sizeof (struct raw3215_info ),GFP_KERNEL |GFP_DMA ); + raw->buffer =kzalloc (RAW3215_BUFFER_SIZE ,GFP_KERNEL |GFP_DMA ); + raw->inbuf =kzalloc (RAW3215_INBUF_SIZE ,GFP_KERNEL |GFP_DMA ); raw->cdev = cdev;dev_set_drvdata (&cdev->dev, raw); cdev->handler = raw3215_irq;
@@ -906,9 +902,9 @@ static int __init con3215_init(void)/* Request the console irq */ if (raw3215_startup (raw) !=0 ) { -free_bootmem ((unsigned long ) raw->inbuf,RAW3215_INBUF_SIZE ); -free_bootmem ((unsigned long ) raw->buffer,RAW3215_BUFFER_SIZE ); -free_bootmem ((unsigned long ) raw,sizeof (struct raw3215_info )); +kfree (raw->inbuf); +kfree (raw->buffer); +kfree (raw); raw3215[0 ] =NULL ;return -ENODEV ; }
drivers/s390/char/con3270.c +5 -8
@@ -7,7 +7,6 @@* Copyright IBM Corp. 2003, 2009 */ -#include <linux/bootmem.h> #include <linux/console.h> #include <linux/init.h> #include <linux/interrupt.h>
@@ -600,16 +599,14 @@ con3270_init(void)if (IS_ERR (rp))return PTR_ERR (rp); - condev = (struct con3270 *)alloc_bootmem_low (sizeof (struct con3270 )); -memset (condev,0 ,sizeof (struct con3270 )); + condev =kzalloc (sizeof (struct con3270 ),GFP_KERNEL |GFP_DMA ); condev->view.dev = rp; - condev->read =raw3270_request_alloc_bootmem (0 ); + condev->read =raw3270_request_alloc (0 ); condev->read->callback = con3270_read_callback; condev->read->callback_data = condev; - condev->write = -raw3270_request_alloc_bootmem (CON3270_OUTPUT_BUFFER_SIZE ); - condev->kreset =raw3270_request_alloc_bootmem (1 ); + condev->write =raw3270_request_alloc (CON3270_OUTPUT_BUFFER_SIZE ); + condev->kreset =raw3270_request_alloc (1 );INIT_LIST_HEAD (&condev->lines);INIT_LIST_HEAD (&condev->update);
@@ -623,7 +620,7 @@ con3270_init(void)INIT_LIST_HEAD (&condev->freemem);for (i =0 ; i <CON3270_STRING_PAGES ; i++) { - cbuf = (void *)alloc_bootmem_low_pages (PAGE_SIZE ); + cbuf = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );add_string_memory (&condev->freemem, cbuf,PAGE_SIZE ); } condev->cline =alloc_string (&condev->freemem, condev->view.cols);
drivers/s390/char/monreader.c +3 -3
@@ -320,7 +320,7 @@ static int mon_open(struct inode *inode, struct file *filp) goto out_path; } filp->private_data = monpriv; - monreader_device->driver_data = monpriv; +dev_set_drvdata (&monreader_device, monpriv);unlock_kernel ();return nonseekable_open (inode, filp);
@@ -463,7 +463,7 @@ static struct miscdevice mon_dev = {*****************************************************************************/ static int monreader_freeze (struct device *dev) { -struct mon_private *monpriv = dev->driver_data; +struct mon_private *monpriv =dev_get_drvdata (&dev);int rc;if (!monpriv)
@@ -487,7 +487,7 @@ static int monreader_freeze(struct device *dev)static int monreader_thaw (struct device *dev) { -struct mon_private *monpriv = dev->driver_data; +struct mon_private *monpriv =dev_get_drvdata (dev);int rc;if (!monpriv)
drivers/s390/char/raw3270.c +4 -32
@@ -7,7 +7,6 @@* Copyright IBM Corp. 2003, 2009 */ -#include <linux/bootmem.h> #include <linux/module.h> #include <linux/err.h> #include <linux/init.h>
@@ -143,33 +142,6 @@ raw3270_request_alloc(size_t size)return rq; } -#ifdef CONFIG_TN3270_CONSOLE -/* -* Allocate a new 3270 ccw request from bootmem. Only works very -* early in the boot process. Only con3270.c should be using this. -*/ -struct raw3270_request __init *raw3270_request_alloc_bootmem (size_t size) -{ -struct raw3270_request *rq; - - rq =alloc_bootmem_low (sizeof (struct raw3270 )); - -/* alloc output buffer. */ -if (size >0 ) - rq->buffer =alloc_bootmem_low (size); - rq->size = size; -INIT_LIST_HEAD (&rq->list); - -/* -* Setup ccw. -*/ - rq->ccw.cda =__pa (rq->buffer); - rq->ccw.flags =CCW_FLAG_SLI ; - -return rq; -} -#endif -/* * Free 3270 ccw request */
@@ -846,8 +818,8 @@ struct raw3270 __init *raw3270_setup_console(struct ccw_device *cdev)char *ascebc;int rc; - rp = (struct raw3270 *)alloc_bootmem_low (sizeof (struct raw3270 )); - ascebc = (char *)alloc_bootmem (256 ); + rp =kzalloc (sizeof (struct raw3270 ),GFP_KERNEL |GFP_DMA ); + ascebc =kzalloc (256 ,GFP_KERNEL ); rc =raw3270_setup_device (cdev, rp, ascebc);if (rc)return ERR_PTR (rc);
@@ -1350,7 +1322,7 @@ static int raw3270_pm_stop(struct ccw_device *cdev)struct raw3270_view *view;unsigned long flags; - rp = cdev->dev.driver_data; + rp =dev_get_drvdata (&cdev->dev);if (!rp)return 0 ;spin_lock_irqsave (get_ccwdev_lock (rp->cdev), flags);
@@ -1376,7 +1348,7 @@ static int raw3270_pm_start(struct ccw_device *cdev)struct raw3270 *rp;unsigned long flags; - rp = cdev->dev.driver_data; + rp =dev_get_drvdata (&cdev->dev);if (!rp)return 0 ;spin_lock_irqsave (get_ccwdev_lock (rp->cdev), flags);
drivers/s390/char/sclp_con.c +3 -4
@@ -11,7 +11,6 @@#include <linux/init.h> #include <linux/timer.h> #include <linux/jiffies.h> -#include <linux/bootmem.h> #include <linux/termios.h> #include <linux/err.h> #include <linux/reboot.h>
@@ -110,7 +109,7 @@ static void sclp_console_sync_queue(void)spin_lock_irqsave (&sclp_con_lock, flags);if (timer_pending (&sclp_con_timer)) -del_timer_sync (&sclp_con_timer); +del_timer (&sclp_con_timer);while (sclp_con_queue_running) {spin_unlock_irqrestore (&sclp_con_lock, flags);sclp_sync_wait ();
@@ -298,8 +297,8 @@ sclp_console_init(void)/* Allocate pages for output buffering */ INIT_LIST_HEAD (&sclp_con_pages);for (i =0 ; i <MAX_CONSOLE_PAGES ; i++) { - page =alloc_bootmem_low_pages (PAGE_SIZE ); -list_add_tail ((struct list_head *) page, &sclp_con_pages); + page = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA ); +list_add_tail (page, &sclp_con_pages); }INIT_LIST_HEAD (&sclp_con_outqueue);spin_lock_init (&sclp_con_lock);
drivers/s390/char/sclp_vt220.c +5 -13
@@ -20,7 +20,6 @@#include <linux/major.h> #include <linux/console.h> #include <linux/kdev_t.h> -#include <linux/bootmem.h> #include <linux/interrupt.h> #include <linux/init.h> #include <linux/reboot.h>
@@ -601,10 +600,7 @@ static void __init __sclp_vt220_free_pages(void)list_for_each_safe (page, p, &sclp_vt220_empty) {list_del (page); -if (slab_is_available ()) -free_page ((unsigned long ) page); -else -free_bootmem ((unsigned long ) page,PAGE_SIZE ); +free_page ((unsigned long ) page); } }
@@ -640,16 +636,12 @@ static int __init __sclp_vt220_init(int num_pages) sclp_vt220_flush_later =0 ;/* Allocate pages for output buffering */ + rc = -ENOMEM ;for (i =0 ; i < num_pages; i++) { -if (slab_is_available ()) - page = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA ); -else - page =alloc_bootmem_low_pages (PAGE_SIZE ); -if (!page) { - rc = -ENOMEM ; + page = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA ); +if (!page) goto out; - } -list_add_tail ((struct list_head *) page, &sclp_vt220_empty); +list_add_tail (page, &sclp_vt220_empty); } rc =sclp_register (&sclp_vt220_register); out:
drivers/s390/char/tape_core.c +1 -1
@@ -396,7 +396,7 @@ int tape_generic_pm_suspend(struct ccw_device *cdev) {struct tape_device *device; - device = cdev->dev.driver_data; + device =dev_get_drvdata (&cdev->dev);if (!device) {return -ENODEV ; }
drivers/s390/char/vmlogrdr.c +2 -2
@@ -663,7 +663,7 @@ static struct attribute *vmlogrdr_attrs[] = {static int vmlogrdr_pm_prepare (struct device *dev) {int rc; -struct vmlogrdr_priv_t *priv = dev->driver_data; +struct vmlogrdr_priv_t *priv =dev_get_drvdata (dev); rc =0 ;if (priv) {
@@ -753,7 +753,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) dev->bus = &iucv_bus; dev->parent = iucv_root; dev->driver = &vmlogrdr_driver; - dev->driver_data = priv; +dev_set_drvdata (dev, priv);/* * The release function could be called after the * module has been unloaded. It's _only_ task is to
drivers/s390/char/vmur.c +1 -1
@@ -170,7 +170,7 @@ static void urdev_put(struct urdev *urd)*/ static int ur_pm_suspend (struct ccw_device *cdev) { -struct urdev *urd = cdev->dev.driver_data; +struct urdev *urd =dev_get_drvdata (&cdev->dev);TRACE ("ur_pm_suspend: cdev=%p\n" , cdev);if (urd->open_flag) {
drivers/s390/cio/qdio.h +2 -9
@@ -351,15 +351,6 @@ static inline unsigned long long get_usecs(void) ((bufnr - dec) &QDIO_MAX_BUFFERS_MASK ) /* prototypes for thin interrupt */ -void qdio_sync_after_thinint (struct qdio_q *q); -int get_buf_state (struct qdio_q *q,unsigned int bufnr,unsigned char *state, -int auto_ack); -void qdio_check_outbound_after_thinint (struct qdio_q *q); -int qdio_inbound_q_moved (struct qdio_q *q); -void qdio_kick_handler (struct qdio_q *q); -void qdio_stop_polling (struct qdio_q *q); -int qdio_siga_sync_q (struct qdio_q *q); -void qdio_setup_thinint (struct qdio_irq *irq_ptr);int qdio_establish_thinint (struct qdio_irq *irq_ptr);void qdio_shutdown_thinint (struct qdio_irq *irq_ptr);
@@ -392,4 +383,6 @@ void qdio_setup_destroy_sysfs(struct ccw_device *cdev);int qdio_setup_init (void );void qdio_setup_exit (void ); +int debug_get_buf_state (struct qdio_q *q,unsigned int bufnr, +unsigned char *state);#endif /* _CIO_QDIO_H */
drivers/s390/cio/qdio_debug.c +1 -2
@@ -70,9 +70,8 @@ static int qstat_show(struct seq_file *m, void *v)seq_printf (m,"slsb buffer states:\n" );seq_printf (m,"|0 |8 |16 |24 |32 |40 |48 |56 63|\n" ); -qdio_siga_sync_q (q);for (i =0 ; i <QDIO_MAX_BUFFERS_PER_Q ; i++) { -get_buf_state (q, i, &state,0 ); +debug_get_buf_state (q, i, &state);switch (state) {case SLSB_P_INPUT_NOT_INIT :case SLSB_P_OUTPUT_NOT_INIT :
drivers/s390/cio/qdio_main.c +74 -70
276 lines not on this page · raw message
drivers/s390/cio/qdio_thinint.c +17 -97
158 lines not on this page · raw message
drivers/s390/crypto/ap_bus.c +83 -2
125 lines not on this page · raw message
drivers/s390/net/netiucv.c +2 -2
@@ -1307,7 +1307,7 @@ static void netiucv_pm_complete(struct device *dev)*/ static int netiucv_pm_freeze (struct device *dev) { -struct netiucv_priv *priv = dev->driver_data; +struct netiucv_priv *priv =dev_get_drvdata (dev);struct net_device *ndev =NULL ;int rc =0 ;
@@ -1331,7 +1331,7 @@ out:*/ static int netiucv_pm_restore_thaw (struct device *dev) { -struct netiucv_priv *priv = dev->driver_data; +struct netiucv_priv *priv =dev_get_drvdata (dev);struct net_device *ndev =NULL ;int rc =0 ;
tools/perf/perf.h +6 -0
@@ -13,6 +13,12 @@#define cpu_relax () asm volatile ("" ::: "memory");#endif +#ifdef __s390__ +#include "../../arch/s390/include/asm/unistd.h" +#define rmb () asm volatile("bcr 15,0" ::: "memory") +#define cpu_relax () asm volatile("" ::: "memory"); +#endif +#include <time.h> #include <unistd.h> #include <sys/types.h>