Skip to content

Commit 591dd4c

Browse files
torvaldstorvalds
committed
Merge tag 's390-5.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik: - Remove ieee_emulation_warnings sysctl which is a dead code. - Avoid triggering rebuild of the kernel during make install. - Enable protected virtualization guest support in default configs. - Fix cio_ignore seq_file .next function to increase position index. And use kobj_to_dev instead of container_of in cio code. - Fix storage block address lists to contain absolute addresses in qdio code. - Few clang warnings and spelling fixes. * tag 's390-5.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/qdio: fill SBALEs with absolute addresses s390/qdio: fill SL with absolute addresses s390: remove obsolete ieee_emulation_warnings s390: make 'install' not depend on vmlinux s390/kaslr: Fix casts in get_random s390/mm: Explicitly compare PAGE_DEFAULT_KEY against zero in storage_key_init_range s390/pkey/zcrypt: spelling s/crytp/crypt/ s390/cio: use kobj_to_dev() API s390/defconfig: enable CONFIG_PROTECTED_VIRTUALIZATION_GUEST s390/cio: cio_ignore_proc_seq_next should increase position index
2 parents 54dedb5 + 2db01da commit 591dd4c

File tree

17 files changed

+64
-75
lines changed

17 files changed

+64
-75
lines changed

‎arch/s390/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ all: bzImage
146146
#KBUILD_IMAGE is necessary for packaging targets like rpm-pkg, deb-pkg...
147147
KBUILD_IMAGE := $(boot)/bzImage
148148

149-
install: vmlinux
149+
install:
150150
$(Q)$(MAKE) $(build)=$(boot) $@
151151

152152
bzImage: vmlinux

‎arch/s390/boot/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE
7070
$(obj)/startup.a: $(OBJECTS) FORCE
7171
$(call if_changed,ar)
7272

73-
install: $(CONFIGURE) $(obj)/bzImage
73+
install:
7474
sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
7575
System.map "$(INSTALL_PATH)"
7676

‎arch/s390/boot/kaslr.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static unsigned long get_random(unsigned long limit)
7575
*(unsigned long *) prng.parm_block ^= seed;
7676
for (i = 0; i < 16; i++) {
7777
cpacf_kmc(CPACF_KMC_PRNG, prng.parm_block,
78-
(char *) entropy, (char *) entropy,
78+
(u8 *) entropy, (u8 *) entropy,
7979
sizeof(entropy));
8080
memcpy(prng.parm_block, entropy, sizeof(entropy));
8181
}

