Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b50511e4 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

[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: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b6ef5bb3

arch/s390/include/asm/compat.h

+6 −7
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define PSW32_MASK_IO		0x02000000UL

#define PSW32_MASK_EXT		0x01000000UL

#define PSW32_MASK_KEY		0x00F00000UL

#define PSW32_MASK_BASE		0x00080000UL	/* Always one */

#define PSW32_MASK_MCHECK	0x00040000UL

#define PSW32_MASK_WAIT		0x00020000UL

#define PSW32_MASK_PSTATE	0x00010000UL
@@ -19,21 +20,19 @@ 
#define PSW32_MASK_CC		0x00003000UL

#define PSW32_MASK_PM		0x00000f00UL



#define PSW32_ADDR_AMODE31	0x80000000UL

#define PSW32_MASK_USER		0x00003F00UL



#define PSW32_ADDR_AMODE	0x80000000UL

#define PSW32_ADDR_INSN		0x7FFFFFFFUL



#define PSW32_BASE_BITS		0x00080000UL

#define PSW32_DEFAULT_KEY	(((u32) PAGE_DEFAULT_ACC) << 20)



#define PSW32_ASC_PRIMARY	0x00000000UL

#define PSW32_ASC_ACCREG	0x00004000UL

#define PSW32_ASC_SECONDARY	0x00008000UL

#define PSW32_ASC_HOME		0x0000C000UL



#define PSW32_MASK_MERGE(CURRENT,NEW) \

	(((CURRENT) & ~(PSW32_MASK_CC|PSW32_MASK_PM)) | \

	 ((NEW) & (PSW32_MASK_CC|PSW32_MASK_PM)))



extern long psw32_user_bits;

extern u32 psw32_user_bits;



#define COMPAT_USER_HZ		100

#define COMPAT_UTS_MACHINE	"s390\0\0\0\0"

arch/s390/include/asm/processor.h

+10 −20
Original line number Diff line number Diff line
@@ -119,13 +119,13 @@ struct stack_frame { 
 * Do necessary setup to start up a new thread.

 */

#define start_thread(regs, new_psw, new_stackp) do {			\

	regs->psw.mask	= psw_user_bits;			\

	regs->psw.mask	= psw_user_bits | PSW_MASK_EA | PSW_MASK_BA;	\

	regs->psw.addr	= new_psw | PSW_ADDR_AMODE;			\

	regs->gprs[15]	= new_stackp;					\

} while (0)



#define start_thread31(regs, new_psw, new_stackp) do {			\

	regs->psw.mask	= psw_user32_bits;			\

	regs->psw.mask	= psw_user_bits | PSW_MASK_BA;			\

	regs->psw.addr	= new_psw | PSW_ADDR_AMODE;			\

	regs->gprs[15]	= new_stackp;					\

	crst_table_downgrade(current->mm, 1UL << 31);			\
@@ -233,25 +233,15 @@ static inline unsigned long __rewind_psw(psw_t psw, unsigned long ilc) 
#endif

}

 

/*

 * Function to stop a processor until an interruption occurred

 */

static inline void enabled_wait(void)

{

	__load_psw_mask(PSW_BASE_BITS | PSW_MASK_IO | PSW_MASK_EXT |

			PSW_MASK_MCHECK | PSW_MASK_WAIT | PSW_DEFAULT_KEY);

}



/*

 * Function to drop a processor into disabled wait state

 */



static inline void ATTRIB_NORET disabled_wait(unsigned long code)

