s390/ctl_reg: move control register definitions to ctl_reg.h

The nmi.h header has some constant defines for control register bits.
These definitions should really be located in ctl_reg.h. Move and
rename the defines.

Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/ctl_reg.h b/arch/s390/include/asm/ctl_reg.h
index 5d23ecf4297af2a94618a0eac8a6abeea5c6100c..0095a40886e1e0d05709fb93cd560dd8ed9423e4 100644 (file)
--- a/arch/s390/include/asm/ctl_reg.h
+++ b/arch/s390/include/asm/ctl_reg.h
@@ -7,6 +7,16 @@
 #ifndef __ASM_CTL_REG_H
 #define __ASM_CTL_REG_H
 
+#include <linux/const.h>
+
+#define CR14_CHANNEL_REPORT_SUBMASK    _BITUL(63 - 35)
+#define CR14_RECOVERY_SUBMASK          _BITUL(63 - 36)
+#define CR14_DEGRADATION_SUBMASK       _BITUL(63 - 37)
+#define CR14_EXTERNAL_DAMAGE_SUBMASK   _BITUL(63 - 38)
+#define CR14_WARNING_SUBMASK           _BITUL(63 - 39)
+
+#ifndef __ASSEMBLY__
+
 #include <linux/bug.h>
 
 #define __ctl_load(array, low, high) do {                              \
@@ -95,4 +105,5 @@ union ctlreg2 {
 # define ctl_clear_bit(cr, bit) __ctl_clear_bit(cr, bit)
 #endif
 
+#endif /* __ASSEMBLY__ */
 #endif /* __ASM_CTL_REG_H */

diff --git a/arch/s390/include/asm/nmi.h b/arch/s390/include/asm/nmi.h
index c8e211b9a0020b1245e05236630dee472debe16a..77a7d9445e33103c9e7a3766641053b6dc66b5c2 100644 (file)
--- a/arch/s390/include/asm/nmi.h
+++ b/arch/s390/include/asm/nmi.h
@@ -26,12 +26,6 @@
 #define MCCK_CODE_PSW_MWP_VALID                _BITUL(63 - 20)
 #define MCCK_CODE_PSW_IA_VALID         _BITUL(63 - 23)
 
-#define MCCK_CR14_CR_PENDING_SUB_MASK  (1 << 28)
-#define MCCK_CR14_RECOVERY_SUB_MASK    (1 << 27)
-#define MCCK_CR14_DEGRAD_SUB_MASK      (1 << 26)
-#define MCCK_CR14_EXT_DAMAGE_SUB_MASK  (1 << 25)
-#define MCCK_CR14_WARN_SUB_MASK                (1 << 24)
-
 #ifndef __ASSEMBLY__
 
 union mci {

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index a832ad031cee78f5cc6fe17b93fb315e17fdd50a..329b2843fee2161093f13ef55db77977f6c5449a 100644 (file)
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -2483,11 +2483,11 @@ void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu,
 
        mci.val = mcck_info->mcic;
        if (mci.sr)
-               cr14 |= MCCK_CR14_RECOVERY_SUB_MASK;
+               cr14 |= CR14_RECOVERY_SUBMASK;
        if (mci.dg)
-               cr14 |= MCCK_CR14_DEGRAD_SUB_MASK;
+               cr14 |= CR14_DEGRADATION_SUBMASK;
        if (mci.w)
-               cr14 |= MCCK_CR14_WARN_SUB_MASK;
+               cr14 |= CR14_WARNING_SUBMASK;
 
        mchk = mci.ck ? &inti.mchk : &irq.u.mchk;
        mchk->cr14 = cr14;