Please pull git390 'for-linus' branch
Subsystems (2)
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/appldata/appldata_base.c | 2 - arch/s390/kernel/s390_ext.c | 4 + arch/s390/kernel/stacktrace.c | 17 +++-- arch/s390/kernel/vtime.c | 8 +-- drivers/s390/char/monwriter.c | 2 - drivers/s390/cio/chsc.c | 23 +++---- drivers/s390/cio/cio.c | 4 + drivers/s390/cio/css.c | 2 - drivers/s390/cio/css.h | 7 +- drivers/s390/cio/device.c | 48 +++++++-------- drivers/s390/cio/device.h | 1 drivers/s390/cio/device_fsm.c | 113 ++++++++++-------------------------- drivers/s390/cio/device_id.c | 14 +++- drivers/s390/cio/device_ops.c | 6 +- drivers/s390/cio/device_pgid.c | 23 ++++--- drivers/s390/cio/device_status.c | 7 +- drivers/s390/cio/qdio.c | 10 ++- include/asm-s390/cio.h | 6 ++ include/asm-s390/timer.h | 2 - 19 files changed, 123 insertions(+), 176 deletions(-)
Christian Borntraeger:
[S390] stacktrace bug.
Cornelia Huck:
[S390] cio: add missing KERN_INFO printk header. [S390] cio: Use ccw_dev_id and subchannel_id in ccw_device_private [S390] cio: Remove grace period for vary off chpid. [S390] cio: remove casts from/to (void *).
Heiko Carstens:
[S390] irq change improvements.
Melissa Howland:
[S390] monwriter kzalloc size.
arch/s390/appldata/appldata_base.c +1 -1
@@ -109,7 +109,7 @@ static LIST_HEAD(appldata_ops_list);* * schedule work and reschedule timer */ -static void appldata_timer_function (unsigned long data,struct pt_regs *regs) +static void appldata_timer_function (unsigned long data) {P_DEBUG (" -= Timer =-\n" ); P_DEBUG("CPU: %i, expire_count: %i\n", smp_processor_id(),
arch/s390/kernel/s390_ext.c +2 -2
@@ -117,8 +117,8 @@ void do_extint(struct pt_regs *regs, unsint index;struct pt_regs *old_regs; -irq_enter (); old_regs =set_irq_regs (regs); +irq_enter (); asmvolatile ("mc 0,0" );if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)/**
@@ -134,8 +134,8 @@ void do_extint(struct pt_regs *regs, uns p->handler (code); } } -set_irq_regs (old_regs);irq_exit (); +set_irq_regs (old_regs); }EXPORT_SYMBOL (register_external_interrupt);
arch/s390/kernel/stacktrace.c +8 -9
@@ -62,27 +62,26 @@ static inline unsigned long save_contextvoid save_stack_trace (struct stack_trace *trace,struct task_struct *task) { registerunsigned long sp asm ("15" ); -unsigned long orig_sp; +unsigned long orig_sp, new_sp; - sp &=PSW_ADDR_INSN ; - orig_sp = sp; + orig_sp = sp &PSW_ADDR_INSN ; - sp =save_context_stack (trace, &trace->skip, sp, + new_sp =save_context_stack (trace, &trace->skip, orig_sp, S390_lowcore.panic_stack -PAGE_SIZE , S390_lowcore.panic_stack); -if ((sp != orig_sp) && !trace->all_contexts) +if ((new_sp != orig_sp) && !trace->all_contexts)return ; - sp =save_context_stack (trace, &trace->skip, sp, + new_sp =save_context_stack (trace, &trace->skip, new_sp, S390_lowcore.async_stack -ASYNC_SIZE , S390_lowcore.async_stack); -if ((sp != orig_sp) && !trace->all_contexts) +if ((new_sp != orig_sp) && !trace->all_contexts)return ;if (task) -save_context_stack (trace, &trace->skip, sp, +save_context_stack (trace, &trace->skip, new_sp, (unsigned long )task_stack_page (task), (unsigned long )task_stack_page (task) +THREAD_SIZE );else -save_context_stack (trace, &trace->skip, sp, +save_context_stack (trace, &trace->skip, new_sp, S390_lowcore.thread_info, S390_lowcore.thread_info +THREAD_SIZE );return ;
arch/s390/kernel/vtime.c +4 -4
@@ -209,11 +209,11 @@ static void list_add_sorted(struct vtime* Do the callback functions of expired vtimer events. * Called from within the interrupt handler. */ -static void do_callbacks (struct list_head *cb_list,struct pt_regs *regs) +static void do_callbacks (struct list_head *cb_list) {struct vtimer_queue *vt_list;struct vtimer_list *event, *tmp; -void (*fn)(unsigned long ,struct pt_regs *); +void (*fn)(unsigned long );unsigned long data;if (list_empty (cb_list))
@@ -224,7 +224,7 @@ static void do_callbacks(struct list_healist_for_each_entry_safe (event, tmp, cb_list, entry) { fn = event->function; data = event->data; -fn (data, regs); +fn (data);if (!event->interval)/* delete one shot timer */
@@ -275,7 +275,7 @@ static void do_cpu_timer_interrupt(__u16list_move_tail (&event->entry, &cb_list); }spin_unlock (&vt_list->lock); -do_callbacks (&cb_list,get_irq_regs ()); +do_callbacks (&cb_list);/* next event is first in list */ spin_lock (&vt_list->lock);
drivers/s390/char/monwriter.c +1 -1
@@ -110,7 +110,7 @@ static int monwrite_new_hdr(struct mon_p monbuf =kzalloc (sizeof (struct mon_buf ),GFP_KERNEL );if (!monbuf)return -ENOMEM ; - monbuf->data =kzalloc (monbuf->hdr.datalen, + monbuf->data =kzalloc (monhdr->datalen,GFP_KERNEL |GFP_DMA );if (!monbuf->data) {kfree (monbuf);
drivers/s390/cio/chsc.c +9 -14
@@ -370,7 +370,7 @@ __s390_process_res_acc(struct subchannelstruct res_acc_data *res_data;struct subchannel *sch; - res_data = (struct res_acc_data *)data; + res_data = data; sch =get_subchannel_by_schid (schid);if (!sch)/* Check if a subchannel is newly available. */
@@ -444,7 +444,7 @@ __get_chpid_from_lir(void *data)u32 isinfo[28 ]; } *lir; - lir = (struct lir *) data; + lir = data;if (!(lir->iq&0x80 ))/* NULL link incident record */ return -EINVAL ;
@@ -628,7 +628,7 @@ __chp_add(struct subchannel_id schid, vostruct channel_path *chp;struct subchannel *sch; - chp = (struct channel_path *)data; + chp = data; sch =get_subchannel_by_schid (schid);if (!sch)/* Check if the subchannel is now available. */
@@ -707,8 +707,7 @@ chp_process_crw(int chpid, int on)return chp_add (chpid); } -static inline int -__check_for_io_and_kill (struct subchannel *sch,int index) +static inline int check_for_io_on_path (struct subchannel *sch,int index) {int cc;
@@ -718,10 +717,8 @@ __check_for_io_and_kill(struct subchanne cc =stsch (sch->schid, &sch->schib);if (cc)return 0 ; -if (sch->schib.scsw.actl && sch->schib.pmcw.lpum == (0x80 >> index)) { -device_set_waiting (sch); +if (sch->schib.scsw.actl && sch->schib.pmcw.lpum == (0x80 >> index))return 1 ; - }return 0 ; }
@@ -750,12 +747,10 @@ __s390_subchannel_vary_chpid(struct subc }else { sch->opm &= ~(0x80 >> chp); sch->lpm &= ~(0x80 >> chp); -/* -* Give running I/O a grace period in which it -* can successfully terminate, even using the -* just varied off path. Then kill it. -*/ -if (!__check_for_io_and_kill (sch, chp) && !sch->lpm) { +if (check_for_io_on_path (sch, chp)) +/* Path verification is done after killing. */ +device_kill_io (sch); +else if (!sch->lpm) {if (css_enqueue_subchannel_slow (sch->schid)) {css_clear_subchannel_slow_list (); need_rescan =1 ;
drivers/s390/cio/cio.c +2 -2
@@ -609,8 +609,8 @@ do_IRQ (struct pt_regs *regs)struct irb *irb;struct pt_regs *old_regs; -irq_enter (); old_regs =set_irq_regs (regs); +irq_enter (); asmvolatile ("mc 0,0" );if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)/**
@@ -655,8 +655,8 @@ do_IRQ (struct pt_regs *regs)* out of the sie which costs more cycles than it saves. */ }while (!MACHINE_IS_VM &&tpi (NULL ) !=0 ); +irq_exit ();set_irq_regs (old_regs); -irq_exit (); }#ifdef CONFIG_CCW_CONSOLE
drivers/s390/cio/css.c +1 -1
@@ -177,7 +177,7 @@ get_subchannel_by_schid(struct subchannestruct device *dev; dev =bus_find_device (&css_bus_type,NULL , - (void *)&schid, check_subchannel); + &schid, check_subchannel);return dev ?to_subchannel (dev) :NULL ; }
drivers/s390/cio/css.h +3 -4
@@ -76,9 +76,8 @@ struct ccw_device_private {int state;/* device state */ atomic_t onoff;unsigned long registered; -__u16 devno;/* device number */ -__u16 sch_no;/* subchannel number */ -__u8 ssid;/* subchannel set id */ +struct ccw_dev_id dev_id;/* device id */ +struct subchannel_id schid;/* subchannel number */ __u8 imask;/* lpm mask for SNID/SID/SPGID */ int iretry;/* retry counter SNID/SID/SPGID */ struct {
@@ -171,7 +170,7 @@ void device_trigger_reprobe(struct subch/* Helper functions for vary on/off. */ int device_is_online (struct subchannel *); -void device_set_waiting (struct subchannel *); +void device_kill_io (struct subchannel *);/* Machine check helper function. */ void device_kill_pending_timer (struct subchannel *);
drivers/s390/cio/device.c +23 -25
143 lines not on this page · raw message
drivers/s390/cio/device.h +0 -1
@@ -21,7 +21,6 @@ enum dev_state {/* states to wait for i/o completion before doing something */ DEV_STATE_CLEAR_VERIFY ,DEV_STATE_TIMEOUT_KILL , -DEV_STATE_WAIT4IO ,DEV_STATE_QUIESCE ,/* special states for devices gone not operational */ DEV_STATE_DISCONNECTED,
drivers/s390/cio/device_fsm.c +31 -82
259 lines not on this page · raw message
drivers/s390/cio/device_id.c +8 -6
@@ -251,7 +251,7 @@ ccw_device_check_sense_id(struct ccw_dev*/ CIO_MSG_EVENT (2 ,"SenseID : device %04x on Subchannel " "0.%x.%04x reports cmd reject\n" , - cdev->private->devno, sch->schid.ssid, + cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no);return -EOPNOTSUPP ; }
@@ -259,7 +259,8 @@ ccw_device_check_sense_id(struct ccw_dev CIO_MSG_EVENT(2, "SenseID : UC on dev 0.%x.%04x, " "lpum %02X, cnt %02d, sns :" " %02X%02X%02X%02X %02X%02X%02X%02X ...\n", - cdev->private->ssid, cdev->private->devno, + cdev->private->dev_id.ssid, + cdev->private->dev_id.devno, irb->esw.esw0.sublog.lpum, irb->esw.esw0.erw.scnt, irb->ecw[0], irb->ecw[1],
@@ -274,14 +275,15 @@ ccw_device_check_sense_id(struct ccw_devCIO_MSG_EVENT (2 ,"SenseID : path %02X for device %04x " "on subchannel 0.%x.%04x is " "'not operational'\n" , sch->orb.lpm, - cdev->private->devno, sch->schid.ssid, - sch->schid.sch_no); + cdev->private->dev_id.devno, + sch->schid.ssid, sch->schid.sch_no);return -EACCES ; }/* Hmm, whatever happened, try again. */ CIO_MSG_EVENT (2 ,"SenseID : start_IO() for device %04x on " "subchannel 0.%x.%04x returns status %02X%02X\n" , - cdev->private->devno, sch->schid.ssid, sch->schid.sch_no, + cdev->private->dev_id.devno, sch->schid.ssid, + sch->schid.sch_no, irb->scsw.dstat, irb->scsw.cstat);return -EAGAIN ; }
@@ -330,7 +332,7 @@ ccw_device_sense_id_irq(struct ccw_devic/* fall through. */ default :/* Sense ID failed. Try asking VM. */ if (MACHINE_IS_VM ) { -VM_virtual_device_info (cdev->private->devno, +VM_virtual_device_info (cdev->private->dev_id.devno, &cdev->private->senseid);if (cdev->private->senseid.cu_type !=0xFFFF ) {/* Got the device information from VM. */
drivers/s390/cio/device_ops.c +2 -4
@@ -50,7 +50,6 @@ ccw_device_clear(struct ccw_device *cdevif (cdev->private->state ==DEV_STATE_NOT_OPER )return -ENODEV ;if (cdev->private->state !=DEV_STATE_ONLINE && - cdev->private->state !=DEV_STATE_WAIT4IO && cdev->private->state !=DEV_STATE_W4SENSE )return -EINVAL ; sch =to_subchannel (cdev->dev.parent);
@@ -155,7 +154,6 @@ ccw_device_halt(struct ccw_device *cdev,if (cdev->private->state ==DEV_STATE_NOT_OPER )return -ENODEV ;if (cdev->private->state !=DEV_STATE_ONLINE && - cdev->private->state !=DEV_STATE_WAIT4IO && cdev->private->state !=DEV_STATE_W4SENSE )return -EINVAL ; sch =to_subchannel (cdev->dev.parent);
@@ -592,13 +590,13 @@ ccw_device_get_chp_desc(struct ccw_devicint _ccw_device_get_subchannel_number (struct ccw_device *cdev) { -return cdev->private->sch_no; +return cdev->private->schid.sch_no; }int _ccw_device_get_device_number (struct ccw_device *cdev) { -return cdev->private->devno; +return cdev->private->dev_id.devno; }
drivers/s390/cio/device_pgid.c +13 -10
@@ -79,7 +79,8 @@ __ccw_device_sense_pgid_start(struct ccwCIO_MSG_EVENT (2 ,"SNID - Device %04x on Subchannel " "0.%x.%04x, lpm %02X, became 'not " "operational'\n" , - cdev->private->devno, sch->schid.ssid, + cdev->private->dev_id.devno, + sch->schid.ssid, sch->schid.sch_no, cdev->private->imask); }
@@ -135,7 +136,8 @@ __ccw_device_check_sense_pgid(struct ccw CIO_MSG_EVENT(2, "SNID - device 0.%x.%04x, unit check, " "lpum %02X, cnt %02d, sns : " "%02X%02X%02X%02X %02X%02X%02X%02X ...\n", - cdev->private->ssid, cdev->private->devno, + cdev->private->dev_id.ssid, + cdev->private->dev_id.devno, irb->esw.esw0.sublog.lpum, irb->esw.esw0.erw.scnt, irb->ecw[0], irb->ecw[1],
@@ -147,7 +149,7 @@ __ccw_device_check_sense_pgid(struct ccwif (irb->scsw.cc ==3 ) {CIO_MSG_EVENT (2 ,"SNID - Device %04x on Subchannel 0.%x.%04x," " lpm %02X, became 'not operational'\n" , - cdev->private->devno, sch->schid.ssid, + cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, sch->orb.lpm);return -EACCES ; }
@@ -155,7 +157,7 @@ __ccw_device_check_sense_pgid(struct ccwif (cdev->private->pgid[i].inf.ps.state2 ==SNID_STATE2_RESVD_ELSE ) {CIO_MSG_EVENT (2 ,"SNID - Device %04x on Subchannel 0.%x.%04x " "is reserved by someone else\n" , - cdev->private->devno, sch->schid.ssid, + cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no);return -EUSERS ; }
@@ -261,7 +263,7 @@ __ccw_device_do_pgid(struct ccw_device */* PGID command failed on this path. */ CIO_MSG_EVENT (2 ,"SPID - Device %04x on Subchannel " "0.%x.%04x, lpm %02X, became 'not operational'\n" , - cdev->private->devno, sch->schid.ssid, + cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);return ret; }
@@ -301,7 +303,7 @@ static int __ccw_device_do_nop(struct cc/* nop command failed on this path. */ CIO_MSG_EVENT (2 ,"NOP - Device %04x on Subchannel " "0.%x.%04x, lpm %02X, became 'not operational'\n" , - cdev->private->devno, sch->schid.ssid, + cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);return ret; }
@@ -328,8 +330,9 @@ __ccw_device_check_pgid(struct ccw_devic CIO_MSG_EVENT(2, "SPID - device 0.%x.%04x, unit check, " "cnt %02d, " "sns : %02X%02X%02X%02X %02X%02X%02X%02X ...\n", - cdev->private->ssid, - cdev->private->devno, irb->esw.esw0.erw.scnt, + cdev->private->dev_id.ssid, + cdev->private->dev_id.devno, + irb->esw.esw0.erw.scnt, irb->ecw[0], irb->ecw[1], irb->ecw[2], irb->ecw[3], irb->ecw[4], irb->ecw[5],
@@ -339,7 +342,7 @@ __ccw_device_check_pgid(struct ccw_devicif (irb->scsw.cc ==3 ) {CIO_MSG_EVENT (2 ,"SPID - Device %04x on Subchannel 0.%x.%04x," " lpm %02X, became 'not operational'\n" , - cdev->private->devno, sch->schid.ssid, + cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);return -EACCES ; }
@@ -362,7 +365,7 @@ static int __ccw_device_check_nop(structif (irb->scsw.cc ==3 ) {CIO_MSG_EVENT (2 ,"NOP - Device %04x on Subchannel 0.%x.%04x," " lpm %02X, became 'not operational'\n" , - cdev->private->devno, sch->schid.ssid, + cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);return -EACCES ; }
drivers/s390/cio/device_status.c +3 -4
@@ -32,19 +32,18 @@ ccw_device_msg_control_check(struct ccw_SCHN_STAT_CHN_CTRL_CHK | SCHN_STAT_INTF_CTRL_CHK))) return; -CIO_MSG_EVENT (0 ,"Channel-Check or Interface-Control-Check " "received" " ... device %04x on subchannel 0.%x.%04x, dev_stat " ": %02X sch_stat : %02X\n" , - cdev->private->devno, cdev->private->ssid, - cdev->private->sch_no, + cdev->private->dev_id.devno, cdev->private->schid.ssid, + cdev->private->schid.sch_no, irb->scsw.dstat, irb->scsw.cstat);if (irb->scsw.cc !=3 ) {char dbf_text[15 ]; -sprintf (dbf_text,"chk%x" , cdev->private->sch_no); +sprintf (dbf_text,"chk%x" , cdev->private->schid.sch_no);CIO_TRACE_EVENT (0 , dbf_text);CIO_HEX_EVENT (0 , irb,sizeof (struct irb )); }
drivers/s390/cio/qdio.c +5 -5
@@ -1741,7 +1741,7 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, svoid *ptr;int available; -sprintf (dbf_text,"qfqs%4x" ,cdev->private->sch_no); +sprintf (dbf_text,"qfqs%4x" ,cdev->private->schid.sch_no);QDIO_DBF_TEXT0 (0 ,setup,dbf_text);for (i=0 ;i<no_input_qs;i++) { q=irq_ptr->input_qs[i];
@@ -2924,7 +2924,7 @@ qdio_establish_handle_irq(struct ccw_dev irq_ptr = cdev->private->qdio_data; -sprintf (dbf_text,"qehi%4x" ,cdev->private->sch_no); +sprintf (dbf_text,"qehi%4x" ,cdev->private->schid.sch_no);QDIO_DBF_TEXT0 (0 ,setup,dbf_text);QDIO_DBF_TEXT0 (0 ,trace,dbf_text);
@@ -2943,7 +2943,7 @@ qdio_initialize(struct qdio_initialize *int rc;char dbf_text[15 ]; -sprintf (dbf_text,"qini%4x" ,init_data->cdev->private->sch_no); +sprintf (dbf_text,"qini%4x" ,init_data->cdev->private->schid.sch_no);QDIO_DBF_TEXT0 (0 ,setup,dbf_text);QDIO_DBF_TEXT0 (0 ,trace,dbf_text);
@@ -2964,7 +2964,7 @@ qdio_allocate(struct qdio_initialize *instruct qdio_irq *irq_ptr;char dbf_text[15 ]; -sprintf (dbf_text,"qalc%4x" ,init_data->cdev->private->sch_no); +sprintf (dbf_text,"qalc%4x" ,init_data->cdev->private->schid.sch_no);QDIO_DBF_TEXT0 (0 ,setup,dbf_text);QDIO_DBF_TEXT0 (0 ,trace,dbf_text); if ( (init_data->no_input_qs>QDIO_MAX_QUEUES_PER_IRQ) ||
@@ -3187,7 +3187,7 @@ qdio_establish(struct qdio_initialize *itiqdio_set_delay_target (irq_ptr,TIQDIO_DELAY_TARGET ); } -sprintf (dbf_text,"qest%4x" ,cdev->private->sch_no); +sprintf (dbf_text,"qest%4x" ,cdev->private->schid.sch_no);QDIO_DBF_TEXT0 (0 ,setup,dbf_text);QDIO_DBF_TEXT0 (0 ,trace,dbf_text);
include/asm-s390/cio.h +6 -0
@@ -275,6 +275,12 @@ struct ccw_dev_id {u16 devno; }; +static inline int ccw_dev_id_is_equal (struct ccw_dev_id *dev_id1, +struct ccw_dev_id *dev_id2) +{ +return !memcmp (dev_id1, dev_id2,sizeof (struct ccw_dev_id )); +} +extern int diag210 (struct diag210 *addr);extern void wait_cons_dev (void );
include/asm-s390/timer.h +1 -1
@@ -26,7 +26,7 @@ struct vtimer_list {spinlock_t lock;unsigned long magic; -void (*function)(unsigned long ,struct pt_regs *); +void (*function)(unsigned long );unsigned long data; };