Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 's390-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Martin Schwidefsky:
- Enhancements for the QDIO layer
- Remove the RCP trace event
- Avoid three build issues
- Move the defconfig to the configs directory
* tag 's390-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: move arch/s390/defconfig to arch/s390/configs/defconfig
s390/qdio: optimize state inspection of HW-owned SBALs
s390/qdio: use get_buf_state() in debug_get_buf_state()
s390/qdio: allow to scan all Output SBALs in one go
s390/cio: Remove tracing for rchp instruction
s390/kasan: adapt disabled_wait usage to avoid build error
latent_entropy: avoid build error when plugin cflags are not set
s390/boot: fix compiler error due to missing awk strtonum
+17
-35
+2
arch/s390/Makefile
+2
arch/s390/Makefile
-1
arch/s390/boot/Makefile
-1
arch/s390/boot/Makefile
···
58
58
touch $@
59
59
endef
60
60
61
-
OBJCOPYFLAGS_bzImage := --pad-to $$(readelf -s $(obj)/compressed/vmlinux | awk '/\<_end\>/ {print or(strtonum("0x"$$2),4095)+1}')
62
61
$(obj)/bzImage: $(obj)/compressed/vmlinux $(obj)/section_cmp.boot.data $(obj)/section_cmp.boot.preserved.data FORCE
63
62
$(call if_changed,objcopy)
64
63
+2
arch/s390/boot/compressed/vmlinux.lds.S
+2
arch/s390/boot/compressed/vmlinux.lds.S
arch/s390/defconfig
arch/s390/configs/defconfig
arch/s390/defconfig
arch/s390/configs/defconfig
+1
-1
arch/s390/mm/kasan_init.c
+1
-1
arch/s390/mm/kasan_init.c
+11
-8
drivers/s390/cio/qdio_main.c
+11
-8
drivers/s390/cio/qdio_main.c
···
205
205
int auto_ack, int merge_pending)
206
206
{
207
207
unsigned char __state = 0;
208
-
int i;
208
+
int i = 1;
209
209
210
210
if (is_qebsm(q))
211
211
return qdio_do_eqbs(q, state, bufnr, count, auto_ack);
212
212
213
213
/* get initial state: */
214
214
__state = q->slsb.val[bufnr];
215
+
216
+
/* Bail out early if there is no work on the queue: */
217
+
if (__state & SLSB_OWNER_CU)
218
+
goto out;
219
+
215
220
if (merge_pending && __state == SLSB_P_OUTPUT_PENDING)
216
221
__state = SLSB_P_OUTPUT_EMPTY;
217
222
218
-
for (i = 1; i < count; i++) {
223
+
for (; i < count; i++) {
219
224
bufnr = next_buf(bufnr);
220
225
221
226
/* merge PENDING into EMPTY: */
···
233
228
if (q->slsb.val[bufnr] != __state)
234
229
break;
235
230
}
231
+
232
+
out:
236
233
*state = __state;
237
234
return i;
238
235
}
···
389
382
{
390
383
if (need_siga_sync(q))
391
384
qdio_siga_sync_q(q);
392
-
return get_buf_states(q, bufnr, state, 1, 0, 0);
385
+
return get_buf_state(q, bufnr, state, 0);
393
386
}
394
387
395
388
static inline void qdio_stop_polling(struct qdio_q *q)
···
726
719
multicast_outbound(q)))
727
720
qdio_siga_sync_q(q);
728
721
729
-
/*
730
-
* Don't check 128 buffers, as otherwise qdio_inbound_q_moved
731
-
* would return 0.
732
-
*/
733
-
count = min(atomic_read(&q->nr_buf_used), QDIO_MAX_BUFFERS_MASK);
722
+
count = atomic_read(&q->nr_buf_used);
734
723
if (!count)
735
724
return 0;
736
725
-1
drivers/s390/cio/trace.c
-1
drivers/s390/cio/trace.c
-23
drivers/s390/cio/trace.h
-23
drivers/s390/cio/trace.h
···
274
274
TP_ARGS(schid, cc)
275
275
);
276
276
277
-
/**
278
-
* s390_cio_rchp - Reset Channel Path (RCHP) instruction was performed
279
-
* @chpid: Channel-Path Identifier
280
-
* @cc: Condition code
281
-
*/
282
-
TRACE_EVENT(s390_cio_rchp,
283
-
TP_PROTO(struct chp_id chpid, int cc),
284
-
TP_ARGS(chpid, cc),
285
-
TP_STRUCT__entry(
286
-
__field(u8, cssid)
287
-
__field(u8, id)
288
-
__field(int, cc)
289
-
),
290
-
TP_fast_assign(
291
-
__entry->cssid = chpid.cssid;
292
-
__entry->id = chpid.id;
293
-
__entry->cc = cc;
294
-
),
295
-
TP_printk("chpid=%x.%02x cc=%d", __entry->cssid, __entry->id,
296
-
__entry->cc
297
-
)
298
-
);
299
-
300
277
#define CHSC_MAX_REQUEST_LEN 64
301
278
#define CHSC_MAX_RESPONSE_LEN 64
302
279
+1
-1
include/linux/random.h
+1
-1
include/linux/random.h
···
20
20
21
21
extern void add_device_randomness(const void *, unsigned int);
22
22
23
-
#if defined(CONFIG_GCC_PLUGIN_LATENT_ENTROPY) && !defined(__CHECKER__)
23
+
#if defined(LATENT_ENTROPY_PLUGIN) && !defined(__CHECKER__)
24
24
static inline void add_latent_entropy(void)
25
25
{
26
26
add_device_randomness((const void *)&latent_entropy,