leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Martin Schwidefsky
2017-10-12 13:24:46 +02:00
parent ad3bc0ac1d
commit cc65450c83
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/s390/include/asm/ctl_reg.h
View File

@@ -7,6 +7,16 @@
#ifndef __ASM_CTL_REG_H #ifndef __ASM_CTL_REG_H
#define __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> #include <linux/bug.h>
#define __ctl_load(array, low, high) do { \ #define __ctl_load(array, low, high) do { \
@@ -95,4 +105,5 @@ union ctlreg2 {
# define ctl_clear_bit(cr, bit) __ctl_clear_bit(cr, bit) # define ctl_clear_bit(cr, bit) __ctl_clear_bit(cr, bit)
#endif #endif
#endif /* __ASSEMBLY__ */
#endif /* __ASM_CTL_REG_H */ #endif /* __ASM_CTL_REG_H */

6
arch/s390/include/asm/nmi.h
View File

@@ -26,12 +26,6 @@
#define MCCK_CODE_PSW_MWP_VALID _BITUL(63 - 20) #define MCCK_CODE_PSW_MWP_VALID _BITUL(63 - 20)
#define MCCK_CODE_PSW_IA_VALID _BITUL(63 - 23) #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__ #ifndef __ASSEMBLY__
union mci { union mci {

6
arch/s390/kvm/interrupt.c
View File

@@ -2483,11 +2483,11 @@ void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu,
mci.val = mcck_info->mcic; mci.val = mcck_info->mcic;
if (mci.sr) if (mci.sr)
cr14 |= MCCK_CR14_RECOVERY_SUB_MASK; cr14 |= CR14_RECOVERY_SUBMASK;
if (mci.dg) if (mci.dg)
cr14 |= MCCK_CR14_DEGRAD_SUB_MASK; cr14 |= CR14_DEGRADATION_SUBMASK;
if (mci.w) if (mci.w)
cr14 |= MCCK_CR14_WARN_SUB_MASK; cr14 |= CR14_WARNING_SUBMASK;
mchk = mci.ck ? &inti.mchk : &irq.u.mchk; mchk = mci.ck ? &inti.mchk : &irq.u.mchk;
mchk->cr14 = cr14; mchk->cr14 = cr14;