Please pull git390 'for-linus' branch
Subsystems (7)
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
arch/s390/crypto/crypt_s390.h | 2 +- arch/s390/kernel/early.c | 45 +++------- arch/s390/kernel/entry.S | 7 ++- arch/s390/kernel/entry64.S | 7 ++- arch/s390/kernel/ipl.c | 17 ++-- arch/s390/kernel/process.c | 6 +- arch/s390/kernel/smp.c | 63 +++++--------- arch/s390/kernel/time.c | 4 +- arch/s390/kernel/vtime.c | 4 +- arch/s390/lib/Makefile | 4 +- drivers/s390/block/dasd_proc.c | 4 + drivers/s390/char/sclp.h | 12 +++ drivers/s390/char/sclp_chp.c | 4 + drivers/s390/char/sclp_info.c | 117 ++++++++++++++++++------ drivers/s390/char/vmcp.c | 13 ++-- drivers/s390/char/vmlogrdr.c | 4 +- drivers/s390/char/zcore.c | 2 +- drivers/s390/cio/device_id.c | 22 ++--- drivers/s390/crypto/ap_bus.c | 98 +++++++++++++++++++-- drivers/s390/crypto/ap_bus.h | 11 +++ drivers/s390/crypto/zcrypt_cex2a.c | 27 ++---- drivers/s390/crypto/zcrypt_pcica.c | 27 ++---- drivers/s390/crypto/zcrypt_pcicc.c | 27 ++---- drivers/s390/crypto/zcrypt_pcixcc.c | 40 +++------ fs/partitions/ibm.c | 167 ++++++++++++++++++++--------------- include/asm-s390/atomic.h | 4 +- include/asm-s390/cmb.h | 1 - include/asm-s390/processor.h | 4 +- include/asm-s390/sclp.h | 47 ++++------ include/asm-s390/sfp-machine.h | 6 +- include/asm-s390/sfp-util.h | 11 +++ 31 files changed, 459 insertions(+), 348 deletions(-)
Christian Borntraeger (1):
[S390] vmlogrdr function annotation.
Cornelia Huck (1):
[S390] cio: Remove prototype for non-existing function cmf_reset().
Heiko Carstens (7):
[S390] sclp: introduce some new interfaces.
[S390] sclp: Test facility list before executing a service call. [S390] zcore: Fix __user annotation.
[S390] smp: Merge smp_count_cpus() and smp_get_save_areas(). [S390] Remove volatile from atomic_t
[S390] dasd: Avoid compile warnings on !CONFIG_DASD_PROFILE [S390] s390: rename CPU_IDLE to S390_CPU_IDLE
Martin Schwidefsky (2):
[S390] Bogomips calculation for 64 bit.
[S390] system call optimization.
Michael Holzheu (1):
[S390] Program check in diag 210 under 31 bit
Ralph Wuerthner (2):
[S390] Fixed comment typo.
[S390] zcrypt: fix request timeout handling
Robert P. J. Day (1):
[S390] vmcp cleanup
Stefan Haberland (1):
[S390] fixed cdl-format detection.
arch/s390/crypto/crypt_s390.h +1 -1
@@ -24,7 +24,7 @@#define CRYPT_S390_PRIORITY 300#define CRYPT_S390_COMPOSITE_PRIORITY 400 -/* s930 cryptographic operations */ +/* s390 cryptographic operations */ enum crypt_s390_operations {CRYPT_S390_KM =0x0100 ,CRYPT_S390_KMC =0x0200 ,
arch/s390/kernel/early.c +12 -33
70 lines not on this page · raw message
arch/s390/kernel/entry.S +6 -1
@@ -107,6 +107,11 @@ STACK_SIZE = 1 << STACK_SHIFT l %r13,__LC_SVC_NEW_PSW+4 # load &system_call to %r13 .endm + .macro SAVE_ALL_SVC psworg,savearea + la %r12,\psworg + l %r15,__LC_KERNEL_STACK # problem state -> load ksp + .endm + .macro SAVE_ALL_SYNC psworg,savearea la %r12,\psworg tm \psworg+1,0x01 # test problem state bit
@@ -218,7 +223,7 @@ system_call: STORE_TIMER __LC_SYNC_ENTER_TIMER sysc_saveall: SAVE_ALL_BASE __LC_SAVE_AREA - SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA + SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA lh %r7,0x8a # get svc number from lowcore #ifdef CONFIG_VIRT_CPU_ACCOUNTING
arch/s390/kernel/entry64.S +6 -1
@@ -99,6 +99,11 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \ larl %r13,system_call .endm + .macro SAVE_ALL_SVC psworg,savearea + la %r12,\psworg + lg %r15,__LC_KERNEL_STACK # problem state -> load ksp + .endm + .macro SAVE_ALL_SYNC psworg,savearea la %r12,\psworg tm \psworg+1,0x01 # test problem state bit
@@ -207,7 +212,7 @@ system_call: STORE_TIMER __LC_SYNC_ENTER_TIMER sysc_saveall: SAVE_ALL_BASE __LC_SAVE_AREA - SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA + SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA llgh %r7,__LC_SVC_INT_CODE # get svc number from lowcore #ifdef CONFIG_VIRT_CPU_ACCOUNTING
arch/s390/kernel/ipl.c +8 -9
@@ -25,10 +25,6 @@#define IPL_PARM_BLOCK_VERSION 0 -#define SCCB_VALID (s390_readinfo_sccb.header.response_code == 0x10) -#define SCCB_LOADPARM (&s390_readinfo_sccb.loadparm) -#define SCCB_FLAG (s390_readinfo_sccb.flags) -#define IPL_UNKNOWN_STR "unknown"#define IPL_CCW_STR "ccw"#define IPL_FCP_STR "fcp"
@@ -146,6 +142,8 @@ static struct ipl_parameter_block *dump_block_ccw;static enum shutdown_action on_panic_action =SHUTDOWN_STOP ; +static struct sclp_ipl_info sclp_ipl_info; +int diag308 (unsigned long subcode,void *addr) { register unsigned long _addr asm("0") = (unsigned long) addr;
@@ -375,9 +373,9 @@ static ssize_t ipl_ccw_loadparm_show(struct kset *kset, char *page) {char loadparm[LOADPARM_LEN +1 ] = {}; -if (!SCCB_VALID ) +if (!sclp_ipl_info.is_valid)return sprintf (page,"#unknown#\n" ); -memcpy (loadparm,SCCB_LOADPARM ,LOADPARM_LEN ); +memcpy (loadparm, &sclp_ipl_info.loadparm,LOADPARM_LEN );EBCASC (loadparm,LOADPARM_LEN );strstrip (loadparm);return sprintf (page,"%s\n" , loadparm);
@@ -910,9 +908,9 @@ static int __init reipl_ccw_init(void) reipl_block_ccw->hdr.blk0_len =IPL_PARM_BLK0_CCW_LEN ; reipl_block_ccw->hdr.pbt =DIAG308_IPL_TYPE_CCW ;/* check if read scp info worked and set loadparm */ -if (SCCB_VALID ) +if (sclp_ipl_info.is_valid)memcpy (reipl_block_ccw->ipl_info.ccw.load_param, -SCCB_LOADPARM ,LOADPARM_LEN ); + &sclp_ipl_info.loadparm,LOADPARM_LEN );else /* read scp info failed: set empty loadparm (EBCDIC blanks) */ memset(reipl_block_ccw->ipl_info.ccw.load_param, 0x40,
@@ -1007,7 +1005,7 @@ static int __init dump_fcp_init(void) {int rc; -if (!(SCCB_FLAG &0x2 ) || !SCCB_VALID ) +if (!sclp_ipl_info.has_dump)return 0 ;/* LDIPL DUMP is not installed */ if (!diag308_set_works)return 0 ;
@@ -1088,6 +1086,7 @@ static int __init s390_ipl_init(void) {int rc; +sclp_get_ipl_info (&sclp_ipl_info);reipl_probe (); rc =ipl_init ();if (rc)
arch/s390/kernel/process.c +3 -3
@@ -93,8 +93,8 @@ void do_monitor_call(struct pt_regs *regs, long interruption_code)/* disable monitor call class 0 */ __ctl_clear_bit (8 ,15 ); -atomic_notifier_call_chain (&idle_chain,CPU_NOT_IDLE , - (void *)(long )smp_processor_id ()); +atomic_notifier_call_chain (&idle_chain,S390_CPU_NOT_IDLE , + (void *)(long )smp_processor_id ()); }extern void s390_handle_mcck (void );
@@ -115,7 +115,7 @@ static void default_idle(void) } rc =atomic_notifier_call_chain (&idle_chain, -CPU_IDLE , (void *)(long ) cpu); +S390_CPU_IDLE , (void *)(long ) cpu);if (rc !=NOTIFY_OK && rc !=NOTIFY_DONE )BUG ();if (rc !=NOTIFY_OK ) {
arch/s390/kernel/smp.c +21 -42
105 lines not on this page · raw message
arch/s390/kernel/time.c +2 -2
@@ -226,10 +226,10 @@ static int nohz_idle_notify(struct notifier_block *self, unsigned long action, void *hcpu) {switch (action) { -case CPU_IDLE : +case S390_CPU_IDLE :stop_hz_timer ();break ; -case CPU_NOT_IDLE : +case S390_CPU_NOT_IDLE :start_hz_timer ();break ; }
arch/s390/kernel/vtime.c +2 -2
@@ -545,10 +545,10 @@ static int vtimer_idle_notify(struct notifier_block *self, unsigned long action, void *hcpu) {switch (action) { -case CPU_IDLE : +case S390_CPU_IDLE :stop_cpu_timer ();break ; -case CPU_NOT_IDLE : +case S390_CPU_NOT_IDLE :start_cpu_timer ();break ; }
arch/s390/lib/Makefile +2 -2
@@ -4,7 +4,7 @@ EXTRA_AFLAGS := -traditional -lib-y += delay.o string.o uaccess_std.o uaccess_pt.o qrnnd.o -obj-$(CONFIG_32BIT) += div64.o +lib-y += delay.o string.o uaccess_std.o uaccess_pt.o +obj-$(CONFIG_32BIT) += div64.o qrnnd.o lib-$(CONFIG_64BIT) += uaccess_mvcos.o lib-$(CONFIG_SMP) += spinlock.o
drivers/s390/block/dasd_proc.c +4 -0
@@ -28,6 +28,7 @@ static struct proc_dir_entry *dasd_proc_root_entry = NULL;static struct proc_dir_entry *dasd_devices_entry =NULL ;static struct proc_dir_entry *dasd_statistics_entry =NULL ; +#ifdef CONFIG_DASD_PROFILE static char *dasd_get_user_string (const char __user *user_buf,size_t user_len) {
@@ -47,6 +48,7 @@ dasd_get_user_string(const char __user *user_buf, size_t user_len) buffer[user_len] =0 ; return buffer; } +#endif /* CONFIG_DASD_PROFILE */ static int dasd_devices_show (struct seq_file *m,void *v)
@@ -167,6 +169,7 @@ dasd_calc_metrics(char *page, char **start, off_t off,return len; } +#ifdef CONFIG_DASD_PROFILE static char *dasd_statistics_array (char *str,unsigned int *array,int shift) {
@@ -180,6 +183,7 @@ dasd_statistics_array(char *str, unsigned int *array, int shift) str +=sprintf (str,"\n" );return str; } +#endif /* CONFIG_DASD_PROFILE */ static int dasd_statistics_read(char *page, char **start, off_t off,
drivers/s390/char/sclp.h +12 -0
@@ -72,6 +72,18 @@ typedef unsigned int sclp_cmdw_t;typedef u32 sccb_mask_t ;/* ATTENTION: assumes 32bit mask !!! */ +struct sccb_header { +u16 length; +u8 function_code; +u8 control_mask[3 ]; +u16 response_code; +} __attribute__((packed)); + +extern u64 sclp_facilities; + +#define SCLP_HAS_CHP_INFO (sclp_facilities & 0x8000000000000000ULL) +#define SCLP_HAS_CHP_RECONFIG (sclp_facilities & 0x2000000000000000ULL) +struct gds_subvector {u8 length;u8 key;
drivers/s390/char/sclp_chp.c +4 -0
@@ -55,6 +55,8 @@ static int do_configure(sclp_cmdw_t cmd)struct chp_cfg_data *data;int rc; +if (!SCLP_HAS_CHP_RECONFIG ) +return -EOPNOTSUPP ;/* Prepare sccb. */ data = (struct chp_cfg_data *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!data)
@@ -152,6 +154,8 @@ int sclp_chp_read_info(struct sclp_chp_info *info)struct chp_info_data *data;int rc; +if (!SCLP_HAS_CHP_INFO ) +return -EOPNOTSUPP ;/* Prepare sccb. */ data = (struct chp_info_data *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!data)
drivers/s390/char/sclp_info.c +88 -29
135 lines not on this page · raw message
drivers/s390/char/vmcp.c +6 -7
@@ -175,13 +175,12 @@ static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)static const struct file_operations vmcp_fops = { .owner =THIS_MODULE , - .open = &vmcp_open, - .release = &vmcp_release, - .read = &vmcp_read, - .llseek = &no_llseek, - .write = &vmcp_write, - .unlocked_ioctl = &vmcp_ioctl, - .compat_ioctl = &vmcp_ioctl + .open = vmcp_open, + .release = vmcp_release, + .read = vmcp_read, + .write = vmcp_write, + .unlocked_ioctl = vmcp_ioctl, + .compat_ioctl = vmcp_ioctl };static struct miscdevice vmcp_dev = {
drivers/s390/char/vmlogrdr.c +2 -2
@@ -835,7 +835,7 @@ static void vmlogrdr_cleanup(void) } -static int vmlogrdr_init (void ) +static int __init vmlogrdr_init (void ) {int rc;int i;
@@ -885,7 +885,7 @@ cleanup: } -static void vmlogrdr_exit (void ) +static void __exit vmlogrdr_exit(void) {vmlogrdr_cleanup ();printk (KERN_INFO "vmlogrdr: driver unloaded\n" );
drivers/s390/char/zcore.c +1 -1
@@ -156,7 +156,7 @@ static int memcpy_real(void *dest, unsigned long src, size_t count)return rc; } -static int memcpy_real_user (__user void *dest,unsigned long src,size_t count) +static int memcpy_real_user (void __user *dest,unsigned long src,size_t count) {static char buf[4096 ];int offs =0 , size;
drivers/s390/cio/device_id.c +7 -15
@@ -27,7 +27,6 @@/* * diag210 is used under VM to get information about a virtual device */ -#ifdef CONFIG_64BIT int diag210 (struct diag210 * addr) {
@@ -43,6 +42,7 @@ diag210(struct diag210 * addr)spin_lock_irqsave (&diag210_lock, flags); diag210_tmp = *addr; +#ifdef CONFIG_64BIT asmvolatile (" lhi %0,-1\n" " sam31\n"
@@ -51,19 +51,8 @@ diag210(struct diag210 * addr)" srl %0,28\n" "1: sam64\n" EX_TABLE (0b ,1b ) - : "=&d" (ccode) : "a" (__pa(&diag210_tmp)) : "cc", "memory"); - - *addr = diag210_tmp; -spin_unlock_irqrestore (&diag210_lock, flags); - -return ccode; -} + : "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory"); #else -int -diag210 (struct diag210 * addr) -{ -int ccode; - asm volatile( " lhi %0,-1\n" " diag %1,0,0x210\n"
@@ -71,11 +60,14 @@ diag210(struct diag210 * addr)" srl %0,28\n" "1:\n" EX_TABLE (0b ,1b ) - : "=&d" (ccode) : "a" (__pa(addr)) : "cc", "memory"); + : "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory"); +#endif + + *addr = diag210_tmp; +spin_unlock_irqrestore (&diag210_lock, flags); return ccode; } -#endif /* * Input :
drivers/s390/crypto/ap_bus.c +89 -9
201 lines not on this page · raw message
drivers/s390/crypto/ap_bus.h +11 -0
@@ -33,6 +33,7 @@#define AP_DEVICES 64/* Number of AP devices. */ #define AP_DOMAINS 16/* Number of AP domains. */ #define AP_MAX_RESET 90/* Maximum number of resets. */ +#define AP_RESET_TIMEOUT (HZ/2)/* Time in ticks for reset timeouts. */ #define AP_CONFIG_TIME 30/* Time in seconds between AP bus rescans. */ #define AP_POLL_TIME 1/* Time in ticks between receive polls. */
@@ -83,6 +84,13 @@ struct ap_queue_status {#define AP_DEVICE_TYPE_CEX2A 6#define AP_DEVICE_TYPE_CEX2C 7 +/** +* AP reset flag states +*/ +#define AP_RESET_IGNORE 0/* request timeout will be ignored */ +#define AP_RESET_ARMED 1/* request timeout timer is active */ +#define AP_RESET_DO 2/* AP reset required */ +struct ap_device ;struct ap_message ;
@@ -95,6 +103,7 @@ struct ap_driver {/* receive is called from tasklet context */ void (*receive)(struct ap_device *,struct ap_message *,struct ap_message *); +int request_timeout;/* request timeout in jiffies */ };#define to_ap_drv (x) container_of((x), struct ap_driver, driver)
@@ -112,6 +121,8 @@ struct ap_device {int queue_depth;/* AP queue depth.*/ int device_type;/* AP device type. */ int unregistered;/* marks AP device as unregistered */ +struct timer_list timeout;/* Timer for request timeouts. */ +int reset;/* Reset required after req. timeout. */ int queue_count;/* # messages currently on AP queue. */
drivers/s390/crypto/zcrypt_cex2a.c +9 -18
@@ -70,6 +70,7 @@ static struct ap_driver zcrypt_cex2a_driver = { .remove = zcrypt_cex2a_remove, .receive = zcrypt_cex2a_receive, .ids = zcrypt_cex2a_ids, + .request_timeout = CEX2A_CLEANUP_TIME, };/**
@@ -306,18 +307,13 @@ static long zcrypt_cex2a_modexpo(struct zcrypt_device *zdev, goto out_free;init_completion (&work);ap_queue_message (zdev->ap_dev, &ap_msg); - rc =wait_for_completion_interruptible_timeout ( - &work,CEX2A_CLEANUP_TIME ); -if (rc >0 ) + rc =wait_for_completion_interruptible (&work); +if (rc ==0 ) rc =convert_response (zdev, &ap_msg, mex->outputdata, mex->outputdatalength); -else { -/* Signal pending or message timed out. */ +else +/* Signal pending. */ ap_cancel_message (zdev->ap_dev, &ap_msg); -if (rc ==0 ) -/* Message timed out. */ - rc = -ETIME ; - } out_free:kfree (ap_msg.message);return rc;
@@ -348,18 +344,13 @@ static long zcrypt_cex2a_modexpo_crt(struct zcrypt_device *zdev, goto out_free;init_completion (&work);ap_queue_message (zdev->ap_dev, &ap_msg); - rc =wait_for_completion_interruptible_timeout ( - &work,CEX2A_CLEANUP_TIME ); -if (rc >0 ) + rc =wait_for_completion_interruptible (&work); +if (rc ==0 ) rc =convert_response (zdev, &ap_msg, crt->outputdata, crt->outputdatalength); -else { -/* Signal pending or message timed out. */ +else +/* Signal pending. */ ap_cancel_message (zdev->ap_dev, &ap_msg); -if (rc ==0 ) -/* Message timed out. */ - rc = -ETIME ; - } out_free:kfree (ap_msg.message);return rc;
drivers/s390/crypto/zcrypt_pcica.c +9 -18
@@ -70,6 +70,7 @@ static struct ap_driver zcrypt_pcica_driver = { .remove = zcrypt_pcica_remove, .receive = zcrypt_pcica_receive, .ids = zcrypt_pcica_ids, + .request_timeout = PCICA_CLEANUP_TIME, };/**
@@ -290,18 +291,13 @@ static long zcrypt_pcica_modexpo(struct zcrypt_device *zdev, goto out_free;init_completion (&work);ap_queue_message (zdev->ap_dev, &ap_msg); - rc =wait_for_completion_interruptible_timeout ( - &work,PCICA_CLEANUP_TIME ); -if (rc >0 ) + rc =wait_for_completion_interruptible (&work); +if (rc ==0 ) rc =convert_response (zdev, &ap_msg, mex->outputdata, mex->outputdatalength); -else { -/* Signal pending or message timed out. */ +else +/* Signal pending. */ ap_cancel_message (zdev->ap_dev, &ap_msg); -if (rc ==0 ) -/* Message timed out. */ - rc = -ETIME ; - } out_free:kfree (ap_msg.message);return rc;
@@ -332,18 +328,13 @@ static long zcrypt_pcica_modexpo_crt(struct zcrypt_device *zdev, goto out_free;init_completion (&work);ap_queue_message (zdev->ap_dev, &ap_msg); - rc =wait_for_completion_interruptible_timeout ( - &work,PCICA_CLEANUP_TIME ); -if (rc >0 ) + rc =wait_for_completion_interruptible (&work); +if (rc ==0 ) rc =convert_response (zdev, &ap_msg, crt->outputdata, crt->outputdatalength); -else { -/* Signal pending or message timed out. */ +else +/* Signal pending. */ ap_cancel_message (zdev->ap_dev, &ap_msg); -if (rc ==0 ) -/* Message timed out. */ - rc = -ETIME ; - } out_free:kfree (ap_msg.message);return rc;
drivers/s390/crypto/zcrypt_pcicc.c +9 -18
@@ -82,6 +82,7 @@ static struct ap_driver zcrypt_pcicc_driver = { .remove = zcrypt_pcicc_remove, .receive = zcrypt_pcicc_receive, .ids = zcrypt_pcicc_ids, + .request_timeout = PCICC_CLEANUP_TIME, };/**
@@ -501,18 +502,13 @@ static long zcrypt_pcicc_modexpo(struct zcrypt_device *zdev, goto out_free;init_completion (&work);ap_queue_message (zdev->ap_dev, &ap_msg); - rc =wait_for_completion_interruptible_timeout ( - &work,PCICC_CLEANUP_TIME ); -if (rc >0 ) + rc =wait_for_completion_interruptible (&work); +if (rc ==0 ) rc =convert_response (zdev, &ap_msg, mex->outputdata, mex->outputdatalength); -else { -/* Signal pending or message timed out. */ +else +/* Signal pending. */ ap_cancel_message (zdev->ap_dev, &ap_msg); -if (rc ==0 ) -/* Message timed out. */ - rc = -ETIME ; - } out_free:free_page ((unsigned long ) ap_msg.message);return rc;
@@ -544,18 +540,13 @@ static long zcrypt_pcicc_modexpo_crt(struct zcrypt_device *zdev, goto out_free;init_completion (&work);ap_queue_message (zdev->ap_dev, &ap_msg); - rc =wait_for_completion_interruptible_timeout ( - &work,PCICC_CLEANUP_TIME ); -if (rc >0 ) + rc =wait_for_completion_interruptible (&work); +if (rc ==0 ) rc =convert_response (zdev, &ap_msg, crt->outputdata, crt->outputdatalength); -else { -/* Signal pending or message timed out. */ +else +/* Signal pending. */ ap_cancel_message (zdev->ap_dev, &ap_msg); -if (rc ==0 ) -/* Message timed out. */ - rc = -ETIME ; - } out_free:free_page ((unsigned long ) ap_msg.message);return rc;
drivers/s390/crypto/zcrypt_pcixcc.c +13 -27
@@ -93,6 +93,7 @@ static struct ap_driver zcrypt_pcixcc_driver = { .remove = zcrypt_pcixcc_remove, .receive = zcrypt_pcixcc_receive, .ids = zcrypt_pcixcc_ids, + .request_timeout = PCIXCC_CLEANUP_TIME, };/**
@@ -641,18 +642,13 @@ static long zcrypt_pcixcc_modexpo(struct zcrypt_device *zdev, goto out_free;init_completion (&resp_type.work);ap_queue_message (zdev->ap_dev, &ap_msg); - rc =wait_for_completion_interruptible_timeout ( - &resp_type.work,PCIXCC_CLEANUP_TIME ); -if (rc >0 ) + rc =wait_for_completion_interruptible (&resp_type.work); +if (rc ==0 ) rc =convert_response_ica (zdev, &ap_msg, mex->outputdata, mex->outputdatalength); -else { -/* Signal pending or message timed out. */ +else +/* Signal pending. */ ap_cancel_message (zdev->ap_dev, &ap_msg); -if (rc ==0 ) -/* Message timed out. */ - rc = -ETIME ; - } out_free:free_page ((unsigned long ) ap_msg.message);return rc;
@@ -685,18 +681,13 @@ static long zcrypt_pcixcc_modexpo_crt(struct zcrypt_device *zdev, goto out_free;init_completion (&resp_type.work);ap_queue_message (zdev->ap_dev, &ap_msg); - rc =wait_for_completion_interruptible_timeout ( - &resp_type.work,PCIXCC_CLEANUP_TIME ); -if (rc >0 ) + rc =wait_for_completion_interruptible (&resp_type.work); +if (rc ==0 ) rc =convert_response_ica (zdev, &ap_msg, crt->outputdata, crt->outputdatalength); -else { -/* Signal pending or message timed out. */ +else +/* Signal pending. */ ap_cancel_message (zdev->ap_dev, &ap_msg); -if (rc ==0 ) -/* Message timed out. */ - rc = -ETIME ; - } out_free:free_page ((unsigned long ) ap_msg.message);return rc;
@@ -729,17 +720,12 @@ static long zcrypt_pcixcc_send_cprb(struct zcrypt_device *zdev, goto out_free;init_completion (&resp_type.work);ap_queue_message (zdev->ap_dev, &ap_msg); - rc =wait_for_completion_interruptible_timeout ( - &resp_type.work,PCIXCC_CLEANUP_TIME ); -if (rc >0 ) + rc =wait_for_completion_interruptible (&resp_type.work); +if (rc ==0 ) rc =convert_response_xcrb (zdev, &ap_msg, xcRB); -else { -/* Signal pending or message timed out. */ +else +/* Signal pending. */ ap_cancel_message (zdev->ap_dev, &ap_msg); -if (rc ==0 ) -/* Message timed out. */ - rc = -ETIME ; - } out_free:memset (ap_msg.message,0x0 , ap_msg.length);kfree (ap_msg.message);
fs/partitions/ibm.c +97 -70
202 lines not on this page · raw message
include/asm-s390/atomic.h +2 -2
@@ -24,7 +24,7 @@*/ typedef struct { -volatile int counter; +int counter; } __attribute__ ((aligned (4 )))atomic_t ;#define ATOMIC_INIT (i) { (i) }
@@ -141,7 +141,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)#ifdef __s390x__typedef struct { -volatile long long counter; +long long counter; } __attribute__ ((aligned (8 )))atomic64_t ;#define ATOMIC64_INIT (i) { (i) }
include/asm-s390/cmb.h +0 -1
@@ -88,7 +88,6 @@ extern u64 cmf_read(struct ccw_device *cdev, int index);* any **/ extern int cmf_readall (struct ccw_device *cdev,struct cmbdata *data); -extern void cmf_reset (struct ccw_device *cdev);#endif /* __KERNEL__ */ #endif /* S390_CMB_H */
include/asm-s390/processor.h +2 -2
@@ -357,8 +357,8 @@ extern void (*s390_base_ext_handler_fn)(void);/* * CPU idle notifier chain. */ -#define CPU_IDLE 0 -#define CPU_NOT_IDLE 1 +#define S390_CPU_IDLE 0 +#define S390_CPU_NOT_IDLE 1struct notifier_block ;int register_idle_notifier (struct notifier_block *nb);
include/asm-s390/sclp.h +17 -30
58 lines not on this page · raw message
include/asm-s390/sfp-machine.h +3 -3
@@ -27,9 +27,9 @@#define _FP_W_TYPE_SIZE 32 -#define _FP_W_TYPE unsigned long -#define _FP_WS_TYPE signed long -#define _FP_I_TYPE long +#define _FP_W_TYPE unsigned int +#define _FP_WS_TYPE signed int +#define _FP_I_TYPE int#define _FP_MUL_MEAT_S (R ,X ,Y ) \ _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm)
include/asm-s390/sfp-util.h +11 -0
@@ -51,6 +51,16 @@ wl = __wl; \ }) +#ifdef __s390x__ +#define udiv_qrnnd (q, r, n1, n0, d) \ + do { unsigned long __n; \ + unsigned int __r, __d; \ + __n = ((unsigned long)(n1) << 32) + n0; \ + __d = (d); \ + (q) = __n / __d; \ + (r) = __n % __d; \ + } while (0) +#else #define udiv_qrnnd (q, r, n1, n0, d) \ do { unsigned int __r; \ (q) = __udiv_qrnnd (&__r, (n1), (n0), (d)); \
@@ -58,6 +68,7 @@ } while (0) extern unsigned long __udiv_qrnnd (unsigned int *, unsigned int,unsigned int ,unsigned int ); +#endif #define UDIV_NEEDS_NORMALIZATION 0