‎arch/s390/configs/debug_defconfig‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ CONFIG_VFIO_AP=m
5353
CONFIG_CRASH_DUMP=y
5454
CONFIG_HIBERNATION=y
5555
CONFIG_PM_DEBUG=y
56+
CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y
5657
CONFIG_CMM=m
5758
CONFIG_APPLDATA_BASE=y
5859
CONFIG_KVM=m
@@ -474,7 +475,6 @@ CONFIG_NLMON=m
474475
# CONFIG_NET_VENDOR_EMULEX is not set
475476
# CONFIG_NET_VENDOR_EZCHIP is not set
476477
# CONFIG_NET_VENDOR_GOOGLE is not set
477-
# CONFIG_NET_VENDOR_HP is not set
478478
# CONFIG_NET_VENDOR_HUAWEI is not set
479479
# CONFIG_NET_VENDOR_INTEL is not set
480480
# CONFIG_NET_VENDOR_MARVELL is not set
@@ -684,7 +684,6 @@ CONFIG_CRYPTO_ADIANTUM=m
684684
CONFIG_CRYPTO_XCBC=m
685685
CONFIG_CRYPTO_VMAC=m
686686
CONFIG_CRYPTO_CRC32=m
687-
CONFIG_CRYPTO_XXHASH=m
688687
CONFIG_CRYPTO_MICHAEL_MIC=m
689688
CONFIG_CRYPTO_RMD128=m
690689
CONFIG_CRYPTO_RMD160=m
@@ -748,7 +747,6 @@ CONFIG_DEBUG_INFO_DWARF4=y
748747
CONFIG_GDB_SCRIPTS=y
749748
CONFIG_FRAME_WARN=1024
750749
CONFIG_HEADERS_INSTALL=y
751-
CONFIG_HEADERS_CHECK=y
752750
CONFIG_DEBUG_SECTION_MISMATCH=y
753751
CONFIG_MAGIC_SYSRQ=y
754752
CONFIG_DEBUG_PAGEALLOC=y
@@ -772,9 +770,9 @@ CONFIG_DEBUG_MEMORY_INIT=y
772770
CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
773771
CONFIG_DEBUG_PER_CPU_MAPS=y
774772
CONFIG_DEBUG_SHIRQ=y
773+
CONFIG_PANIC_ON_OOPS=y
775774
CONFIG_DETECT_HUNG_TASK=y
776775
CONFIG_WQ_WATCHDOG=y
777-
CONFIG_PANIC_ON_OOPS=y
778776
CONFIG_DEBUG_TIMEKEEPING=y
779777
CONFIG_PROVE_LOCKING=y
780778
CONFIG_LOCK_STAT=y
@@ -783,9 +781,20 @@ CONFIG_DEBUG_ATOMIC_SLEEP=y
783781
CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
784782
CONFIG_DEBUG_SG=y
785783
CONFIG_DEBUG_NOTIFIERS=y
784+
CONFIG_BUG_ON_DATA_CORRUPTION=y
786785
CONFIG_DEBUG_CREDENTIALS=y
787786
CONFIG_RCU_TORTURE_TEST=m
788787
CONFIG_RCU_CPU_STALL_TIMEOUT=300
788+
CONFIG_LATENCYTOP=y
789+
CONFIG_FUNCTION_PROFILER=y
790+
CONFIG_STACK_TRACER=y
791+
CONFIG_IRQSOFF_TRACER=y
792+
CONFIG_PREEMPT_TRACER=y
793+
CONFIG_SCHED_TRACER=y
794+
CONFIG_FTRACE_SYSCALLS=y
795+
CONFIG_BLK_DEV_IO_TRACE=y
796+
CONFIG_HIST_TRIGGERS=y
797+
CONFIG_S390_PTDUMP=y
789798
CONFIG_NOTIFIER_ERROR_INJECTION=m
790799
CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
791800
CONFIG_FAULT_INJECTION=y
@@ -796,15 +805,6 @@ CONFIG_FAIL_IO_TIMEOUT=y
796805
CONFIG_FAIL_FUTEX=y
797806
CONFIG_FAULT_INJECTION_DEBUG_FS=y
798807
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
799-
CONFIG_LATENCYTOP=y
800-
CONFIG_IRQSOFF_TRACER=y
801-
CONFIG_PREEMPT_TRACER=y
802-
CONFIG_SCHED_TRACER=y
803-
CONFIG_FTRACE_SYSCALLS=y
804-
CONFIG_STACK_TRACER=y
805-
CONFIG_BLK_DEV_IO_TRACE=y
806-
CONFIG_FUNCTION_PROFILER=y
807-
CONFIG_HIST_TRIGGERS=y
808808
CONFIG_LKDTM=m
809809
CONFIG_TEST_LIST_SORT=y
810810
CONFIG_TEST_SORT=y
@@ -814,5 +814,3 @@ CONFIG_INTERVAL_TREE_TEST=m
814814
CONFIG_PERCPU_TEST=m
815815
CONFIG_ATOMIC64_SELFTEST=y
816816
CONFIG_TEST_BPF=m
817-
CONFIG_BUG_ON_DATA_CORRUPTION=y
818-
CONFIG_S390_PTDUMP=y

