[S390] cleanup psw related bits and pieces

Split out addressing mode bits from PSW_BASE_BITS, rename PSW_BASE_BITS
to PSW_MASK_BASE, get rid of psw_user32_bits, remove unused function
enabled_wait(), introduce PSW_MASK_USER, and drop PSW_MASK_MERGE macros.
Change psw_kernel_bits / psw_user_bits to contain only the bits that
are always set in the respective mode.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 837e010299a8..0b54a91f8dcd 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -61,8 +61,8 @@ static int __init sclp_cmd_sync_early(sclp_cmdw_t cmd, void *sccb)
         rc = sclp_service_call(cmd, sccb);
         if (rc)
                 goto out;
-        __load_psw_mask(PSW_BASE_BITS | PSW_MASK_EXT |
-                        PSW_MASK_WAIT | PSW_DEFAULT_KEY);
+        __load_psw_mask(PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA |
+                        PSW_MASK_BA | PSW_MASK_EXT | PSW_MASK_WAIT);
         local_irq_disable();
 out:
         /* Contents of the sccb might have changed. */
diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c
index a90a02c28d6a..87fc0ac11e67 100644
--- a/drivers/s390/char/sclp_quiesce.c
+++ b/drivers/s390/char/sclp_quiesce.c
@@ -30,7 +30,8 @@ static void do_machine_quiesce(void)
         psw_t quiesce_psw;
 
         smp_send_stop();
-        quiesce_psw.mask = PSW_BASE_BITS | PSW_MASK_WAIT;
+        quiesce_psw.mask =
+                PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA | PSW_MASK_WAIT;
         quiesce_psw.addr = 0xfff;
         __load_psw(quiesce_psw);
 }