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

Commit f088fc84 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] FPU affinity for MT ASE. 



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

arch/mips/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -1464,6 +1464,11 @@ config MIPS_VPE_LOADER 


endchoice



config MIPS_MT_FPAFF

	bool "Dynamic FPU affinity for FP-intensive threads"

	depends on MIPS_MT

	default y



config MIPS_VPE_LOADER_TOM

	bool "Load VPE program into memory hidden from linux"

	depends on MIPS_VPE_LOADER

arch/mips/kernel/process.c

+11 −0
Original line number Diff line number Diff line
@@ -185,6 +185,17 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, 
	childregs->cp0_status &= ~(ST0_CU2|ST0_CU1);

	clear_tsk_thread_flag(p, TIF_USEDFPU);



#ifdef CONFIG_MIPS_MT_FPAFF

	/*

	 * FPU affinity support is cleaner if we track the

	 * user-visible CPU affinity from the very beginning.

	 * The generic cpus_allowed mask will already have

	 * been copied from the parent before copy_thread

	 * is invoked.

	 */

	p->thread.user_cpus_allowed = p->cpus_allowed;

#endif /* CONFIG_MIPS_MT_FPAFF */



	if (clone_flags & CLONE_SETTLS)

		ti->tp_value = regs->regs[7];

arch/mips/kernel/scall32-o32.S

+11 −0
Original line number Diff line number Diff line
@@ -569,8 +569,19 @@ einval: li v0, -EINVAL 
	sys	sys_tkill		2

	sys	sys_sendfile64		5

	sys	sys_futex		6

#ifdef CONFIG_MIPS_MT_FPAFF

	/*

	 * For FPU affinity scheduling on MIPS MT processors, we need to

	 * intercept sys_sched_xxxaffinity() calls until we get a proper hook

	 * in kernel/sched.c.  Considered only temporary we only support these

	 * hooks for the 32-bit kernel - there is no MIPS64 MT processor atm.

	 */

	sys	mipsmt_sys_sched_setaffinity	3

	sys	mipsmt_sys_sched_getaffinity	3

#else

	sys	sys_sched_setaffinity	3

	sys	sys_sched_getaffinity	3	/* 4240 */

#endif /* CONFIG_MIPS_MT_FPAFF */

	sys	sys_io_setup		2

	sys	sys_io_destroy		1

	sys	sys_io_getevents	5

arch/mips/kernel/setup.c

+4 −1
Original line number Diff line number Diff line
@@ -529,7 +529,10 @@ void __init setup_arch(char **cmdline_p) 


int __init fpu_disable(char *s)

{

	cpu_data[0].options &= ~MIPS_CPU_FPU;

	int i;



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

		cpu_data[i].options &= ~MIPS_CPU_FPU;



	return 1;

}

arch/mips/kernel/smp-mt.c

+11 −0
Original line number Diff line number Diff line
@@ -150,6 +150,11 @@ void plat_smp_setup(void) 
	unsigned long val;

	int i, num;



#ifdef CONFIG_MIPS_MT_FPAFF

	/* If we have an FPU, enroll ourselves in the FPU-full mask */

	if (cpu_has_fpu)

		cpu_set(0, mt_fpu_cpumask);

#endif /* CONFIG_MIPS_MT_FPAFF */

	if (!cpu_has_mipsmt)

		return;
@@ -312,6 +317,12 @@ void prom_smp_finish(void) 
{

	write_c0_compare(read_c0_count() + (8* mips_hpt_frequency/HZ));



#ifdef CONFIG_MIPS_MT_FPAFF

	/* If we have an FPU, enroll ourselves in the FPU-full mask */

	if (cpu_has_fpu)

		cpu_set(smp_processor_id(), mt_fpu_cpumask);

#endif /* CONFIG_MIPS_MT_FPAFF */



	local_irq_enable();

}