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

3 files changed, 11 insertions, 32 deletions

diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index cfce255521ac..7b7620de2acd 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -205,17 +205,22 @@ static inline int get_buf_states(struct qdio_q *q, unsigned int bufnr,
                                  int auto_ack, int merge_pending)
 {
         unsigned char __state = 0;
-        int i;
+        int i = 1;
 
         if (is_qebsm(q))
                 return qdio_do_eqbs(q, state, bufnr, count, auto_ack);
 
         /* get initial state: */
         __state = q->slsb.val[bufnr];
+
+        /* Bail out early if there is no work on the queue: */
+        if (__state & SLSB_OWNER_CU)
+                goto out;
+
         if (merge_pending && __state == SLSB_P_OUTPUT_PENDING)
                 __state = SLSB_P_OUTPUT_EMPTY;
 
-        for (i = 1; i < count; i++) {
+        for (; i < count; i++) {
                 bufnr = next_buf(bufnr);
 
                 /* merge PENDING into EMPTY: */
@@ -228,6 +233,8 @@ static inline int get_buf_states(struct qdio_q *q, unsigned int bufnr,
                 if (q->slsb.val[bufnr] != __state)
                         break;
         }
+
+out:
         *state = __state;
         return i;
 }
@@ -382,7 +389,7 @@ int debug_get_buf_state(struct qdio_q *q, unsigned int bufnr,
 {
         if (need_siga_sync(q))
                 qdio_siga_sync_q(q);
-        return get_buf_states(q, bufnr, state, 1, 0, 0);
+        return get_buf_state(q, bufnr, state, 0);
 }
 
 static inline void qdio_stop_polling(struct qdio_q *q)
@@ -719,11 +726,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q, unsigned int start)
                     multicast_outbound(q)))
                         qdio_siga_sync_q(q);
 
-        /*
-         * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
-         * would return 0.
-         */
-        count = min(atomic_read(&q->nr_buf_used), QDIO_MAX_BUFFERS_MASK);
+        count = atomic_read(&q->nr_buf_used);
         if (!count)
                 return 0;
 
diff --git a/drivers/s390/cio/trace.c b/drivers/s390/cio/trace.c
index e331cd97e83b..882ee538ca30 100644
--- a/drivers/s390/cio/trace.c
+++ b/drivers/s390/cio/trace.c
@@ -21,5 +21,4 @@ EXPORT_TRACEPOINT_SYMBOL(s390_cio_csch);
 EXPORT_TRACEPOINT_SYMBOL(s390_cio_hsch);
 EXPORT_TRACEPOINT_SYMBOL(s390_cio_xsch);
 EXPORT_TRACEPOINT_SYMBOL(s390_cio_rsch);
-EXPORT_TRACEPOINT_SYMBOL(s390_cio_rchp);
 EXPORT_TRACEPOINT_SYMBOL(s390_cio_chsc);
diff --git a/drivers/s390/cio/trace.h b/drivers/s390/cio/trace.h
index 0ebb29b6fd6d..4803139bce14 100644
--- a/drivers/s390/cio/trace.h
+++ b/drivers/s390/cio/trace.h
@@ -274,29 +274,6 @@ DEFINE_EVENT(s390_class_schid, s390_cio_rsch,
         TP_ARGS(schid, cc)
 );
 
-/**
- * s390_cio_rchp - Reset Channel Path (RCHP) instruction was performed
- * @chpid: Channel-Path Identifier
- * @cc: Condition code
- */
-TRACE_EVENT(s390_cio_rchp,
-        TP_PROTO(struct chp_id chpid, int cc),
-        TP_ARGS(chpid, cc),
-        TP_STRUCT__entry(
-                __field(u8, cssid)
-                __field(u8, id)
-                __field(int, cc)
-        ),
-        TP_fast_assign(
-                __entry->cssid = chpid.cssid;
-                __entry->id = chpid.id;
-                __entry->cc = cc;
-        ),
-        TP_printk("chpid=%x.%02x cc=%d", __entry->cssid, __entry->id,
-                  __entry->cc
-        )
-);
-
 #define CHSC_MAX_REQUEST_LEN            64
 #define CHSC_MAX_RESPONSE_LEN           64