Commit c7914834 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Tidy up NEFF-based sign extension for SH-5. 



This consolidates all of the NEFF-based sign extension for SH-5.
In the future the other SH code will need to make use of this as well,
so make it generic in preparation for more 32/64 consolidation.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c0fe478d

arch/sh/include/asm/pgtable.h

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; 
#define	NEFF_SIGN	(1LL << (NEFF - 1))

#define	NEFF_MASK	(-1LL << NEFF)



static inline unsigned long long neff_sign_extend(unsigned long val)

{

	unsigned long long extended = val;

	return (extended & NEFF_SIGN) ? (extended | NEFF_MASK) : extended;

}



#ifdef CONFIG_29BIT

#define NPHYS		29

#else

arch/sh/kernel/process_64.c

+10 −14
Original line number Diff line number Diff line
@@ -425,7 +425,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 
		struct task_struct *p, struct pt_regs *regs)

{

	struct pt_regs *childregs;

	unsigned long long se;			/* Sign extension */



#ifdef CONFIG_SH_FPU

	if(last_task_used_math == current) {
@@ -441,11 +440,19 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 


	*childregs = *regs;



	/*

	 * Sign extend the edited stack.

	 * Note that thread.pc and thread.pc will stay

	 * 32-bit wide and context switch must take care

	 * of NEFF sign extension.

	 */

	if (user_mode(regs)) {

		childregs->regs[15] = usp;

		childregs->regs[15] = neff_sign_extend(usp);

		p->thread.uregs = childregs;

	} else {

		childregs->regs[15] = (unsigned long)task_stack_page(p) + THREAD_SIZE;

		childregs->regs[15] =

			neff_sign_extend((unsigned long)task_stack_page(p) +

					 THREAD_SIZE);

	}



	childregs->regs[9] = 0; /* Set return value for child */
@@ -454,17 +461,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 
	p->thread.sp = (unsigned long) childregs;

	p->thread.pc = (unsigned long) ret_from_fork;



	/*

	 * Sign extend the edited stack.

         * Note that thread.pc and thread.pc will stay

	 * 32-bit wide and context switch must take care

	 * of NEFF sign extension.

	 */



	se = childregs->regs[15];

	se = (se & NEFF_SIGN) ? (se | NEFF_MASK) : se;

	childregs->regs[15] = se;



	return 0;

}

arch/sh/kernel/signal_64.c

+13 −25
Original line number Diff line number Diff line
@@ -561,13 +561,11 @@ static int setup_frame(int sig, struct k_sigaction *ka, 
	/* Set up to return from userspace.  If provided, use a stub

	   already in userspace.  */

	if (ka->sa.sa_flags & SA_RESTORER) {

		DEREF_REG_PR = (unsigned long) ka->sa.sa_restorer | 0x1;



		/*

		 * On SH5 all edited pointers are subject to NEFF

		 */

		DEREF_REG_PR = (DEREF_REG_PR & NEFF_SIGN) ?

			(DEREF_REG_PR | NEFF_MASK) : DEREF_REG_PR;

		DEREF_REG_PR = neff_sign_extend((unsigned long)

			ka->sa.sa_restorer | 0x1);

	} else {

		/*

		 * Different approach on SH5.
@@ -580,9 +578,8 @@ static int setup_frame(int sig, struct k_sigaction *ka, 
		 * . being code, linker turns ShMedia bit on, always

		 *   dereference index -1.

		 */

		DEREF_REG_PR = (unsigned long) frame->retcode | 0x01;

		DEREF_REG_PR = (DEREF_REG_PR & NEFF_SIGN) ?

			(DEREF_REG_PR | NEFF_MASK) : DEREF_REG_PR;

		DEREF_REG_PR = neff_sign_extend((unsigned long)

			frame->retcode | 0x01);



		if (__copy_to_user(frame->retcode,

			(void *)((unsigned long)sa_default_restorer & (~1)), 16) != 0)
@@ -596,9 +593,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, 
	 * Set up registers for signal handler.

	 * All edited pointers are subject to NEFF.

	 */

	regs->regs[REG_SP] = (unsigned long) frame;

	regs->regs[REG_SP] = (regs->regs[REG_SP] & NEFF_SIGN) ?

		 (regs->regs[REG_SP] | NEFF_MASK) : regs->regs[REG_SP];

	regs->regs[REG_SP] = neff_sign_extend((unsigned long)frame);

	regs->regs[REG_ARG1] = signal; /* Arg for signal handler */



        /* FIXME:
@@ -613,8 +608,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, 
	regs->regs[REG_ARG2] = (unsigned long long)(unsigned long)(signed long)&frame->sc;

	regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->sc;



	regs->pc = (unsigned long) ka->sa.sa_handler;

	regs->pc = (regs->pc & NEFF_SIGN) ? (regs->pc | NEFF_MASK) : regs->pc;

	regs->pc = neff_sign_extend((unsigned long)ka->sa.sa_handler);



	set_fs(USER_DS);
@@ -676,13 +670,11 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
	/* Set up to return from userspace.  If provided, use a stub

	   already in userspace.  */

	if (ka->sa.sa_flags & SA_RESTORER) {

		DEREF_REG_PR = (unsigned long) ka->sa.sa_restorer | 0x1;



		/*

		 * On SH5 all edited pointers are subject to NEFF

		 */

		DEREF_REG_PR = (DEREF_REG_PR & NEFF_SIGN) ?

			(DEREF_REG_PR | NEFF_MASK) : DEREF_REG_PR;

		DEREF_REG_PR = neff_sign_extend((unsigned long)

			ka->sa.sa_restorer | 0x1);

	} else {

		/*

		 * Different approach on SH5.
@@ -695,15 +687,14 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
		 * . being code, linker turns ShMedia bit on, always

		 *   dereference index -1.

		 */



		DEREF_REG_PR = (unsigned long) frame->retcode | 0x01;

		DEREF_REG_PR = (DEREF_REG_PR & NEFF_SIGN) ?

			(DEREF_REG_PR | NEFF_MASK) : DEREF_REG_PR;

		DEREF_REG_PR = neff_sign_extend((unsigned long)

			frame->retcode | 0x01);



		if (__copy_to_user(frame->retcode,

			(void *)((unsigned long)sa_default_rt_restorer & (~1)), 16) != 0)

			goto give_sigsegv;



		/* Cohere the trampoline with the I-cache. */

		flush_icache_range(DEREF_REG_PR-1, DEREF_REG_PR-1+15);

	}
@@ -711,14 +702,11 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
	 * Set up registers for signal handler.

	 * All edited pointers are subject to NEFF.

	 */

	regs->regs[REG_SP] = (unsigned long) frame;

	regs->regs[REG_SP] = (regs->regs[REG_SP] & NEFF_SIGN) ?

		 (regs->regs[REG_SP] | NEFF_MASK) : regs->regs[REG_SP];

	regs->regs[REG_SP] = neff_sign_extend((unsigned long)frame);

	regs->regs[REG_ARG1] = signal; /* Arg for signal handler */

	regs->regs[REG_ARG2] = (unsigned long long)(unsigned long)(signed long)&frame->info;

	regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->uc.uc_mcontext;

	regs->pc = (unsigned long) ka->sa.sa_handler;

	regs->pc = (regs->pc & NEFF_SIGN) ? (regs->pc | NEFF_MASK) : regs->pc;

	regs->pc = neff_sign_extend((unsigned long)ka->sa.sa_handler);



	set_fs(USER_DS);

arch/sh/mm/fault_64.c

+1 −10
Original line number Diff line number Diff line
@@ -56,16 +56,7 @@ inline void __do_tlb_refill(unsigned long address, 
	/*

	 * Set PTEH register

	 */

	pteh = address & MMU_VPN_MASK;



	/* Sign extend based on neff. */

#if (NEFF == 32)

	/* Faster sign extension */

	pteh = (unsigned long long)(signed long long)(signed long)pteh;

#else

	/* General case */

	pteh = (pteh & NEFF_SIGN) ? (pteh | NEFF_MASK) : pteh;

#endif

	pteh = neff_sign_extend(address & MMU_VPN_MASK);



	/* Set the ASID. */

	pteh |= get_asid() << PTEH_ASID_SHIFT;

arch/sh/mm/tlb-sh5.c

+5 −16
Original line number Diff line number Diff line
@@ -117,26 +117,15 @@ int sh64_put_wired_dtlb_entry(unsigned long long entry) 
 * Load up a virtual<->physical translation for @eaddr<->@paddr in the

 * pre-allocated TLB slot @config_addr (see sh64_get_wired_dtlb_entry).

 */

inline void sh64_setup_tlb_slot(unsigned long long config_addr,

				unsigned long eaddr,

				unsigned long asid,

				unsigned long paddr)

void sh64_setup_tlb_slot(unsigned long long config_addr, unsigned long eaddr,

			 unsigned long asid, unsigned long paddr)

{

	unsigned long long pteh, ptel;



	/* Sign extension */

#if (NEFF == 32)

	pteh = (unsigned long long)(signed long long)(signed long) eaddr;

#else

#error "Can't sign extend more than 32 bits yet"

#endif

	pteh = neff_sign_extend(eaddr);

	pteh &= PAGE_MASK;

	pteh |= (asid << PTEH_ASID_SHIFT) | PTEH_VALID;

#if (NEFF == 32)

	ptel = (unsigned long long)(signed long long)(signed long) paddr;

#else

#error "Can't sign extend more than 32 bits yet"

#endif

	ptel = neff_sign_extend(paddr);

	ptel &= PAGE_MASK;

	ptel |= (_PAGE_CACHABLE | _PAGE_READ | _PAGE_WRITE);
@@ -152,5 +141,5 @@ inline void sh64_setup_tlb_slot(unsigned long long config_addr, 
 *

 * Teardown any existing mapping in the TLB slot @config_addr.

 */

inline void sh64_teardown_tlb_slot(unsigned long long config_addr)

void sh64_teardown_tlb_slot(unsigned long long config_addr)

	__attribute__ ((alias("__flush_tlb_slot")));

CRA Git | Maintained and supported by SUSTech CRA and CCSE