Please pull git390 'for-linus' branch
Subsystems (9)
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:
arch/s390/Kconfig | 3 + arch/s390/defconfig | 1 arch/s390/kernel/s390_ext.c | 9 ++- arch/s390/kernel/smp.c | 2 - arch/s390/kernel/time.c | 103 +++++++++++----------------------------- arch/s390/kernel/traps.c | 2 - arch/s390/kernel/vtime.c | 5 +- arch/s390/mm/fault.c | 2 - drivers/char/sysrq.c | 1 drivers/s390/block/dasd_diag.c | 2 - drivers/s390/char/ctrlchar.c | 2 - drivers/s390/char/keyboard.c | 2 - drivers/s390/char/monwriter.c | 10 ++-- drivers/s390/char/sclp.c | 4 +- drivers/s390/cio/chsc.c | 25 ++++++---- drivers/s390/cio/cio.c | 6 ++ drivers/s390/crypto/ap_bus.c | 2 - drivers/s390/net/iucv.c | 4 +- include/asm-s390/hardirq.h | 2 - include/asm-s390/irq_regs.h | 1 include/asm-s390/s390_ext.h | 2 - 21 files changed, 83 insertions(+), 107 deletions(-) create mode 100644 include/asm-s390/irq_regs.h
Christian Borntraeger:
[S390] ap bus poll thread priority.
Cornelia Huck:
[S390] cio: 0 is a valid chpid.
Heiko Carstens:
[S390] irq change build fixes.
sysrq: irq change build fix.
Martin Schwidefsky:
[S390] Use CONFIG_GENERIC_TIME and define TOD clock source.
Melissa Howland:
[S390] monwriter buffer limit.
arch/s390/Kconfig +3 -0
@@ -30,6 +30,9 @@ config GENERIC_CALIBRATE_DELAY bool default y +config GENERIC_TIME + def_bool y + config GENERIC_BUST_SPINLOCK bool
arch/s390/defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_STACKTRACE_SUPPORT=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_TIME=y CONFIG_S390=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
arch/s390/kernel/s390_ext.c +6 -3
@@ -16,6 +16,7 @@ #include <linux/interrupt.h>#include <asm/lowcore.h> #include <asm/s390_ext.h> +#include <asm/irq_regs.h> #include <asm/irq.h> /*
@@ -114,26 +115,28 @@ void do_extint(struct pt_regs *regs, uns {ext_int_info_t *p;int index; +struct pt_regs *old_regs;irq_enter (); + old_regs =set_irq_regs (regs); asmvolatile ("mc 0,0" );if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)/** * Make sure that the i/o interrupt did not "overtake" * the last HZ timer interrupt. */ -account_ticks (regs); +account_ticks ();kstat_cpu (smp_processor_id ()).irqs[EXTERNAL_INTERRUPT ]++; index =ext_hash (code);for (p = ext_int_hash[index]; p; p = p->next) {if (likely (p->code == code)) {if (likely (p->handler)) - p->handler (regs, code); + p->handler (code); } } +set_irq_regs (old_regs);irq_exit (); }EXPORT_SYMBOL (register_external_interrupt);EXPORT_SYMBOL (unregister_external_interrupt); -
arch/s390/kernel/smp.c +1 -1
@@ -339,7 +339,7 @@ void machine_power_off_smp(void)* cpus are handled. */ -void do_ext_call_interrupt (struct pt_regs *regs,__u16 code) +void do_ext_call_interrupt (__u16 code) {unsigned long bits;
arch/s390/kernel/time.c +29 -74
157 lines not on this page · raw message
arch/s390/kernel/traps.c +1 -1
@@ -61,7 +61,7 @@ extern pgm_check_handler_t do_dat_except#ifdef CONFIG_PFAULT extern int pfault_init (void );extern void pfault_fini (void ); -extern void pfault_interrupt (struct pt_regs *regs,__u16 error_code); +extern void pfault_interrupt (__u16 error_code);static ext_int_info_t ext_int_pfault;#endif extern pgm_check_handler_t do_monitor_call;
arch/s390/kernel/vtime.c +3 -2
@@ -22,6 +22,7 @@ #include <linux/posix-timers.h>#include <asm/s390_ext.h> #include <asm/timer.h> +#include <asm/irq_regs.h> static ext_int_info_t ext_int_info_timer; DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer);
@@ -241,7 +242,7 @@ static void do_callbacks(struct list_hea/* * Handler for the virtual CPU timer. */ -static void do_cpu_timer_interrupt (struct pt_regs *regs,__u16 error_code) +static void do_cpu_timer_interrupt (__u16 error_code) {int cpu;__u64 next, delta;
@@ -274,7 +275,7 @@ static void do_cpu_timer_interrupt(struclist_move_tail (&event->entry, &cb_list); }spin_unlock (&vt_list->lock); -do_callbacks (&cb_list, regs); +do_callbacks (&cb_list,get_irq_regs ());/* next event is first in list */ spin_lock (&vt_list->lock);
arch/s390/mm/fault.c +1 -1
@@ -451,7 +451,7 @@ void pfault_fini(void) } asmlinkage void -pfault_interrupt (struct pt_regs *regs,__u16 error_code) +pfault_interrupt (__u16 error_code) {struct task_struct *tsk;__u16 subcode;
drivers/char/sysrq.c +1 -0
@@ -38,6 +38,7 @@ #include <linux/kexec.h>#include <linux/irq.h> #include <asm/ptrace.h> +#include <asm/irq_regs.h> /* Whether we react on sysrq keys or just ignore them */ int sysrq_enabled =1 ;
drivers/s390/block/dasd_diag.c +1 -1
@@ -218,7 +218,7 @@ dasd_diag_term_IO(struct dasd_ccw_req */* Handle external interruption. */ static void -dasd_ext_handler (struct pt_regs *regs,__u16 code) +dasd_ext_handler (__u16 code) {struct dasd_ccw_req *cqr, *next;struct dasd_device *device;
drivers/s390/char/ctrlchar.c +1 -1
@@ -20,7 +20,7 @@ static int ctrlchar_sysrq_key;static void ctrlchar_handle_sysrq (void *tty) { -handle_sysrq (ctrlchar_sysrq_key,NULL , (struct tty_struct *) tty); +handle_sysrq (ctrlchar_sysrq_key, (struct tty_struct *) tty); } static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq, NULL);
drivers/s390/char/keyboard.c +1 -1
@@ -304,7 +304,7 @@ #ifdef CONFIG_MAGIC_SYSRQ /* Handif (kbd->sysrq) {if (kbd->sysrq ==K (KT_LATIN ,'-' )) { kbd->sysrq =0 ; -handle_sysrq (value,NULL , kbd->tty); +handle_sysrq (value, kbd->tty);return ; }if (value =='-' ) {
drivers/s390/char/monwriter.c +5 -5
@@ -26,6 +26,7 @@ #include <asm/monwriter.h>#define MONWRITE_MAX_DATALEN 4024static int mon_max_bufs =255 ; +static int mon_buf_count;struct mon_buf {struct list_head list;
@@ -40,7 +41,6 @@ struct mon_private {size_t hdr_to_read;size_t data_to_read;struct mon_buf *current_buf; -int mon_buf_count; };/*
@@ -99,13 +99,13 @@ static int monwrite_new_hdr(struct mon_p rc =monwrite_diag (monhdr, monbuf->data,APPLDATA_STOP_REC );list_del (&monbuf->list); - monpriv->mon_buf_count--; + mon_buf_count--;kfree (monbuf->data);kfree (monbuf); monbuf =NULL ; } }else { -if (monpriv->mon_buf_count >= mon_max_bufs) +if (mon_buf_count >= mon_max_bufs)return -ENOSPC ; monbuf =kzalloc (sizeof (struct mon_buf ),GFP_KERNEL );if (!monbuf)
@@ -118,7 +118,7 @@ static int monwrite_new_hdr(struct mon_p } monbuf->hdr = *monhdr;list_add_tail (&monbuf->list, &monpriv->list); - monpriv->mon_buf_count++; + mon_buf_count++; } monpriv->current_buf = monbuf;return 0 ;
@@ -186,7 +186,7 @@ static int monwrite_close(struct inode *if (entry->hdr.mon_function !=MONWRITE_GEN_EVENT )monwrite_diag (&entry->hdr, entry->data,APPLDATA_STOP_REC ); - monpriv->mon_buf_count--; + mon_buf_count--;list_del (&entry->list);kfree (entry->data);kfree (entry);
drivers/s390/char/sclp.c +2 -2
@@ -324,7 +324,7 @@ __sclp_find_req(u32 sccb)* Prepare read event data request if necessary. Start processing of next * request on queue. */ static void -sclp_interrupt_handler (struct pt_regs *regs,__u16 code) +sclp_interrupt_handler (__u16 code) {struct sclp_req *req;u32 finished_sccb;
@@ -743,7 +743,7 @@ EXPORT_SYMBOL(sclp_reactivate);/* Handler for external interruption used during initialization. Modify * request state to done. */ static void -sclp_check_handler (struct pt_regs *regs,__u16 code) +sclp_check_handler (__u16 code) {u32 finished_sccb;
drivers/s390/cio/chsc.c +16 -9
@@ -200,11 +200,13 @@ css_get_ssd_info(struct subchannel *sch)spin_unlock_irq (&sch->lock);free_page ((unsigned long )page);if (!ret) { -int j, chpid; +int j, chpid, mask;/* Allocate channel path structures, if needed. */ for (j =0 ; j <8 ; j++) { + mask =0x80 >> j; chpid = sch->ssd_info.chpid[j]; -if (chpid && (get_chp_status (chpid) <0 )) +if ((sch->schib.pmcw.pim & mask) && + (get_chp_status (chpid) <0 ))new_channel_path (chpid); } }
@@ -222,13 +224,15 @@ s390_subchannel_remove_chpid(struct devi sch =to_subchannel (dev); chpid = data; -for (j =0 ; j <8 ; j++) -if (sch->schib.pmcw.chpid[j] == chpid->id) +for (j =0 ; j <8 ; j++) { + mask =0x80 >> j; +if ((sch->schib.pmcw.pim & mask) && + (sch->schib.pmcw.chpid[j] == chpid->id))break ; + }if (j >=8 )return 0 ; - mask =0x80 >> j;spin_lock_irq (&sch->lock);stsch (sch->schid, &schib);
@@ -620,7 +624,7 @@ __chp_add_new_sch(struct subchannel_id sstatic int __chp_add (struct subchannel_id schid,void *data) { -int i; +int i, mask;struct channel_path *chp;struct subchannel *sch;
@@ -630,8 +634,10 @@ __chp_add(struct subchannel_id schid, vo/* Check if the subchannel is now available. */ return __chp_add_new_sch (schid);spin_lock_irq (&sch->lock); -for (i=0 ; i<8 ; i++) -if (sch->schib.pmcw.chpid[i] == chp->id) { +for (i=0 ; i<8 ; i++) { + mask =0x80 >> i; +if ((sch->schib.pmcw.pim & mask) && + (sch->schib.pmcw.chpid[i] == chp->id)) {if (stsch (sch->schid, &sch->schib) !=0 ) {/* Endgame. */ spin_unlock_irq (&sch->lock);
@@ -639,6 +645,7 @@ __chp_add(struct subchannel_id schid, vo }break ; } + }if (i==8 ) {spin_unlock_irq (&sch->lock);return 0 ;
@@ -646,7 +653,7 @@ __chp_add(struct subchannel_id schid, vo sch->lpm = ((sch->schib.pmcw.pim & sch->schib.pmcw.pam & sch->schib.pmcw.pom) - |0x80 >> i) & sch->opm; + | mask) & sch->opm;if (sch->driver && sch->driver->verify) sch->driver->verify (&sch->dev);
drivers/s390/cio/cio.c +5 -1
@@ -19,6 +19,7 @@ #include <linux/interrupt.h>#include <asm/cio.h> #include <asm/delay.h> #include <asm/irq.h> +#include <asm/irq_regs.h> #include <asm/setup.h> #include "airq.h" #include "cio.h"
@@ -606,15 +607,17 @@ do_IRQ (struct pt_regs *regs)struct tpi_info *tpi_info;struct subchannel *sch;struct irb *irb; +struct pt_regs *old_regs;irq_enter (); + old_regs =set_irq_regs (regs); asmvolatile ("mc 0,0" );if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)/** * Make sure that the i/o interrupt did not "overtake" * the last HZ timer interrupt. */ -account_ticks (regs); +account_ticks ();/* * Get interrupt information from lowcore */
@@ -652,6 +655,7 @@ do_IRQ (struct pt_regs *regs)* out of the sie which costs more cycles than it saves. */ }while (!MACHINE_IS_VM &&tpi (NULL ) !=0 ); +set_irq_regs (old_regs);irq_exit (); }
drivers/s390/crypto/ap_bus.c +1 -1
@@ -1062,7 +1062,7 @@ static int ap_poll_thread(void *data)unsigned long flags;int requests; -set_user_nice (current,-20 ); +set_user_nice (current,19 );while (1 ) {if (need_resched ()) {schedule ();
drivers/s390/net/iucv.c +2 -2
@@ -116,7 +116,7 @@ static DEFINE_SPINLOCK(iucv_irq_queue_lo*Internal function prototypes */ static void iucv_tasklet_handler (unsigned long ); -static void iucv_irq_handler (struct pt_regs *,__u16 ); +static void iucv_irq_handler (__u16 ); static DECLARE_TASKLET(iucv_tasklet,iucv_tasklet_handler,0);
@@ -2251,7 +2251,7 @@ iucv_sever(__u16 pathid, __u8 user_data[* Places the interrupt buffer on a queue and schedules iucv_tasklet_handler(). */ static void -iucv_irq_handler (struct pt_regs *regs,__u16 code) +iucv_irq_handler (__u16 code) {iucv_irqdata *irqdata;
include/asm-s390/hardirq.h +1 -1
@@ -32,6 +32,6 @@ #define __ARCH_HAS_DO_SOFTIRQ#define HARDIRQ_BITS 8 -extern void account_ticks (struct pt_regs *); +extern void account_ticks (void );#endif /* __ASM_HARDIRQ_H */
include/asm-s390/irq_regs.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/irq_regs.h>
include/asm-s390/s390_ext.h +1 -1
@@ -10,7 +10,7 @@ #define _S390_EXTINT_H* Martin Schwidefsky ([email protected]) */ -typedef void (*ext_int_handler_t )(struct pt_regs *regs,__u16 code); +typedef void (*ext_int_handler_t )(__u16 code);/* * Warning: if you change ext_int_info_t you have to change the