‎arch/s390/configs/defconfig‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ CONFIG_VFIO_AP=m
5353
CONFIG_CRASH_DUMP=y
5454
CONFIG_HIBERNATION=y
5555
CONFIG_PM_DEBUG=y
56+
CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y
5657
CONFIG_CMM=m
5758
CONFIG_APPLDATA_BASE=y
5859
CONFIG_KVM=m
@@ -470,7 +471,6 @@ CONFIG_NLMON=m
470471
# CONFIG_NET_VENDOR_EMULEX is not set
471472
# CONFIG_NET_VENDOR_EZCHIP is not set
472473
# CONFIG_NET_VENDOR_GOOGLE is not set
473-
# CONFIG_NET_VENDOR_HP is not set
474474
# CONFIG_NET_VENDOR_HUAWEI is not set
475475
# CONFIG_NET_VENDOR_INTEL is not set
476476
# CONFIG_NET_VENDOR_MARVELL is not set
@@ -677,7 +677,6 @@ CONFIG_CRYPTO_ADIANTUM=m
677677
CONFIG_CRYPTO_XCBC=m
678678
CONFIG_CRYPTO_VMAC=m
679679
CONFIG_CRYPTO_CRC32=m
680-
CONFIG_CRYPTO_XXHASH=m
681680
CONFIG_CRYPTO_MICHAEL_MIC=m
682681
CONFIG_CRYPTO_RMD128=m
683682
CONFIG_CRYPTO_RMD160=m
@@ -739,18 +738,18 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
739738
CONFIG_MAGIC_SYSRQ=y
740739
CONFIG_DEBUG_MEMORY_INIT=y
741740
CONFIG_PANIC_ON_OOPS=y
741+
CONFIG_BUG_ON_DATA_CORRUPTION=y
742742
CONFIG_RCU_TORTURE_TEST=m
743743
CONFIG_RCU_CPU_STALL_TIMEOUT=60
744744
CONFIG_LATENCYTOP=y
745+
CONFIG_FUNCTION_PROFILER=y
746+
CONFIG_STACK_TRACER=y
745747
CONFIG_SCHED_TRACER=y
746748
CONFIG_FTRACE_SYSCALLS=y
747-
CONFIG_STACK_TRACER=y
748749
CONFIG_BLK_DEV_IO_TRACE=y
749-
CONFIG_FUNCTION_PROFILER=y
750750
CONFIG_HIST_TRIGGERS=y
751+
CONFIG_S390_PTDUMP=y
751752
CONFIG_LKDTM=m
752753
CONFIG_PERCPU_TEST=m
753754
CONFIG_ATOMIC64_SELFTEST=y
754755
CONFIG_TEST_BPF=m
755-
CONFIG_BUG_ON_DATA_CORRUPTION=y
756-
CONFIG_S390_PTDUMP=y

‎arch/s390/include/asm/page.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void __storage_key_init_range(unsigned long start, unsigned long end);
4242

4343
static inline void storage_key_init_range(unsigned long start, unsigned long end)
4444
{
45-
if (PAGE_DEFAULT_KEY)
45+
if (PAGE_DEFAULT_KEY != 0)
4646
__storage_key_init_range(start, end);
4747
}
4848

‎arch/s390/include/asm/processor.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ void s390_update_cpu_mhz(void);
8484
void cpu_detect_mhz_feature(void);
8585

8686
extern const struct seq_operations cpuinfo_op;
87-
extern int sysctl_ieee_emulation_warnings;
8887
extern void execve_tail(void);
8988
extern void __bpon(void);
9089

‎arch/s390/include/asm/qdio.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ struct slib {
201201
* @scount: SBAL count
202202
* @sflags: whole SBAL flags
203203
* @length: length
204-
* @addr: address
204+
* @addr: absolute data address
205205
*/
206206
struct qdio_buffer_element {
207207
u8 eflags;
@@ -211,7 +211,7 @@ struct qdio_buffer_element {
211211
u8 scount;
212212
u8 sflags;
213213
u32 length;
214-
void *addr;
214+
u64 addr;
215215
} __attribute__ ((packed, aligned(16)));
216216

217217
/**
@@ -227,7 +227,7 @@ struct qdio_buffer {
227227
* @sbal: absolute SBAL address
228228
*/
229229
struct sl_element {
230-
unsigned long sbal;
230+
u64 sbal;
231231
} __attribute__ ((packed));
232232

233233
/**

‎drivers/s390/cio/blacklist.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,10 @@ static void *
303303
cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset)
304304
{
305305
struct ccwdev_iter *iter;
306+
loff_t p = *offset;
306307

307-
if (*offset >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1))
308+
(*offset)++;
309+
if (p >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1))
308310
return NULL;
309311
iter = it;
310312
if (iter->devno == __MAX_SUBCHANNEL) {
@@ -314,7 +316,6 @@ cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset)
314316
return NULL;
315317
} else
316318
iter->devno++;
317-
(*offset)++;
318319
return iter;
319320
}
320321

‎drivers/s390/cio/chp.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static ssize_t chp_measurement_chars_read(struct file *filp,
135135
struct channel_path *chp;
136136
struct device *device;
137137

138-
device = container_of(kobj, struct device, kobj);
138+
device = kobj_to_dev(kobj);
139139
chp = to_channelpath(device);
140140
if (chp->cmg == -1)
141141
return 0;
@@ -184,7 +184,7 @@ static ssize_t chp_measurement_read(struct file *filp, struct kobject *kobj,
184184
struct device *device;
185185
unsigned int size;
186186

187-
device = container_of(kobj, struct device, kobj);
187+
device = kobj_to_dev(kobj);
188188
chp = to_channelpath(device);
189189
css = to_css(chp->dev.parent);
190190

0 commit comments

Comments
 (0)