s390 patches for the 4.2 merge window
Subsystems (6)
Hi Linus,
please pull from the 'for-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
to receive the following updates:
Pretty boring for a merge window pull.
One change in behaviour is the patch for dasd driver, the module which provides the diagnose discipline is now loaded automatically.
The SCLP code got a nice cleanup, a new global structure replaces a bunch of accessor functions.
And a couple of random, small improvements.
David Hildenbrand (4):
s390/sclp: prepare smp_fill_possible_mask for global "struct sclp" s390/sclp: unify basic sclp access by exposing "struct sclp" s390/sclp: get rid of sclp_get_mtid() and sclp_get_mtid_max() s390/sclp: move sclp_facilities into "struct sclp"
Geert Uytterhoeven (1):
s390/mm: s/specifiation/specification/, s/an specification/a specification/
Jan Kara (1):
s390/keyboard: avoid off-by-one when using strnlen_user()
Joe Perches (1):
s390/sclp: Use DECLARE_BITMAP
Nicholas Mc Guire (1):
s390/sclp: pass timeout as HZ independent value
Peter Oberparleiter (1):
s390/dasd: Enable automatic loading of dasd_diag_mod
Sebastian Ott (2):
s390/setup: fix DMA_API_DEBUG warnings s390/pci: improve handling of hotplug event 0x301
Vaishali Thakkar (1):
s390/zcrypt: remove obsolete __constant
arch/s390/hypfs/hypfs_sprp.c | 4 +- arch/s390/include/asm/pgtable.h | 4 +- arch/s390/include/asm/sclp.h | 34 ++++++----- arch/s390/kernel/crash_dump.c | 8 +-- arch/s390/kernel/setup.c | 23 +++++--- arch/s390/kernel/smp.c | 13 ++-- arch/s390/kvm/interrupt.c | 4 +- arch/s390/kvm/kvm-s390.c | 8 +-- arch/s390/mm/init.c | 2 +- arch/s390/mm/mem_detect.c | 4 +- arch/s390/pci/pci_event.c | 8 ++- drivers/s390/block/dasd.c | 17 ++++++ drivers/s390/char/keyboard.c | 13 ++-- drivers/s390/char/sclp.c | 2 +- drivers/s390/char/sclp.h | 15 ++--- drivers/s390/char/sclp_cmd.c | 29 ++++----- drivers/s390/char/sclp_early.c | 118 +++++++------------------------------ drivers/s390/char/sclp_sdias.c | 3 +- drivers/s390/char/zcore.c | 10 ++-- drivers/s390/crypto/zcrypt_pcicc.c | 8 +-- drivers/s390/kvm/kvm_virtio.c | 4 +- 21 files changed, 141 insertions(+), 190 deletions(-)
arch/s390/hypfs/hypfs_sprp.c +2 -2
@@ -128,14 +128,14 @@ static struct hypfs_dbfs_file hypfs_sprp_file = {int hypfs_sprp_init (void ) { -if (!sclp_has_sprp ()) +if (!sclp.has_sprp)return 0 ;return hypfs_dbfs_create_file (&hypfs_sprp_file); }void hypfs_sprp_exit (void ) { -if (!sclp_has_sprp ()) +if (!sclp.has_sprp)return ;hypfs_dbfs_remove_file (&hypfs_sprp_file); }
arch/s390/include/asm/pgtable.h +2 -2
@@ -1565,9 +1565,9 @@ static inline int has_transparent_hugepage(void)/* * 64 bit swap entry format: * A page-table entry has some bits we have to treat in a special way. -* Bits 52 and bit 55 have to be zero, otherwise an specification +* Bits 52 and bit 55 have to be zero, otherwise a specification * exception will occur instead of a page translation exception. The -* specifiation exception has the bad habit not to store necessary +* specification exception has the bad habit not to store necessary * information in the lowcore. * Bits 54 and 63 are used to indicate the page type. * A swap pte is indicated by bit pattern (pte & 0x201) == 0x200
arch/s390/include/asm/sclp.h +20 -14
@@ -46,33 +46,39 @@ struct sclp_cpu_info {struct sclp_cpu_entry cpu[MAX_CPU_ADDRESS +1 ]; }; +struct sclp_info { +unsigned char has_linemode :1 ; +unsigned char has_vt220 :1 ; +unsigned char has_siif :1 ; +unsigned char has_sigpif :1 ; +unsigned char has_cpu_type :1 ; +unsigned char has_sprp :1 ; +unsigned int ibc; +unsigned int mtid; +unsigned int mtid_cp; +unsigned int mtid_prev; +unsigned long long rzm; +unsigned long long rnmax; +unsigned long long hamax; +unsigned int max_cpu; +unsigned long hsa_size; +unsigned long long facilities; +}; +extern struct sclp_info sclp; +int sclp_get_cpu_info (struct sclp_cpu_info *info);int sclp_cpu_configure (u8 cpu);int sclp_cpu_deconfigure (u8 cpu); -unsigned long long sclp_get_rnmax (void ); -unsigned long long sclp_get_rzm (void ); -unsigned int sclp_get_max_cpu (void ); -unsigned int sclp_get_mtid (u8 cpu_type); -unsigned int sclp_get_mtid_max (void ); -unsigned int sclp_get_mtid_prev (void );int sclp_sdias_blk_count (void );int sclp_sdias_copy (void *dest,int blk_num,int nr_blks);int sclp_chp_configure (struct chp_id chpid);int sclp_chp_deconfigure (struct chp_id chpid);int sclp_chp_read_info (struct sclp_chp_info *info);void sclp_get_ipl_info (struct sclp_ipl_info *info); -bool __init sclp_has_linemode (void ); -bool __init sclp_has_vt220 (void ); -bool sclp_has_sprp (void );int sclp_pci_configure (u32 fid);int sclp_pci_deconfigure (u32 fid);int memcpy_hsa (void *dest,unsigned long src,size_t count,int mode); -unsigned long sclp_get_hsa_size (void );void sclp_early_detect (void ); -int sclp_has_siif (void ); -int sclp_has_sigpif (void ); -unsigned int sclp_get_ibc (void ); -long _sclp_print_early (const char *);#endif /* _ASM_S390_SCLP_H */
arch/s390/kernel/crash_dump.c +4 -4
@@ -122,7 +122,7 @@ static ssize_t copy_oldmem_page_zfcpdump(char *buf, size_t csize, {int rc; -if (src <sclp_get_hsa_size ()) { +if (src < sclp.hsa_size) { rc =memcpy_hsa (buf, src, csize, userbuf); }else {if (userbuf)
@@ -215,7 +215,7 @@ static int remap_oldmem_pfn_range_zfcpdump(struct vm_area_struct *vma,unsigned long pfn, unsigned long size, pgprot_t prot) { - unsigned long hsa_end = sclp_get_hsa_size(); + unsigned long hsa_end = sclp.hsa_size;unsigned long size_hsa;if (pfn < hsa_end >>PAGE_SHIFT ) {
@@ -258,7 +258,7 @@ int copy_from_oldmem(void *dest, void *src, size_t count)return rc; } }else { -unsigned long hsa_end =sclp_get_hsa_size (); +unsigned long hsa_end = sclp.hsa_size;if ((unsigned long ) src < hsa_end) { copied =min (count, hsa_end - (unsigned long ) src); rc =memcpy_hsa (dest, (unsigned long ) src, copied,0 );
@@ -609,7 +609,7 @@ int elfcorehdr_alloc(unsigned long long *addr, unsigned long long *size)if (elfcorehdr_addr !=ELFCORE_ADDR_MAX )return 0 ;/* If we cannot get HSA size for zfcpdump return error */ -if (ipl_info.type ==IPL_TYPE_FCP_DUMP && !sclp_get_hsa_size ()) +if (ipl_info.type ==IPL_TYPE_FCP_DUMP && !sclp.hsa_size)return -ENODEV ;/* For kdump, exclude previous crashkernel memory */
arch/s390/kernel/setup.c +14 -9
@@ -128,9 +128,9 @@ __setup("condev=", condev_setup);static void __init set_preferred_console (void ) {if (MACHINE_IS_KVM ) { -if (sclp_has_vt220 ()) +if (sclp.has_vt220)add_preferred_console ("ttyS" ,1 ,NULL ); -else if (sclp_has_linemode ()) +else if (sclp.has_linemode)add_preferred_console ("ttyS" ,0 ,NULL );else add_preferred_console ("hvc" ,0 ,NULL );
@@ -510,8 +510,8 @@ static void reserve_memory_end(void) {#ifdef CONFIG_CRASH_DUMP if (ipl_info.type ==IPL_TYPE_FCP_DUMP && - !OLDMEM_BASE &&sclp_get_hsa_size ()) { - memory_end =sclp_get_hsa_size (); + !OLDMEM_BASE && sclp.hsa_size) { + memory_end = sclp.hsa_size; memory_end &=PAGE_MASK ; memory_end_set =1 ; }
@@ -576,7 +576,7 @@ static void __init reserve_crashkernel(void) crash_base = low; }else {/* Find suitable area in free memory */ - low = max_t(unsigned long, crash_size, sclp_get_hsa_size()); + low = max_t(unsigned long, crash_size, sclp.hsa_size); high = crash_base ? crash_base + crash_size :ULONG_MAX ;if (crash_base && crash_base < low) {
@@ -640,19 +640,24 @@ static void __init check_initrd(void) }/* -* Reserve all kernel text +* Reserve memory used for lowcore/command line/kernel image. */ static void __init reserve_kernel (void ) { -unsigned long start_pfn; - start_pfn =PFN_UP (__pa (&_end)); +unsigned long start_pfn =PFN_UP (__pa (&_end)); +#ifdef CONFIG_DMA_API_DEBUG /* -* Reserve memory used for lowcore/command line/kernel image. +* DMA_API_DEBUG code stumbles over addresses from the +* range [_ehead, _stext]. Mark the memory as reserved +* so it is not used for CONFIG_DMA_API_DEBUG=y. */ +memblock_reserve (0 ,PFN_PHYS (start_pfn)); +#else memblock_reserve (0 , (unsigned long )_ehead);memblock_reserve ((unsigned long )_stext,PFN_PHYS (start_pfn) - (unsigned long )_stext); +#endif }static void __init reserve_elfcorehdr (void )
arch/s390/kernel/smp.c +7 -6
@@ -601,7 +601,7 @@ static void __init smp_store_cpu_states(struct sclp_cpu_info *info)/* No previous system present, normal boot. */ return ;/* Set multi-threading state to the previous system. */ -pcpu_set_smt (sclp_get_mtid_prev ()); +pcpu_set_smt (sclp.mtid_prev);/* Collect CPU states. */ cpu =0 ;for (i =0 ; i < info->configured; i++) {
@@ -740,7 +740,7 @@ static void __init smp_detect_cpus(void)#endif /* Set multi-threading state for the current system */ - mtid =sclp_get_mtid (boot_cpu_type); + mtid = boot_cpu_type ? sclp.mtid : sclp.mtid_cp; mtid = (mtid < smp_max_threads) ? mtid : smp_max_threads -1 ;pcpu_set_smt (mtid);
@@ -880,12 +880,13 @@ void __noreturn cpu_die(void)void __init smp_fill_possible_mask (void ) { -unsigned int possible, sclp, cpu; +unsigned int possible, sclp_max, cpu; - sclp =min (smp_max_threads,sclp_get_mtid_max () +1 ); - sclp =sclp_get_max_cpu ()*sclp ?: nr_cpu_ids; + sclp_max =max (sclp.mtid, sclp.mtid_cp) +1 ; + sclp_max =min (smp_max_threads, sclp_max); + sclp_max = sclp.max_cpu * sclp_max ?: nr_cpu_ids; possible = setup_possible_cpus ?: nr_cpu_ids; - possible =min (possible, sclp); + possible =min (possible, sclp_max);for (cpu =0 ; cpu < possible && cpu < nr_cpu_ids; cpu++)set_cpu_possible (cpu, true); }
arch/s390/kvm/interrupt.c +2 -2
@@ -799,7 +799,7 @@ int kvm_s390_ext_call_pending(struct kvm_vcpu *vcpu)struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;uint8_t sigp_ctrl = vcpu->kvm->arch.sca->cpu[vcpu->vcpu_id].sigp_ctrl; -if (!sclp_has_sigpif ()) +if (!sclp.has_sigpif)return test_bit (IRQ_PEND_EXT_EXTERNAL , &li->pending_irqs); return (sigp_ctrl & SIGP_CTRL_C) &&
@@ -1058,7 +1058,7 @@ static int __inject_extcall(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq) kvm_get_vcpu(vcpu->kvm, src_id) == NULL)return -EINVAL ; -if (sclp_has_sigpif ()) +if (sclp.has_sigpif)return __inject_extcall_sigpif (vcpu, src_id);if (!test_and_set_bit (IRQ_PEND_EXT_EXTERNAL , &li->pending_irqs))
arch/s390/kvm/kvm-s390.c +4 -4
@@ -604,7 +604,7 @@ static int kvm_s390_get_machine(struct kvm *kvm, struct kvm_device_attr *attr) goto out; }get_cpu_id ((struct cpuid *) &mach->cpuid); - mach->ibc =sclp_get_ibc (); + mach->ibc = sclp.ibc;memcpy (&mach->fac_mask, kvm->arch.model.fac->mask,S390_ARCH_FAC_LIST_SIZE_BYTE ); memcpy((unsigned long *)&mach->fac_list, S390_lowcore.stfle_fac_list,
@@ -1068,7 +1068,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) S390_ARCH_FAC_LIST_SIZE_BYTE);kvm_s390_get_cpu_id (&kvm->arch.model.cpu_id); - kvm->arch.model.ibc =sclp_get_ibc () &0x0fff ; + kvm->arch.model.ibc = sclp.ibc &0x0fff ;if (kvm_s390_crypto_init (kvm) <0 ) goto out_err;
@@ -1321,9 +1321,9 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) vcpu->arch.sie_block->ecb2 =8 ; vcpu->arch.sie_block->eca =0xC1002000U ; -if (sclp_has_siif ()) +if (sclp.has_siif) vcpu->arch.sie_block->eca |=1 ; -if (sclp_has_sigpif ()) +if (sclp.has_sigpif) vcpu->arch.sie_block->eca |=0x10000000U ;if (test_kvm_facility (vcpu->kvm,129 )) { vcpu->arch.sie_block->eca |=0x00020000 ;
arch/s390/mm/init.c +1 -1
@@ -213,7 +213,7 @@ unsigned long memory_block_size_bytes(void)* Make sure the memory block size is always greater * or equal than the memory increment size. */ - return max_t(unsigned long, MIN_MEMORY_BLOCK_SIZE, sclp_get_rzm()); + return max_t(unsigned long, MIN_MEMORY_BLOCK_SIZE, sclp.rzm); }#ifdef CONFIG_MEMORY_HOTREMOVE
arch/s390/mm/mem_detect.c +2 -2
@@ -31,8 +31,8 @@ void __init detect_memory_memblock(void)unsigned long addr, size;int type; - rzm =sclp_get_rzm (); - rnmax =sclp_get_rnmax (); + rzm = sclp.rzm; + rnmax = sclp.rnmax; memsize = rzm * rnmax;if (!rzm) rzm =1ULL <<17 ;
arch/s390/pci/pci_event.c +7 -1
@@ -75,7 +75,13 @@ static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf)zpci_err_hex (ccdf,sizeof (*ccdf));switch (ccdf->pec) { -case 0x0301 :/* Standby -> Configured */ +case 0x0301 :/* Reserved|Standby -> Configured */ +if (!zdev) { + ret =clp_add_pci_device (ccdf->fid, ccdf->fh,0 ); +if (ret) +break ; + zdev =get_zdev_by_fid (ccdf->fid); + }if (!zdev || zdev->state !=ZPCI_FN_STATE_STANDBY )break ; zdev->state =ZPCI_FN_STATE_CONFIGURED ;
drivers/s390/block/dasd.c +17 -0
@@ -38,6 +38,8 @@*/ #define DASD_CHANQ_MAX_SIZE 4 +#define DASD_DIAG_MOD "dasd_diag_mod" +/* * SECTION: exported variables of dasd.c */
@@ -3300,6 +3302,21 @@ int dasd_generic_set_online(struct ccw_device *cdev, discipline = base_discipline;if (device->features &DASD_FEATURE_USEDIAG ) {if (!dasd_diag_discipline_pointer) { +/* Try to load the required module. */ + rc =request_module (DASD_DIAG_MOD ); +if (rc) { +pr_warn ("%s Setting the DASD online failed " +"because the required module %s " +"could not be loaded (rc=%d)\n" , +dev_name (&cdev->dev),DASD_DIAG_MOD , + rc); +dasd_delete_device (device); +return -ENODEV ; + } + } +/* Module init could have failed, so check again here after +* request_module(). */ +if (!dasd_diag_discipline_pointer) {pr_warn ("%s Setting the DASD online failed because of missing DIAG discipline\n" ,dev_name (&cdev->dev));dasd_delete_device (device);
drivers/s390/char/keyboard.c +8 -5
@@ -433,20 +433,23 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs,case KDSKBSENT :if (!perm)return -EPERM ; - len =strnlen_user (u_kbs->kb_string, -sizeof (u_kbs->kb_string) -1 ); + len =strnlen_user (u_kbs->kb_string,sizeof (u_kbs->kb_string));if (!len)return -EFAULT ; -if (len >sizeof (u_kbs->kb_string) -1 ) +if (len >sizeof (u_kbs->kb_string))return -EINVAL ; - p =kmalloc (len +1 ,GFP_KERNEL ); + p =kmalloc (len,GFP_KERNEL );if (!p)return -ENOMEM ;if (copy_from_user (p, u_kbs->kb_string, len)) {kfree (p);return -EFAULT ; } - p[len] =0 ; +/* +* Make sure the string is terminated by 0. User could have +* modified it between us running strnlen_user() and copying it. +*/ + p[len -1 ] =0 ;kfree (kbd->func_table[kb_func]); kbd->func_table[kb_func] = p;break ;
drivers/s390/char/sclp.c +1 -1
@@ -665,7 +665,7 @@ sclp_state_change_cb(struct evbuf_header *evbuf) sclp_send_mask = scbuf->sclp_send_mask;spin_unlock_irqrestore (&sclp_lock, flags);if (scbuf->validity_sclp_active_facility_mask) - sclp_facilities = scbuf->sclp_active_facility_mask; + sclp.facilities = scbuf->sclp_active_facility_mask;sclp_dispatch_state_change (); }
drivers/s390/char/sclp.h +5 -10
@@ -100,13 +100,11 @@ struct init_sccb {sccb_mask_t sclp_send_mask; } __attribute__((packed)); -extern u64 sclp_facilities; - -#define SCLP_HAS_CHP_INFO (sclp_facilities & 0x8000000000000000ULL) -#define SCLP_HAS_CHP_RECONFIG (sclp_facilities & 0x2000000000000000ULL) -#define SCLP_HAS_CPU_INFO (sclp_facilities & 0x0800000000000000ULL) -#define SCLP_HAS_CPU_RECONFIG (sclp_facilities & 0x0400000000000000ULL) -#define SCLP_HAS_PCI_RECONFIG (sclp_facilities & 0x0000000040000000ULL) +#define SCLP_HAS_CHP_INFO (sclp.facilities & 0x8000000000000000ULL) +#define SCLP_HAS_CHP_RECONFIG (sclp.facilities & 0x2000000000000000ULL) +#define SCLP_HAS_CPU_INFO (sclp.facilities & 0x0800000000000000ULL) +#define SCLP_HAS_CPU_RECONFIG (sclp.facilities & 0x0400000000000000ULL) +#define SCLP_HAS_PCI_RECONFIG (sclp.facilities & 0x0000000040000000ULL)struct gds_subvector {
@@ -191,9 +189,6 @@ void sclp_sdias_exit(void);extern int sclp_console_pages;extern int sclp_console_drop;extern unsigned long sclp_console_full; -extern u8 sclp_fac84; -extern unsigned long long sclp_rzm; -extern unsigned long long sclp_rnmax;/* useful inlines */
drivers/s390/char/sclp_cmd.c +12 -17
@@ -101,7 +101,7 @@ static void sclp_fill_cpu_info(struct sclp_cpu_info *info, info->configured = sccb->nr_configured; info->standby = sccb->nr_standby; info->combined = sccb->nr_configured + sccb->nr_standby; - info->has_cpu_type = sclp_fac84 &0x1 ; + info->has_cpu_type = sclp.has_cpu_type;memcpy (&info->cpu, page + sccb->offset_configured, info->combined *sizeof (struct sclp_cpu_entry )); }
@@ -186,7 +186,7 @@ int sclp_cpu_deconfigure(u8 cpu)static DEFINE_MUTEX (sclp_mem_mutex);static LIST_HEAD (sclp_mem_list);static u8 sclp_max_storage_id; -static unsigned long sclp_storage_ids[256 /BITS_PER_LONG ]; +static DECLARE_BITMAP(sclp_storage_ids, 256);static int sclp_mem_state_changed;struct memory_increment {
@@ -202,14 +202,14 @@ struct assign_storage_sccb {int arch_get_memory_phys_device (unsigned long start_pfn) { -if (!sclp_rzm) +if (!sclp.rzm)return 0 ; -return PFN_PHYS (start_pfn) >>ilog2 (sclp_rzm); +return PFN_PHYS (start_pfn) >>ilog2 (sclp.rzm); }static unsigned long long rn2addr (u16 rn) { -return (unsigned long long ) (rn -1 ) * sclp_rzm; +return (unsigned long long ) (rn -1 ) * sclp.rzm; }static int do_assign_storage (sclp_cmdw_t cmd,u16 rn)
@@ -250,7 +250,7 @@ static int sclp_assign_storage(u16 rn)if (rc)return rc; start =rn2addr (rn); -storage_key_init_range (start, start + sclp_rzm); +storage_key_init_range (start, start + sclp.rzm);return 0 ; }
@@ -309,7 +309,7 @@ static int sclp_mem_change_state(unsigned long start, unsigned long size, istart =rn2addr (incr->rn);if (start + size -1 < istart)break ; -if (start > istart + sclp_rzm -1 ) +if (start > istart + sclp.rzm -1 )continue ;if (online) rc |=sclp_assign_storage (incr->rn);
@@ -330,7 +330,7 @@ static bool contains_standby_increment(unsigned long start, unsigned long end) istart =rn2addr (incr->rn);if (end -1 < istart)continue ; -if (start > istart + sclp_rzm -1 ) +if (start > istart + sclp.rzm -1 )continue ;if (incr->standby)return true;
@@ -415,7 +415,7 @@ static void __init add_memory_merged(u16 rn)if (!first_rn) goto skip_add; start =rn2addr (first_rn); - size = (unsigned long long ) num * sclp_rzm; + size = (unsigned long long ) num * sclp.rzm;if (start >=VMEM_MAX_PHYS ) goto skip_add;if (start + size >VMEM_MAX_PHYS )
@@ -465,7 +465,7 @@ static void __init insert_increment(u16 rn, int standby, int assigned) }if (!assigned) new_incr->rn = last_rn +1 ; -if (new_incr->rn > sclp_rnmax) { +if (new_incr->rn > sclp.rnmax) {kfree (new_incr);return ; }
@@ -508,7 +508,7 @@ static int __init sclp_detect_standby_memory(void)if (OLDMEM_BASE )/* No standby memory in kdump mode */ return 0 ; -if ((sclp_facilities &0xe00000000000ULL ) !=0xe00000000000ULL ) +if ((sclp.facilities &0xe00000000000ULL ) !=0xe00000000000ULL )return 0 ; rc = -ENOMEM ; sccb = (void *)__get_free_page (GFP_KERNEL |GFP_DMA );
@@ -550,7 +550,7 @@ static int __init sclp_detect_standby_memory(void) }if (rc ||list_empty (&sclp_mem_list)) goto out; -for (i =1 ; i <= sclp_rnmax - assigned; i++) +for (i =1 ; i <= sclp.rnmax - assigned; i++)insert_increment (0 ,1 ,0 ); rc =register_memory_notifier (&sclp_mem_nb);if (rc)
@@ -753,8 +753,3 @@ out:free_page ((unsigned long ) sccb);return rc; } - -bool sclp_has_sprp (void ) -{ -return !!(sclp_fac84 &0x2 ); -}
drivers/s390/char/sclp_early.c +21 -97
170 lines not on this page · raw message
drivers/s390/char/sclp_sdias.c +1 -2
@@ -21,7 +21,6 @@ #define TRACE(x...) debug_sprintf_event(sdias_dbf, 1, x)#define SDIAS_RETRIES 300 -#define SDIAS_SLEEP_TICKS 50static struct debug_info *sdias_dbf;
@@ -68,7 +67,7 @@ static int sdias_sclp_send(struct sclp_req *req)/* not initiated, wait some time and retry */ set_current_state (TASK_INTERRUPTIBLE );TRACE ("add request failed: rc = %i\n" ,rc); -schedule_timeout (SDIAS_SLEEP_TICKS ); +schedule_timeout (msecs_to_jiffies (500 ));continue ; }/* initiated, wait for completion of service call */
drivers/s390/char/zcore.c +5 -5
@@ -330,9 +330,9 @@ static ssize_t zcore_read(struct file *file, char __user *buf, size_t count, mem_offs =0 ;/* Copy from HSA data */ -if (*ppos <sclp_get_hsa_size () +HEADER_SIZE ) { +if (*ppos < sclp.hsa_size +HEADER_SIZE ) { size =min ((count - hdr_count), - (size_t ) (sclp_get_hsa_size () - mem_start)); + (size_t ) (sclp.hsa_size - mem_start)); rc =memcpy_hsa_user (buf + hdr_count, mem_start, size);if (rc) goto fail;
@@ -483,7 +483,7 @@ static ssize_t zcore_hsa_read(struct file *filp, char __user *buf,static char str[18 ];if (hsa_available) -snprintf (str,sizeof (str),"%lx\n" ,sclp_get_hsa_size ()); +snprintf (str,sizeof (str),"%lx\n" , sclp.hsa_size);else snprintf (str,sizeof (str),"0\n" );return simple_read_from_buffer (buf, count, ppos, str,strlen (str));
@@ -558,7 +558,7 @@ static int __init sys_info_init(enum arch_id arch, unsigned long mem_end)static int __init check_sdias (void ) { -if (!sclp_get_hsa_size ()) { +if (!sclp.hsa_size) {TRACE ("Could not determine HSA size\n" );return -ENODEV ; }
@@ -619,7 +619,7 @@ static int __init zcore_reipl_init(void) ipl_block = (void *)__get_free_page (GFP_KERNEL );if (!ipl_block)return -ENOMEM ; -if (ipib_info.ipib <sclp_get_hsa_size ()) +if (ipib_info.ipib < sclp.hsa_size) rc =memcpy_hsa_kernel (ipl_block, ipib_info.ipib,PAGE_SIZE );else rc =memcpy_real (ipl_block, (void *) ipib_info.ipib,PAGE_SIZE );
drivers/s390/crypto/zcrypt_pcicc.c +4 -4
@@ -98,11 +98,11 @@ static struct ap_driver zcrypt_pcicc_driver = {* - VUD block */ static struct CPRB static_cprb = { - .cprb_len =__constant_cpu_to_le16 (0x0070 ), + .cprb_len =cpu_to_le16 (0x0070 ), .cprb_ver_id =0x41 , .func_id = {0x54 ,0x32 }, .checkpoint_flag=0x01 , - .svr_namel =__constant_cpu_to_le16 (0x0008 ), + .svr_namel =cpu_to_le16 (0x0008 ), .svr_name = {'I' ,'C' ,'S' ,'F' ,' ' ,' ' ,' ' ,' ' } };
@@ -164,7 +164,7 @@ static int ICAMEX_msg_to_type6MEX_msg(struct zcrypt_device *zdev, };static struct function_and_rules_block static_pke_function_and_rules ={ .function_code = {'P' ,'K' }, - .ulen =__constant_cpu_to_le16 (10 ), + .ulen =cpu_to_le16 (10 ), .only_rule = {'P' ,'K' ,'C' ,'S' ,'-' ,'1' ,'.' ,'2' } };struct {
@@ -251,7 +251,7 @@ static int ICACRT_msg_to_type6CRT_msg(struct zcrypt_device *zdev, };static struct function_and_rules_block static_pkd_function_and_rules ={ .function_code = {'P' ,'D' }, - .ulen =__constant_cpu_to_le16 (10 ), + .ulen =cpu_to_le16 (10 ), .only_rule = {'P' ,'K' ,'C' ,'S' ,'-' ,'1' ,'.' ,'2' } };struct {
drivers/s390/kvm/kvm_virtio.c +2 -2
@@ -450,7 +450,7 @@ static int __init test_devices_support(unsigned long addr)static int __init kvm_devices_init (void ) {int rc; -unsigned long total_memory_size =sclp_get_rzm () *sclp_get_rnmax (); +unsigned long total_memory_size = sclp.rzm * sclp.rnmax;if (!MACHINE_IS_KVM )return -ENODEV ;
@@ -497,7 +497,7 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)static int __init s390_virtio_console_init (void ) { -if (sclp_has_vt220 () ||sclp_has_linemode ()) +if (sclp.has_vt220 || sclp.has_linemode)return -ENODEV ;return virtio_cons_early_init (early_put_chars); }