s390 patch queue for 2.6.34
Subsystems (12)
cover s390 patch queue for 2.6.34
Greetings,
we are closing in on 2.6.33 so it is time for the usual s390 patch bomb. 32 patches are waiting on the features branch of git390 right now, mostly boring stuff. Two patches are intersting though:
the spinlock improvement that checks for the virtual cpu running status of the lock holder and the kernel image compression (yes, we finally have kernel image compression after only 10 years..)
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
PATCH 1/32 uaccess: implement strict user copy checks
From: Heiko Carstens <[email protected]>
Same as on x86 and sparc, besides the fact that enabling the option will just emit compile time warnings instead of errors. Keeps allyesconfig kernels compiling.
---
arch/s390/Kconfig.debug | 13 +++++++++++++ arch/s390/include/asm/uaccess.h | 12 ++++++++++++ arch/s390/lib/Makefile | 2 +- arch/s390/lib/usercopy.c | 8 ++++++++ 4 files changed, 34 insertions(+), 1 deletion(-)
arch/s390/include/asm/uaccess.h +12 -0
@@ -265,6 +265,12 @@return uaccess.copy_from_user (n, from, to); } +extern void copy_from_user_overflow(void) +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS +__compiletime_warning("copy_from_user() buffer size is not provably correct") +#endif +; +/** * copy_from_user: - Copy a block of data from user space. * @to: Destination address, in kernel space.
@@ -284,7 +290,13 @@static inline unsigned long __must_check copy_from_user (void *to,const void __user *from,unsigned long n) { +unsigned int sz =__compiletime_object_size (to); +might_fault (); +if (unlikely (sz !=-1 && sz < n)) { +copy_from_user_overflow (); +return n; + }if (access_ok (VERIFY_READ , from, n)) n =__copy_from_user (to, from, n);else
arch/s390/Kconfig.debug +13 -0
@@ -6,4 +6,17 @@ source "lib/Kconfig.debug" +config DEBUG_STRICT_USER_COPY_CHECKS + bool "Strict user copy size checks" + ---help--- + Enabling this option turns a certain set of sanity checks for user + copy operations into compile time warnings. + + The copy_from_user() etc checks are there to help test if there + are sufficient security checks on the length argument of + the copy operation, by having gcc prove that the argument is + within bounds. + + If unsure, or if you run an older (pre 4.4) gcc, say N. + endmenu
arch/s390/lib/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for s390-specific library files.. # -lib-y += delay.o string.o uaccess_std.o uaccess_pt.o +lib-y += delay.o string.o uaccess_std.o uaccess_pt.o usercopy.o obj-$(CONFIG_32BIT) += div64.o qrnnd.o ucmpdi2.o lib-$(CONFIG_64BIT) += uaccess_mvcos.o lib-$(CONFIG_SMP) += spinlock.o
arch/s390/lib/usercopy.c new file +8 -0
@@ -0,0 +1,8 @@ +#include <linux/module.h> +#include <linux/bug.h> + +void copy_from_user_overflow (void ) +{ +WARN (1 ,"Buffer overflow detected!\n" ); +} +EXPORT_SYMBOL (copy_from_user_overflow);
PATCH 2/32 adapt text to cu3088-removal
In reply to Martin SchwidefskyFrom: Ursula Braun <[email protected]>
cu3088 layer for lcs and ctcm has been removed. Thus the reference to cu3088 in this text is to be removed as well.
---
Documentation/s390/driver-model.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/s390/driver-model.txt +2 -2
@@ -223,8 +223,8 @@ private data. To implement a ccwgroup driver, please refer to include/asm/ccwgroup.h. Keep in -mind that most drivers will need to implement both a ccwgroup and a ccw driver -(unless you have a meta ccw driver, like cu3088 for lcs and ctc). +mind that most drivers will need to implement both a ccwgroup and a ccw +driver. 2. Channel paths
PATCH 3/32 cio: consolidate workqueues
In reply to Martin SchwidefskyFrom: Sebastian Ott <[email protected]>
We used to maintain 2 singlethreaded workqueues for synchronization and to trigger work from interrupt context. Since our latest cio changes we only use one of these workqueues. So get rid of the unused workqueue, rename the remaining one to "cio_work_q" and move its ownership to the channel subsystem driver.
---
drivers/s390/cio/css.c | 26 ++++++++++++++++++-------- drivers/s390/cio/css.h | 2 +- drivers/s390/cio/device.c | 28 ++++++---------------------- drivers/s390/cio/device.h | 1 - 4 files changed, 25 insertions(+), 32 deletions(-)
drivers/s390/cio/css.c +18 -8
@@ -232,7 +232,7 @@if (!get_device (&sch->dev))return ; sch->todo = todo; -if (!queue_work (slow_path_wq, &sch->todo_work)) { +if (!queue_work (cio_work_q, &sch->todo_work)) {/* Already queued, release workqueue ref. */ put_device (&sch->dev); }
@@ -543,7 +543,7 @@ } static DECLARE_WORK(slow_path_work, css_slow_path_func); -struct workqueue_struct *slow_path_wq; +struct workqueue_struct *cio_work_q;void css_schedule_eval (struct subchannel_id schid) {
@@ -552,7 +552,7 @@spin_lock_irqsave (&slow_subchannel_lock, flags);idset_sch_add (slow_subchannel_set, schid);atomic_set (&css_eval_scheduled,1 ); -queue_work (slow_path_wq, &slow_path_work); +queue_work (cio_work_q, &slow_path_work);spin_unlock_irqrestore (&slow_subchannel_lock, flags); }
@@ -563,7 +563,7 @@spin_lock_irqsave (&slow_subchannel_lock, flags);idset_fill (slow_subchannel_set);atomic_set (&css_eval_scheduled,1 ); -queue_work (slow_path_wq, &slow_path_work); +queue_work (cio_work_q, &slow_path_work);spin_unlock_irqrestore (&slow_subchannel_lock, flags); }
@@ -594,14 +594,14 @@spin_lock_irqsave (&slow_subchannel_lock, flags);idset_add_set (slow_subchannel_set, unreg_set);atomic_set (&css_eval_scheduled,1 ); -queue_work (slow_path_wq, &slow_path_work); +queue_work (cio_work_q, &slow_path_work);spin_unlock_irqrestore (&slow_subchannel_lock, flags);idset_free (unreg_set); }void css_wait_for_slow_path (void ) { -flush_workqueue (slow_path_wq); +flush_workqueue (cio_work_q); }/* Schedule reprobing of all unregistered subchannels. */
@@ -992,12 +992,21 @@ ret =css_bus_init ();if (ret)return ret; - + cio_work_q =create_singlethread_workqueue ("cio" ); +if (!cio_work_q) { + ret = -ENOMEM ; + goto out_bus; + } ret =io_subchannel_init ();if (ret) -css_bus_cleanup (); + goto out_wq;return ret; +out_wq: +destroy_workqueue (cio_work_q); +out_bus: +css_bus_cleanup (); +return ret; }subsys_initcall (channel_subsystem_init);
@@ -1020,6 +1029,7 @@css_schedule_eval_all ();/* Wait for the evaluation of subchannels to finish. */ wait_event (css_eval_wq,atomic_read (&css_eval_scheduled) ==0 ); +flush_workqueue (cio_work_q);/* Wait for the subchannel type specific initialization to finish */ return bus_for_each_drv (&css_bus_type,NULL ,NULL , css_settle); }
drivers/s390/cio/css.h +1 -1
@@ -151,7 +151,7 @@struct schib ;int css_sch_is_valid (struct schib *); -extern struct workqueue_struct *slow_path_wq; +extern struct workqueue_struct *cio_work_q;void css_wait_for_slow_path (void );void css_sched_sch_todo (struct subchannel *sch,enum sch_todo todo);#endif
drivers/s390/cio/device.c +6 -22
@@ -136,7 +136,6 @@static int io_subchannel_chp_event (struct subchannel *,struct chp_link *,int );static void recovery_func (unsigned long data); -struct workqueue_struct *ccw_device_work;wait_queue_head_t ccw_device_init_wq;atomic_t ccw_device_init_count;
@@ -163,7 +162,7 @@ {wait_event (ccw_device_init_wq,atomic_read (&ccw_device_init_count) ==0 ); -flush_workqueue (ccw_device_work); +flush_workqueue (cio_work_q); }static struct css_driver io_subchannel_driver = {
@@ -188,27 +187,13 @@atomic_set (&ccw_device_init_count,0 );setup_timer (&recovery_timer, recovery_func,0 ); - ccw_device_work =create_singlethread_workqueue ("cio" ); -if (!ccw_device_work) -return -ENOMEM ; - slow_path_wq =create_singlethread_workqueue ("kslowcrw" ); -if (!slow_path_wq) { - ret = -ENOMEM ; - goto out_err; - } -if ((ret =bus_register (&ccw_bus_type))) - goto out_err; - + ret =bus_register (&ccw_bus_type); +if (ret) +return ret; ret =css_driver_register (&io_subchannel_driver);if (ret) - goto out_err; +bus_unregister (&ccw_bus_type); -return 0 ; -out_err: -if (ccw_device_work) -destroy_workqueue (ccw_device_work); -if (slow_path_wq) -destroy_workqueue (slow_path_wq);return ret; }
@@ -2028,7 +2013,7 @@/* Get workqueue ref. */ if (!get_device (&cdev->dev))return ; -if (!queue_work (slow_path_wq, &cdev->private->todo_work)) { +if (!queue_work (cio_work_q, &cdev->private->todo_work)) {/* Already queued, release workqueue ref. */ put_device (&cdev->dev); }
@@ -2041,5 +2026,4 @@EXPORT_SYMBOL (ccw_driver_unregister);EXPORT_SYMBOL (get_ccwdev_by_busid);EXPORT_SYMBOL (ccw_bus_type); -EXPORT_SYMBOL (ccw_device_work);EXPORT_SYMBOL_GPL (ccw_device_get_subchannel_id);
drivers/s390/cio/device.h +0 -1
@@ -71,7 +71,6 @@ cdev->private->state == DEV_STATE_BOXED); } -extern struct workqueue_struct *ccw_device_work;extern wait_queue_head_t ccw_device_init_wq;extern atomic_t ccw_device_init_count;int __init io_subchannel_init (void );
PATCH 4/32 cio: introduce cio_settle
In reply to Martin SchwidefskyFrom: Sebastian Ott <[email protected]>
This patch introduces a proc file cio_settle. A write request to this file is blocked until all queued cio actions are handled.
This will allow userspace to wait for pending work affecting device availability after changing cio_ignore or the hardware configuration.
---
Documentation/s390/CommonIO | 6 +++++ drivers/s390/cio/css.c | 47 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-)
Documentation/s390/CommonIO +6 -0
@@ -87,6 +87,12 @@ compatibility, by the device number in hexadecimal (0xabcd or abcd). Device numbers given as 0xabcd will be interpreted as 0.0.abcd. +* /proc/cio_settle + + A write request to this file is blocked until all queued cio actions are + handled. This will allow userspace to wait for pending work affecting + device availability after changing cio_ignore or the hardware configuration. + * For some of the information present in the /proc filesystem in 2.4 (namely, /proc/subchannels and /proc/chpids), see driver-model.txt. Information formerly in /proc/irq_count is now in /proc/interrupts.
drivers/s390/cio/css.c +42 -5
68 lines not on this page · raw message
PATCH 5/32 cio: wait for channel report
In reply to Martin SchwidefskyFrom: Sebastian Ott <[email protected]>
To fetch a pending channel report word (crw) we use a kernel thread which triggers stcrw and sleeps on a semaphore. The s390 machine check handler uses crw_handle_channel_report to handle one crw if needed.
This patch replaces the semaphore with a waitqueue (to block the kernel thread) and an atomic_t (to count the number of pending requests).
By this we achieve the ability to force this thread to check for a pending crw (independent on when it is triggered by the machine check handler) and wait for this action to finish.
---
arch/s390/include/asm/crw.h | 1 + drivers/s390/cio/crw.c | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-)
arch/s390/include/asm/crw.h +1 -0
@@ -32,6 +32,7 @@extern int crw_register_handler (int rsc,crw_handler_t handler);extern void crw_unregister_handler (int rsc);extern void crw_handle_channel_report (void ); +void crw_wait_for_channel_report (void );#define NR_RSCS 16
drivers/s390/cio/crw.c +15 -14
@@ -8,15 +8,16 @@* Heiko Carstens <[email protected]>, */ -#include <linux/semaphore.h> #include <linux/mutex.h> #include <linux/kthread.h> #include <linux/init.h> +#include <linux/wait.h> #include <asm/crw.h> -static struct semaphore crw_semaphore;static DEFINE_MUTEX (crw_handler_mutex);static crw_handler_t crw_handlers[NR_RSCS ]; +static atomic_t crw_nr_req =ATOMIC_INIT (0 ); +static DECLARE_WAIT_QUEUE_HEAD (crw_handler_wait_q);/** * crw_register_handler() - register a channel report word handler
@@ -59,12 +60,14 @@static int crw_collect_info (void *unused) {struct crw crw[2 ]; -int ccode; +int ccode, signal;unsigned int chain; -int ignore; repeat: - ignore =down_interruptible (&crw_semaphore); + signal =wait_event_interruptible (crw_handler_wait_q, +atomic_read (&crw_nr_req) >0 ); +if (unlikely (signal)) +atomic_inc (&crw_nr_req); chain =0 ;while (1 ) {crw_handler_t handler;
@@ -122,25 +125,23 @@/* chain is always 0 or 1 here. */ chain = crw[chain].chn ? chain +1 :0 ; } +if (atomic_dec_and_test (&crw_nr_req)) +wake_up (&crw_handler_wait_q); goto repeat;return 0 ; }void crw_handle_channel_report (void ) { -up (&crw_semaphore); +atomic_inc (&crw_nr_req); +wake_up (&crw_handler_wait_q); } -/* -* Separate initcall needed for semaphore initialization since -* crw_handle_channel_report might be called before crw_machine_check_init. -*/ -static int __init crw_init_semaphore (void ) +void crw_wait_for_channel_report (void ) { -init_MUTEX_LOCKED (&crw_semaphore); -return 0 ; +crw_handle_channel_report (); +wait_event (crw_handler_wait_q,atomic_read (&crw_nr_req) ==0 ); } -pure_initcall (crw_init_semaphore);/* * Machine checks for the channel subsystem must be enabled
PATCH 6/32 cio: make wait_events interruptible
In reply to Martin SchwidefskyFrom: Sebastian Ott <[email protected]>
Make the potentially long blocking wait_event's used by the cio settle mechanism interruptible.
---
drivers/s390/cio/css.c | 18 ++++++++++++------ drivers/s390/cio/css.h | 2 +- drivers/s390/cio/device.c | 11 ++++++++--- 3 files changed, 21 insertions(+), 10 deletions(-)
drivers/s390/cio/css.c +12 -6
@@ -1016,19 +1016,22 @@struct css_driver *cssdrv =to_cssdriver (drv);if (cssdrv->settle) - cssdrv->settle (); +return cssdrv->settle ();return 0 ; } -static inline void css_complete_work (void ) +static inline int css_complete_work (void ) {int ret;/* Wait for the evaluation of subchannels to finish. */ -wait_event (css_eval_wq,atomic_read (&css_eval_scheduled) ==0 ); + ret =wait_event_interruptible (css_eval_wq, +atomic_read (&css_eval_scheduled) ==0 ); +if (ret) +return -EINTR ;flush_workqueue (cio_work_q);/* Wait for the subchannel type specific initialization to finish */ - ret =bus_for_each_drv (&css_bus_type,NULL ,NULL , css_settle); +return bus_for_each_drv (&css_bus_type,NULL ,NULL , css_settle); }
@@ -1049,10 +1052,13 @@static ssize_t cio_settle_write (struct file *file,const char __user *buf,size_t count,loff_t *ppos) { +int ret; +/* Handle pending CRW's. */ crw_wait_for_channel_report (); -css_complete_work (); -return count; + ret =css_complete_work (); + +return ret ? ret : count; }static const struct file_operations cio_settle_proc_fops = {
drivers/s390/cio/css.h +1 -1
@@ -95,7 +95,7 @@int (*freeze)(struct subchannel *);int (*thaw) (struct subchannel *);int (*restore)(struct subchannel *); -void (*settle)(void ); +int (*settle)(void );const char *name; };
drivers/s390/cio/device.c +8 -3
@@ -158,11 +158,16 @@return 0 ; } -static void io_subchannel_settle (void ) +static int io_subchannel_settle (void ) { -wait_event (ccw_device_init_wq, -atomic_read (&ccw_device_init_count) ==0 ); +int ret; + + ret =wait_event_interruptible (ccw_device_init_wq, +atomic_read (&ccw_device_init_count) ==0 ); +if (ret) +return -EINTR ;flush_workqueue (cio_work_q); +return 0 ; }static struct css_driver io_subchannel_driver = {
PATCH 7/32 use inline assembly contraints available with gcc 3.3.3
In reply to Martin SchwidefskyFrom: Martin Schwidefsky <[email protected]>
Drop support to compile the kernel with gcc versions older than 3.3.3. This allows us to use the "Q" inline assembly contraint on some more inline assemblies without duplicating a lot of complex code (e.g. __xchg and __cmpxchg). The distinction for older gcc versions can be removed which saves a few lines and simplifies the code.
---
arch/s390/include/asm/atomic.h | 86 ++----------------- arch/s390/include/asm/bitops.h | 83 ++++-------------- arch/s390/include/asm/etr.h | 12 +- arch/s390/include/asm/irqflags.h | 36 -------- arch/s390/include/asm/processor.h | 18 ++-- arch/s390/include/asm/rwsem.h | 147 ++++++++++++++++----------------- arch/s390/include/asm/spinlock.h | 18 ---- arch/s390/include/asm/swab.h | 16 +-- arch/s390/include/asm/system.h | 168 +++++++++++++++++++------------------- arch/s390/include/asm/timex.h | 22 +--- arch/s390/kernel/asm-offsets.c | 8 + 11 files changed, 226 insertions(+), 388 deletions(-)
arch/s390/include/asm/atomic.h +11 -75
@@ -18,8 +18,6 @@#define ATOMIC_INIT (i) { (i) } -#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >2 ) -#define __CS_LOOP (ptr, op_val, op_string) ({ \ int old_val, new_val; \ asm volatile( \
@@ -35,26 +33,6 @@ new_val; \ }) -#else /* __GNUC__ */ - -#define __CS_LOOP (ptr, op_val, op_string) ({ \ - int old_val, new_val; \ - asm volatile( \ - " l %0,0(%3)\n" \ - "0: lr %1,%0\n" \ - op_string " %1,%4\n" \ - " cs %0,%1,0(%3)\n" \ - " jl 0b" \ - : "=&d" (old_val), "=&d" (new_val), \ - "=m" (((atomic_t *)(ptr))->counter) \ - : "a" (ptr), "d" (op_val), \ - "m" (((atomic_t *)(ptr))->counter) \ - : "cc", "memory"); \ - new_val; \ -}) - -#endif /* __GNUC__ */ -static inline int atomic_read (const atomic_t *v) {barrier ();
@@ -101,19 +79,11 @@static inline int atomic_cmpxchg (atomic_t *v,int old,int new) { -#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >2 ) asmvolatile (" cs %0,%2,%1" :"+d" (old),"=Q" (v->counter) :"d" (new),"Q" (v->counter) :"cc" ,"memory" ); -#else /* __GNUC__ */ - asmvolatile ( -" cs %0,%3,0(%2)" - :"+d" (old),"=m" (v->counter) - :"a" (v),"d" (new),"m" (v->counter) - :"cc" ,"memory" ); -#endif /* __GNUC__ */ return old; }
@@ -140,8 +110,6 @@#ifdef CONFIG_64BIT -#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >2 ) -#define __CSG_LOOP (ptr, op_val, op_string) ({ \ long long old_val, new_val; \ asm volatile( \
@@ -157,26 +125,6 @@ new_val; \ }) -#else /* __GNUC__ */ - -#define __CSG_LOOP (ptr, op_val, op_string) ({ \ - long long old_val, new_val; \ - asm volatile( \ - " lg %0,0(%3)\n" \ - "0: lgr %1,%0\n" \ - op_string " %1,%4\n" \ - " csg %0,%1,0(%3)\n" \ - " jl 0b" \ - : "=&d" (old_val), "=&d" (new_val), \ - "=m" (((atomic_t *)(ptr))->counter) \ - : "a" (ptr), "d" (op_val), \ - "m" (((atomic_t *)(ptr))->counter) \ - : "cc", "memory"); \ - new_val; \ -}) - -#endif /* __GNUC__ */ -static inline long long atomic64_read (const atomic64_t *v) {barrier ();
@@ -214,19 +162,11 @@static inline long long atomic64_cmpxchg (atomic64_t *v,long long old,long long new) { -#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >2 ) asmvolatile (" csg %0,%2,%1" :"+d" (old),"=Q" (v->counter) :"d" (new),"Q" (v->counter) :"cc" ,"memory" ); -#else /* __GNUC__ */ - asmvolatile ( -" csg %0,%3,0(%2)" - :"+d" (old),"=m" (v->counter) - :"a" (v),"d" (new),"m" (v->counter) - :"cc" ,"memory" ); -#endif /* __GNUC__ */ return old; }
@@ -243,10 +183,8 @@register_pair rp; asmvolatile ( -" lm %0,%N0,0(%1)" - :"=&d" (rp) - :"a" (&v->counter),"m" (v->counter) - ); +" lm %0,%N0,%1" + :"=&d" (rp) :"Q" (v->counter) );return rp.pair; }
@@ -255,10 +193,8 @@register_pair rp = {.pair = i}; asmvolatile ( -" stm %1,%N1,0(%2)" - :"=m" (v->counter) - :"d" (rp),"a" (&v->counter) - ); +" stm %1,%N1,%0" + :"=Q" (v->counter) :"d" (rp) ); }static inline long long atomic64_xchg (atomic64_t *v,long long new)
@@ -267,11 +203,11 @@register_pair rp_old; asmvolatile ( -" lm %0,%N0,0(%2)\n" -"0: cds %0,%3,0(%2)\n" +" lm %0,%N0,%1\n" +"0: cds %0,%2,%1\n" " jl 0b\n" - :"=&d" (rp_old),"+m" (v->counter) - :"a" (&v->counter),"d" (rp_new) + :"=&d" (rp_old),"=Q" (v->counter) + :"d" (rp_new),"Q" (v->counter) :"cc" );return rp_old.pair; }
@@ -283,9 +219,9 @@register_pair rp_new = {.pair = new}; asmvolatile ( -" cds %0,%3,0(%2)" - :"+&d" (rp_old),"+m" (v->counter) - :"a" (&v->counter),"d" (rp_new) +" cds %0,%2,%1" + :"+&d" (rp_old),"=Q" (v->counter) + :"d" (rp_new),"Q" (v->counter) :"cc" );return rp_old.pair; }
arch/s390/include/asm/bitops.h +20 -63
149 lines not on this page · raw message
arch/s390/include/asm/etr.h +6 -6
@@ -145,11 +145,11 @@int rc = -ENOSYS ; asmvolatile ( -" .insn s,0xb2160000,0(%2)\n" +" .insn s,0xb2160000,%1\n" "0: la %0,0\n" "1:\n" EX_TABLE(0b,1b) - : "+d" (rc) : "m" (*ctrl), "a" (ctrl)); + : "+d" (rc) : "Q" (*ctrl)); return rc; }
@@ -159,11 +159,11 @@int rc = -ENOSYS ; asmvolatile ( -" .insn s,0xb2170000,0(%2)\n" +" .insn s,0xb2170000,%1\n" "0: la %0,0\n" "1:\n" EX_TABLE(0b,1b) - : "+d" (rc) : "m" (*aib), "a" (aib)); + : "+d" (rc) : "Q" (*aib)); return rc; }
@@ -174,11 +174,11 @@int rc = -ENOSYS ; asmvolatile ( -" .insn s,0xb2b30000,0(%2)\n" +" .insn s,0xb2b30000,%1\n" "0: la %0,0\n" "1:\n" EX_TABLE(0b,1b) - : "+d" (rc) : "m" (*aib), "a" (aib), "d" (reg0)); + : "+d" (rc) : "Q" (*aib), "d" (reg0)); return rc; }
arch/s390/include/asm/irqflags.h +0 -36
@@ -8,8 +8,6 @@#include <linux/types.h> -#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >2 ) -/* store then or system mask. */ #define __raw_local_irq_stosm (__or) \ ({ \
@@ -36,40 +34,6 @@ asmvolatile ("ssm %0" : :"Q" (__mask) :"memory" ); \ }) -#else /* __GNUC__ */ - -/* store then or system mask. */ -#define __raw_local_irq_stosm (__or) \ -({ \ - unsigned long __mask; \ - asm volatile( \ - " stosm 0(%1),%2" \ - : "=m" (__mask) \ - : "a" (&__mask), "i" (__or) : "memory"); \ - __mask; \ -}) - -/* store then and system mask. */ -#define __raw_local_irq_stnsm (__and) \ -({ \ - unsigned long __mask; \ - asm volatile( \ - " stnsm 0(%1),%2" \ - : "=m" (__mask) \ - : "a" (&__mask), "i" (__and) : "memory"); \ - __mask; \ -}) - -/* set system mask. */ -#define __raw_local_irq_ssm (__mask) \ -({ \ - asm volatile( \ - " ssm 0(%0)" \ - : : "a" (&__mask), "m" (__mask) : "memory"); \ -}) - -#endif /* __GNUC__ */ -/* interrupt control.. */ static inline unsigned long raw_local_irq_enable (void ) {
arch/s390/include/asm/processor.h +9 -9
@@ -28,7 +28,7 @@static inline void get_cpu_id (struct cpuid *ptr) { - asmvolatile ("stidp 0(%1)" :"=m" (*ptr) :"a" (ptr)); + asmvolatile ("stidp %0" :"=Q" (*ptr)); }extern void s390_adjust_jiffies (void );
@@ -184,9 +184,9 @@static inline void __load_psw (psw_t psw) {#ifndef __s390x__ - asmvolatile ("lpsw 0(%0)" : :"a" (&psw),"m" (psw) :"cc" ); + asmvolatile ("lpsw %0" : :"Q" (psw) :"cc" );#else - asmvolatile ("lpswe 0(%0)" : :"a" (&psw),"m" (psw) :"cc" ); + asmvolatile ("lpswe %0" : :"Q" (psw) :"cc" );#endif }
@@ -206,17 +206,17 @@ asmvolatile (" basr %0,0\n" "0: ahi %0,1f-0b\n" -" st %0,4(%1)\n" -" lpsw 0(%1)\n" +" st %0,%O1+4(%R1)\n" +" lpsw %1\n" "1:" - :"=&d" (addr) :"a" (&psw),"m" (psw) :"memory" ,"cc" ); + :"=&d" (addr),"=Q" (psw) :"Q" (psw) :"memory" ,"cc" );#else /* __s390x__ */ asmvolatile (" larl %0,1f\n" -" stg %0,8(%1)\n" -" lpswe 0(%1)\n" +" stg %0,%O1+8(%R1)\n" +" lpswe %1\n" "1:" - :"=&d" (addr) :"a" (&psw),"m" (psw) :"memory" ,"cc" ); + :"=&d" (addr),"=Q" (psw) :"Q" (psw) :"memory" ,"cc" );#endif /* __s390x__ */ }
arch/s390/include/asm/rwsem.h +73 -74
262 lines not on this page · raw message
arch/s390/include/asm/spinlock.h +0 -18
@@ -13,8 +13,6 @@#include <linux/smp.h> -#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >2 ) -static inline int _raw_compare_and_swap (volatile unsigned int *lock,unsigned int old,unsigned int new)
@@ -27,22 +25,6 @@return old; } -#else /* __GNUC__ */ - -static inline int -_raw_compare_and_swap (volatile unsigned int *lock, -unsigned int old,unsigned int new) -{ - asmvolatile ( -" cs %0,%3,0(%4)" - :"=d" (old),"=m" (*lock) - :"0" (old),"d" (new),"a" (lock),"m" (*lock) - :"cc" ,"memory" ); -return old; -} - -#endif /* __GNUC__ */ -/* * Simple spin lock operations. There are two variants, one clears IRQ's * on the local processor, one does not.
arch/s390/include/asm/swab.h +8 -8
@@ -47,11 +47,11 @@ asmvolatile ( #ifndef __s390x__ -" icm %0,8,3(%1)\n" -" icm %0,4,2(%1)\n" -" icm %0,2,1(%1)\n" -" ic %0,0(%1)" - :"=&d" (result) :"a" (x),"m" (*x) :"cc" ); +" icm %0,8,%O1+3(%R1)\n" +" icm %0,4,%O1+2(%R1)\n" +" icm %0,2,%O1+1(%R1)\n" +" ic %0,%1" + :"=&d" (result) :"Q" (*x) :"cc" );#else /* __s390x__ */ " lrv %0,%1" : "=d" (result) : "m" (*x));
@@ -77,9 +77,9 @@ asmvolatile ( #ifndef __s390x__ -" icm %0,2,1(%1)\n" -" ic %0,0(%1)\n" - :"=&d" (result) :"a" (x),"m" (*x) :"cc" ); +" icm %0,2,%O+1(%R1)\n" +" ic %0,%1\n" + :"=&d" (result) :"Q" (*x) :"cc" );#else /* __s390x__ */ " lrvh %0,%1" : "=d" (result) : "m" (*x));
arch/s390/include/asm/system.h +85 -83
285 lines not on this page · raw message
arch/s390/include/asm/timex.h +6 -16
@@ -20,10 +20,10 @@int cc; asmvolatile ( -" sck 0(%2)\n" +" sck %1\n" " ipm %0\n" " srl %0,28\n" - :"=d" (cc) :"m" (time),"a" (&time) :"cc" ); + :"=d" (cc) :"Q" (time) :"cc" );return cc; }
@@ -32,21 +32,21 @@int cc; asmvolatile ( -" stck 0(%2)\n" +" stck %1\n" " ipm %0\n" " srl %0,28\n" - :"=d" (cc),"=m" (*time) :"a" (time) :"cc" ); + :"=d" (cc),"=Q" (*time) : :"cc" );return cc; }static inline void set_clock_comparator (__u64 time) { - asmvolatile ("sckc 0(%1)" : :"m" (time),"a" (&time)); + asmvolatile ("sckc %0" : :"Q" (time)); }static inline void store_clock_comparator (__u64 *time) { - asmvolatile ("stckc 0(%1)" :"=m" (*time) :"a" (time)); + asmvolatile ("stckc %0" :"=Q" (*time)); }#define CLOCK_TICK_RATE 1193180/* Underlying HZ */
@@ -57,11 +57,7 @@ {unsigned long long clk; -#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >2 ) asmvolatile ("stck %0" :"=Q" (clk) : :"cc" ); -#else /* __GNUC__ */ - asmvolatile ("stck 0(%1)" :"=m" (clk) :"a" (&clk) :"cc" ); -#endif /* __GNUC__ */ return clk; }
@@ -69,13 +65,7 @@ {unsigned char clk[16 ]; -#if __GNUC__ >3 || (__GNUC__ ==3 && __GNUC_MINOR__ >2 ) asmvolatile ("stcke %0" :"=Q" (clk) : :"cc" ); -#else /* __GNUC__ */ - asmvolatile ("stcke 0(%1)" :"=m" (clk) - :"a" (clk) :"cc" ); -#endif /* __GNUC__ */ -return *((unsigned long long *)&clk[1 ]); }
arch/s390/kernel/asm-offsets.c +8 -0
@@ -9,6 +9,14 @@#include <asm/vdso.h> #include <asm/sigp.h> +/* +* Make sure that the compiler is new enough. We want a compiler that +* is known to work with the "Q" assembler constraint. +*/ +#if __GNUC__ <3 || (__GNUC__ ==3 && __GNUC_MINOR__ <3 ) +#error Your compiler is too old; please use version 3.3.3 or newer +#endif +int main (void ) {DEFINE (__THREAD_info, offsetof(struct task_struct , stack));
PATCH 8/32 zfcpdump: remove cross arch dump support
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
Remove support to be able to dump 31 bit systems with a 64 bit dumper. This is mostly useless since no distro ships 31 bit kernels together with a 64 bit dumper.
We also get rid of a bit of hacky code.
---
arch/s390/include/asm/lowcore.h | 26 ++----- arch/s390/include/asm/smp.h | 2 arch/s390/kernel/head64.S | 70 ------------------- arch/s390/kernel/smp.c | 19 ----- arch/s390/kvm/kvm-s390.c | 20 ++--- drivers/s390/char/zcore.c | 146 +++++++++++++--------------------------- 6 files changed, 75 insertions(+), 208 deletions(-)
arch/s390/include/asm/lowcore.h +10 -16
@@ -144,7 +144,9 @@void mcck_int_handler (void );void io_int_handler (void ); -struct save_area_s390 { +#ifdef CONFIG_32BIT + +struct save_area { u32 ext_save; u64 timer; u64 clk_cmp;
@@ -158,7 +160,11 @@ u32 ctrl_regs[16]; } __attribute__((packed)); -struct save_area_s390x { +#define SAVE_AREA_BASE offsetof(struct _lowcore, extended_save_area_addr) + +#else /* CONFIG_32BIT */ + +struct save_area { u64 fp_regs[16]; u64 gp_regs[16]; u8 psw[16];
@@ -174,21 +180,9 @@u64 ctrl_regs[16 ]; } __attribute__((packed)); -union save_area { -struct save_area_s390 s390; -struct save_area_s390x s390x; -}; +#define SAVE_AREA_BASE offsetof(struct _lowcore, floating_pt_save_area) -#define SAVE_AREA_BASE_S390 0xd4 -#define SAVE_AREA_BASE_S390X 0x1200 - -#ifndef __s390x__ -#define SAVE_AREA_SIZE sizeof(struct save_area_s390) -#define SAVE_AREA_BASE SAVE_AREA_BASE_S390 -#else -#define SAVE_AREA_SIZE sizeof(struct save_area_s390x) -#define SAVE_AREA_BASE SAVE_AREA_BASE_S390X -#endif +#endif /* CONFIG_32BIT */ #ifndef __s390x__#define LC_ORDER 0
arch/s390/include/asm/smp.h +1 -1
@@ -29,7 +29,7 @@extern void arch_send_call_function_single_ipi (int cpu);extern void arch_send_call_function_ipi_mask (const struct cpumask *mask); -extern union save_area *zfcpdump_save_areas[NR_CPUS +1 ]; +extern struct save_area *zfcpdump_save_areas[NR_CPUS +1 ];#endif /* CONFIG_SMP */
arch/s390/kernel/head64.S +1 -69
84 lines not on this page · raw message
arch/s390/kernel/smp.c +3 -16
@@ -248,15 +248,6 @@#ifdef CONFIG_ZFCPDUMP -/* -* zfcpdump_prefix_array holds prefix registers for the following scenario: -* 64 bit zfcpdump kernel and 31 bit kernel which is to be dumped. We have to -* save its prefix registers, since they get lost, when switching from 31 bit -* to 64 bit. -*/ -unsigned int zfcpdump_prefix_array[NR_CPUS + 1] \ - __attribute__((__section__(".data"))); -static void __init smp_get_save_area (unsigned int cpu,unsigned int phy_cpu) {if (ipl_info.type !=IPL_TYPE_FCP_DUMP )
@@ -266,21 +257,17 @@ "the dump\n", cpu, NR_CPUS - 1); return; } - zfcpdump_save_areas[cpu] =kmalloc (sizeof (union save_area ),GFP_KERNEL ); + zfcpdump_save_areas[cpu] =kmalloc (sizeof (struct save_area ),GFP_KERNEL ); __cpu_logical_map[CPU_INIT_NO ] = (__u16 ) phy_cpu;while (signal_processor (CPU_INIT_NO , sigp_stop_and_store_status) == sigp_busy)cpu_relax ();memcpy (zfcpdump_save_areas[cpu], (void *)(unsigned long )store_prefix () +SAVE_AREA_BASE , -SAVE_AREA_SIZE ); -#ifdef CONFIG_64BIT -/* copy original prefix register */ - zfcpdump_save_areas[cpu]->s390x.pref_reg = zfcpdump_prefix_array[cpu]; -#endif +sizeof (struct save_area )); } -union save_area *zfcpdump_save_areas[NR_CPUS +1 ]; +struct save_area *zfcpdump_save_areas[NR_CPUS +1 ];EXPORT_SYMBOL_GPL (zfcpdump_save_areas);#else
arch/s390/kvm/kvm-s390.c +10 -10
@@ -603,45 +603,45 @@ }else prefix =0 ; -if (__guestcopy (vcpu, addr + offsetof(struct save_area_s390x , fp_regs), +if (__guestcopy (vcpu, addr + offsetof(struct save_area , fp_regs), vcpu->arch.guest_fpregs.fprs,128 , prefix))return -EFAULT ; -if (__guestcopy (vcpu, addr + offsetof(struct save_area_s390x , gp_regs), +if (__guestcopy (vcpu, addr + offsetof(struct save_area , gp_regs), vcpu->arch.guest_gprs,128 , prefix))return -EFAULT ; -if (__guestcopy (vcpu, addr + offsetof(struct save_area_s390x , psw), +if (__guestcopy (vcpu, addr + offsetof(struct save_area , psw), &vcpu->arch.sie_block->gpsw,16 , prefix))return -EFAULT ; -if (__guestcopy (vcpu, addr + offsetof(struct save_area_s390x , pref_reg), +if (__guestcopy (vcpu, addr + offsetof(struct save_area , pref_reg), &vcpu->arch.sie_block->prefix,4 , prefix))return -EFAULT ;if (__guestcopy (vcpu, - addr + offsetof(struct save_area_s390x , fp_ctrl_reg), + addr + offsetof(struct save_area , fp_ctrl_reg), &vcpu->arch.guest_fpregs.fpc,4 , prefix))return -EFAULT ; -if (__guestcopy (vcpu, addr + offsetof(struct save_area_s390x , tod_reg), +if (__guestcopy (vcpu, addr + offsetof(struct save_area , tod_reg), &vcpu->arch.sie_block->todpr,4 , prefix))return -EFAULT ; -if (__guestcopy (vcpu, addr + offsetof(struct save_area_s390x , timer), +if (__guestcopy (vcpu, addr + offsetof(struct save_area , timer), &vcpu->arch.sie_block->cputm,8 , prefix))return -EFAULT ; -if (__guestcopy (vcpu, addr + offsetof(struct save_area_s390x , clk_cmp), +if (__guestcopy (vcpu, addr + offsetof(struct save_area , clk_cmp), &vcpu->arch.sie_block->ckc,8 , prefix))return -EFAULT ; -if (__guestcopy (vcpu, addr + offsetof(struct save_area_s390x , acc_regs), +if (__guestcopy (vcpu, addr + offsetof(struct save_area , acc_regs), &vcpu->arch.guest_acrs,64 , prefix))return -EFAULT ;if (__guestcopy (vcpu, - addr + offsetof(struct save_area_s390x , ctrl_regs), + addr + offsetof(struct save_area , ctrl_regs), &vcpu->arch.sie_block->gcr,128 , prefix))return -EFAULT ;return 0 ;
drivers/s390/char/zcore.c +50 -96
215 lines not on this page · raw message
PATCH 9/32 smp: rename and add lowcore defines
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
Rename __LC_RESTART_PSW to __LC_RST_NEW_PSW, add a define for the missing 32 bit variant and the missing old PSWs.
---
arch/s390/include/asm/lowcore.h | 5 ++++- arch/s390/kernel/swsusp_asm64.S | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
arch/s390/include/asm/lowcore.h +4 -1
@@ -36,6 +36,8 @@#define __LC_DUMP_REIPL 0x0e00#ifndef __s390x__ +#define __LC_RST_NEW_PSW 0x0000 +#define __LC_RST_OLD_PSW 0x0008#define __LC_EXT_OLD_PSW 0x0018#define __LC_SVC_OLD_PSW 0x0020#define __LC_PGM_OLD_PSW 0x0028
@@ -81,12 +83,13 @@#define __LC_CREGS_SAVE_AREA 0x01c0#else /* __s390x__ */ #define __LC_LAST_BREAK 0x0110 +#define __LC_RST_OLD_PSW 0x0120#define __LC_EXT_OLD_PSW 0x0130#define __LC_SVC_OLD_PSW 0x0140#define __LC_PGM_OLD_PSW 0x0150#define __LC_MCK_OLD_PSW 0x0160#define __LC_IO_OLD_PSW 0x0170 -#define __LC_RESTART_PSW 0x01a0 +#define __LC_RST_NEW_PSW 0x01a0#define __LC_EXT_NEW_PSW 0x01b0#define __LC_SVC_NEW_PSW 0x01c0#define __LC_PGM_NEW_PSW 0x01d0
arch/s390/kernel/swsusp_asm64.S +1 -1
@@ -176,7 +176,7 @@ cgr %r1,%r2 je restore_registers /* r1 = r2 -> nothing to do */ larl %r4,.Lrestart_suspend_psw /* Set new restart PSW */ - mvc __LC_RESTART_PSW(16,%r0),0(%r4) + mvc __LC_RST_NEW_PSW(16,%r0),0(%r4) 3: sigp %r9,%r1,__SIGP_INITIAL_CPU_RESET brc 8,4f /* accepted */
PATCH 10/32 smp: always reboot on cpu 0
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
Always reboot on logical cpu 0. This makes sure that the IPL cpu is always the same and usually avoids strange numbering schemes between physical and logical cpus.
---
arch/s390/include/asm/smp.h | 12 +++++++ arch/s390/kernel/Makefile | 2 + arch/s390/kernel/ipl.c | 31 +++++++++++++++----- arch/s390/kernel/machine_kexec.c | 10 +++++- arch/s390/kernel/smp.c | 36 +++++++++++++++++++++++ arch/s390/kernel/switch_cpu.S | 59 +++++++++++++++++++++++++++++++++++++++ arch/s390/kernel/switch_cpu64.S | 52 ++++++++++++++++++++++++++++++++++ 7 files changed, 191 insertions(+), 11 deletions(-)
arch/s390/include/asm/smp.h +12 -0
@@ -31,6 +31,18 @@extern struct save_area *zfcpdump_save_areas[NR_CPUS +1 ]; +extern void smp_switch_to_ipl_cpu (void (*func)(void *),void *); +extern void smp_switch_to_cpu (void (*)(void *),void *,unsigned long sp, +int from,int to); +extern void smp_restart_cpu (void ); + +#else /* CONFIG_SMP */ + +static inline void smp_switch_to_ipl_cpu (void (*func)(void *),void *data) +{ +func (data); +} +#endif /* CONFIG_SMP */ #ifdef CONFIG_HOTPLUG_CPU
arch/s390/kernel/ipl.c +23 -8
@@ -553,7 +553,7 @@return rc; } -static void ipl_run (struct shutdown_trigger *trigger) +static void __ipl_run (void *unused) {diag308 (DIAG308_IPL ,NULL );if (MACHINE_IS_VM )
@@ -562,6 +562,11 @@reipl_ccw_dev (&ipl_info.data.ccw.dev_id); } +static void ipl_run (struct shutdown_trigger *trigger) +{ +smp_switch_to_ipl_cpu (__ipl_run,NULL ); +} +static int __init ipl_init (void ) {int rc;
@@ -1039,7 +1044,7 @@sprintf (dst + pos," PARM %s" , vmparm); } -static void reipl_run (struct shutdown_trigger *trigger) +static void __reipl_run (void *unused) {struct ccw_dev_id devid;static char buf[128 ];
@@ -1087,6 +1092,11 @@disabled_wait ((unsigned long )__builtin_return_address (0 )); } +static void reipl_run (struct shutdown_trigger *trigger) +{ +smp_switch_to_ipl_cpu (__reipl_run,NULL ); +} +static void reipl_block_ccw_init (struct ipl_parameter_block *ipb) { ipb->hdr.len =IPL_PARM_BLK_CCW_LEN ;
@@ -1369,20 +1379,18 @@static struct kset *dump_kset; -static void dump_run (struct shutdown_trigger *trigger) +static void __dump_run (void *unused) {struct ccw_dev_id devid;static char buf[100 ];switch (dump_method) {case DUMP_METHOD_CCW_CIO : -smp_send_stop (); devid.devno = dump_block_ccw->ipl_info.ccw.devno; devid.ssid =0 ;reipl_ccw_dev (&devid);break ;case DUMP_METHOD_CCW_VM : -smp_send_stop ();sprintf (buf,"STORE STATUS" );__cpcmd (buf,NULL ,0 ,NULL );sprintf (buf,"IPL %X" , dump_block_ccw->ipl_info.ccw.devno);
@@ -1396,10 +1404,17 @@diag308 (DIAG308_SET , dump_block_fcp);diag308 (DIAG308_DUMP ,NULL );break ; -case DUMP_METHOD_NONE : -return ; +default : +break ; } -printk (KERN_EMERG "Dump failed!\n" ); +} + +static void dump_run (struct shutdown_trigger *trigger) +{ +if (dump_method ==DUMP_METHOD_NONE ) +return ; +smp_send_stop (); +smp_switch_to_ipl_cpu (__dump_run,NULL ); }static int __init dump_ccw_init (void )
arch/s390/kernel/machine_kexec.c +8 -2
@@ -54,11 +54,11 @@ { } -void machine_kexec (struct kimage *image) +static void __machine_kexec (void *data) {relocate_kernel_t data_mover; +struct kimage *image = data; -smp_send_stop ();pfault_fini ();s390_reset_system ();
@@ -68,3 +68,9 @@ (*data_mover)(&image->head, image->start);for (;;); } + +void machine_kexec (struct kimage *image) +{ +smp_send_stop (); +smp_switch_to_ipl_cpu (__machine_kexec, image); +}
arch/s390/kernel/Makefile +2 -0
@@ -32,6 +32,8 @@ obj-$(CONFIG_MODULES) += s390_ksyms.o module.o obj-$(CONFIG_SMP) += smp.o topology.o +obj-$(CONFIG_SMP) += $(if $(CONFIG_64BIT),switch_cpu64.o, \ + switch_cpu.o) obj-$(CONFIG_HIBERNATION) += suspend.o swsusp_asm64.o obj-$(CONFIG_AUDIT) += audit.o compat-obj-$(CONFIG_AUDIT) += compat_audit.o
arch/s390/kernel/smp.c +35 -1
@@ -90,6 +90,39 @@return 0 ; } +void smp_switch_to_ipl_cpu (void (*func)(void *),void *data) +{ +struct _lowcore *lc, *current_lc; +struct stack_frame *sf; +struct pt_regs *regs; +unsigned long sp; + +if (smp_processor_id () ==0 ) +func (data); +__load_psw_mask (PSW_BASE_BITS |PSW_DEFAULT_KEY ); +/* Disable lowcore protection */ +__ctl_clear_bit (0 ,28 ); + current_lc = lowcore_ptr[smp_processor_id ()]; + lc = lowcore_ptr[0 ]; +if (!lc) + lc = current_lc; + lc->restart_psw.mask =PSW_BASE_BITS |PSW_DEFAULT_KEY ; + lc->restart_psw.addr =PSW_ADDR_AMODE | (unsigned long ) smp_restart_cpu; +if (!cpu_online (0 )) +smp_switch_to_cpu (func, data,0 ,stap (), __cpu_logical_map[0 ]); +while (signal_processor (0 , sigp_stop_and_store_status) == sigp_busy) +cpu_relax (); + sp = lc->panic_stack; + sp -=sizeof (struct pt_regs ); + regs = (struct pt_regs *) sp; +memcpy (®s->gprs, ¤t_lc->gpregs_save_area,sizeof (regs->gprs)); +memcpy (®s->psw, ¤t_lc->st_status_fixed_logout,sizeof (psw_t)); + sp -=STACK_FRAME_OVERHEAD ; + sf = (struct stack_frame *) sp; + sf->back_chain = regs->gprs[15 ]; +smp_switch_to_cpu (func, data, sp,stap (), __cpu_logical_map[0 ]); +} +void smp_send_stop (void ) {int cpu, rc;
@@ -752,7 +785,8 @@get_online_cpus ();mutex_lock (&smp_cpu_state_mutex); rc = -EBUSY ; -if (cpu_online (cpu)) +/* disallow configuration changes of online cpus and cpu 0 */ +if (cpu_online (cpu) || cpu ==0 ) goto out; rc =0 ;switch (val) {
arch/s390/kernel/switch_cpu64.S new file +52 -0
52 lines not on this page · raw message
arch/s390/kernel/switch_cpu.S new file +59 -0
59 lines not on this page · raw message
PATCH 11/32 qdio: account processed SBAL during queue scan
In reply to Martin SchwidefskyFrom: Jan Glauber <[email protected]>
Add counters for the number of processed SBALs. The numbers summarize how many SBALs were processed at each queue scan and indicate the utilization of the queue. Furthermore the number of unsuccessfull queue scans, SBAL errors and the total number of processed SBALs are accounted.
Also regroup struct qdio_q to move read-mostly and write-mostly data into different cachelines.
---
drivers/s390/cio/qdio.h | 85 ++++++++++++++++++++++++++---------------- drivers/s390/cio/qdio_debug.c | 23 ++++++++++- drivers/s390/cio/qdio_main.c | 26 ++++++++++++ 3 files changed, 101 insertions(+), 33 deletions(-)
drivers/s390/cio/qdio_debug.c +21 -2
@@ -60,7 +60,7 @@seq_printf (m,"ftc: %d last_move: %d\n" , q->first_to_check, q->last_move);seq_printf (m,"polling: %d ack start: %d ack count: %d\n" , q->u.in.polling, q->u.in.ack_start, q->u.in.ack_count); -seq_printf (m,"slsb buffer states:\n" ); +seq_printf (m,"SBAL states:\n" );seq_printf (m,"|0 |8 |16 |24 |32 |40 |48 |56 63|\n" );for (i =0 ; i <QDIO_MAX_BUFFERS_PER_Q ; i++) {
@@ -97,6 +97,20 @@ }seq_printf (m,"\n" );seq_printf (m,"|64 |72 |80 |88 |96 |104 |112 | 127|\n" ); + +seq_printf (m,"\nSBAL statistics:" ); +if (!q->irq_ptr->perf_stat_enabled) { +seq_printf (m," disabled\n" ); +return 0 ; + } + +seq_printf (m,"\n1 2.. 4.. 8.. " +"16.. 32.. 64.. 127\n" ); +for (i =0 ; i <ARRAY_SIZE (q->q_stats.nr_sbals); i++) +seq_printf (m,"%-10u " , q->q_stats.nr_sbals[i]); +seq_printf (m,"\nError NOP Total\n%-10u %-10u %-10u\n\n" , + q->q_stats.nr_sbal_error, q->q_stats.nr_sbal_nop, + q->q_stats.nr_sbal_total);return 0 ; }
@@ -181,9 +195,10 @@ {struct seq_file *seq = file->private_data;struct qdio_irq *irq_ptr = seq->private; +struct qdio_q *q;unsigned long val;char buf[8 ]; -int ret; +int ret, i;if (!irq_ptr)return 0 ;
@@ -201,6 +216,10 @@case 0 : irq_ptr->perf_stat_enabled =0 ;memset (&irq_ptr->perf_stat,0 ,sizeof (irq_ptr->perf_stat)); +for_each_input_queue (irq_ptr, q, i) +memset (&q->q_stats,0 ,sizeof (q->q_stats)); +for_each_output_queue (irq_ptr, q, i) +memset (&q->q_stats,0 ,sizeof (q->q_stats));break ;case 1 : irq_ptr->perf_stat_enabled =1 ;
drivers/s390/cio/qdio.h +54 -31
135 lines not on this page · raw message
drivers/s390/cio/qdio_main.c +26 -0
@@ -392,6 +392,20 @@set_buf_state (q, q->u.in.ack_start,SLSB_P_INPUT_NOT_INIT ); } +static inline void account_sbals (struct qdio_q *q,int count) +{ +int pos =0 ; + + q->q_stats.nr_sbal_total += count; +if (count ==QDIO_MAX_BUFFERS_MASK ) { + q->q_stats.nr_sbals[7 ]++; +return ; + } +while (count >>=1 ) + pos++; + q->q_stats.nr_sbals[pos]++; +} +static void announce_buffer_error (struct qdio_q *q,int count) { q->qdio_error |=QDIO_ERROR_SLSB_STATE ;
@@ -487,16 +501,22 @@ q->first_to_check =add_buf (q->first_to_check, count);if (atomic_sub (count, &q->nr_buf_used) ==0 )qperf_inc (q, inbound_queue_full); +if (q->irq_ptr->perf_stat_enabled) +account_sbals (q, count);break ;case SLSB_P_INPUT_ERROR :announce_buffer_error (q, count);/* process the buffer, the upper layer will take care of it */ q->first_to_check =add_buf (q->first_to_check, count);atomic_sub (count, &q->nr_buf_used); +if (q->irq_ptr->perf_stat_enabled) +account_sbals_error (q, count);break ;case SLSB_CU_INPUT_EMPTY :case SLSB_P_INPUT_NOT_INIT :case SLSB_P_INPUT_ACK : +if (q->irq_ptr->perf_stat_enabled) + q->q_stats.nr_sbal_nop++;DBF_DEV_EVENT (DBF_INFO , q->irq_ptr,"in nop" );break ;default :
@@ -643,15 +663,21 @@atomic_sub (count, &q->nr_buf_used); q->first_to_check =add_buf (q->first_to_check, count); +if (q->irq_ptr->perf_stat_enabled) +account_sbals (q, count);break ;case SLSB_P_OUTPUT_ERROR :announce_buffer_error (q, count);/* process the buffer, the upper layer will take care of it */ q->first_to_check =add_buf (q->first_to_check, count);atomic_sub (count, &q->nr_buf_used); +if (q->irq_ptr->perf_stat_enabled) +account_sbals_error (q, count);break ;case SLSB_CU_OUTPUT_PRIMED :/* the adapter has not fetched the output yet */ +if (q->irq_ptr->perf_stat_enabled) + q->q_stats.nr_sbal_nop++;DBF_DEV_EVENT (DBF_INFO , q->irq_ptr,"out primed:%1d" , q->nr);break ;case SLSB_P_OUTPUT_NOT_INIT :
PATCH 12/32 qdio: optimize cache line usage of struct qdio_irq
In reply to Martin SchwidefskyFrom: Jan Glauber <[email protected]>
Remove a memset hack that relied on the internal layout of the qdio_irq struct and move the per device statistics data into an own cache line to avoid cache line bashing between the inbound and the outbound queue tasklets. Also reduce the number of allocated queues from 32 to 4 which is the current maximum. That saves a cache line in struct qdio_irq.
---
arch/s390/include/asm/qdio.h | 3 ++- drivers/s390/cio/qdio.h | 9 +++------ drivers/s390/cio/qdio_setup.c | 10 +++++++++- 3 files changed, 14 insertions(+), 8 deletions(-)
arch/s390/include/asm/qdio.h +2 -1
@@ -13,7 +13,8 @@#include <asm/cio.h> #include <asm/ccwdev.h> -#define QDIO_MAX_QUEUES_PER_IRQ 32 +/* only use 4 queues to save some cachelines */ +#define QDIO_MAX_QUEUES_PER_IRQ 4#define QDIO_MAX_BUFFERS_PER_Q 128#define QDIO_MAX_BUFFERS_MASK (QDIO_MAX_BUFFERS_PER_Q - 1)#define QDIO_MAX_ELEMENTS_PER_BUFFER 16
drivers/s390/cio/qdio.h +3 -6
@@ -208,7 +208,7 @@unsigned int eqbs_partial;unsigned int sqbs;unsigned int sqbs_partial; -}; +}____cacheline_aligned ;struct qdio_queue_perf_stat {/*
@@ -329,12 +329,8 @@struct qdio_ssqd_desc ssqd_desc;void (*orig_handler) (struct ccw_device *,unsigned long ,struct irb *); -struct qdio_dev_perf_stat perf_stat;int perf_stat_enabled; -/* -* Warning: Leave these members together at the end so they won't be -* cleared in qdio_setup_irq. -*/ +struct qdr *qdr;unsigned long chsc_page;
@@ -343,6 +339,7 @@debug_info_t *debug_area;struct mutex setup_mutex; +struct qdio_dev_perf_stat perf_stat; };/* helper functions */
drivers/s390/cio/qdio_setup.c +9 -1
@@ -382,7 +382,15 @@struct qdio_irq *irq_ptr = init_data->cdev->private->qdio_data;int rc; -memset (irq_ptr,0 , ((char *)&irq_ptr->qdr) - ((char *)irq_ptr)); +memset (&irq_ptr->qib,0 ,sizeof (irq_ptr->qib)); +memset (&irq_ptr->siga_flag,0 ,sizeof (irq_ptr->siga_flag)); +memset (&irq_ptr->ccw,0 ,sizeof (irq_ptr->ccw)); +memset (&irq_ptr->ssqd_desc,0 ,sizeof (irq_ptr->ssqd_desc)); +memset (&irq_ptr->perf_stat,0 ,sizeof (irq_ptr->perf_stat)); + + irq_ptr->debugfs_dev = irq_ptr->debugfs_perf =NULL ; + irq_ptr->sch_token = irq_ptr->state = irq_ptr->perf_stat_enabled =0 ; +/* wipes qib.ac, required by ar7063 */ memset (irq_ptr->qdr,0 ,sizeof (struct qdr ));
PATCH 13/32 add MACHINE_IS_LPAR flag
In reply to Martin SchwidefskyFrom: Martin Schwidefsky <[email protected]>
Introduce the MACHINE_IS_LPAR flag for code that should only be executed if Linux is running in an LPAR.
---
arch/s390/include/asm/setup.h | 3 +++ arch/s390/kernel/early.c | 9 ++++++--- arch/s390/kernel/setup.c | 4 ++-- drivers/s390/cio/cio.c | 2 +- drivers/s390/cio/qdio_main.c | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-)
arch/s390/include/asm/setup.h +3 -0
@@ -71,9 +71,12 @@#define MACHINE_FLAG_KVM (1UL << 9)#define MACHINE_FLAG_HPAGE (1UL << 10)#define MACHINE_FLAG_PFMF (1UL << 11) +#define MACHINE_FLAG_LPAR (1UL << 12)#define MACHINE_IS_VM (S390_lowcore.machine_flags & MACHINE_FLAG_VM)#define MACHINE_IS_KVM (S390_lowcore.machine_flags & MACHINE_FLAG_KVM) +#define MACHINE_IS_LPAR (S390_lowcore.machine_flags & MACHINE_FLAG_LPAR) +#define MACHINE_HAS_DIAG9C (S390_lowcore.machine_flags & MACHINE_FLAG_DIAG9C)#ifndef __s390x__
arch/s390/kernel/early.c +6 -3
@@ -214,10 +214,13 @@ static noinline __init void detect_machine_type(void) { -/* No VM information? Looks like LPAR */ -if (stsi (&vmms,3 ,2 ,2 ) == -ENOSYS ) +/* Check current-configuration-level */ +if ((stsi (NULL ,0 ,0 ,0 ) >>28 ) <=2 ) { + S390_lowcore.machine_flags |=MACHINE_FLAG_LPAR ;return ; -if (!vmms.count) + } +/* Get virtual-machine cpu information. */ +if (stsi (&vmms,3 ,2 ,2 ) == -ENOSYS || !vmms.count)return ;/* Running under KVM? If not we assume z/VM */
arch/s390/kernel/setup.c +2 -2
@@ -804,7 +804,7 @@if (MACHINE_IS_VM )pr_info ("Linux is running as a z/VM " "guest operating system in 31-bit mode\n" ); -else +else if (MACHINE_IS_LPAR )pr_info ("Linux is running natively in 31-bit mode\n" );if (MACHINE_HAS_IEEE ) pr_info("The hardware system has IEEE compatible "
@@ -818,7 +818,7 @@ "guest operating system in 64-bit mode\n"); else if (MACHINE_IS_KVM) pr_info("Linux is running under KVM in 64-bit mode\n"); - else + else if (MACHINE_IS_LPAR) pr_info("Linux is running natively in 64-bit mode\n");#endif /* CONFIG_64BIT */
drivers/s390/cio/cio.c +1 -1
@@ -661,7 +661,7 @@* We don't do this for VM because a tpi drops the cpu * out of the sie which costs more cycles than it saves. */ - }while (!MACHINE_IS_VM &&tpi (NULL ) !=0 ); + }while (MACHINE_IS_LPAR &&tpi (NULL ) !=0 );irq_exit ();set_irq_regs (old_regs); }
drivers/s390/cio/qdio_main.c +1 -1
@@ -534,7 +534,7 @@if ((bufnr != q->last_move) || q->qdio_error) { q->last_move = bufnr; -if (!is_thinint_irq (q->irq_ptr) && !MACHINE_IS_VM ) +if (!is_thinint_irq (q->irq_ptr) &&MACHINE_IS_LPAR ) q->u.in.timestamp =get_usecs ();return 1 ; }else
PATCH 14/32 sysinfo: fix SYSIB 3,2,2 structure
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
The size of the field that contains the description block count is only four bits instead of eight bits.
The first four bits are reserved but this might change and break.
---
arch/s390/include/asm/sysinfo.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/s390/include/asm/sysinfo.h +2 -1
@@ -87,7 +87,8 @@struct sysinfo_3_2_2 {char reserved_0[31 ]; -unsigned char count; + unsigned char :4; +unsigned char count:4 ;struct {char reserved_0[4 ];unsigned short cpus_total;
PATCH 15/32 spinlock: check virtual cpu running status
In reply to Martin SchwidefskyFrom: Gerald Schaefer <[email protected]>
This patch introduces a new function that checks the running status of a cpu in a hypervisor. This status is not virtualized, so the check is only correct if running in an LPAR. On acquiring a spinlock, if the cpu holding the lock is scheduled by the hypervisor, we do a busy wait on the lock. If it is not scheduled, we yield over to that cpu.
---
arch/s390/include/asm/sigp.h | 40 ++++++++++++++---------------- arch/s390/include/asm/smp.h | 24 ++++++++++++++++++ arch/s390/lib/spinlock.c | 57 +++++++++++++++++++++++++++++-------------- 3 files changed, 82 insertions(+), 39 deletions(-)
arch/s390/include/asm/sigp.h +19 -21
@@ -31,32 +31,31 @@typedef enum { - sigp_unassigned=0x0 , - sigp_sense, - sigp_external_call, - sigp_emergency_signal, - sigp_start, - sigp_stop, - sigp_restart, - sigp_unassigned1, - sigp_unassigned2, - sigp_stop_and_store_status, - sigp_unassigned3, - sigp_initial_cpu_reset, - sigp_cpu_reset, - sigp_set_prefix, - sigp_store_status_at_address, - sigp_store_extended_status_at_address + sigp_sense =1 , + sigp_external_call =2 , + sigp_emergency_signal =3 , + sigp_start =4 , + sigp_stop =5 , + sigp_restart =6 , + sigp_stop_and_store_status =9 , + sigp_initial_cpu_reset =11 , + sigp_cpu_reset =12 , + sigp_set_prefix =13 , + sigp_store_status_at_address =14 , + sigp_store_extended_status_at_address =15 , + sigp_set_architecture =18 , + sigp_conditional_emergency_signal =19 , + sigp_sense_running =21 , }sigp_order_code ;typedef __u32 sigp_status_word ;typedef enum { - sigp_order_code_accepted=0 , - sigp_status_stored, - sigp_busy, - sigp_not_operational + sigp_order_code_accepted =0 , + sigp_status_stored =1 , + sigp_busy =2 , + sigp_not_operational =3 , }sigp_ccode ;
@@ -70,7 +69,6 @@ ec_schedule=0 , ec_call_function, ec_call_function_single, - ec_bit_last } ec_bit_sig;/*
arch/s390/include/asm/smp.h +24 -0
@@ -36,6 +36,28 @@ int from, int to);extern void smp_restart_cpu (void ); +/* +* returns 1 if (virtual) cpu is scheduled +* returns 0 otherwise +*/ +static inline int smp_vcpu_scheduled (int cpu) +{ +__u32 status =0 ; + +switch (signal_processor_ps (&status,0 , cpu, sigp_sense_running)) { +case sigp_status_stored: +/* Check for running status */ +if (status &0x400 ) +return 0 ; +break ; +case sigp_not_operational: +return 0 ; +default : +break ; + } +return 1 ; +} +#else /* CONFIG_SMP */ static inline void smp_switch_to_ipl_cpu (void (*func)(void *),void *data)
@@ -43,6 +65,8 @@ func(data); } +#define smp_vcpu_scheduled (1) +#endif /* CONFIG_SMP */ #ifdef CONFIG_HOTPLUG_CPU
arch/s390/lib/spinlock.c +37 -16
78 lines not on this page · raw message
PATCH 16/32 smp: rework sigp code
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
Rename signal_processor* functions to sigp*.
Add raw variants of each version, so we can get rid of the hacks played in smp code which establish temporary cpu logical mappings so they could call the sigp functions.
---
arch/s390/include/asm/sigp.h | 100 +++++++++++++++++++++---------------------- arch/s390/include/asm/smp.h | 4 - arch/s390/kernel/ipl.c | 2 arch/s390/kernel/smp.c | 54 ++++++++++------------- 4 files changed, 76 insertions(+), 84 deletions(-)
arch/s390/include/asm/sigp.h +49 -51
@@ -1,24 +1,19 @@/* -* include/asm-s390/sigp.h +* Routines and structures for signalling other processors. * -* S390 version -* Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation -* Author(s): Denis Joseph Barrow ([email protected],[email protected]), -* Martin Schwidefsky ([email protected]) -* Heiko Carstens ([email protected]) -* -* sigp.h by D.J. Barrow (c) IBM 1999 -* contains routines / structures for signalling other S/390 processors in an -* SMP configuration. +* Copyright IBM Corp. 1999,2010 +* Author(s): Denis Joseph Barrow, +* Martin Schwidefsky <[email protected]>, +* Heiko Carstens <[email protected]>, */ -#ifndef __SIGP__ -#define __SIGP__ +#ifndef __ASM_SIGP_H +#define __ASM_SIGP_H#include <asm/system.h> -/* get real cpu address from logical cpu number */ -extern int __cpu_logical_map[]; +/* Get real cpu address from logical cpu number. */ +extern unsigned short __cpu_logical_map[];static inline int cpu_logical_map (int cpu) {
@@ -29,8 +24,7 @@#endif } -typedef enum -{ +enum { sigp_sense =1 , sigp_external_call =2 , sigp_emergency_signal =3 ,
@@ -46,88 +40,92 @@ sigp_set_architecture =18 , sigp_conditional_emergency_signal =19 , sigp_sense_running = 21, -} sigp_order_code; - -typedef __u32 sigp_status_word ; +}; -typedef enum -{ +enum { sigp_order_code_accepted =0 , sigp_status_stored =1 , sigp_busy =2 , sigp_not_operational =3 , -}sigp_ccode ; - +};/* -* Definitions for the external call +* Definitions for external call. */ - -/* 'Bit' signals, asynchronous */ -typedef enum -{ - ec_schedule=0 , +enum { + ec_schedule =0 , ec_call_function, ec_call_function_single, -}ec_bit_sig ; +};/* -* Signal processor +* Signal processor. */ -static inline sigp_ccode -signal_processor (__u16 cpu_addr,sigp_order_code order_code) +static inline int raw_sigp (u16 cpu,int order) { register unsigned long reg1 asm ("1") = 0; -sigp_ccode ccode; +int ccode; asmvolatile (" sigp %1,%2,0(%3)\n" " ipm %0\n" " srl %0,28\n" :"=d" (ccode) - :"d" (reg1),"d" (cpu_logical_map (cpu_addr)), -"a" (order_code) :"cc" ,"memory" ); + :"d" (reg1),"d" (cpu), +"a" (order) :"cc" ,"memory" );return ccode; }/* -* Signal processor with parameter +* Signal processor with parameter. */ -static inline sigp_ccode -signal_processor_p (__u32 parameter,__u16 cpu_addr,sigp_order_code order_code) +static inline int raw_sigp_p (u32 parameter,u16 cpu,int order) { register unsigned int reg1 asm ("1") = parameter; -sigp_ccode ccode; +int ccode; asmvolatile (" sigp %1,%2,0(%3)\n" " ipm %0\n" " srl %0,28\n" :"=d" (ccode) - :"d" (reg1),"d" (cpu_logical_map (cpu_addr)), -"a" (order_code) :"cc" ,"memory" ); + :"d" (reg1),"d" (cpu), +"a" (order) :"cc" ,"memory" );return ccode; }/* -* Signal processor with parameter and return status +* Signal processor with parameter and return status. */ -static inline sigp_ccode -signal_processor_ps (__u32 *statusptr,__u32 parameter,__u16 cpu_addr, -sigp_order_code order_code) +static inline int raw_sigp_ps (u32 *status,u32 parm,u16 cpu,int order) { - register unsigned int reg1 asm ("1") = parameter; -sigp_ccode ccode; + register unsigned int reg1 asm ("1") = parm; +int ccode; asmvolatile (" sigp %1,%2,0(%3)\n" " ipm %0\n" " srl %0,28\n" :"=d" (ccode),"+d" (reg1) - :"d" (cpu_logical_map (cpu_addr)),"a" (order_code) + :"d" (cpu),"a" (order) :"cc" ,"memory" ); - *statusptr = reg1; + *status = reg1;return ccode; } -#endif /* __SIGP__ */ +static inline int sigp (int cpu,int order) +{ +return raw_sigp (cpu_logical_map (cpu), order); +} + +static inline int sigp_p (u32 parameter,int cpu,int order) +{ +return raw_sigp_p (parameter,cpu_logical_map (cpu), order); +} + +static inline int sigp_ps (u32 *status,u32 parm,int cpu,int order) +{ +return raw_sigp_ps (status, parm,cpu_logical_map (cpu), order); +} + +#endif /* __ASM_SIGP_H */
arch/s390/include/asm/smp.h +2 -2
@@ -42,9 +42,9 @@*/ static inline int smp_vcpu_scheduled (int cpu) { -__u32 status =0 ; +u32 status; -switch (signal_processor_ps (&status,0 , cpu, sigp_sense_running)) { +switch (sigp_ps (&status,0 , cpu, sigp_sense_running)) {case sigp_status_stored:/* Check for running status */ if (status &0x400 )
arch/s390/kernel/ipl.c +1 -1
@@ -1610,7 +1610,7 @@ {if (strcmp (trigger->name,ON_PANIC_STR ) ==0 )disabled_wait ((unsigned long )__builtin_return_address (0 )); -while (signal_processor (smp_processor_id (), sigp_stop) == sigp_busy) +while (sigp (smp_processor_id (), sigp_stop) == sigp_busy)cpu_relax ();for (;;); }
arch/s390/kernel/smp.c +24 -30
161 lines not on this page · raw message
PATCH 17/32 Replace ENOTSUPP usage with EOPNOTSUPP
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
ENOTSUPP is not supposed to leak to userspace so lets just use EOPNOTSUPP everywhere.
Doesn't fix a bug, but makes future reviews easier.
---
arch/s390/hypfs/hypfs_diag.c | 4 ++-- arch/s390/kernel/ipl.c | 2 +- arch/s390/kvm/diag.c | 4 ++-- arch/s390/kvm/intercept.c | 18 +++++++++--------- arch/s390/kvm/interrupt.c | 2 +- arch/s390/kvm/kvm-s390.c | 2 +- arch/s390/kvm/priv.c | 2 +- arch/s390/kvm/sigp.c | 4 ++-- arch/s390/mm/extmem.c | 12 ++++++------ 9 files changed, 25 insertions(+), 25 deletions(-)
arch/s390/hypfs/hypfs_diag.c +2 -2
@@ -488,7 +488,7 @@static int diag224 (void *ptr) { -int rc = -ENOTSUPP ; +int rc = -EOPNOTSUPP ; asmvolatile ( " diag %1,%2,0x224\n"
@@ -507,7 +507,7 @@return -ENOMEM ;if (diag224 (diag224_cpu_names)) {kfree (diag224_cpu_names); -return -ENOTSUPP ; +return -EOPNOTSUPP ; }EBCASC (diag224_cpu_names +16 , (*diag224_cpu_names +1 ) *16 );return 0 ;
arch/s390/kernel/ipl.c +1 -1
@@ -1592,7 +1592,7 @@static int vmcmd_init (void ) {if (!MACHINE_IS_VM ) -return -ENOTSUPP ; +return -EOPNOTSUPP ; vmcmd_kset =kset_create_and_add ("vmcmd" ,NULL , firmware_kobj);if (!vmcmd_kset)return -ENOMEM ;
arch/s390/kvm/diag.c +2 -2
@@ -39,7 +39,7 @@ vcpu->run->s390_reset_flags =0 ;break ;default : -return -ENOTSUPP ; +return -EOPNOTSUPP ; }atomic_clear_mask (CPUSTAT_RUNNING , &vcpu->arch.sie_block->cpuflags);
@@ -62,6 +62,6 @@case 0x308 :return __diag_ipl_functions (vcpu);default : -return -ENOTSUPP ; +return -EOPNOTSUPP ; } }
arch/s390/kvm/intercept.c +9 -9
@@ -32,7 +32,7 @@ vcpu->stat.instruction_lctlg++;if ((vcpu->arch.sie_block->ipb &0xff ) !=0x2f ) -return -ENOTSUPP ; +return -EOPNOTSUPP ; useraddr = disp2;if (base2)
@@ -138,7 +138,7 @@ rc =__kvm_s390_vcpu_store_status (vcpu,KVM_S390_STORE_STATUS_NOADDR );if (rc >=0 ) - rc = -ENOTSUPP ; + rc = -EOPNOTSUPP ; }if (vcpu->arch.local_int.action_bits &ACTION_RELOADVCPU_ON_STOP ) {
@@ -150,7 +150,7 @@if (vcpu->arch.local_int.action_bits &ACTION_STOP_ON_STOP ) { vcpu->arch.local_int.action_bits &= ~ACTION_STOP_ON_STOP ;VCPU_EVENT (vcpu,3 ,"%s" ,"cpu stopped" ); - rc = -ENOTSUPP ; + rc = -EOPNOTSUPP ; }spin_unlock_bh (&vcpu->arch.local_int.lock);
@@ -171,9 +171,9 @@ 2*PAGE_SIZE);if (rc)/* user will receive sigsegv, exit to user */ - rc = -ENOTSUPP ; + rc = -EOPNOTSUPP ; }else - rc = -ENOTSUPP ; + rc = -EOPNOTSUPP ;if (rc) VCPU_EVENT(vcpu, 2, "unhandled validity intercept code %d",
@@ -189,7 +189,7 @@ handler = instruction_handlers[vcpu->arch.sie_block->ipa >>8 ];if (handler)return handler (vcpu); -return -ENOTSUPP ; +return -EOPNOTSUPP ; }static int handle_prog (struct kvm_vcpu *vcpu)
@@ -206,7 +206,7 @@ rc =handle_instruction (vcpu); rc2 =handle_prog (vcpu); -if (rc == -ENOTSUPP ) +if (rc == -EOPNOTSUPP ) vcpu->arch.sie_block->icptcode =0x04 ;if (rc)return rc;
@@ -231,9 +231,9 @@u8 code = vcpu->arch.sie_block->icptcode;if (code &3 || (code >>2 ) >=ARRAY_SIZE (intercept_funcs)) -return -ENOTSUPP ; +return -EOPNOTSUPP ; func = intercept_funcs[code >>2 ];if (func)return func (vcpu); -return -ENOTSUPP ; +return -EOPNOTSUPP ; }
arch/s390/kvm/interrupt.c +1 -1
@@ -342,7 +342,7 @@if (psw_interrupts_disabled (vcpu)) {VCPU_EVENT (vcpu,3 ,"%s" ,"disabled wait" );__unset_cpu_idle (vcpu); -return -ENOTSUPP ;/* disabled wait */ +return -EOPNOTSUPP ;/* disabled wait */ } if (psw_extint_disabled(vcpu) ||
arch/s390/kvm/kvm-s390.c +1 -1
@@ -543,7 +543,7 @@ rc = -EINTR ; } -if (rc == -ENOTSUPP ) { +if (rc == -EOPNOTSUPP ) {/* intercept cannot be handled in-kernel, prepare kvm-run */ kvm_run->exit_reason =KVM_EXIT_S390_SIEIC ; kvm_run->s390_sieic.icptcode = vcpu->arch.sie_block->icptcode;
arch/s390/kvm/priv.c +1 -1
@@ -323,5 +323,5 @@else return handler (vcpu); } -return -ENOTSUPP ; +return -EOPNOTSUPP ; }
arch/s390/kvm/sigp.c +2 -2
@@ -172,7 +172,7 @@ rc =0 ;/* order accepted */ break ;default : - rc = -ENOTSUPP ; + rc = -EOPNOTSUPP ; }return rc; }
@@ -293,7 +293,7 @@ vcpu->stat.instruction_sigp_restart++;/* user space must know about restart */ default : -return -ENOTSUPP ; +return -EOPNOTSUPP ; }if (rc <0 )
arch/s390/mm/extmem.c +6 -6
@@ -309,7 +309,7 @@ }#endif if (qout->segcnt >6 ) { - rc = -ENOTSUPP ; + rc = -EOPNOTSUPP ; goto out_free; }
@@ -324,11 +324,11 @@for (i=0 ; i<qout->segcnt; i++) {if (((qout->range[i].start &0xff ) !=SEG_TYPE_EW ) && ((qout->range[i].start &0xff ) !=SEG_TYPE_EN )) { - rc = -ENOTSUPP ; + rc = -EOPNOTSUPP ; goto out_free; }if (start != qout->range[i].start >>PAGE_SHIFT ) { - rc = -ENOTSUPP ; + rc = -EOPNOTSUPP ; goto out_free; } start = (qout->range[i].end >>PAGE_SHIFT ) +1 ;
@@ -357,7 +357,7 @@* -ENOSYS : we are not running on VM * -EIO : could not perform query diagnose * -ENOENT : no such segment -* -ENOTSUPP: multi-part segment cannot be used with linux +* -EOPNOTSUPP: multi-part segment cannot be used with linux * -ENOMEM : out of memory * 0 .. 6 : type of segment as defined in include/asm-s390/extmem.h */
@@ -515,7 +515,7 @@* -ENOSYS : we are not running on VM * -EIO : could not perform query or load diagnose * -ENOENT : no such segment -* -ENOTSUPP: multi-part segment cannot be used with linux +* -EOPNOTSUPP: multi-part segment cannot be used with linux * -ENOSPC : segment cannot be used (overlaps with storage) * -EBUSY : segment can temporarily not be used (overlaps with dcss) * -ERANGE : segment cannot be used (exceeds kernel mapping range)
@@ -742,7 +742,7 @@pr_err ("Loading or querying DCSS %s resulted in a " "hardware error\n" , seg_name);break ; -case -ENOTSUPP : +case -EOPNOTSUPP :pr_err ("DCSS %s has multiple page ranges and cannot be " "loaded or queried\n" , seg_name);break ;
PATCH 18/32 free_initmem: reduce code duplication
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
free_initmem() and free_initrd_mem() are nearly identical. So make them call a common function.
Also fixes a bug: if the initrd wouldn't start on a page boundary also memory after the initrd would be initialized with the poison value.
---
arch/s390/mm/init.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
arch/s390/mm/init.c +17 -16
@@ -143,33 +143,34 @@ }#endif -void free_initmem (void ) +void free_init_pages (char *what,unsigned long begin,unsigned long end) { -unsigned long addr; +unsigned long addr = begin; - addr = (unsigned long )(&__init_begin); -for (; addr < (unsigned long )(&__init_end); addr +=PAGE_SIZE ) { +if (begin >= end) +return ; +for (; addr < end; addr +=PAGE_SIZE ) {ClearPageReserved (virt_to_page (addr));init_page_count (virt_to_page (addr)); -memset ((void *)addr,POISON_FREE_INITMEM ,PAGE_SIZE ); +memset ((void *)(addr &PAGE_MASK ),POISON_FREE_INITMEM , +PAGE_SIZE );free_page (addr); totalram_pages++; - } -printk ("Freeing unused kernel memory: %ldk freed\n" , - ((unsigned long )&__init_end - (unsigned long )&__init_begin) >>10 ); + } +printk (KERN_INFO "Freeing %s: %luk freed\n" , what, (end - begin) >>10 ); +} + +void free_initmem (void ) +{ +free_init_pages ("unused kernel memory" , + (unsigned long )&__init_begin, + (unsigned long )&__init_end); }#ifdef CONFIG_BLK_DEV_INITRD void free_initrd_mem (unsigned long start,unsigned long end) { -if (start < end) -printk ("Freeing initrd memory: %ldk freed\n" , (end - start) >>10 ); -for (; start < end; start +=PAGE_SIZE ) { -ClearPageReserved (virt_to_page (start)); -init_page_count (virt_to_page (start)); -free_page (start); - totalram_pages++; - } +free_init_pages ("initrd memory" , start, end); }#endif
PATCH 19/32 ccw_device_notify: improve return codes
In reply to Martin SchwidefskyFrom: Sebastian Ott <[email protected]>
Callers of ccw_device_notify could not distinguish between a driver who has no notifier registered and a driver who doesn't want to keep a device after a certain event. Change this by adding proper return codes.
---
drivers/s390/cio/device.c | 10 +++++----- drivers/s390/cio/device.h | 2 +- drivers/s390/cio/device_fsm.c | 39 +++++++++++++++++++++++++++++++-------- 3 files changed, 37 insertions(+), 14 deletions(-)
drivers/s390/cio/device.c +5 -5
@@ -1338,7 +1338,7 @@/* Not operational. */ if (!cdev)return IO_SCH_UNREG ; -if (!ccw_device_notify (cdev,CIO_GONE )) +if (ccw_device_notify (cdev,CIO_GONE ) !=NOTIFY_OK )return IO_SCH_UNREG ;return IO_SCH_ORPH_UNREG ; }
@@ -1346,12 +1346,12 @@if (!cdev)return IO_SCH_ATTACH ;if (sch->schib.pmcw.dev != cdev->private->dev_id.devno) { -if (!ccw_device_notify (cdev,CIO_GONE )) +if (ccw_device_notify (cdev,CIO_GONE ) !=NOTIFY_OK )return IO_SCH_UNREG_ATTACH ;return IO_SCH_ORPH_ATTACH ; }if ((sch->schib.pmcw.pam & sch->opm) ==0 ) { -if (!ccw_device_notify (cdev,CIO_NO_PATH )) +if (ccw_device_notify (cdev,CIO_NO_PATH ) !=NOTIFY_OK )return IO_SCH_UNREG ;return IO_SCH_DISC ; }
@@ -1788,7 +1788,7 @@static int resume_handle_boxed (struct ccw_device *cdev) { cdev->private->state =DEV_STATE_BOXED ; -if (ccw_device_notify (cdev,CIO_BOXED )) +if (ccw_device_notify (cdev,CIO_BOXED ) ==NOTIFY_OK )return 0 ;ccw_device_sched_todo (cdev,CDEV_TODO_UNREG );return -ENODEV ;
@@ -1797,7 +1797,7 @@static int resume_handle_disc (struct ccw_device *cdev) { cdev->private->state =DEV_STATE_DISCONNECTED ; -if (ccw_device_notify (cdev,CIO_GONE )) +if (ccw_device_notify (cdev,CIO_GONE ) ==NOTIFY_OK )return 0 ;ccw_device_sched_todo (cdev,CDEV_TODO_UNREG );return -ENODEV ;
drivers/s390/cio/device_fsm.c +31 -8
@@ -313,21 +313,43 @@ } } +/** +* ccw_device_notify() - inform the device's driver about an event +* @cdev: device for which an event occured +* @event: event that occurred +* +* Returns: +* -%EINVAL if the device is offline or has no driver. +* -%EOPNOTSUPP if the device's driver has no notifier registered. +* %NOTIFY_OK if the driver wants to keep the device. +* %NOTIFY_BAD if the driver doesn't want to keep the device. +*/ int ccw_device_notify (struct ccw_device *cdev,int event) { +int ret = -EINVAL ; +if (!cdev->drv) -return 0 ; + goto out;if (!cdev->online) -return 0 ; + goto out;CIO_MSG_EVENT (2 ,"notify called for 0.%x.%04x, event=%d\n" , cdev->private->dev_id.ssid, cdev->private->dev_id.devno, event); -return cdev->drv->notify ? cdev->drv->notify (cdev, event) :0 ; +if (!cdev->drv->notify) { + ret = -EOPNOTSUPP ; + goto out; + } +if (cdev->drv->notify (cdev, event)) + ret =NOTIFY_OK ; +else + ret =NOTIFY_BAD ; +out: +return ret; }static void ccw_device_oper_notify (struct ccw_device *cdev) { -if (ccw_device_notify (cdev,CIO_OPER )) { +if (ccw_device_notify (cdev,CIO_OPER ) ==NOTIFY_OK ) {/* Reenable channel measurements, if needed. */ ccw_device_sched_todo (cdev,CDEV_TODO_ENABLE_CMF );return ;
@@ -361,14 +383,15 @@case DEV_STATE_BOXED :CIO_MSG_EVENT (0 ,"Boxed device %04x on subchannel %04x\n" , cdev->private->dev_id.devno, sch->schid.sch_no); -if (cdev->online && !ccw_device_notify (cdev,CIO_BOXED )) +if (cdev->online && +ccw_device_notify (cdev,CIO_BOXED ) !=NOTIFY_OK )ccw_device_sched_todo (cdev,CDEV_TODO_UNREG ); cdev->private->flags.donotify =0 ;break ;case DEV_STATE_NOT_OPER :CIO_MSG_EVENT (0 ,"Device %04x gone on subchannel %04x\n" , cdev->private->dev_id.devno, sch->schid.sch_no); -if (!ccw_device_notify (cdev,CIO_GONE )) +if (ccw_device_notify (cdev,CIO_GONE ) !=NOTIFY_OK )ccw_device_sched_todo (cdev,CDEV_TODO_UNREG );else ccw_device_set_disconnected (cdev);
@@ -378,7 +401,7 @@CIO_MSG_EVENT (0 ,"Disconnected device %04x on subchannel " "%04x\n" , cdev->private->dev_id.devno, sch->schid.sch_no); -if (!ccw_device_notify (cdev,CIO_NO_PATH )) +if (ccw_device_notify (cdev,CIO_NO_PATH ) !=NOTIFY_OK )ccw_device_sched_todo (cdev,CDEV_TODO_UNREG );else ccw_device_set_disconnected (cdev);
@@ -586,7 +609,7 @@static void ccw_device_generic_notoper (struct ccw_device *cdev,enum dev_event dev_event) { -if (!ccw_device_notify (cdev,CIO_GONE )) +if (ccw_device_notify (cdev,CIO_GONE ) !=NOTIFY_OK )ccw_device_sched_todo (cdev,CDEV_TODO_UNREG );else ccw_device_set_disconnected (cdev);
drivers/s390/cio/device.h +1 -1
@@ -4,7 +4,7 @@#include <asm/ccwdev.h> #include <asm/atomic.h> #include <linux/wait.h> - +#include <linux/notifier.h> #include "io_sch.h" /*
PATCH 20/32 Cleanup struct _lowcore usage and defines.
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
Use asm offsets to make sure the offset defines to struct _lowcore and its layout don't get out of sync.
Also add a BUILD_BUG_ON() which checks that the size of the structure is sane.
And while being at it change those sites which use odd casts to access the current lowcore. These should use S390_lowcore instead.
---
arch/s390/include/asm/lowcore.h | 241 ++++++++---------------------------- arch/s390/include/asm/setup.h | 6 arch/s390/include/asm/thread_info.h | 2 arch/s390/kernel/asm-offsets.c | 91 ++++++++++++- arch/s390/kernel/base.S | 2 arch/s390/kernel/entry.S | 1 arch/s390/kernel/entry64.S | 2 arch/s390/kernel/ftrace.c | 2 arch/s390/kernel/head.S | 1 arch/s390/kernel/ipl.c | 6 arch/s390/kernel/reipl.S | 2 arch/s390/kernel/reipl64.S | 2 arch/s390/kernel/setup.c | 7 - arch/s390/kernel/smp.c | 3 arch/s390/kernel/switch_cpu.S | 1 arch/s390/kernel/switch_cpu64.S | 1 arch/s390/kernel/vdso.c | 1 arch/s390/kvm/interrupt.c | 10 - arch/s390/kvm/kvm-s390.c | 1 arch/s390/mm/fault.c | 1 drivers/s390/char/zcore.c | 1 drivers/s390/cio/ccwreq.c | 2 drivers/s390/cio/chsc_sch.c | 2 drivers/s390/cio/cio.c | 12 - drivers/s390/cio/device_fsm.c | 4 drivers/s390/kvm/kvm_virtio.c | 4 26 files changed, 174 insertions(+), 234 deletions(-)
arch/s390/include/asm/lowcore.h +55 -186
@@ -1,144 +1,16 @@/* -* include/asm-s390/lowcore.h -* -* S390 version -* Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation -* Author(s): Hartmut Penner ([email protected]), -* Martin Schwidefsky ([email protected]), -* Denis Joseph Barrow ([email protected],[email protected]) +* Copyright IBM Corp. 1999,2010 +* Author(s): Hartmut Penner <[email protected]>, +* Martin Schwidefsky <[email protected]>, +* Denis Joseph Barrow, */ #ifndef _ASM_S390_LOWCORE_H#define _ASM_S390_LOWCORE_H -#define __LC_IPL_PARMBLOCK_PTR 0x0014 -#define __LC_EXT_PARAMS 0x0080 -#define __LC_CPU_ADDRESS 0x0084 -#define __LC_EXT_INT_CODE 0x0086 - -#define __LC_SVC_ILC 0x0088 -#define __LC_SVC_INT_CODE 0x008a -#define __LC_PGM_ILC 0x008c -#define __LC_PGM_INT_CODE 0x008e - -#define __LC_PER_ATMID 0x0096 -#define __LC_PER_ADDRESS 0x0098 -#define __LC_PER_ACCESS_ID 0x00a1 -#define __LC_AR_MODE_ID 0x00a3 - -#define __LC_SUBCHANNEL_ID 0x00b8 -#define __LC_SUBCHANNEL_NR 0x00ba -#define __LC_IO_INT_PARM 0x00bc -#define __LC_IO_INT_WORD 0x00c0 -#define __LC_STFL_FAC_LIST 0x00c8 -#define __LC_MCCK_CODE 0x00e8 - -#define __LC_DUMP_REIPL 0x0e00 - -#ifndef __s390x__ -#define __LC_RST_NEW_PSW 0x0000 -#define __LC_RST_OLD_PSW 0x0008 -#define __LC_EXT_OLD_PSW 0x0018 -#define __LC_SVC_OLD_PSW 0x0020 -#define __LC_PGM_OLD_PSW 0x0028 -#define __LC_MCK_OLD_PSW 0x0030 -#define __LC_IO_OLD_PSW 0x0038 -#define __LC_EXT_NEW_PSW 0x0058 -#define __LC_SVC_NEW_PSW 0x0060 -#define __LC_PGM_NEW_PSW 0x0068 -#define __LC_MCK_NEW_PSW 0x0070 -#define __LC_IO_NEW_PSW 0x0078 -#define __LC_SAVE_AREA 0x0200 -#define __LC_RETURN_PSW 0x0240 -#define __LC_RETURN_MCCK_PSW 0x0248 -#define __LC_SYNC_ENTER_TIMER 0x0250 -#define __LC_ASYNC_ENTER_TIMER 0x0258 -#define __LC_EXIT_TIMER 0x0260 -#define __LC_USER_TIMER 0x0268 -#define __LC_SYSTEM_TIMER 0x0270 -#define __LC_STEAL_TIMER 0x0278 -#define __LC_LAST_UPDATE_TIMER 0x0280 -#define __LC_LAST_UPDATE_CLOCK 0x0288 -#define __LC_CURRENT 0x0290 -#define __LC_THREAD_INFO 0x0294 -#define __LC_KERNEL_STACK 0x0298 -#define __LC_ASYNC_STACK 0x029c -#define __LC_PANIC_STACK 0x02a0 -#define __LC_KERNEL_ASCE 0x02a4 -#define __LC_USER_ASCE 0x02a8 -#define __LC_USER_EXEC_ASCE 0x02ac -#define __LC_CPUID 0x02b0 -#define __LC_INT_CLOCK 0x02c8 -#define __LC_MACHINE_FLAGS 0x02d8 -#define __LC_FTRACE_FUNC 0x02dc -#define __LC_IRB 0x0300 -#define __LC_PFAULT_INTPARM 0x0080 -#define __LC_CPU_TIMER_SAVE_AREA 0x00d8 -#define __LC_CLOCK_COMP_SAVE_AREA 0x00e0 -#define __LC_PSW_SAVE_AREA 0x0100 -#define __LC_PREFIX_SAVE_AREA 0x0108 -#define __LC_AREGS_SAVE_AREA 0x0120 -#define __LC_FPREGS_SAVE_AREA 0x0160 -#define __LC_GPREGS_SAVE_AREA 0x0180 -#define __LC_CREGS_SAVE_AREA 0x01c0 -#else /* __s390x__ */ -#define __LC_LAST_BREAK 0x0110 -#define __LC_RST_OLD_PSW 0x0120 -#define __LC_EXT_OLD_PSW 0x0130 -#define __LC_SVC_OLD_PSW 0x0140 -#define __LC_PGM_OLD_PSW 0x0150 -#define __LC_MCK_OLD_PSW 0x0160 -#define __LC_IO_OLD_PSW 0x0170 -#define __LC_RST_NEW_PSW 0x01a0 -#define __LC_EXT_NEW_PSW 0x01b0 -#define __LC_SVC_NEW_PSW 0x01c0 -#define __LC_PGM_NEW_PSW 0x01d0 -#define __LC_MCK_NEW_PSW 0x01e0 -#define __LC_IO_NEW_PSW 0x01f0 -#define __LC_SAVE_AREA 0x0200 -#define __LC_RETURN_PSW 0x0280 -#define __LC_RETURN_MCCK_PSW 0x0290 -#define __LC_SYNC_ENTER_TIMER 0x02a0 -#define __LC_ASYNC_ENTER_TIMER 0x02a8 -#define __LC_EXIT_TIMER 0x02b0 -#define __LC_USER_TIMER 0x02b8 -#define __LC_SYSTEM_TIMER 0x02c0 -#define __LC_STEAL_TIMER 0x02c8 -#define __LC_LAST_UPDATE_TIMER 0x02d0 -#define __LC_LAST_UPDATE_CLOCK 0x02d8 -#define __LC_CURRENT 0x02e0 -#define __LC_THREAD_INFO 0x02e8 -#define __LC_KERNEL_STACK 0x02f0 -#define __LC_ASYNC_STACK 0x02f8 -#define __LC_PANIC_STACK 0x0300 -#define __LC_KERNEL_ASCE 0x0308 -#define __LC_USER_ASCE 0x0310 -#define __LC_USER_EXEC_ASCE 0x0318 -#define __LC_CPUID 0x0320 -#define __LC_INT_CLOCK 0x0340 -#define __LC_VDSO_PER_CPU 0x0350 -#define __LC_MACHINE_FLAGS 0x0358 -#define __LC_FTRACE_FUNC 0x0360 -#define __LC_IRB 0x0380 -#define __LC_PASTE 0x03c0 -#define __LC_PFAULT_INTPARM 0x11b8 -#define __LC_FPREGS_SAVE_AREA 0x1200 -#define __LC_GPREGS_SAVE_AREA 0x1280 -#define __LC_PSW_SAVE_AREA 0x1300 -#define __LC_PREFIX_SAVE_AREA 0x1318 -#define __LC_FP_CREG_SAVE_AREA 0x131c -#define __LC_TODREG_SAVE_AREA 0x1324 -#define __LC_CPU_TIMER_SAVE_AREA 0x1328 -#define __LC_CLOCK_COMP_SAVE_AREA 0x1331 -#define __LC_AREGS_SAVE_AREA 0x1340 -#define __LC_CREGS_SAVE_AREA 0x1380 -#endif /* __s390x__ */ - -#ifndef __ASSEMBLY__ - -#include <asm/cpu.h> -#include <asm/ptrace.h> #include <linux/types.h> +#include <asm/ptrace.h> +#include <asm/cpu.h> void restart_int_handler (void );void ext_int_handler (void );
@@ -149,6 +21,9 @@ #ifdef CONFIG_32BIT +#define LC_ORDER 0 +#define LC_PAGES 1 + struct save_area { u32 ext_save; u64 timer;
@@ -161,46 +36,13 @@u64 fp_regs[4 ];u32 gp_regs[16 ];u32 ctrl_regs[16 ]; -} __attribute__((packed)); - -#define SAVE_AREA_BASE offsetof(struct _lowcore, extended_save_area_addr) - -#else /* CONFIG_32BIT */ - -struct save_area { -u64 fp_regs[16 ]; -u64 gp_regs[16 ]; -u8 psw[16 ]; -u8 pad1[8 ]; -u32 pref_reg; -u32 fp_ctrl_reg; -u8 pad2[4 ]; -u32 tod_reg; -u64 timer; -u64 clk_cmp; -u8 pad3[8 ]; -u32 acc_regs[16 ]; -u64 ctrl_regs[16 ]; -} __attribute__((packed)); - -#define SAVE_AREA_BASE offsetof(struct _lowcore, floating_pt_save_area) - -#endif /* CONFIG_32BIT */ - -#ifndef __s390x__ -#define LC_ORDER 0 -#else -#define LC_ORDER 1 -#endif +} __packed; -#define LC_PAGES (1UL << LC_ORDER) - -struct _lowcore -{ -#ifndef __s390x__ -/* 0x0000 - 0x01ff: defined by architecture */ +struct _lowcore {psw_t restart_psw;/* 0x0000 */ -__u32 ccw2[4 ];/* 0x0008 */ +psw_t restart_old_psw;/* 0x0008 */ +__u8 pad_0x0010[0x0014 -0x0010 ];/* 0x0010 */ +__u32 ipl_parmblock_ptr;/* 0x0014 */ psw_t external_old_psw;/* 0x0018 */ psw_t svc_old_psw;/* 0x0020 */ psw_t program_old_psw;/* 0x0028 */
@@ -226,7 +68,9 @@__u32 monitor_code;/* 0x009c */ __u8 exc_access_id;/* 0x00a0 */ __u8 per_access_id;/* 0x00a1 */ -__u8 pad_0x00a2[0x00b8 -0x00a2 ];/* 0x00a2 */ +__u8 op_access_id;/* 0x00a2 */ +__u8 ar_access_id;/* 0x00a3 */ +__u8 pad_0x00a4[0x00b8 -0x00a4 ];/* 0x00a4 */ __u16 subchannel_id;/* 0x00b8 */ __u16 subchannel_nr;/* 0x00ba */ __u32 io_int_parm;/* 0x00bc */
@@ -242,8 +86,9 @@__u32 external_damage_code;/* 0x00f4 */ __u32 failing_storage_address;/* 0x00f8 */ __u8 pad_0x00fc[0x0100 -0x00fc ];/* 0x00fc */ -__u32 st_status_fixed_logout[4 ];/* 0x0100 */ -__u8 pad_0x0110[0x0120 -0x0110 ];/* 0x0110 */ +psw_t psw_save_area;/* 0x0100 */ +__u32 prefixreg_save_area;/* 0x0108 */ +__u8 pad_0x010c[0x0120 -0x010c ];/* 0x010c */ /* CPU register save area: defined by architecture */ __u32 access_regs_save_area[16 ];/* 0x0120 */
@@ -307,10 +152,32 @@ /* Align to the top 1k of prefix area */ __u8 pad_0x0e08[0x1000-0x0e08]; /* 0x0e08 */ -#else /* !__s390x__ */ -/* 0x0000 - 0x01ff: defined by architecture */ -__u32 ccw1[2 ];/* 0x0000 */ -__u32 ccw2[4 ];/* 0x0008 */ +} __packed; + +#else /* CONFIG_32BIT */ + +#define LC_ORDER 1 +#define LC_PAGES 2 + +struct save_area { + u64 fp_regs[16]; + u64 gp_regs[16]; + u8 psw[16]; + u8 pad1[8]; + u32 pref_reg; + u32 fp_ctrl_reg; + u8 pad2[4]; + u32 tod_reg; + u64 timer; + u64 clk_cmp; + u8 pad3[8]; + u32 acc_regs[16]; + u64 ctrl_regs[16]; +} __packed; + +struct _lowcore { + __u8 pad_0x0000[0x0014-0x0000]; /* 0x0000 */ + __u32 ipl_parmblock_ptr; /* 0x0014 */ __u8 pad_0x0018[0x0080-0x0018]; /* 0x0018 */ __u32 ext_params; /* 0x0080 */ __u16 cpu_addr; /* 0x0084 */
@@ -341,7 +208,9 @@__u8 pad_0x00f0[0x00f4 -0x00f0 ];/* 0x00f0 */ __u32 external_damage_code;/* 0x00f4 */ addr_t failing_storage_address;/* 0x00f8 */ -__u8 pad_0x0100[0x0120 -0x0100 ];/* 0x0100 */ +__u8 pad_0x0100[0x0110 -0x0100 ];/* 0x0100 */ +__u64 breaking_event_addr;/* 0x0110 */ +__u8 pad_0x0118[0x0120 -0x0118 ];/* 0x0118 */ psw_t restart_old_psw;/* 0x0120 */ psw_t external_old_psw;/* 0x0130 */ psw_t svc_old_psw;/* 0x0140 */
@@ -422,7 +291,7 @@/* CPU register save area: defined by architecture */ __u64 floating_pt_save_area[16 ];/* 0x1200 */ __u64 gpregs_save_area[16 ];/* 0x1280 */ -__u32 st_status_fixed_logout[4 ];/* 0x1300 */ +psw_t psw_save_area;/* 0x1300 */ __u8 pad_0x1310[0x1318 -0x1310 ];/* 0x1310 */ __u32 prefixreg_save_area;/* 0x1318 */ __u32 fpt_creg_save_area;/* 0x131c */
@@ -436,10 +305,12 @@/* align to the top of the prefix area */ __u8 pad_0x1400[0x2000-0x1400]; /* 0x1400 */ -#endif /* !__s390x__ */ -} __attribute__((packed)); /* End structure*/ +} __packed; + +#endif /* CONFIG_32BIT */ #define S390_lowcore (*((struct _lowcore *) 0)) +extern struct _lowcore *lowcore_ptr[];static inline void set_prefix (__u32 address)
@@ -455,6 +326,4 @@ return address; } -#endif - -#endif +#endif /* _ASM_S390_LOWCORE_H */
arch/s390/include/asm/setup.h +3 -3
@@ -14,14 +14,14 @@#ifdef __KERNEL__ -#include <asm/lowcore.h> -#include <asm/types.h> -#define PARMAREA 0x10400#define MEMORY_CHUNKS 256#ifndef __ASSEMBLY__ +#include <asm/lowcore.h> +#include <asm/types.h> +#ifndef __s390x__#define IPL_DEVICE (*(unsigned long *) (0x10404))#define INITRD_START (*(unsigned long *) (0x1040C))
arch/s390/include/asm/thread_info.h +1 -1
@@ -73,7 +73,7 @@/* how to get the thread information struct from C */ static inline struct thread_info *current_thread_info (void ) { -return (struct thread_info *)((*(unsigned long *) __LC_KERNEL_STACK)-THREAD_SIZE ); +return (struct thread_info *)(S390_lowcore.kernel_stack -THREAD_SIZE ); }#define THREAD_SIZE_ORDER THREAD_ORDER
arch/s390/kernel/asm-offsets.c +84 -7
118 lines not on this page · raw message
arch/s390/kernel/base.S +1 -1
@@ -6,8 +6,8 @@ * Michael Holzheu <[email protected]> */ +#include <asm/asm-offsets.h> #include <asm/ptrace.h> -#include <asm/lowcore.h> #ifdef CONFIG_64BIT
arch/s390/kernel/entry64.S +0 -2
@@ -9,11 +9,9 @@ * Heiko Carstens <[email protected]> */ -#include <linux/sys.h> #include <linux/linkage.h> #include <linux/init.h> #include <asm/cache.h> -#include <asm/lowcore.h> #include <asm/errno.h> #include <asm/ptrace.h> #include <asm/thread_info.h>
arch/s390/kernel/entry.S +0 -1
@@ -13,7 +13,6 @@ #include <linux/linkage.h> #include <linux/init.h> #include <asm/cache.h> -#include <asm/lowcore.h> #include <asm/errno.h> #include <asm/ptrace.h> #include <asm/thread_info.h>
arch/s390/kernel/ftrace.c +1 -1
@@ -13,7 +13,7 @@#include <linux/kernel.h> #include <linux/types.h> #include <trace/syscall.h> -#include <asm/lowcore.h> +#include <asm/asm-offsets.h> #ifdef CONFIG_DYNAMIC_FTRACE
arch/s390/kernel/head.S +0 -1
@@ -23,7 +23,6 @@ #include <linux/init.h> #include <asm/setup.h> -#include <asm/lowcore.h> #include <asm/asm-offsets.h> #include <asm/thread_info.h> #include <asm/page.h>
arch/s390/kernel/ipl.c +2 -4
@@ -1917,7 +1917,6 @@void __init ipl_save_parameters (void ) {struct cio_iplinfo iplinfo; -unsigned int *ipl_ptr;void *src, *dst;if (cio_get_iplinfo (&iplinfo))
@@ -1928,11 +1927,10 @@if (!iplinfo.is_qdio)return ; ipl_flags |=IPL_PARMBLOCK_VALID ; - ipl_ptr = (unsigned int *)__LC_IPL_PARMBLOCK_PTR; - src = (void *)(unsigned long )*ipl_ptr; + src = (void *)(unsigned long )S390_lowcore.ipl_parmblock_ptr; dst = (void *)IPL_PARMBLOCK_ORIGIN ;memmove (dst, src,PAGE_SIZE ); - *ipl_ptr =IPL_PARMBLOCK_ORIGIN ; + S390_lowcore.ipl_parmblock_ptr =IPL_PARMBLOCK_ORIGIN ; }static LIST_HEAD (rcall);
arch/s390/kernel/reipl64.S +1 -1
@@ -4,7 +4,7 @@ * Denis Joseph Barrow, */ -#include <asm/lowcore.h> +#include <asm/asm-offsets.h> # # do_reipl_asm
arch/s390/kernel/reipl.S +1 -1
@@ -6,7 +6,7 @@ * Author(s): Holger Smolinski ([email protected]) */ -#include <asm/lowcore.h> +#include <asm/asm-offsets.h> # # do_reipl_asm
arch/s390/kernel/setup.c +2 -5
@@ -396,15 +396,12 @@setup_lowcore (void) {struct _lowcore *lc; -int lc_pages;/* * Setup lowcore for boot cpu */ - lc_pages =sizeof (void *) ==8 ?2 :1 ; - lc = (struct _lowcore *) -__alloc_bootmem (lc_pages *PAGE_SIZE , lc_pages *PAGE_SIZE ,0 ); -memset (lc,0 , lc_pages *PAGE_SIZE ); +BUILD_BUG_ON (sizeof (struct _lowcore ) !=LC_PAGES *4096 ); + lc =__alloc_bootmem (LC_PAGES *PAGE_SIZE ,LC_PAGES *PAGE_SIZE ,0 ); lc->restart_psw.mask =PSW_BASE_BITS |PSW_DEFAULT_KEY ; lc->restart_psw.addr =PSW_ADDR_AMODE | (unsigned long ) restart_int_handler;
arch/s390/kernel/smp.c +2 -1
@@ -36,6 +36,7 @@#include <linux/cpu.h> #include <linux/timex.h> #include <linux/bootmem.h> +#include <asm/asm-offsets.h> #include <asm/ipl.h> #include <asm/setup.h> #include <asm/sigp.h>
@@ -121,7 +122,7 @@ sp -=sizeof (struct pt_regs ); regs = (struct pt_regs *) sp;memcpy (®s->gprs, ¤t_lc->gpregs_save_area,sizeof (regs->gprs)); -memcpy (®s->psw, ¤t_lc->st_status_fixed_logout,sizeof (psw_t)); + regs->psw = lc->psw_save_area; sp -=STACK_FRAME_OVERHEAD ; sf = (struct stack_frame *) sp; sf->back_chain = regs->gprs[15 ];
arch/s390/kernel/switch_cpu64.S +0 -1
@@ -6,7 +6,6 @@ */ #include <asm/asm-offsets.h> -#include <asm/lowcore.h> #include <asm/ptrace.h> # smp_switch_to_cpu switches to destination cpu and executes the passed function
arch/s390/kernel/switch_cpu.S +0 -1
@@ -6,7 +6,6 @@ */ #include <asm/asm-offsets.h> -#include <asm/lowcore.h> #include <asm/ptrace.h> # smp_switch_to_cpu switches to destination cpu and executes the passed function
arch/s390/kernel/vdso.c +1 -0
@@ -23,6 +23,7 @@#include <linux/security.h> #include <linux/bootmem.h> #include <linux/compat.h> +#include <asm/asm-offsets.h> #include <asm/pgtable.h> #include <asm/system.h> #include <asm/processor.h>
arch/s390/kvm/interrupt.c +5 -5
@@ -10,12 +10,12 @@* Author(s): Carsten Otte <[email protected]> */ -#include <asm/lowcore.h> -#include <asm/uaccess.h> -#include <linux/hrtimer.h> #include <linux/interrupt.h> #include <linux/kvm_host.h> +#include <linux/hrtimer.h> #include <linux/signal.h> +#include <asm/asm-offsets.h> +#include <asm/uaccess.h> #include "kvm-s390.h" #include "gaccess.h"
@@ -187,8 +187,8 @@if (rc == -EFAULT ) exception =1 ; - rc =put_guest_u64 (vcpu, __LC_PFAULT_INTPARM, - inti->ext.ext_params2); + rc =put_guest_u64 (vcpu, __LC_EXT_PARAMS2, + inti->ext.ext_params2);if (rc == -EFAULT ) exception =1 ;break ;
arch/s390/kvm/kvm-s390.c +1 -0
@@ -23,6 +23,7 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/timer.h> +#include <asm/asm-offsets.h> #include <asm/lowcore.h> #include <asm/pgtable.h> #include <asm/nmi.h>
arch/s390/mm/fault.c +1 -0
@@ -30,6 +30,7 @@#include <linux/kprobes.h> #include <linux/uaccess.h> #include <linux/hugetlb.h> +#include <asm/asm-offsets.h> #include <asm/system.h> #include <asm/pgtable.h> #include <asm/s390_ext.h>
drivers/s390/char/zcore.c +1 -0
@@ -15,6 +15,7 @@#include <linux/init.h> #include <linux/miscdevice.h> #include <linux/debugfs.h> +#include <asm/asm-offsets.h> #include <asm/ipl.h> #include <asm/sclp.h> #include <asm/setup.h>
drivers/s390/cio/ccwreq.c +1 -1
@@ -224,8 +224,8 @@*/ void ccw_request_handler (struct ccw_device *cdev) { +struct irb *irb = (struct irb *)&S390_lowcore.irb;struct ccw_request *req = &cdev->private->req; -struct irb *irb = (struct irb *) __LC_IRB;enum io_status status;int rc = -EOPNOTSUPP ;
drivers/s390/cio/chsc_sch.c +1 -1
@@ -51,7 +51,7 @@ {struct chsc_private *private = sch->private;struct chsc_request *request = private->request; -struct irb *irb = (struct irb *)__LC_IRB; +struct irb *irb = (struct irb *)&S390_lowcore.irb;CHSC_LOG (4 ,"irb" );CHSC_LOG_HEX (4 , irb,sizeof (*irb));
drivers/s390/cio/cio.c +6 -6
@@ -625,8 +625,8 @@/* * Get interrupt information from lowcore */ - tpi_info = (struct tpi_info *) __LC_SUBCHANNEL_ID; - irb = (struct irb *) __LC_IRB; + tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id; + irb = (struct irb *)&S390_lowcore.irb; do { kstat_cpu(smp_processor_id()).irqs[IO_INTERRUPT]++; /*
@@ -682,10 +682,10 @@struct irb *irb;int irq_context; - tpi_info = (struct tpi_info *) __LC_SUBCHANNEL_ID; + tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id;if (tpi (NULL ) !=1 )return 0 ; - irb = (struct irb *) __LC_IRB; + irb = (struct irb *)&S390_lowcore.irb;/* Store interrupt response block to lowcore. */ if (tsch (tpi_info->schid, irb) !=0 )/* Not status pending or not operational. */
@@ -885,7 +885,7 @@struct tpi_info ti;if (tpi (&ti)) { -tsch (ti.schid, (struct irb *)__LC_IRB); +tsch (ti.schid, (struct irb *)&S390_lowcore.irb);if (schid_equal (&ti.schid, &schid))return 0 ; }
@@ -1083,7 +1083,7 @@struct subchannel_id schid;struct schib schib; - schid = *(struct subchannel_id *)__LC_SUBCHANNEL_ID; + schid = *(struct subchannel_id *)&S390_lowcore.subchannel_id;if (!schid.one)return -ENODEV ;if (stsch (schid, &schib))
drivers/s390/cio/device_fsm.c +2 -2
@@ -690,7 +690,7 @@struct irb *irb;int is_cmd; - irb = (struct irb *) __LC_IRB; + irb = (struct irb *)&S390_lowcore.irb; is_cmd = !scsw_is_tm (&irb->scsw);/* Check for unsolicited interrupt. */ if (!scsw_is_solicited (&irb->scsw)) {
@@ -755,7 +755,7 @@ {struct irb *irb; - irb = (struct irb *) __LC_IRB; + irb = (struct irb *)&S390_lowcore.irb;/* Check for unsolicited interrupt. */ if (scsw_stctl (&irb->scsw) == (SCSW_STCTL_STATUS_PEND |SCSW_STCTL_ALERT_STATUS )) {
drivers/s390/kvm/kvm_virtio.c +2 -2
@@ -340,11 +340,11 @@return ;/* The LSB might be overloaded, we have to mask it */ - vq = (struct virtqueue *) ((*(long *) __LC_PFAULT_INTPARM) & ~1UL ); + vq = (struct virtqueue *)(S390_lowcore.ext_params2 & ~1UL );/* We use the LSB of extparam, to decide, if this interrupt is a config * change or a "standard" interrupt */ - config_changed = (*(int *) __LC_EXT_PARAMS &1 ); + config_changed = S390_lowcore.ext_params &1 ;if (config_changed) {struct virtio_driver *drv;
PATCH 21/32 bug: use relative pointers in bug table entries
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
Reduces the size of the bug table entries by 50% on 64bit kernels. Saves around 30kb on a defconfig kernel.
s390 version of b93a531e "allow bug table entries to use relative pointers (and use it on x86-64)".
---
arch/s390/Kconfig | 3 +++ arch/s390/include/asm/bug.h | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-)
arch/s390/include/asm/bug.h +2 -8
@@ -5,12 +5,6 @@#ifdef CONFIG_BUG -#ifdef CONFIG_64BIT -#define S390_LONG ".quad" -#else -#define S390_LONG ".long" -#endif -#ifdef CONFIG_DEBUG_BUGVERBOSE #define __EMIT_BUG (x) do { \
@@ -21,7 +15,7 @@"2: .asciz \"" __FILE__"\"\n" \".previous\n" \".section __bug_table,\"a\"\n" \ -"3:\t" S390_LONG "\t1b,2b\n" \ +"3: .long 1b-3b,2b-3b\n" \" .short %0,%1\n" \" .org 3b+%2\n" \".previous\n" \
@@ -37,7 +31,7 @@"0: j 0b+2\n" \"1:\n" \".section __bug_table,\"a\"\n" \ -"2:\t" S390_LONG "\t1b\n" \ +"2: .long 1b-2b\n" \" .short %0\n" \" .org 2b+%1\n" \".previous\n" \
arch/s390/Kconfig +3 -0
@@ -54,6 +54,9 @@ depends on BUG default y +config GENERIC_BUG_RELATIVE_POINTERS + def_bool y + config NO_IOMEM def_bool y
PATCH 22/32 use kprobes_built_in() in mm/fault code
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
Use kprobes_built_in() to avoid ifdefs like most other architectures do.
---
arch/s390/mm/fault.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/s390/mm/fault.c +1 -3
@@ -60,15 +60,13 @@ {int ret =0 ; -#ifdef CONFIG_KPROBES /* kprobe_running() needs smp_processor_id() */ -if (!user_mode (regs)) { +if (kprobes_built_in () && !user_mode (regs)) {preempt_disable ();if (kprobe_running () &&kprobe_fault_handler (regs,14 )) ret =1 ;preempt_enable (); } -#endif return ret; }
PATCH 23/32 dasd: fix online/offline race
In reply to Martin SchwidefskyFrom: Stefan Haberland <[email protected]>
Setting a DASD online and offline in quick succession may cause a kernel panic or let the chhccwdev command wait forever. The Online process is split into two parts. After the first part is finished the offline process may be called. This may result in a situation where the second online processing part tries to set the DASD offline as well.
Use a mutex to protect online and offline against each other. Also correct some checking.
---
drivers/s390/block/dasd.c | 22 ++++++++++++++-------- drivers/s390/block/dasd_genhd.c | 1 + drivers/s390/block/dasd_int.h | 1 + 3 files changed, 16 insertions(+), 8 deletions(-)
drivers/s390/block/dasd.c +14 -8
@@ -20,6 +20,7 @@#include <linux/buffer_head.h> #include <linux/hdreg.h> #include <linux/async.h> +#include <linux/mutex.h> #include <asm/ccwdev.h> #include <asm/ebcdic.h>
@@ -112,6 +113,7 @@INIT_WORK (&device->restore_device, do_restore_device); device->state =DASD_STATE_NEW ; device->target =DASD_STATE_NEW ; +mutex_init (&device->state_mutex);return device; }
@@ -484,10 +486,8 @@if (rc) 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 );
@@ -502,7 +502,9 @@static void do_kick_device (struct work_struct *work) { struct dasd_device *device = container_of(work, struct dasd_device, kick_work); +mutex_lock (&device->state_mutex);dasd_change_state (device); +mutex_unlock (&device->state_mutex);dasd_schedule_device_bh (device);dasd_put_device (device); }
@@ -539,18 +541,19 @@void dasd_set_target_state (struct dasd_device *device,int target) {dasd_get_device (device); +mutex_lock (&device->state_mutex);/* 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)dasd_change_state (device); +mutex_unlock (&device->state_mutex); +dasd_put_device (device); }/*
@@ -1692,7 +1695,6 @@ cqr, rc); }else { cqr->stopclk =get_clock (); - rc =1 ; }break ;default :/* already finished or clear pending - do nothing */
@@ -2170,9 +2172,13 @@static int dasd_open (struct block_device *bdev,fmode_t mode) {struct dasd_block *block = bdev->bd_disk->private_data; -struct dasd_device *base = block->base; +struct dasd_device *base;int rc; +if (!block) +return -ENODEV ; + + base = block->base;atomic_inc (&block->open_count);if (test_bit (DASD_FLAG_OFFLINE , &base->flags)) { rc = -ENODEV ;
drivers/s390/block/dasd_genhd.c +1 -0
@@ -88,6 +88,7 @@if (block->gdp) {del_gendisk (block->gdp); block->gdp->queue =NULL ; + block->gdp->private_data =NULL ;put_disk (block->gdp); block->gdp =NULL ; }
drivers/s390/block/dasd_int.h +1 -0
@@ -368,6 +368,7 @@/* Device state and target state. */ int state, target; +struct mutex state_mutex;int stopped;/* device (ccw_device_start) was stopped */ /* reference count. */
PATCH 24/32 add z9-ec/z10 instruction to kernel disassembler
In reply to Martin SchwidefskyFrom: Martin Schwidefsky <[email protected]>
Add the instruction of the z9-ec and z10 machines to the kernel disassembler. Add the missing "ptff" instruction of z9-109 and the missing "sqd" of g5. Remove useless comments with instruction examples from format table.
---
arch/s390/kernel/dis.c | 369 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 285 insertions(+), 84 deletions(-)
arch/s390/kernel/dis.c +285 -84
@@ -86,10 +86,17 @@U4_12 ,/* 4 bit unsigned value starting at 12 */ U4_16 ,/* 4 bit unsigned value starting at 16 */ U4_20 ,/* 4 bit unsigned value starting at 20 */ +U4_32 ,/* 4 bit unsigned value starting at 32 */ U8_8 ,/* 8 bit unsigned value starting at 8 */ U8_16 ,/* 8 bit unsigned value starting at 16 */ +U8_24 ,/* 8 bit unsigned value starting at 24 */ +U8_32 ,/* 8 bit unsigned value starting at 32 */ +I8_8 ,/* 8 bit signed value starting at 8 */ +I8_32 ,/* 8 bit signed value starting at 32 */ I16_16 ,/* 16 bit signed value starting at 16 */ +I16_32 ,/* 32 bit signed value starting at 16 */ U16_16 ,/* 16 bit unsigned value starting at 16 */ +U16_32 ,/* 32 bit unsigned value starting at 16 */ J16_16 ,/* PC relative jump offset at 16 */ J32_16 ,/* PC relative long offset at 16 */ I32_16, /* 32 bit signed value starting at 16 */
@@ -104,21 +111,37 @@*/ enum {INSTR_INVALID , -INSTR_E ,INSTR_RIE_RRP ,INSTR_RIL_RI ,INSTR_RIL_RP ,INSTR_RIL_RU , -INSTR_RIL_UP ,INSTR_RI_RI ,INSTR_RI_RP ,INSTR_RI_RU ,INSTR_RI_UP , +INSTR_E , +INSTR_RIE_R0IU ,INSTR_RIE_R0UU ,INSTR_RIE_RRP ,INSTR_RIE_RRPU , +INSTR_RIE_RRUUU ,INSTR_RIE_RUPI ,INSTR_RIE_RUPU , +INSTR_RIL_RI ,INSTR_RIL_RP ,INSTR_RIL_RU ,INSTR_RIL_UP , +INSTR_RIS_R0RDU ,INSTR_RIS_R0UU ,INSTR_RIS_RURDI ,INSTR_RIS_RURDU , +INSTR_RI_RI ,INSTR_RI_RP ,INSTR_RI_RU ,INSTR_RI_UP ,INSTR_RRE_00 ,INSTR_RRE_0R ,INSTR_RRE_AA ,INSTR_RRE_AR ,INSTR_RRE_F0 , -INSTR_RRE_FF ,INSTR_RRE_R0 ,INSTR_RRE_RA ,INSTR_RRE_RF ,INSTR_RRE_RR , -INSTR_RRE_RR_OPT ,INSTR_RRF_F0FF ,INSTR_RRF_FUFF ,INSTR_RRF_M0RR , -INSTR_RRF_R0RR ,INSTR_RRF_RURR ,INSTR_RRF_U0FF ,INSTR_RRF_U0RF , +INSTR_RRE_FF ,INSTR_RRE_FR ,INSTR_RRE_R0 ,INSTR_RRE_RA ,INSTR_RRE_RF , +INSTR_RRE_RR ,INSTR_RRE_RR_OPT , +INSTR_RRF_0UFF ,INSTR_RRF_F0FF ,INSTR_RRF_F0FF2 ,INSTR_RRF_F0FR , +INSTR_RRF_FFRU ,INSTR_RRF_FUFF ,INSTR_RRF_M0RR ,INSTR_RRF_R0RR , +INSTR_RRF_RURR ,INSTR_RRF_U0FF ,INSTR_RRF_U0RF ,INSTR_RRF_U0RR , +INSTR_RRF_UUFF ,INSTR_RRR_F0FF ,INSTR_RRS_RRRDU ,INSTR_RR_FF ,INSTR_RR_R0 ,INSTR_RR_RR ,INSTR_RR_U0 ,INSTR_RR_UR , -INSTR_RSE_CCRD ,INSTR_RSE_RRRD ,INSTR_RSE_RURD ,INSTR_RSI_RRP , -INSTR_RSL_R0RD ,INSTR_RSY_AARD ,INSTR_RSY_CCRD ,INSTR_RSY_RRRD , -INSTR_RSY_RURD ,INSTR_RS_AARD ,INSTR_RS_CCRD ,INSTR_RS_R0RD , -INSTR_RS_RRRD ,INSTR_RS_RURD ,INSTR_RXE_FRRD ,INSTR_RXE_RRRD , -INSTR_RXF_FRRDF ,INSTR_RXY_FRRD ,INSTR_RXY_RRRD ,INSTR_RX_FRRD , -INSTR_RX_RRRD ,INSTR_RX_URRD ,INSTR_SIY_URD ,INSTR_SI_URD , -INSTR_SSE_RDRD ,INSTR_SSF_RRDRD ,INSTR_SS_L0RDRD ,INSTR_SS_LIRDRD , -INSTR_SS_LLRDRD ,INSTR_SS_RRRDRD ,INSTR_SS_RRRDRD2 ,INSTR_SS_RRRDRD3 , +INSTR_RSE_CCRD ,INSTR_RSE_RRRD ,INSTR_RSE_RURD , +INSTR_RSI_RRP , +INSTR_RSL_R0RD , +INSTR_RSY_AARD ,INSTR_RSY_CCRD ,INSTR_RSY_RRRD ,INSTR_RSY_RURD , +INSTR_RS_AARD ,INSTR_RS_CCRD ,INSTR_RS_R0RD ,INSTR_RS_RRRD , +INSTR_RS_RURD , +INSTR_RXE_FRRD ,INSTR_RXE_RRRD , +INSTR_RXF_FRRDF , +INSTR_RXY_FRRD ,INSTR_RXY_RRRD ,INSTR_RXY_URRD , +INSTR_RX_FRRD ,INSTR_RX_RRRD ,INSTR_RX_URRD , +INSTR_SIL_RDI ,INSTR_SIL_RDU , +INSTR_SIY_IRD ,INSTR_SIY_URD , +INSTR_SI_URD , +INSTR_SSE_RDRD , +INSTR_SSF_RRDRD , +INSTR_SS_L0RDRD ,INSTR_SS_LIRDRD ,INSTR_SS_LLRDRD ,INSTR_SS_RRRDRD , +INSTR_SS_RRRDRD2 ,INSTR_SS_RRRDRD3 ,INSTR_S_00 ,INSTR_S_RD , };
@@ -129,7 +152,7 @@ };struct insn { -const char name[5 ]; +const char name[6 ];unsigned char opfrag;unsigned char format; };
@@ -170,11 +193,16 @@ [U4_12] = { 4, 12, 0 }, [U4_16] = { 4, 16, 0 }, [U4_20] = { 4, 20, 0 }, + [U4_32] = { 4, 32, 0 }, [U8_8] = { 8, 8, 0 }, [U8_16] = { 8, 16, 0 }, + [U8_24] = { 8, 24, 0 }, + [U8_32] = { 8, 32, 0 }, [I16_16] = { 16, 16, OPERAND_SIGNED }, [U16_16] = { 16, 16, 0 }, + [U16_32] = { 16, 32, 0 }, [J16_16] = { 16, 16, OPERAND_PCREL }, + [I16_32] = { 16, 32, OPERAND_SIGNED }, [J32_16] = { 32, 16, OPERAND_PCREL }, [I32_16] = { 32, 16, OPERAND_SIGNED }, [U32_16] = { 32, 16, 0 },
@@ -183,82 +211,93 @@ };static const unsigned char formats[][7 ] = { - [INSTR_E ] = {0xff ,0 ,0 ,0 ,0 ,0 ,0 },/* e.g. pr */ - [INSTR_RIE_RRP ] = {0xff ,R_8 ,R_12 ,J16_16 ,0 ,0 ,0 },/* e.g. brxhg */ - [INSTR_RIL_RP ] = {0x0f ,R_8 ,J32_16 ,0 ,0 ,0 ,0 },/* e.g. brasl */ - [INSTR_RIL_UP ] = {0x0f ,U4_8 ,J32_16 ,0 ,0 ,0 ,0 },/* e.g. brcl */ - [INSTR_RIL_RI ] = {0x0f ,R_8 ,I32_16 ,0 ,0 ,0 ,0 },/* e.g. afi */ - [INSTR_RIL_RU ] = {0x0f ,R_8 ,U32_16 ,0 ,0 ,0 ,0 },/* e.g. alfi */ - [INSTR_RI_RI ] = {0x0f ,R_8 ,I16_16 ,0 ,0 ,0 ,0 },/* e.g. ahi */ - [INSTR_RI_RP ] = {0x0f ,R_8 ,J16_16 ,0 ,0 ,0 ,0 },/* e.g. brct */ - [INSTR_RI_RU ] = {0x0f ,R_8 ,U16_16 ,0 ,0 ,0 ,0 },/* e.g. tml */ - [INSTR_RI_UP ] = {0x0f ,U4_8 ,J16_16 ,0 ,0 ,0 ,0 },/* e.g. brc */ - [INSTR_RRE_00 ] = {0xff ,0 ,0 ,0 ,0 ,0 ,0 },/* e.g. palb */ - [INSTR_RRE_0R ] = {0xff ,R_28 ,0 ,0 ,0 ,0 ,0 },/* e.g. tb */ - [INSTR_RRE_AA ] = {0xff ,A_24 ,A_28 ,0 ,0 ,0 ,0 },/* e.g. cpya */ - [INSTR_RRE_AR ] = {0xff ,A_24 ,R_28 ,0 ,0 ,0 ,0 },/* e.g. sar */ - [INSTR_RRE_F0 ] = {0xff ,F_24 ,0 ,0 ,0 ,0 ,0 },/* e.g. sqer */ - [INSTR_RRE_FF ] = {0xff ,F_24 ,F_28 ,0 ,0 ,0 ,0 },/* e.g. debr */ - [INSTR_RRE_R0 ] = {0xff ,R_24 ,0 ,0 ,0 ,0 ,0 },/* e.g. ipm */ - [INSTR_RRE_RA ] = {0xff ,R_24 ,A_28 ,0 ,0 ,0 ,0 },/* e.g. ear */ - [INSTR_RRE_RF ] = {0xff ,R_24 ,F_28 ,0 ,0 ,0 ,0 },/* e.g. cefbr */ - [INSTR_RRE_RR ] = {0xff ,R_24 ,R_28 ,0 ,0 ,0 ,0 },/* e.g. lura */ - [INSTR_RRE_RR_OPT ]= {0xff ,R_24 ,RO_28 ,0 ,0 ,0 ,0 },/* efpc, sfpc */ - [INSTR_RRF_F0FF ] = {0xff ,F_16 ,F_24 ,F_28 ,0 ,0 ,0 },/* e.g. madbr */ - [INSTR_RRF_FUFF ] = {0xff ,F_24 ,F_16 ,F_28 ,U4_20 ,0 ,0 },/* e.g. didbr */ - [INSTR_RRF_RURR ] = {0xff ,R_24 ,R_28 ,R_16 ,U4_20 ,0 ,0 },/* e.g. .insn */ - [INSTR_RRF_R0RR ] = {0xff ,R_24 ,R_16 ,R_28 ,0 ,0 ,0 },/* e.g. idte */ - [INSTR_RRF_U0FF ] = {0xff ,F_24 ,U4_16 ,F_28 ,0 ,0 ,0 },/* e.g. fixr */ - [INSTR_RRF_U0RF ] = {0xff ,R_24 ,U4_16 ,F_28 ,0 ,0 ,0 },/* e.g. cfebr */ - [INSTR_RRF_M0RR ] = {0xff ,R_24 ,R_28 ,M_16 ,0 ,0 ,0 },/* e.g. sske */ - [INSTR_RR_FF ] = {0xff ,F_8 ,F_12 ,0 ,0 ,0 ,0 },/* e.g. adr */ - [INSTR_RR_R0 ] = {0xff ,R_8 ,0 ,0 ,0 ,0 ,0 },/* e.g. spm */ - [INSTR_RR_RR ] = {0xff ,R_8 ,R_12 ,0 ,0 ,0 ,0 },/* e.g. lr */ - [INSTR_RR_U0 ] = {0xff ,U8_8 ,0 ,0 ,0 ,0 ,0 },/* e.g. svc */ - [INSTR_RR_UR ] = {0xff ,U4_8 ,R_12 ,0 ,0 ,0 ,0 },/* e.g. bcr */ - [INSTR_RSE_RRRD ] = {0xff ,R_8 ,R_12 ,D_20 ,B_16 ,0 ,0 },/* e.g. lmh */ - [INSTR_RSE_CCRD ] = {0xff ,C_8 ,C_12 ,D_20 ,B_16 ,0 ,0 },/* e.g. lmh */ - [INSTR_RSE_RURD ] = {0xff ,R_8 ,U4_12 ,D_20 ,B_16 ,0 ,0 },/* e.g. icmh */ - [INSTR_RSL_R0RD ] = {0xff ,R_8 ,D_20 ,B_16 ,0 ,0 ,0 },/* e.g. tp */ - [INSTR_RSI_RRP ] = {0xff ,R_8 ,R_12 ,J16_16 ,0 ,0 ,0 },/* e.g. brxh */ - [INSTR_RSY_RRRD ] = {0xff ,R_8 ,R_12 ,D20_20 ,B_16 ,0 ,0 },/* e.g. stmy */ + [INSTR_E ] = {0xff ,0 ,0 ,0 ,0 ,0 ,0 }, + [INSTR_RIE_R0UU ] = {0xff ,R_8 ,U16_16 ,U4_32 ,0 ,0 ,0 }, + [INSTR_RIE_RRPU ] = {0xff ,R_8 ,R_12 ,U4_32 ,J16_16 ,0 ,0 }, + [INSTR_RIE_RRP ] = {0xff ,R_8 ,R_12 ,J16_16 ,0 ,0 ,0 }, + [INSTR_RIE_RRUUU ] = {0xff ,R_8 ,R_12 ,U8_16 ,U8_24 ,U8_32 ,0 }, + [INSTR_RIE_RUPI ] = {0xff ,R_8 ,I8_32 ,U4_12 ,J16_16 ,0 ,0 }, + [INSTR_RIL_RI ] = {0x0f ,R_8 ,I32_16 ,0 ,0 ,0 ,0 }, + [INSTR_RIL_RP ] = {0x0f ,R_8 ,J32_16 ,0 ,0 ,0 ,0 }, + [INSTR_RIL_RU ] = {0x0f ,R_8 ,U32_16 ,0 ,0 ,0 ,0 }, + [INSTR_RIL_UP ] = {0x0f ,U4_8 ,J32_16 ,0 ,0 ,0 ,0 }, + [INSTR_RIS_R0RDU ] = {0xff ,R_8 ,U8_32 ,D_20 ,B_16 ,0 ,0 }, + [INSTR_RIS_RURDI ] = {0xff ,R_8 ,I8_32 ,U4_12 ,D_20 ,B_16 ,0 }, + [INSTR_RIS_RURDU ] = {0xff ,R_8 ,U8_32 ,U4_12 ,D_20 ,B_16 ,0 }, + [INSTR_RI_RI ] = {0x0f ,R_8 ,I16_16 ,0 ,0 ,0 ,0 }, + [INSTR_RI_RP ] = {0x0f ,R_8 ,J16_16 ,0 ,0 ,0 ,0 }, + [INSTR_RI_RU ] = {0x0f ,R_8 ,U16_16 ,0 ,0 ,0 ,0 }, + [INSTR_RI_UP ] = {0x0f ,U4_8 ,J16_16 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_00 ] = {0xff ,0 ,0 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_0R ] = {0xff ,R_28 ,0 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_AA ] = {0xff ,A_24 ,A_28 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_AR ] = {0xff ,A_24 ,R_28 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_F0 ] = {0xff ,F_24 ,0 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_FF ] = {0xff ,F_24 ,F_28 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_FR ] = {0xff ,F_24 ,R_28 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_R0 ] = {0xff ,R_24 ,0 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_RA ] = {0xff ,R_24 ,A_28 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_RF ] = {0xff ,R_24 ,F_28 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_RR ] = {0xff ,R_24 ,R_28 ,0 ,0 ,0 ,0 }, + [INSTR_RRE_RR_OPT ]= {0xff ,R_24 ,RO_28 ,0 ,0 ,0 ,0 }, + [INSTR_RRF_0UFF ] = {0xff ,F_24 ,F_28 ,U4_20 ,0 ,0 ,0 }, + [INSTR_RRF_F0FF2 ] = {0xff ,F_24 ,F_16 ,F_28 ,0 ,0 ,0 }, + [INSTR_RRF_F0FF ] = {0xff ,F_16 ,F_24 ,F_28 ,0 ,0 ,0 }, + [INSTR_RRF_F0FR ] = {0xff ,F_24 ,F_16 ,R_28 ,0 ,0 ,0 }, + [INSTR_RRF_FFRU ] = {0xff ,F_24 ,F_16 ,R_28 ,U4_20 ,0 ,0 }, + [INSTR_RRF_FUFF ] = {0xff ,F_24 ,F_16 ,F_28 ,U4_20 ,0 ,0 }, + [INSTR_RRF_M0RR ] = {0xff ,R_24 ,R_28 ,M_16 ,0 ,0 ,0 }, + [INSTR_RRF_R0RR ] = {0xff ,R_24 ,R_16 ,R_28 ,0 ,0 ,0 }, + [INSTR_RRF_RURR ] = {0xff ,R_24 ,R_28 ,R_16 ,U4_20 ,0 ,0 }, + [INSTR_RRF_U0FF ] = {0xff ,F_24 ,U4_16 ,F_28 ,0 ,0 ,0 }, + [INSTR_RRF_U0RF ] = {0xff ,R_24 ,U4_16 ,F_28 ,0 ,0 ,0 }, + [INSTR_RRF_U0RR ] = {0xff ,R_24 ,R_28 ,U4_16 ,0 ,0 ,0 }, + [INSTR_RRF_UUFF ] = {0xff ,F_24 ,U4_16 ,F_28 ,U4_20 ,0 ,0 }, + [INSTR_RRR_F0FF ] = {0xff ,F_24 ,F_28 ,F_16 ,0 ,0 ,0 }, + [INSTR_RRS_RRRDU ] = {0xff ,R_8 ,R_12 ,U4_32 ,D_20 ,B_16 ,0 }, + [INSTR_RR_FF ] = {0xff ,F_8 ,F_12 ,0 ,0 ,0 ,0 }, + [INSTR_RR_R0 ] = {0xff ,R_8 ,0 ,0 ,0 ,0 ,0 }, + [INSTR_RR_RR ] = {0xff ,R_8 ,R_12 ,0 ,0 ,0 ,0 }, + [INSTR_RR_U0 ] = {0xff ,U8_8 ,0 ,0 ,0 ,0 ,0 }, + [INSTR_RR_UR ] = {0xff ,U4_8 ,R_12 ,0 ,0 ,0 ,0 }, + [INSTR_RSE_CCRD ] = {0xff ,C_8 ,C_12 ,D_20 ,B_16 ,0 ,0 }, + [INSTR_RSE_RRRD ] = {0xff ,R_8 ,R_12 ,D_20 ,B_16 ,0 ,0 }, + [INSTR_RSE_RURD ] = {0xff ,R_8 ,U4_12 ,D_20 ,B_16 ,0 ,0 }, + [INSTR_RSI_RRP ] = {0xff ,R_8 ,R_12 ,J16_16 ,0 ,0 ,0 }, + [INSTR_RSL_R0RD ] = {0xff ,D_20 ,L4_8 ,B_16 ,0 ,0 ,0 }, + [INSTR_RSY_AARD ] = {0xff ,A_8 ,A_12 ,D20_20 ,B_16 ,0 ,0 }, + [INSTR_RSY_CCRD ] = {0xff ,C_8 ,C_12 ,D20_20 ,B_16 ,0 ,0 }, + [INSTR_RSY_RRRD ] = {0xff ,R_8 ,R_12 ,D20_20 ,B_16 ,0 ,0 }, [INSTR_RSY_RURD ] = {0xff ,R_8 ,U4_12 ,D20_20 ,B_16 ,0 ,0 }, -/* e.g. icmh */ - [INSTR_RSY_AARD ] = {0xff ,A_8 ,A_12 ,D20_20 ,B_16 ,0 ,0 },/* e.g. lamy */ - [INSTR_RSY_CCRD ] = {0xff ,C_8 ,C_12 ,D20_20 ,B_16 ,0 ,0 },/* e.g. lamy */ - [INSTR_RS_AARD ] = {0xff ,A_8 ,A_12 ,D_20 ,B_16 ,0 ,0 },/* e.g. lam */ - [INSTR_RS_CCRD ] = {0xff ,C_8 ,C_12 ,D_20 ,B_16 ,0 ,0 },/* e.g. lctl */ - [INSTR_RS_R0RD ] = {0xff ,R_8 ,D_20 ,B_16 ,0 ,0 ,0 },/* e.g. sll */ - [INSTR_RS_RRRD ] = {0xff ,R_8 ,R_12 ,D_20 ,B_16 ,0 ,0 },/* e.g. cs */ - [INSTR_RS_RURD ] = {0xff ,R_8 ,U4_12 ,D_20 ,B_16 ,0 ,0 },/* e.g. icm */ - [INSTR_RXE_FRRD ] = {0xff ,F_8 ,D_20 ,X_12 ,B_16 ,0 ,0 },/* e.g. axbr */ - [INSTR_RXE_RRRD ] = {0xff ,R_8 ,D_20 ,X_12 ,B_16 ,0 ,0 },/* e.g. lg */ + [INSTR_RS_AARD ] = {0xff ,A_8 ,A_12 ,D_20 ,B_16 ,0 ,0 }, + [INSTR_RS_CCRD ] = {0xff ,C_8 ,C_12 ,D_20 ,B_16 ,0 ,0 }, + [INSTR_RS_R0RD ] = {0xff ,R_8 ,D_20 ,B_16 ,0 ,0 ,0 }, + [INSTR_RS_RRRD ] = {0xff ,R_8 ,R_12 ,D_20 ,B_16 ,0 ,0 }, + [INSTR_RS_RURD ] = {0xff ,R_8 ,U4_12 ,D_20 ,B_16 ,0 ,0 }, + [INSTR_RXE_FRRD ] = {0xff ,F_8 ,D_20 ,X_12 ,B_16 ,0 ,0 }, + [INSTR_RXE_RRRD ] = {0xff ,R_8 ,D_20 ,X_12 ,B_16 ,0 ,0 }, [INSTR_RXF_FRRDF ] = {0xff ,F_32 ,F_8 ,D_20 ,X_12 ,B_16 ,0 }, -/* e.g. madb */ - [INSTR_RXY_RRRD ] = {0xff ,R_8 ,D20_20 ,X_12 ,B_16 ,0 ,0 },/* e.g. ly */ - [INSTR_RXY_FRRD ] = {0xff ,F_8 ,D20_20 ,X_12 ,B_16 ,0 ,0 },/* e.g. ley */ - [INSTR_RX_FRRD ] = {0xff ,F_8 ,D_20 ,X_12 ,B_16 ,0 ,0 },/* e.g. ae */ - [INSTR_RX_RRRD ] = {0xff ,R_8 ,D_20 ,X_12 ,B_16 ,0 ,0 },/* e.g. l */ - [INSTR_RX_URRD ] = {0xff ,U4_8 ,D_20 ,X_12 ,B_16 ,0 ,0 },/* e.g. bc */ - [INSTR_SI_URD ] = {0xff ,D_20 ,B_16 ,U8_8 ,0 ,0 ,0 },/* e.g. cli */ - [INSTR_SIY_URD ] = {0xff ,D20_20 ,B_16 ,U8_8 ,0 ,0 ,0 },/* e.g. tmy */ - [INSTR_SSE_RDRD ] = {0xff ,D_20 ,B_16 ,D_36 ,B_32 ,0 ,0 },/* e.g. mvsdk */ + [INSTR_RXY_FRRD ] = {0xff ,F_8 ,D20_20 ,X_12 ,B_16 ,0 ,0 }, + [INSTR_RXY_RRRD ] = {0xff ,R_8 ,D20_20 ,X_12 ,B_16 ,0 ,0 }, + [INSTR_RXY_URRD ] = {0xff ,U4_8 ,D20_20 ,X_12 ,B_16 ,0 ,0 }, + [INSTR_RX_FRRD ] = {0xff ,F_8 ,D_20 ,X_12 ,B_16 ,0 ,0 }, + [INSTR_RX_RRRD ] = {0xff ,R_8 ,D_20 ,X_12 ,B_16 ,0 ,0 }, + [INSTR_RX_URRD ] = {0xff ,U4_8 ,D_20 ,X_12 ,B_16 ,0 ,0 }, + [INSTR_SIL_RDI ] = {0xff ,D_20 ,B_16 ,I16_32 ,0 ,0 ,0 }, + [INSTR_SIL_RDU ] = {0xff ,D_20 ,B_16 ,U16_32 ,0 ,0 ,0 }, + [INSTR_SIY_IRD ] = {0xff ,D20_20 ,B_16 ,I8_8 ,0 ,0 ,0 }, + [INSTR_SIY_URD ] = {0xff ,D20_20 ,B_16 ,U8_8 ,0 ,0 ,0 }, + [INSTR_SI_URD ] = {0xff ,D_20 ,B_16 ,U8_8 ,0 ,0 ,0 }, + [INSTR_SSE_RDRD ] = {0xff ,D_20 ,B_16 ,D_36 ,B_32 ,0 ,0 }, + [INSTR_SSF_RRDRD ] = {0x00 ,D_20 ,B_16 ,D_36 ,B_32 ,R_8 ,0 }, [INSTR_SS_L0RDRD ] = {0xff ,D_20 ,L8_8 ,B_16 ,D_36 ,B_32 ,0 }, -/* e.g. mvc */ [INSTR_SS_LIRDRD ] = {0xff ,D_20 ,L4_8 ,B_16 ,D_36 ,B_32 ,U4_12 }, -/* e.g. srp */ [INSTR_SS_LLRDRD ] = {0xff ,D_20 ,L4_8 ,B_16 ,D_36 ,L4_12 ,B_32 }, -/* e.g. pack */ - [INSTR_SS_RRRDRD ] = {0xff ,D_20 ,R_8 ,B_16 ,D_36 ,B_32 ,R_12 }, -/* e.g. mvck */ [INSTR_SS_RRRDRD2 ]= {0xff ,R_8 ,D_20 ,B_16 ,R_12 ,D_36 ,B_32 }, -/* e.g. plo */ [INSTR_SS_RRRDRD3 ]= {0xff ,R_8 ,R_12 ,D_20 ,B_16 ,D_36 ,B_32 }, -/* e.g. lmd */ - [INSTR_S_00 ] = {0xff ,0 ,0 ,0 ,0 ,0 ,0 },/* e.g. hsch */ - [INSTR_S_RD ] = {0xff ,D_20 ,B_16 ,0 ,0 ,0 ,0 },/* e.g. lpsw */ - [INSTR_SSF_RRDRD ] = {0x00 ,D_20 ,B_16 ,D_36 ,B_32 ,R_8 ,0 }, -/* e.g. mvcos */ + [INSTR_SS_RRRDRD ] = {0xff ,D_20 ,R_8 ,B_16 ,D_36 ,B_32 ,R_12 }, + [INSTR_S_00 ] = {0xff ,0 ,0 ,0 ,0 ,0 ,0 }, + [INSTR_S_RD ] = {0xff ,D_20 ,B_16 ,0 ,0 ,0 ,0 }, };static struct insn opcode[] = {
@@ -454,6 +493,8 @@ static struct insn opcode_01[] = {#ifdef CONFIG_64BIT { "sam64", 0x0e, INSTR_E }, + { "pfpo", 0x0a, INSTR_E }, + { "ptff", 0x04, INSTR_E }, #endif { "pr", 0x01, INSTR_E }, { "upt", 0x02, INSTR_E },
@@ -519,6 +560,8 @@ { "cutfu", 0xa7, INSTR_RRF_M0RR }, { "stfle", 0xb0, INSTR_S_RD }, { "lpswe", 0xb2, INSTR_S_RD }, + { "srnmt", 0xb9, INSTR_S_RD }, + { "lfas", 0xbd, INSTR_S_RD }, #endif { "stidp", 0x02, INSTR_S_RD }, { "sck", 0x04, INSTR_S_RD },
@@ -589,7 +632,6 @@ { "clst", 0x5d, INSTR_RRE_RR }, { "srst", 0x5e, INSTR_RRE_RR }, { "cmpsc", 0x63, INSTR_RRE_RR }, - { "cmpsc", 0x63, INSTR_RRE_RR }, { "siga", 0x74, INSTR_S_RD }, { "xsch", 0x76, INSTR_S_00 }, { "rp", 0x77, INSTR_S_RD },
@@ -630,6 +672,57 @@ { "cger", 0xc8, INSTR_RRF_U0RF }, { "cgdr", 0xc9, INSTR_RRF_U0RF }, { "cgxr", 0xca, INSTR_RRF_U0RF }, + { "lpdfr", 0x70, INSTR_RRE_FF }, + { "lndfr", 0x71, INSTR_RRE_FF }, + { "cpsdr", 0x72, INSTR_RRF_F0FF2 }, + { "lcdfr", 0x73, INSTR_RRE_FF }, + { "ldgr", 0xc1, INSTR_RRE_FR }, + { "lgdr", 0xcd, INSTR_RRE_RF }, + { "adtr", 0xd2, INSTR_RRR_F0FF }, + { "axtr", 0xda, INSTR_RRR_F0FF }, + { "cdtr", 0xe4, INSTR_RRE_FF }, + { "cxtr", 0xec, INSTR_RRE_FF }, + { "kdtr", 0xe0, INSTR_RRE_FF }, + { "kxtr", 0xe8, INSTR_RRE_FF }, + { "cedtr", 0xf4, INSTR_RRE_FF }, + { "cextr", 0xfc, INSTR_RRE_FF }, + { "cdgtr", 0xf1, INSTR_RRE_FR }, + { "cxgtr", 0xf9, INSTR_RRE_FR }, + { "cdstr", 0xf3, INSTR_RRE_FR }, + { "cxstr", 0xfb, INSTR_RRE_FR }, + { "cdutr", 0xf2, INSTR_RRE_FR }, + { "cxutr", 0xfa, INSTR_RRE_FR }, + { "cgdtr", 0xe1, INSTR_RRF_U0RF }, + { "cgxtr", 0xe9, INSTR_RRF_U0RF }, + { "csdtr", 0xe3, INSTR_RRE_RF }, + { "csxtr", 0xeb, INSTR_RRE_RF }, + { "cudtr", 0xe2, INSTR_RRE_RF }, + { "cuxtr", 0xea, INSTR_RRE_RF }, + { "ddtr", 0xd1, INSTR_RRR_F0FF }, + { "dxtr", 0xd9, INSTR_RRR_F0FF }, + { "eedtr", 0xe5, INSTR_RRE_RF }, + { "eextr", 0xed, INSTR_RRE_RF }, + { "esdtr", 0xe7, INSTR_RRE_RF }, + { "esxtr", 0xef, INSTR_RRE_RF }, + { "iedtr", 0xf6, INSTR_RRF_F0FR }, + { "iextr", 0xfe, INSTR_RRF_F0FR }, + { "ltdtr", 0xd6, INSTR_RRE_FF }, + { "ltxtr", 0xde, INSTR_RRE_FF }, + { "fidtr", 0xd7, INSTR_RRF_UUFF }, + { "fixtr", 0xdf, INSTR_RRF_UUFF }, + { "ldetr", 0xd4, INSTR_RRF_0UFF }, + { "lxdtr", 0xdc, INSTR_RRF_0UFF }, + { "ledtr", 0xd5, INSTR_RRF_UUFF }, + { "ldxtr", 0xdd, INSTR_RRF_UUFF }, + { "mdtr", 0xd0, INSTR_RRR_F0FF }, + { "mxtr", 0xd8, INSTR_RRR_F0FF }, + { "qadtr", 0xf5, INSTR_RRF_FUFF }, + { "qaxtr", 0xfd, INSTR_RRF_FUFF }, + { "rrdtr", 0xf7, INSTR_RRF_FFRU }, + { "rrxtr", 0xff, INSTR_RRF_FFRU }, + { "sfasr", 0x85, INSTR_RRE_R0 }, + { "sdtr", 0xd3, INSTR_RRR_F0FF }, + { "sxtr", 0xdb, INSTR_RRR_F0FF }, #endif { "lpebr", 0x00, INSTR_RRE_FF }, { "lnebr", 0x01, INSTR_RRE_FF },
@@ -780,6 +873,14 @@ { "cu24", 0xb1, INSTR_RRF_M0RR }, { "cu41", 0xb2, INSTR_RRF_M0RR }, { "cu42", 0xb3, INSTR_RRF_M0RR }, + { "crt", 0x72, INSTR_RRF_U0RR }, + { "cgrt", 0x60, INSTR_RRF_U0RR }, + { "clrt", 0x73, INSTR_RRF_U0RR }, + { "clgrt", 0x61, INSTR_RRF_U0RR }, + { "ptf", 0xa2, INSTR_RRE_R0 }, + { "pfmf", 0xaf, INSTR_RRE_RR }, + { "trte", 0xbf, INSTR_RRF_M0RR }, + { "trtre", 0xbd, INSTR_RRF_M0RR }, #endif { "kmac", 0x1e, INSTR_RRE_RR }, { "lrvr", 0x1f, INSTR_RRE_RR },
@@ -835,6 +936,43 @@ { "cfi", 0x0d, INSTR_RIL_RI }, { "clgfi", 0x0e, INSTR_RIL_RU }, { "clfi", 0x0f, INSTR_RIL_RU }, + { "msfi", 0x01, INSTR_RIL_RI }, + { "msgfi", 0x00, INSTR_RIL_RI }, +#endif + { "", 0, INSTR_INVALID } +}; + +static struct insn opcode_c4[] = { +#ifdef CONFIG_64BIT + { "lrl", 0x0d, INSTR_RIL_RP }, + { "lgrl", 0x08, INSTR_RIL_RP }, + { "lgfrl", 0x0c, INSTR_RIL_RP }, + { "lhrl", 0x05, INSTR_RIL_RP }, + { "lghrl", 0x04, INSTR_RIL_RP }, + { "llgfrl", 0x0e, INSTR_RIL_RP }, + { "llhrl", 0x02, INSTR_RIL_RP }, + { "llghrl", 0x06, INSTR_RIL_RP }, + { "strl", 0x0f, INSTR_RIL_RP }, + { "stgrl", 0x0b, INSTR_RIL_RP }, + { "sthrl", 0x07, INSTR_RIL_RP }, +#endif + { "", 0, INSTR_INVALID } +}; + +static struct insn opcode_c6[] = { +#ifdef CONFIG_64BIT + { "crl", 0x0d, INSTR_RIL_RP }, + { "cgrl", 0x08, INSTR_RIL_RP }, + { "cgfrl", 0x0c, INSTR_RIL_RP }, + { "chrl", 0x05, INSTR_RIL_RP }, + { "cghrl", 0x04, INSTR_RIL_RP }, + { "clrl", 0x0f, INSTR_RIL_RP }, + { "clgrl", 0x0a, INSTR_RIL_RP }, + { "clgfrl", 0x0e, INSTR_RIL_RP }, + { "clhrl", 0x07, INSTR_RIL_RP }, + { "clghrl", 0x06, INSTR_RIL_RP }, + { "pfdrl", 0x02, INSTR_RIL_UP }, + { "exrl", 0x00, INSTR_RIL_RP }, #endif { "", 0, INSTR_INVALID } };
@@ -842,6 +980,8 @@ static struct insn opcode_c8[] = { #ifdef CONFIG_64BIT { "mvcos", 0x00, INSTR_SSF_RRDRD }, + { "ectg", 0x01, INSTR_SSF_RRDRD }, + { "csst", 0x02, INSTR_SSF_RRDRD }, #endif { "", 0, INSTR_INVALID } };
@@ -917,6 +1057,12 @@ { "llgh", 0x91, INSTR_RXY_RRRD }, { "llc", 0x94, INSTR_RXY_RRRD }, { "llh", 0x95, INSTR_RXY_RRRD }, + { "cgh", 0x34, INSTR_RXY_RRRD }, + { "laey", 0x75, INSTR_RXY_RRRD }, + { "ltgf", 0x32, INSTR_RXY_RRRD }, + { "mfy", 0x5c, INSTR_RXY_RRRD }, + { "mhy", 0x7c, INSTR_RXY_RRRD }, + { "pfd", 0x36, INSTR_RXY_URRD }, #endif { "lrv", 0x1e, INSTR_RXY_RRRD }, { "lrvh", 0x1f, INSTR_RXY_RRRD },
@@ -931,6 +1077,15 @@ static struct insn opcode_e5[] = {#ifdef CONFIG_64BIT { "strag", 0x02, INSTR_SSE_RDRD }, + { "chhsi", 0x54, INSTR_SIL_RDI }, + { "chsi", 0x5c, INSTR_SIL_RDI }, + { "cghsi", 0x58, INSTR_SIL_RDI }, + { "clhhsi", 0x55, INSTR_SIL_RDU }, + { "clfhsi", 0x5d, INSTR_SIL_RDU }, + { "clghsi", 0x59, INSTR_SIL_RDU }, + { "mvhhi", 0x44, INSTR_SIL_RDI }, + { "mvhi", 0x4c, INSTR_SIL_RDI }, + { "mvghi", 0x48, INSTR_SIL_RDI }, #endif { "lasp", 0x00, INSTR_SSE_RDRD }, { "tprot", 0x01, INSTR_SSE_RDRD },
@@ -977,6 +1132,11 @@ { "lmy", 0x98, INSTR_RSY_RRRD }, { "lamy", 0x9a, INSTR_RSY_AARD }, { "stamy", 0x9b, INSTR_RSY_AARD }, + { "asi", 0x6a, INSTR_SIY_IRD }, + { "agsi", 0x7a, INSTR_SIY_IRD }, + { "alsi", 0x6e, INSTR_SIY_IRD }, + { "algsi", 0x7e, INSTR_SIY_IRD }, + { "ecag", 0x4c, INSTR_RSY_RRRD }, #endif { "rll", 0x1d, INSTR_RSY_RRRD }, { "mvclu", 0x8e, INSTR_RSY_RRRD },
@@ -988,6 +1148,30 @@ #ifdef CONFIG_64BIT { "brxhg", 0x44, INSTR_RIE_RRP }, { "brxlg", 0x45, INSTR_RIE_RRP }, + { "crb", 0xf6, INSTR_RRS_RRRDU }, + { "cgrb", 0xe4, INSTR_RRS_RRRDU }, + { "crj", 0x76, INSTR_RIE_RRPU }, + { "cgrj", 0x64, INSTR_RIE_RRPU }, + { "cib", 0xfe, INSTR_RIS_RURDI }, + { "cgib", 0xfc, INSTR_RIS_RURDI }, + { "cij", 0x7e, INSTR_RIE_RUPI }, + { "cgij", 0x7c, INSTR_RIE_RUPI }, + { "cit", 0x72, INSTR_RIE_R0IU }, + { "cgit", 0x70, INSTR_RIE_R0IU }, + { "clrb", 0xf7, INSTR_RRS_RRRDU }, + { "clgrb", 0xe5, INSTR_RRS_RRRDU }, + { "clrj", 0x77, INSTR_RIE_RRPU }, + { "clgrj", 0x65, INSTR_RIE_RRPU }, + { "clib", 0xff, INSTR_RIS_RURDU }, + { "clgib", 0xfd, INSTR_RIS_RURDU }, + { "clij", 0x7f, INSTR_RIE_RUPU }, + { "clgij", 0x7d, INSTR_RIE_RUPU }, + { "clfit", 0x73, INSTR_RIE_R0UU }, + { "clgit", 0x71, INSTR_RIE_R0UU }, + { "rnsbg", 0x54, INSTR_RIE_RRUUU }, + { "rxsbg", 0x57, INSTR_RIE_RRUUU }, + { "rosbg", 0x56, INSTR_RIE_RRUUU }, + { "risbg", 0x55, INSTR_RIE_RRUUU }, #endif { "", 0, INSTR_INVALID } };
@@ -1004,6 +1188,16 @@ { "ldy", 0x65, INSTR_RXY_FRRD }, { "stey", 0x66, INSTR_RXY_FRRD }, { "stdy", 0x67, INSTR_RXY_FRRD }, + { "sldt", 0x40, INSTR_RXF_FRRDF }, + { "slxt", 0x48, INSTR_RXF_FRRDF }, + { "srdt", 0x41, INSTR_RXF_FRRDF }, + { "srxt", 0x49, INSTR_RXF_FRRDF }, + { "tdcet", 0x50, INSTR_RXE_FRRD }, + { "tdcdt", 0x54, INSTR_RXE_FRRD }, + { "tdcxt", 0x58, INSTR_RXE_FRRD }, + { "tdget", 0x51, INSTR_RXE_FRRD }, + { "tdgdt", 0x55, INSTR_RXE_FRRD }, + { "tdgxt", 0x59, INSTR_RXE_FRRD }, #endif { "ldeb", 0x04, INSTR_RXE_FRRD }, { "lxdb", 0x05, INSTR_RXE_FRRD },
@@ -1037,6 +1231,7 @@ { "mae", 0x2e, INSTR_RXF_FRRDF }, { "mse", 0x2f, INSTR_RXF_FRRDF }, { "sqe", 0x34, INSTR_RXE_FRRD }, + { "sqd", 0x35, INSTR_RXE_FRRD }, { "mee", 0x37, INSTR_RXE_FRRD }, { "mad", 0x3e, INSTR_RXF_FRRDF }, { "msd", 0x3f, INSTR_RXF_FRRDF },
@@ -1117,6 +1312,12 @@case 0xc2 : table = opcode_c2;break ; +case 0xc4 : + table = opcode_c4; +break ; +case 0xc6 : + table = opcode_c6; +break ;case 0xc8 : table = opcode_c8;break ;
PATCH 25/32 seq_file: convert drivers/s390/
In reply to Martin SchwidefskyFrom: Alexey Dobriyan <[email protected]>
---
drivers/s390/block/dasd_proc.c | 109 ++++++++++++-------------- drivers/s390/crypto/zcrypt_api.c | 158 +++++++++++++++++---------------------- 2 files changed, 122 insertions(+), 145 deletions(-)
drivers/s390/block/dasd_proc.c +50 -59
@@ -165,51 +165,32 @@ .release = seq_release, }; -static int -dasd_calc_metrics (char *page,char **start,off_t off, -int count,int *eof,int len) -{ - len = (len > off) ? len - off :0 ; -if (len > count) - len = count; -if (len < count) - *eof =1 ; - *start = page + off; -return len; -} -#ifdef CONFIG_DASD_PROFILE -static char * -dasd_statistics_array (char *str,unsigned int *array,int factor) +static void dasd_statistics_array (struct seq_file *m,unsigned int *array,int factor) {int i;for (i =0 ; i <32 ; i++) { - str +=sprintf (str,"%7d " , array[i] / factor); +seq_printf (m,"%7d " , array[i] / factor);if (i ==15 ) - str +=sprintf (str,"\n" ); +seq_putc (m,'\n' ); } - str +=sprintf (str,"\n" ); -return str; +seq_putc (m,'\n' ); }#endif /* CONFIG_DASD_PROFILE */ -static int -dasd_statistics_read (char *page,char **start,off_t off, -int count,int *eof,void *data) +static int dasd_stats_proc_show (struct seq_file *m,void *v) { -unsigned long len;#ifdef CONFIG_DASD_PROFILE struct dasd_profile_info_t *prof; -char *str;int factor;/* check for active profiling */ if (dasd_profile_level ==DASD_PROFILE_OFF ) { - len =sprintf (page,"Statistics are off - they might be " +seq_printf (m,"Statistics are off - they might be " "switched on using 'echo set on > " "/proc/dasd/statistics'\n" ); -return dasd_calc_metrics (page, start, off, count, eof, len); +return 0 ; } prof = &dasd_global_profile;
@@ -217,47 +198,49 @@for (factor =1 ; (prof->dasd_io_reqs / factor) >9999999 ; factor *=10 ); - str = page; - str +=sprintf (str,"%d dasd I/O requests\n" , prof->dasd_io_reqs); - str +=sprintf (str,"with %u sectors(512B each)\n" , +seq_printf (m,"%d dasd I/O requests\n" , prof->dasd_io_reqs); +seq_printf (m,"with %u sectors(512B each)\n" , prof->dasd_io_sects); - str +=sprintf (str,"Scale Factor is %d\n" , factor); - str +=sprintf (str, +seq_printf (m,"Scale Factor is %d\n" , factor); +seq_printf (m," __<4 ___8 __16 __32 __64 _128 " " _256 _512 __1k __2k __4k __8k " " _16k _32k _64k 128k\n" ); - str +=sprintf (str, +seq_printf (m," _256 _512 __1M __2M __4M __8M " " _16M _32M _64M 128M 256M 512M " " __1G __2G __4G " " _>4G\n" ); - str +=sprintf (str,"Histogram of sizes (512B secs)\n" ); - str =dasd_statistics_array (str, prof->dasd_io_secs, factor); - str +=sprintf (str,"Histogram of I/O times (microseconds)\n" ); - str =dasd_statistics_array (str, prof->dasd_io_times, factor); - str +=sprintf (str,"Histogram of I/O times per sector\n" ); - str =dasd_statistics_array (str, prof->dasd_io_timps, factor); - str +=sprintf (str,"Histogram of I/O time till ssch\n" ); - str =dasd_statistics_array (str, prof->dasd_io_time1, factor); - str +=sprintf (str,"Histogram of I/O time between ssch and irq\n" ); - str =dasd_statistics_array (str, prof->dasd_io_time2, factor); - str +=sprintf (str,"Histogram of I/O time between ssch " +seq_printf (m,"Histogram of sizes (512B secs)\n" ); +dasd_statistics_array (m, prof->dasd_io_secs, factor); +seq_printf (m,"Histogram of I/O times (microseconds)\n" ); +dasd_statistics_array (m, prof->dasd_io_times, factor); +seq_printf (m,"Histogram of I/O times per sector\n" ); +dasd_statistics_array (m, prof->dasd_io_timps, factor); +seq_printf (m,"Histogram of I/O time till ssch\n" ); +dasd_statistics_array (m, prof->dasd_io_time1, factor); +seq_printf (m,"Histogram of I/O time between ssch and irq\n" ); +dasd_statistics_array (m, prof->dasd_io_time2, factor); +seq_printf (m,"Histogram of I/O time between ssch " "and irq per sector\n" ); - str =dasd_statistics_array (str, prof->dasd_io_time2ps, factor); - str +=sprintf (str,"Histogram of I/O time between irq and end\n" ); - str =dasd_statistics_array (str, prof->dasd_io_time3, factor); - str +=sprintf (str,"# of req in chanq at enqueuing (1..32) \n" ); - str =dasd_statistics_array (str, prof->dasd_io_nr_req, factor); - len = str - page; +dasd_statistics_array (m, prof->dasd_io_time2ps, factor); +seq_printf (m,"Histogram of I/O time between irq and end\n" ); +dasd_statistics_array (m, prof->dasd_io_time3, factor); +seq_printf (m,"# of req in chanq at enqueuing (1..32) \n" ); +dasd_statistics_array (m, prof->dasd_io_nr_req, factor);#else - len =sprintf (page,"Statistics are not activated in this kernel\n" ); +seq_printf (m,"Statistics are not activated in this kernel\n" );#endif -return dasd_calc_metrics (page, start, off, count, eof, len); +return 0 ; } -static int -dasd_statistics_write (struct file *file,const char __user *user_buf, -unsigned long user_len,void *data) +static int dasd_stats_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, dasd_stats_proc_show,NULL ); +} + +static ssize_t dasd_stats_proc_write (struct file *file, +const char __user *user_buf,size_t user_len,loff_t *pos) {#ifdef CONFIG_DASD_PROFILE char *buffer, *str;
@@ -308,6 +291,15 @@#endif /* CONFIG_DASD_PROFILE */ } +static const struct file_operations dasd_stats_proc_fops = { + .owner =THIS_MODULE , + .open = dasd_stats_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, + .write = dasd_stats_proc_write, +}; +/* * Create dasd proc-fs entries. * In case creation failed, cleanup and return -ENOENT.
@@ -324,13 +316,12 @@ &dasd_devices_file_ops);if (!dasd_devices_entry) goto out_nodevices; - dasd_statistics_entry =create_proc_entry ("statistics" , -S_IFREG |S_IRUGO |S_IWUSR , - dasd_proc_root_entry); + dasd_statistics_entry =proc_create ("statistics" , +S_IFREG |S_IRUGO |S_IWUSR , + dasd_proc_root_entry, + &dasd_stats_proc_fops);if (!dasd_statistics_entry) goto out_nostatistics; - dasd_statistics_entry->read_proc = dasd_statistics_read; - dasd_statistics_entry->write_proc = dasd_statistics_write;return 0 ; out_nostatistics:
drivers/s390/crypto/zcrypt_api.c +72 -86
235 lines not on this page · raw message
PATCH 26/32 codepage conversion of kernel parameter line
In reply to Martin SchwidefskyFrom: Martin Schwidefsky <[email protected]>
Move the ebcdic to ascii conversion of the kernel parameter line from head.S to early.c and convert the assembler code to C.
---
arch/s390/kernel/early.c | 13 ++++++++++++- arch/s390/kernel/head.S | 18 +----------------- 2 files changed, 13 insertions(+), 18 deletions(-)
arch/s390/kernel/early.c +12 -1
@@ -405,8 +405,19 @@static void __init setup_boot_command_line (void ) { +int i; + +/* convert arch command line to ascii */ +for (i =0 ; i <ARCH_COMMAND_LINE_SIZE ; i++) +if (COMMAND_LINE [i] &0x80 ) +break ; +if (i <ARCH_COMMAND_LINE_SIZE ) +EBCASC (COMMAND_LINE ,ARCH_COMMAND_LINE_SIZE ); +COMMAND_LINE [ARCH_COMMAND_LINE_SIZE -1 ] =0 ; +/* copy arch command line */ -strlcpy (boot_command_line,COMMAND_LINE ,ARCH_COMMAND_LINE_SIZE ); +strlcpy (boot_command_line,strstrip (COMMAND_LINE ), +ARCH_COMMAND_LINE_SIZE );/* append IPL PARM data to the boot command line */ if (MACHINE_IS_VM )
arch/s390/kernel/head.S +1 -17
@@ -287,19 +287,7 @@ bz .Lagain1 # skip dateset trailer la %r5,0(%r4,%r2) lr %r3,%r2 -.Lidebc: - tm 0(%r5),0x80 # high order bit set ? - bo .Ldocv # yes -> convert from EBCDIC - ahi %r5,-1 - bct %r3,.Lidebc - b .Lnocv -.Ldocv: - l %r3,.Lcvtab - tr 0(256,%r4),0(%r3) # convert parameters to ascii - tr 256(256,%r4),0(%r3) - tr 512(256,%r4),0(%r3) - tr 768(122,%r4),0(%r3) -.Lnocv: la %r3,COMMAND_LINE-PARMAREA(%r12) # load adr. of command line + la %r3,COMMAND_LINE-PARMAREA(%r12) # load adr. of command line mvc 0(256,%r3),0(%r4) mvc 256(256,%r3),256(%r4) mvc 512(256,%r3),512(%r4)
@@ -383,7 +371,6 @@ .Linitrd:.long _end + 0x400000 # default address of initrd .Lparm: .long PARMAREA .Lstartup: .long startup -.Lcvtab:.long _ebcasc # ebcdic to ascii table .Lreset:.byte 0xc3,0xc8,0xc1,0xd5,0xc7,0xc5,0x40,0xd9,0xc4,0xd9,0x40 .byte 0xc1,0xd3,0xd3,0x40,0xd2,0xc5,0xc5,0xd7,0x40,0xd5,0xd6 .byte 0xc8,0xd6,0xd3,0xc4 # "change rdr all keep nohold"
@@ -416,13 +403,10 @@ .sk8x8: mvc 0(240,%r8),0(%r9) # copy iplparms into buffer .gotr: - l %r10,.tbl # EBCDIC to ASCII table - tr 0(240,%r8),0(%r10) slr %r0,%r0 st %r0,INITRD_SIZE+ARCH_OFFSET-PARMAREA(%r11) st %r0,INITRD_START+ARCH_OFFSET-PARMAREA(%r11) j startup # continue with startup -.tbl: .long _ebcasc # translate table .cmd: .long COMMAND_LINE # address of command line buffer .parm: .long PARMAREA .lowcase:
PATCH 27/32 Define new s390 ELF note sections in elf.h
In reply to Martin SchwidefskyFrom: Michael Holzheu <[email protected]>
S390 ELF core dump currently only contains the PSW, the general purpose registers, the floating point registers and the access registers stored in PRSTATUS/PRFPREG note sections.
For analyzing s390 kernel problems additional registers are important. In order to be able to include these registers to a kernel ELF core dump, this patch adds the following five new note sections to elf.h:
* NT_S390_TIMER: S390 timer register
* NT_S390_TODCMP: S390 TOD comparator register
* NT_S390_TODPREG: S390 TOD programmable register
* NT_S390_CTRS: S390 control registers
* NT_S390_PREFIX: S390 prefix register
The new note sections have been already defined and accepted in the upstream binutils package.
---
include/linux/elf.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/elf.h +5 -0
@@ -362,6 +362,11 @@#define NT_386_TLS 0x200/* i386 TLS slots (struct user_desc) */ #define NT_386_IOPERM 0x201/* x86 io permission bitmap (1=deny) */ #define NT_S390_HIGH_GPRS 0x300/* s390 upper register halves */ +#define NT_S390_TIMER 0x301/* s390 timer register */ +#define NT_S390_TODCMP 0x302/* s390 TOD clock comparator register */ +#define NT_S390_TODPREG 0x303/* s390 TOD programmable register */ +#define NT_S390_CTRS 0x304/* s390 control registers */ +#define NT_S390_PREFIX 0x305/* s390 prefix register */ /* Note header in a PT_NOTE section */
PATCH 28/32 add support for compressed kernels
In reply to Martin SchwidefskyFrom: Martin Schwidefsky <[email protected]>
Add the "bzImage" compile target and the necessary code to generate compressed kernel images. The old style uncompressed "image" target is preserved, a simple make will build them both.
---
arch/s390/Kconfig | 3 arch/s390/Makefile | 13 ++ arch/s390/boot/Makefile | 8 + arch/s390/boot/compressed/Makefile | 60 ++++++++++++ arch/s390/boot/compressed/head31.S | 51 ++++++++++ arch/s390/boot/compressed/head64.S | 48 +++++++++ arch/s390/boot/compressed/misc.c | 158 ++++++++++++++++++++++++++++++++ arch/s390/boot/compressed/vmlinux.lds.S | 55 +++++++++++ arch/s390/boot/compressed/vmlinux.scr | 10 ++ arch/s390/defconfig | 7 + arch/s390/kernel/Makefile | 1 arch/s390/kernel/head.S | 41 ++++---- arch/s390/kernel/head31.S | 16 ++- arch/s390/kernel/head64.S | 24 ++-- arch/s390/kernel/sclp.S | 36 ++++++- 15 files changed, 488 insertions(+), 43 deletions(-)
arch/s390/boot/compressed/head31.S new file +51 -0
@@ -0,0 +1,51 @@ +/* + * Startup glue code to uncompress the kernel + * + * Copyright IBM Corp. 2010 + * + * Author(s): Martin Schwidefsky <[email protected]> + */ + +#include <linux/init.h> +#include <asm/asm-offsets.h> +#include <asm/thread_info.h> +#include <asm/page.h> +#include "sizes.h" + +__HEAD + .globl startup_continue +startup_continue: + basr %r13,0 # get base +.LPG1: + # setup stack + l %r15,.Lstack-.LPG1(%r13) + ahi %r15,-96 + l %r1,.Ldecompress-.LPG1(%r13) + basr %r14,%r1 + # setup registers for memory mover & branch to target + lr %r4,%r2 + l %r2,.Loffset-.LPG1(%r13) + la %r4,0(%r2,%r4) + l %r3,.Lmvsize-.LPG1(%r13) + lr %r5,%r3 + # move the memory mover someplace safe + la %r1,0x200 + mvc 0(mover_end-mover,%r1),mover-.LPG1(%r13) + # decompress image is started at 0x11000 + lr %r6,%r2 + br %r1 +mover: + mvcle %r2,%r4,0 + jo mover + br %r6 +mover_end: + + .align 8 +.Lstack: + .long 0x8000 + (1<<(PAGE_SHIFT+THREAD_ORDER)) +.Ldecompress: + .long decompress_kernel +.Loffset: + .long 0x11000 +.Lmvsize: + .long SZ__bss_start
arch/s390/boot/compressed/head64.S new file +48 -0
48 lines not on this page · raw message
arch/s390/boot/compressed/Makefile new file +60 -0
60 lines not on this page · raw message
arch/s390/boot/compressed/misc.c new file +158 -0
158 lines not on this page · raw message
arch/s390/boot/compressed/vmlinux.lds.S new file +55 -0
55 lines not on this page · raw message
arch/s390/boot/compressed/vmlinux.scr new file +10 -0
@@ -0,0 +1,10 @@ +SECTIONS +{ + .rodata.compressed : { + input_len = .; + LONG(input_data_end - input_data) input_data = .; + *(.data) + output_len = . - 4; + input_data_end = .; + } +}
arch/s390/boot/Makefile +8 -0
@@ -9,10 +9,18 @@ EXTRA_CFLAGS := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I. targets := image +targets += bzImage +subdir- := compressed $(obj)/image: vmlinux FORCE $(call if_changed,objcopy) +$(obj)/bzImage: $(obj)/compressed/vmlinux FORCE + $(call if_changed,objcopy) + +$(obj)/compressed/vmlinux: FORCE + $(Q)$(MAKE) $(build)=$(obj)/compressed $@ + install: $(CONFIGURE) $(obj)/image sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \ System.map Kerntypes "$(INSTALL_PATH)"
arch/s390/defconfig +7 -0
@@ -36,6 +36,13 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_LZO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y
arch/s390/Kconfig +3 -0
@@ -98,6 +98,9 @@ select HAVE_ARCH_TRACEHOOK select INIT_ALL_POSSIBLE select HAVE_PERF_EVENTS + select HAVE_KERNEL_GZIP + select HAVE_KERNEL_BZIP2 + select HAVE_KERNEL_LZMA select ARCH_INLINE_SPIN_TRYLOCK select ARCH_INLINE_SPIN_TRYLOCK_BH select ARCH_INLINE_SPIN_LOCK
arch/s390/kernel/head31.S +12 -4
@@ -1,7 +1,7 @@ /* * arch/s390/kernel/head31.S * - * Copyright (C) IBM Corp. 2005,2006 + * Copyright (C) IBM Corp. 2005,2010 * * Author(s): Hartmut Penner <[email protected]> * Martin Schwidefsky <[email protected]>
@@ -10,13 +10,19 @@ * */ - .org 0x11000 +#include <linux/init.h> +#include <asm/asm-offsets.h> +#include <asm/thread_info.h> +#include <asm/page.h> +__HEAD + .globl startup_continue startup_continue: basr %r13,0 # get base .LPG1: - mvi __LC_AR_MODE_ID,0 # set ESA flag (mode 0) + l %r1,.Lbase_cc-.LPG1(%r13) + mvc 0(8,%r1),__LC_LAST_UPDATE_CLOCK lctl %c0,%c15,.Lctl-.LPG1(%r13) # load control registers l %r12,.Lparmaddr-.LPG1(%r13) # pointer to parameter area # move IPL device to lowcore
@@ -69,10 +75,12 @@ .Lduald:.rept 8 .long 0x80000000,0,0,0 # invalid access-list entries .endr +.Lbase_cc: + .long sched_clock_base_cc - .org 0x12000 .globl _ehead _ehead: + #ifdef CONFIG_SHARED_KERNEL .org 0x100000 #endif
arch/s390/kernel/head64.S +12 -12
@@ -1,7 +1,7 @@ /* * arch/s390/kernel/head64.S * - * Copyright (C) IBM Corp. 1999,2006 + * Copyright (C) IBM Corp. 1999,2010 * * Author(s): Hartmut Penner <[email protected]> * Martin Schwidefsky <[email protected]>
@@ -10,18 +10,17 @@ * */ - .org 0x11000 +#include <linux/init.h> +#include <asm/asm-offsets.h> +#include <asm/thread_info.h> +#include <asm/page.h> +__HEAD + .globl startup_continue startup_continue: - basr %r13,0 # get base -.LPG1: sll %r13,1 # remove high order bit - srl %r13,1 - mvi __LC_AR_MODE_ID,1 # set esame flag - slr %r0,%r0 # set cpuid to zero - lhi %r1,2 # mode 2 = esame (dump) - sigp %r1,%r0,0x12 # switch to esame mode - sam64 # switch to 64 bit mode - llgfr %r13,%r13 # clear high-order half of base reg + larl %r1,sched_clock_base_cc + mvc 0(8,%r1),__LC_LAST_UPDATE_CLOCK + larl %r13,.LPG1 # get base lmh %r0,%r15,.Lzero64-.LPG1(%r13) # clear high-order half lctlg %c0,%c15,.Lctl-.LPG1(%r13) # load control registers lg %r12,.Lparmaddr-.LPG1(%r13) # pointer to parameter area
@@ -46,6 +45,7 @@ lpswe .Lentry-.LPG1(13) # jump to _stext in primary-space, # virtual and never return ... .align 16 +.LPG1: .Lentry:.quad 0x0000000180000000,_stext .Lctl: .quad 0x04350002 # cr0: various things .quad 0 # cr1: primary space segment table
@@ -78,9 +78,9 @@ .long 0x80000000,0,0,0 # invalid access-list entries .endr - .org 0x12000 .globl _ehead _ehead: + #ifdef CONFIG_SHARED_KERNEL .org 0x100000 #endif
arch/s390/kernel/head.S +21 -20
88 lines not on this page · raw message
arch/s390/kernel/Makefile +1 -0
@@ -29,6 +29,7 @@ obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o) extra-y += head.o init_task.o vmlinux.lds +extra-y += $(if $(CONFIG_64BIT),head64.o,head31.o) obj-$(CONFIG_MODULES) += s390_ksyms.o module.o obj-$(CONFIG_SMP) += smp.o topology.o
arch/s390/kernel/sclp.S +32 -4
@@ -9,8 +9,10 @@ */ LC_EXT_NEW_PSW = 0x58 # addr of ext int handler +LC_EXT_NEW_PSW_64 = 0x1b0 # addr of ext int handler 64 bit LC_EXT_INT_PARAM = 0x80 # addr of ext int parameter LC_EXT_INT_CODE = 0x86 # addr of ext int code +LC_AR_MODE_ID = 0xa3 # # Subroutine which waits synchronously until either an external interruption
@@ -30,8 +32,16 @@ .LbaseS1: ahi %r15,-96 # create stack frame la %r8,LC_EXT_NEW_PSW # register int handler - mvc .LoldpswS1-.LbaseS1(8,%r13),0(%r8) - mvc 0(8,%r8),.LextpswS1-.LbaseS1(%r13) + la %r9,.LextpswS1-.LbaseS1(%r13) +#ifdef CONFIG_64BIT + tm LC_AR_MODE_ID,1 + jno .Lesa1 + la %r8,LC_EXT_NEW_PSW_64 # register int handler 64 bit + la %r9,.LextpswS1_64-.LbaseS1(%r13) +.Lesa1: +#endif + mvc .LoldpswS1-.LbaseS1(16,%r13),0(%r8) + mvc 0(16,%r8),0(%r9) lhi %r6,0x0200 # cr mask for ext int (cr0.54) ltr %r2,%r2 jz .LsetctS1
@@ -64,15 +74,19 @@ .LtimeoutS1: lctl %c0,%c0,.LctlS1-.LbaseS1(%r13) # restore interrupt setting # restore old handler - mvc 0(8,%r8),.LoldpswS1-.LbaseS1(%r13) + mvc 0(16,%r8),.LoldpswS1-.LbaseS1(%r13) lm %r6,%r15,120(%r15) # restore registers br %r14 # return to caller .align 8 .LoldpswS1: - .long 0, 0 # old ext int PSW + .long 0, 0, 0, 0 # old ext int PSW .LextpswS1: .long 0x00080000, 0x80000000+.LwaitS1 # PSW to handle ext int +#ifdef CONFIG_64BIT +.LextpswS1_64: + .quad 0x0000000180000000, .LwaitS1 # PSW to handle ext int, 64 bit +#endif .LwaitpswS1: .long 0x010a0000, 0x00000000+.LloopS1 # PSW to wait for ext int .LtimeS1:
@@ -250,6 +264,13 @@ _sclp_print_early: stm %r6,%r15,24(%r15) # save registers ahi %r15,-96 # create stack frame +#ifdef CONFIG_64BIT + tm LC_AR_MODE_ID,1 + jno .Lesa2 + ahi %r15,-80 + stmh %r6,%r15,96(%r15) # store upper register halves +.Lesa2: +#endif lr %r10,%r2 # save string pointer lhi %r2,0 bras %r14,_sclp_setup # enable console
@@ -262,6 +283,13 @@ lhi %r2,1 bras %r14,_sclp_setup # disable console .LendS5: +#ifdef CONFIG_64BIT + tm LC_AR_MODE_ID,1 + jno .Lesa3 + lmh %r6,%r15,96(%r15) # store upper register halves + ahi %r15,80 +.Lesa3: +#endif lm %r6,%r15,120(%r15) # restore registers br %r14
arch/s390/Makefile +10 -3
@@ -14,6 +14,7 @@ # ifndef CONFIG_64BIT +LD_BFD := elf32-s390 LDFLAGS := -m elf_s390 KBUILD_CFLAGS += -m31 KBUILD_AFLAGS += -m31
@@ -21,6 +22,7 @@ STACK_SIZE := 8192 CHECKFLAGS += -D__s390__ -msize-long else +LD_BFD := elf64-s390 LDFLAGS := -m elf64_s390 MODFLAGS += -fpic -D__PIC__ KBUILD_CFLAGS += -m64
@@ -30,6 +32,8 @@ CHECKFLAGS += -D__s390__ -D__s390x__ endif +export LD_BFD + cflags-$(CONFIG_MARCH_G5) += $(call cc-option,-march=g5) cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900) cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)
@@ -85,7 +89,9 @@ OBJCOPYFLAGS := -O binary LDFLAGS_vmlinux := -e start -head-y := arch/s390/kernel/head.o arch/s390/kernel/init_task.o +head-y := arch/s390/kernel/head.o +head-y += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o) +head-y += arch/s390/kernel/init_task.o core-y += arch/s390/mm/ arch/s390/kernel/ arch/s390/crypto/ \ arch/s390/appldata/ arch/s390/hypfs/ arch/s390/kvm/
@@ -99,12 +105,12 @@ boot := arch/s390/boot -all: image +all: image bzImage install: vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ -image: vmlinux +image bzImage: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ zfcpdump:
@@ -116,4 +122,5 @@ # Don't use tabs in echo arguments define archhelp echo '* image - Kernel image for IPL ($(boot)/image)' + echo '* bzImage - Compressed kernel image for IPL ($(boot)/bzImage)' endef
PATCH 29/32 correct vdso version string
In reply to Martin SchwidefskyFrom: Martin Schwidefsky <[email protected]>
The glibc vdso code for s390 uses the version string 2.6.29, the kernel uses the version string 2.6.26. No wonder the vdso code is never used. The first kernel version to contain the vdso code is 2.6.29 which makes this the correct version.
---
arch/s390/include/asm/vdso.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/include/asm/vdso.h +1 -1
@@ -7,7 +7,7 @@#define VDSO32_LBASE 0#define VDSO64_LBASE 0 -#define VDSO_VERSION_STRING LINUX_2.6.26 +#define VDSO_VERSION_STRING LINUX_2.6.29#ifndef __ASSEMBLY__
PATCH 30/32 dasd: fix refcounting.
In reply to Martin SchwidefskyFrom: Stefan Haberland <[email protected]>
The function dasd_device_from_cdev returns a reference to the dasd device and increases the refcount by one. If an exception occurs, the refcount was not decreased in all cases
e.g. in dasd_discipline_show.
Prevent the offline processing from hang by correcting two functions to decrease the refcount even if an error occured.
---
drivers/s390/block/dasd.c | 24 +++++++++++++++--------- drivers/s390/block/dasd_devmap.c | 13 ++++++++++--- 2 files changed, 25 insertions(+), 12 deletions(-)
drivers/s390/block/dasd.c +15 -9
@@ -1003,12 +1003,20 @@return ; } - device = (struct dasd_device *) cqr->startdev; -if (device ==NULL || - device !=dasd_device_from_cdev_locked (cdev) || -strncmp (device->discipline->ebcname, (char *) &cqr->magic,4 )) { + device =dasd_device_from_cdev_locked (cdev); +if (IS_ERR (device)) { +DBF_EVENT_DEVID (DBF_DEBUG , cdev,"%s" , +"unable to get device from cdev" ); +return ; + } + +if (!cqr->startdev || + device != cqr->startdev || +strncmp (cqr->startdev->discipline->ebcname, + (char *) &cqr->magic,4 )) {DBF_EVENT_DEVID (DBF_DEBUG , cdev,"%s" ,"invalid device in request" ); +dasd_put_device (device);return ; }
@@ -2291,11 +2299,6 @@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); - } }/*
@@ -2430,6 +2433,9 @@ }else pr_debug ("dasd_generic device %s found\n" ,dev_name (&cdev->dev)); + +wait_event (dasd_init_waitq,_wait_for_device (device)); +dasd_put_device (device);return rc; }
drivers/s390/block/dasd_devmap.c +10 -3
@@ -874,12 +874,19 @@ssize_t len; device =dasd_device_from_cdev (to_ccwdev (dev)); -if (!IS_ERR (device) && device->discipline) { +if (IS_ERR (device)) + goto out; +else if (!device->discipline) { +dasd_put_device (device); + goto out; + }else { len =snprintf (buf,PAGE_SIZE ,"%s\n" , device->discipline->name);dasd_put_device (device); - }else - len =snprintf (buf,PAGE_SIZE ,"none\n" ); +return len; + } +out: + len =snprintf (buf,PAGE_SIZE ,"none\n" );return len; }
PATCH 31/32 dasd: correct offline processing
In reply to Martin SchwidefskyFrom: Stefan Haberland <[email protected]>
Flushing the dasd ccw request queue may stop the processing of the block device request queue. Destroy partitions may wait for outstanding requests and thus hang.
Swapping dasd_destroy_partitions and dasd_flush_request_queue so that the request queue is empty before dasd_destroy_partitions is called.
---
drivers/s390/block/dasd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/block/dasd.c +1 -1
@@ -323,8 +323,8 @@ device->state =DASD_STATE_READY ;return rc; } -dasd_destroy_partitions (block);dasd_flush_request_queue (block); +dasd_destroy_partitions (block); block->blocks =0 ; block->bp_block =0 ; block->s2b_shift =0 ;
PATCH 32/32 cio: trigger subchannel event at resume time
In reply to Martin SchwidefskyFrom: Sebastian Ott <[email protected]>
ccw_device_pm_restore: trigger subchannel event to better handle changes to the subchannel device.
---
drivers/s390/cio/css.c | 2 drivers/s390/cio/css.h | 1 drivers/s390/cio/device.c | 111 +++++++++++++++++++++++++--------------------- 3 files changed, 63 insertions(+), 51 deletions(-)
drivers/s390/cio/css.c +1 -1
@@ -1020,7 +1020,7 @@return 0 ; } -static inline int css_complete_work (void ) +int css_complete_work (void ) {int ret;
drivers/s390/cio/css.h +1 -0
@@ -146,6 +146,7 @@/* Helper functions to build lists for the slow path. */ void css_schedule_eval (struct subchannel_id schid);void css_schedule_eval_all (void ); +int css_complete_work (void );int sch_is_pseudo_sch (struct subchannel *);struct schib ;
drivers/s390/cio/device.c +61 -50
186 lines not on this page · raw message