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

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

sh64: Use the shared FPU state restorer. 



This kills off the sh64-specific state restorer and switches over to
the generic one.

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

arch/sh/kernel/cpu/sh5/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ fpu_error_or_IRQA: 
	pta	its_IRQ, tr0

	beqi/l	r4, EVENT_INTERRUPT, tr0

#ifdef CONFIG_SH_FPU

	movi	do_fpu_state_restore, r6

	movi	fpu_state_restore_trap_handler, r6

#else

	movi	do_exception_error, r6

#endif
@@ -1135,7 +1135,7 @@ fpu_error_or_IRQB: 
	pta	its_IRQ, tr0

	beqi/l	r4, EVENT_INTERRUPT, tr0

#ifdef CONFIG_SH_FPU

	movi	do_fpu_state_restore, r6

	movi	fpu_state_restore_trap_handler, r6

#else

	movi	do_exception_error, r6

#endif

arch/sh/kernel/cpu/sh5/fpu.c

+5 −58
Original line number Diff line number Diff line
@@ -15,24 +15,6 @@ 
#include <linux/sched.h>

#include <linux/signal.h>

#include <asm/processor.h>

#include <asm/user.h>

#include <asm/io.h>

#include <asm/fpu.h>



/*

 * Initially load the FPU with signalling NANS.  This bit pattern

 * has the property that no matter whether considered as single or as

 * double precision, it still represents a signalling NAN.

 */

#define sNAN64		0xFFFFFFFFFFFFFFFFULL

#define sNAN32		0xFFFFFFFFUL



static union thread_xstate init_fpuregs = {

	.hardfpu = {

		.fp_regs = { [0 ... 63] = sNAN32 },

		.fpscr = FPSCR_INIT

	}

};



void save_fpu(struct task_struct *tsk)

{
@@ -76,8 +58,7 @@ void save_fpu(struct task_struct *tsk) 
		: "memory");

}



static inline void

fpload(struct sh_fpu_hard_struct *fpregs)

void restore_fpu(struct task_struct *tsk)

{

	asm volatile("fld.p     %0, (0*8), fp0\n\t"

		     "fld.p     %0, (1*8), fp2\n\t"
@@ -116,16 +97,11 @@ fpload(struct sh_fpu_hard_struct *fpregs) 


		     "fld.p     %0, (31*8), fp62\n\t"

		: /* no output */

		: "r" (fpregs) );

}



void fpinit(struct sh_fpu_hard_struct *fpregs)

{

	*fpregs = init_fpuregs.hardfpu;

		: "r" (&tsk->thread.xstate->hardfpu)

		: "memory");

}



asmlinkage void

do_fpu_error(unsigned long ex, struct pt_regs *regs)

asmlinkage void do_fpu_error(unsigned long ex, struct pt_regs *regs)

{

	struct task_struct *tsk = current;
@@ -133,35 +109,6 @@ do_fpu_error(unsigned long ex, struct pt_regs *regs) 


	tsk->thread.trap_no = 11;

	tsk->thread.error_code = 0;

	force_sig(SIGFPE, tsk);

}





asmlinkage void

do_fpu_state_restore(unsigned long ex, struct pt_regs *regs)

{

	void die(const char *str, struct pt_regs *regs, long err);



	if (! user_mode(regs))

		die("FPU used in kernel", regs, ex);



	regs->sr &= ~SR_FD;



	if (last_task_used_math == current)

		return;



	enable_fpu();

	if (last_task_used_math != NULL)

		/* Other processes fpu state, save away */

		save_fpu(last_task_used_math);



        last_task_used_math = current;

        if (used_math()) {

                fpload(&current->thread.xstate->hardfpu);

        } else {

		/* First time FPU user.  */

		fpload(&init_fpuregs.hardfpu);

                set_used_math();

        }

	disable_fpu();

	force_sig(SIGFPE, tsk);

}

arch/sh/kernel/ptrace_64.c

+1 −2
Original line number Diff line number Diff line
@@ -114,8 +114,7 @@ put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data) 
	regs = (struct pt_regs*)((unsigned char *)task + THREAD_SIZE) - 1;



	if (!tsk_used_math(task)) {

		fpinit(&task->thread.xstate->hardfpu);

		set_stopped_child_used_math(task);

		init_fpu(task);

	} else if (last_task_used_math == task) {

		enable_fpu();

		save_fpu(task);