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

Commit bdc94eb4 authored by Chris Dearman's avatar Chris Dearman Committed by Ralf Baechle
Browse files

[MIPS] Add noulri kernel argument to disable "rdhwr $29" usermode support. 



Signed-off-by: default avatarChris Dearman <chris@mips.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 35133692

arch/mips/kernel/traps.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -1306,6 +1306,17 @@ int cp0_compare_irq; 
int cp0_perfcount_irq;

int cp0_perfcount_irq;

EXPORT_SYMBOL_GPL(cp0_perfcount_irq);

EXPORT_SYMBOL_GPL(cp0_perfcount_irq);





static int __cpuinitdata noulri;



static int __init ulri_disable(char *s)

{

	pr_info("Disabling ulri\n");

	noulri = 1;



	return 1;

}

__setup("noulri", ulri_disable);



void __cpuinit per_cpu_trap_init(void)

void __cpuinit per_cpu_trap_init(void)

{

{

	unsigned int cpu = smp_processor_id();

	unsigned int cpu = smp_processor_id();
@@ -1346,7 +1357,7 @@ void __cpuinit per_cpu_trap_init(void) 
	if (cpu_has_mips_r2) {

	if (cpu_has_mips_r2) {

		unsigned int enable = 0x0000000f;

		unsigned int enable = 0x0000000f;





		if (cpu_has_userlocal)

		if (!noulri && cpu_has_userlocal)

			enable |= (1 << 29);

			enable |= (1 << 29);





		write_c0_hwrena(enable);

		write_c0_hwrena(enable);