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

Commit b2ead528 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: Move & rename fpu_emulator_{save,restore}_context 



These functions aren't directly related to the FPU emulator at all, they
simply copy between a thread's saved context & a sigcontext. Thus move
them to the appropriate signal files & rename them accordingly. This
makes it clearer that the functions don't require the FPU emulator in
any way.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Reviewed-by: default avatarQais Yousef <qais.yousef@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6422/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e87ce948

arch/mips/kernel/signal.c

+38 −7
Original line number Original line Diff line number Diff line
@@ -46,9 +46,6 @@ static int (*restore_fp_context)(struct sigcontext __user *sc); 
extern asmlinkage int _save_fp_context(struct sigcontext __user *sc);

extern asmlinkage int _save_fp_context(struct sigcontext __user *sc);

extern asmlinkage int _restore_fp_context(struct sigcontext __user *sc);

extern asmlinkage int _restore_fp_context(struct sigcontext __user *sc);





extern asmlinkage int fpu_emulator_save_context(struct sigcontext __user *sc);

extern asmlinkage int fpu_emulator_restore_context(struct sigcontext __user *sc);



struct sigframe {

struct sigframe {

	u32 sf_ass[4];		/* argument save space for o32 */

	u32 sf_ass[4];		/* argument save space for o32 */

	u32 sf_pad[2];		/* Was: signal trampoline */

	u32 sf_pad[2];		/* Was: signal trampoline */
@@ -63,6 +60,40 @@ struct rt_sigframe { 
	struct ucontext rs_uc;

	struct ucontext rs_uc;

};

};





/*

 * Thread saved context copy to/from a signal context presumed to be on the

 * user stack, and therefore accessed with appropriate macros from uaccess.h.

 */

static int copy_fp_to_sigcontext(struct sigcontext __user *sc)

{

	int i;

	int err = 0;



	for (i = 0; i < 32; i++) {

		err |=

		    __put_user(get_fpr64(&current->thread.fpu.fpr[i], 0),

			       &sc->sc_fpregs[i]);

	}

	err |= __put_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);



	return err;

}



static int copy_fp_from_sigcontext(struct sigcontext __user *sc)

{

	int i;

	int err = 0;

	u64 fpr_val;



	for (i = 0; i < 32; i++) {

		err |= __get_user(fpr_val, &sc->sc_fpregs[i]);

		set_fpr64(&current->thread.fpu.fpr[i], 0, fpr_val);

	}

	err |= __get_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);



	return err;

}



/*

/*

 * Helper routines

 * Helper routines

 */

 */
@@ -595,14 +626,14 @@ static int smp_save_fp_context(struct sigcontext __user *sc) 
{

{

	return raw_cpu_has_fpu

	return raw_cpu_has_fpu

	       ? _save_fp_context(sc)

	       ? _save_fp_context(sc)

	       : fpu_emulator_save_context(sc);

	       : copy_fp_to_sigcontext(sc);

}

}





static int smp_restore_fp_context(struct sigcontext __user *sc)

static int smp_restore_fp_context(struct sigcontext __user *sc)

{

{

	return raw_cpu_has_fpu

	return raw_cpu_has_fpu

	       ? _restore_fp_context(sc)

	       ? _restore_fp_context(sc)

	       : fpu_emulator_restore_context(sc);

	       : copy_fp_from_sigcontext(sc);

}

}

#endif

#endif
@@ -617,8 +648,8 @@ static int signal_setup(void) 
		save_fp_context = _save_fp_context;

		save_fp_context = _save_fp_context;

		restore_fp_context = _restore_fp_context;

		restore_fp_context = _restore_fp_context;

	} else {

	} else {

		save_fp_context = fpu_emulator_save_context;

		save_fp_context = copy_fp_from_sigcontext;

		restore_fp_context = fpu_emulator_restore_context;

		restore_fp_context = copy_fp_to_sigcontext;

	}

	}

#endif

#endif

arch/mips/kernel/signal32.c

+38 −5
Original line number Original line Diff line number Diff line
@@ -42,9 +42,6 @@ static int (*restore_fp_context32)(struct sigcontext32 __user *sc); 
extern asmlinkage int _save_fp_context32(struct sigcontext32 __user *sc);

extern asmlinkage int _save_fp_context32(struct sigcontext32 __user *sc);

extern asmlinkage int _restore_fp_context32(struct sigcontext32 __user *sc);

extern asmlinkage int _restore_fp_context32(struct sigcontext32 __user *sc);





extern asmlinkage int fpu_emulator_save_context32(struct sigcontext32 __user *sc);

