Commit fecc868a authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: remove all usages of PSW_ADDR_AMODE 



This is a leftover from the 31 bit area. For CONFIG_64BIT the usual
operation "y = x | PSW_ADDR_AMODE" is a nop. Therefore remove all
usages of PSW_ADDR_AMODE and make the code a bit less confusing.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
parent 696aafd3

arch/s390/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -166,14 +166,14 @@ extern __vector128 init_task_fpu_regs[__NUM_VXRS]; 
 */

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

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

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

	regs->psw.addr	= new_psw;					\

	regs->gprs[15]	= new_stackp;					\

	execve_tail();							\

} while (0)



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

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

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

	regs->psw.addr	= new_psw;					\

	regs->gprs[15]	= new_stackp;					\

	crst_table_downgrade(current->mm, 1UL << 31);			\

	execve_tail();							\

arch/s390/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static inline long regs_return_value(struct pt_regs *regs) 
static inline void instruction_pointer_set(struct pt_regs *regs,

					   unsigned long val)

{

	regs->psw.addr = val | PSW_ADDR_AMODE;

	regs->psw.addr = val;

}



int regs_query_register_offset(const char *name);

arch/s390/kernel/early.c

+3 −3
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static void early_pgm_check_handler(void) 
	__ctl_store(cr0, 0, 0);

	cr0_new = cr0 & ~(1UL << 28);

	__ctl_load(cr0_new, 0, 0);

	S390_lowcore.program_old_psw.addr = extable_fixup(fixup)|PSW_ADDR_AMODE;

	S390_lowcore.program_old_psw.addr = extable_fixup(fixup);

	__ctl_load(cr0, 0, 0);

}
@@ -268,9 +268,9 @@ static noinline __init void setup_lowcore_early(void) 
	psw_t psw;



	psw.mask = PSW_MASK_BASE | PSW_DEFAULT_KEY | PSW_MASK_EA | PSW_MASK_BA;

	psw.addr = PSW_ADDR_AMODE | (unsigned long) s390_base_ext_handler;

	psw.addr = (unsigned long) s390_base_ext_handler;

	S390_lowcore.external_new_psw = psw;

	psw.addr = PSW_ADDR_AMODE | (unsigned long) s390_base_pgm_handler;

	psw.addr = (unsigned long) s390_base_pgm_handler;

	S390_lowcore.program_new_psw = psw;

	s390_base_pgm_handler_fn = early_pgm_check_handler;

}

arch/s390/kernel/ipl.c

+2 −2
Original line number Diff line number Diff line
@@ -2057,12 +2057,12 @@ void s390_reset_system(void) 
	/* Set new machine check handler */

	S390_lowcore.mcck_new_psw.mask = PSW_KERNEL_BITS | PSW_MASK_DAT;

	S390_lowcore.mcck_new_psw.addr =

		PSW_ADDR_AMODE | (unsigned long) s390_base_mcck_handler;

		(unsigned long) s390_base_mcck_handler;



	/* Set new program check handler */

	S390_lowcore.program_new_psw.mask = PSW_KERNEL_BITS | PSW_MASK_DAT;

	S390_lowcore.program_new_psw.addr =

		PSW_ADDR_AMODE | (unsigned long) s390_base_pgm_handler;

		(unsigned long) s390_base_pgm_handler;



	/*

	 * Clear subchannel ID and number to signal new kernel that no CCW or

arch/s390/kernel/kprobes.c

+5 −5
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static void enable_singlestep(struct kprobe_ctlblk *kcb, 
	__ctl_load(per_kprobe, 9, 11);

	regs->psw.mask |= PSW_MASK_PER;

	regs->psw.mask &= ~(PSW_MASK_IO | PSW_MASK_EXT);

	regs->psw.addr = ip | PSW_ADDR_AMODE;

	regs->psw.addr = ip;

}

NOKPROBE_SYMBOL(enable_singlestep);
@@ -238,7 +238,7 @@ static void disable_singlestep(struct kprobe_ctlblk *kcb, 
	__ctl_load(kcb->kprobe_saved_ctl, 9, 11);

	regs->psw.mask &= ~PSW_MASK_PER;

	regs->psw.mask |= kcb->kprobe_saved_imask;

	regs->psw.addr = ip | PSW_ADDR_AMODE;

	regs->psw.addr = ip;

}

NOKPROBE_SYMBOL(disable_singlestep);
@@ -460,7 +460,7 @@ static int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) 
			break;

	}



	regs->psw.addr = orig_ret_address | PSW_ADDR_AMODE;

	regs->psw.addr = orig_ret_address;



	pop_kprobe(get_kprobe_ctlblk());

	kretprobe_hash_unlock(current, &flags);
@@ -607,7 +607,7 @@ static int kprobe_trap_handler(struct pt_regs *regs, int trapnr) 
		 */

		entry = search_exception_tables(regs->psw.addr & PSW_ADDR_INSN);

		if (entry) {

			regs->psw.addr = extable_fixup(entry) | PSW_ADDR_AMODE;

			regs->psw.addr = extable_fixup(entry);

			return 1;

		}
@@ -683,7 +683,7 @@ int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs) 
	memcpy(&kcb->jprobe_saved_regs, regs, sizeof(struct pt_regs));



	/* setup return addr to the jprobe handler routine */

	regs->psw.addr = (unsigned long) jp->entry | PSW_ADDR_AMODE;

	regs->psw.addr = (unsigned long) jp->entry;

	regs->psw.mask &= ~(PSW_MASK_IO | PSW_MASK_EXT);



	/* r15 is the stack pointer */

CRA Git | Maintained and supported by SUSTech CRA and CCSE