{

        unsigned long ctl_buf;

        psw_t dw_psw;



        dw_psw.mask = PSW_BASE_BITS | PSW_MASK_WAIT;

	dw_psw.mask = PSW_MASK_BASE | PSW_MASK_WAIT | PSW_MASK_BA | PSW_MASK_EA;

        dw_psw.addr = code;

        /* 

         * Store status and then load disabled wait psw,

arch/s390/include/asm/ptrace.h

+6 −14
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ typedef struct 
#define PSW_MASK_IO		0x02000000UL

#define PSW_MASK_EXT		0x01000000UL

#define PSW_MASK_KEY		0x00F00000UL

#define PSW_MASK_BASE		0x00080000UL	/* always one */

#define PSW_MASK_MCHECK		0x00040000UL

#define PSW_MASK_WAIT		0x00020000UL

#define PSW_MASK_PSTATE		0x00010000UL
@@ -239,10 +240,11 @@ typedef struct 
#define PSW_MASK_EA		0x00000000UL

#define PSW_MASK_BA		0x00000000UL



#define PSW_MASK_USER		0x00003F00UL



#define PSW_ADDR_AMODE		0x80000000UL

#define PSW_ADDR_INSN		0x7FFFFFFFUL



#define PSW_BASE_BITS		0x00080000UL

#define PSW_DEFAULT_KEY		(((unsigned long) PAGE_DEFAULT_ACC) << 20)



#define PSW_ASC_PRIMARY		0x00000000UL
@@ -256,6 +258,7 @@ typedef struct 
#define PSW_MASK_DAT		0x0400000000000000UL

#define PSW_MASK_IO		0x0200000000000000UL

#define PSW_MASK_EXT		0x0100000000000000UL

#define PSW_MASK_BASE		0x0000000000000000UL

#define PSW_MASK_KEY		0x00F0000000000000UL

#define PSW_MASK_MCHECK		0x0004000000000000UL

#define PSW_MASK_WAIT		0x0002000000000000UL
@@ -266,11 +269,11 @@ typedef struct 
#define PSW_MASK_EA		0x0000000100000000UL

#define PSW_MASK_BA		0x0000000080000000UL



#define PSW_MASK_USER		0x00003F0000000000UL



#define PSW_ADDR_AMODE		0x0000000000000000UL

#define PSW_ADDR_INSN		0xFFFFFFFFFFFFFFFFUL



#define PSW_BASE_BITS		0x0000000180000000UL

#define PSW_BASE32_BITS		0x0000000080000000UL

#define PSW_DEFAULT_KEY		(((unsigned long) PAGE_DEFAULT_ACC) << 52)



#define PSW_ASC_PRIMARY		0x0000000000000000UL
@@ -283,18 +286,7 @@ typedef struct 
#ifdef __KERNEL__

extern long psw_kernel_bits;

extern long psw_user_bits;

#ifdef CONFIG_64BIT

extern long psw_user32_bits;

#endif

#endif



/* This macro merges a NEW PSW mask specified by the user into

   the currently active PSW mask CURRENT, modifying only those

   bits in CURRENT that the user may be allowed to change: this

   is the condition code and the program mask bits.  */

#define PSW_MASK_MERGE(CURRENT,NEW) \

	(((CURRENT) & ~(PSW_MASK_CC|PSW_MASK_PM)) | \

	 ((NEW) & (PSW_MASK_CC|PSW_MASK_PM)))



/*

 * The s390_regs structure is used to define the elf_gregset_t.

arch/s390/include/asm/system.h

+4 −2
Original line number Diff line number Diff line
@@ -212,8 +212,10 @@ __set_psw_mask(unsigned long mask) 
	__load_psw_mask(mask | (arch_local_save_flags() & ~(-1UL >> 8)));

}



#define local_mcck_enable()  __set_psw_mask(psw_kernel_bits)

#define local_mcck_disable() __set_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK)

#define local_mcck_enable() \

	__set_psw_mask(psw_kernel_bits | PSW_MASK_DAT | PSW_MASK_MCHECK)

#define local_mcck_disable() \

	__set_psw_mask(psw_kernel_bits | PSW_MASK_DAT)



#ifdef CONFIG_SMP

arch/s390/kernel/compat_linux.c

+3 −6
Original line number Diff line number Diff line
@@ -60,12 +60,9 @@ 


#include "compat_linux.h"



long psw_user32_bits	= (PSW_BASE32_BITS | PSW_MASK_DAT | PSW_ASC_HOME |

			   PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK |

			   PSW_MASK_PSTATE | PSW_DEFAULT_KEY);

long psw32_user_bits	= (PSW32_BASE_BITS | PSW32_MASK_DAT | PSW32_ASC_HOME |

			   PSW32_MASK_IO | PSW32_MASK_EXT | PSW32_MASK_MCHECK |

			   PSW32_MASK_PSTATE);

u32 psw32_user_bits = PSW32_MASK_DAT | PSW32_MASK_IO | PSW32_MASK_EXT |

		      PSW32_DEFAULT_KEY | PSW32_MASK_BASE | PSW32_MASK_MCHECK |

		      PSW32_MASK_PSTATE | PSW32_ASC_HOME;

 

/* For this source file, we want overflow handling. */