extern asmlinkage int fpu_emulator_restore_context32(struct sigcontext32 __user *sc);



/*

/*

 * Including <asm/unistd.h> would give use the 64-bit syscall numbers ...

 * Including <asm/unistd.h> would give use the 64-bit syscall numbers ...

 */

 */
@@ -77,6 +74,42 @@ struct rt_sigframe32 { 
	struct ucontext32 rs_uc;

	struct ucontext32 rs_uc;

};

};





/*

 * Thread saved context copy to/from a signal context presumed to be on the

 * user stack, and therefore accessed with appropriate macros from uaccess.h.

 */

static int copy_fp_to_sigcontext32(struct sigcontext32 __user *sc)

{

	int i;

	int err = 0;

	int inc = test_thread_flag(TIF_32BIT_FPREGS) ? 2 : 1;



	for (i = 0; i < 32; i += inc) {

		err |=

		    __put_user(get_fpr64(&current->thread.fpu.fpr[i], 0),

			       &sc->sc_fpregs[i]);

	}

	err |= __put_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);



	return err;

}



static int copy_fp_from_sigcontext32(struct sigcontext32 __user *sc)

{

	int i;

	int err = 0;

	int inc = test_thread_flag(TIF_32BIT_FPREGS) ? 2 : 1;

	u64 fpr_val;



	for (i = 0; i < 32; i += inc) {

		err |= __get_user(fpr_val, &sc->sc_fpregs[i]);

		set_fpr64(&current->thread.fpu.fpr[i], 0, fpr_val);

	}

	err |= __get_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);



	return err;

}



/*

/*

 * sigcontext handlers

 * sigcontext handlers

 */

 */
@@ -566,8 +599,8 @@ static int signal32_init(void) 
		save_fp_context32 = _save_fp_context32;

		save_fp_context32 = _save_fp_context32;

		restore_fp_context32 = _restore_fp_context32;

		restore_fp_context32 = _restore_fp_context32;

	} else {

	} else {

		save_fp_context32 = fpu_emulator_save_context32;

		save_fp_context32 = copy_fp_to_sigcontext32;

		restore_fp_context32 = fpu_emulator_restore_context32;

		restore_fp_context32 = copy_fp_from_sigcontext32;

	}

	}





	return 0;

	return 0;

arch/mips/math-emu/kernel_linkage.c

+0 −75
Original line number Original line Diff line number Diff line
@@ -43,78 +43,3 @@ void fpu_emulator_init_fpu(void) 
	for (i = 0; i < 32; i++)

	for (i = 0; i < 32; i++)

		set_fpr64(&current->thread.fpu.fpr[i], 0, SIGNALLING_NAN);

		set_fpr64(&current->thread.fpu.fpr[i], 0, SIGNALLING_NAN);

}
 
}
 




/*

 * Emulator context save/restore to/from a signal context

 * presumed to be on the user stack, and therefore accessed

 * with appropriate macros from uaccess.h

 */



int fpu_emulator_save_context(struct sigcontext __user *sc)

{

	int i;

	int err = 0;



	for (i = 0; i < 32; i++) {

		err |=

		    __put_user(get_fpr64(&current->thread.fpu.fpr[i], 0),

			       &sc->sc_fpregs[i]);

	}

	err |= __put_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);



	return err;

}



int fpu_emulator_restore_context(struct sigcontext __user *sc)

{

	int i;

	int err = 0;

	u64 fpr_val;



	for (i = 0; i < 32; i++) {

		err |= __get_user(fpr_val, &sc->sc_fpregs[i]);

		set_fpr64(&current->thread.fpu.fpr[i], 0, fpr_val);

	}

	err |= __get_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);



	return err;

}



#ifdef CONFIG_64BIT

/*

 * This is the o32 version

 */



int fpu_emulator_save_context32(struct sigcontext32 __user *sc)

{

	int i;

	int err = 0;

	int inc = test_thread_flag(TIF_32BIT_FPREGS) ? 2 : 1;



	for (i = 0; i < 32; i += inc) {

		err |=

		    __put_user(get_fpr64(&current->thread.fpu.fpr[i], 0),

			       &sc->sc_fpregs[i]);

	}

	err |= __put_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);



	return err;

}



int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)

{

	int i;

	int err = 0;

	int inc = test_thread_flag(TIF_32BIT_FPREGS) ? 2 : 1;

	u64 fpr_val;



	for (i = 0; i < 32; i += inc) {

		err |= __get_user(fpr_val, &sc->sc_fpregs[i]);

		set_fpr64(&current->thread.fpu.fpr[i], 0, fpr_val);

	}

	err |= __get_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);



	return err;

}

#endif