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

Commit 8ea6cd7a authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

Revert "MIPS: microMIPS: Support dynamic ASID sizing." 



This reverts commit f6b06d93.

The next revert depends on this one, so this has to go too.

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: "Steven J. Hill" <Steven.Hill@imgtec.com>
Cc: David Daney <david.daney@cavium.com>
Patchwork: https://patchwork.linux-mips.org/patch/5241/


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

arch/mips/mm/tlbex.c

+2 −32
Original line number Diff line number Diff line
@@ -309,32 +309,13 @@ static int check_for_high_segbits __cpuinitdata; 
static void __cpuinit insn_fixup(unsigned int **start, unsigned int **stop,

					unsigned int i_const)

{

	unsigned int **p;

	unsigned int **p, *ip;



	for (p = start; p < stop; p++) {

#ifndef CONFIG_CPU_MICROMIPS

		unsigned int *ip;



		ip = *p;

		*ip = (*ip & 0xffff0000) | i_const;

#else

		unsigned short *ip;



		ip = ((unsigned short *)((unsigned int)*p - 1));

		if ((*ip & 0xf000) == 0x4000) {

			*ip &= 0xfff1;

			*ip |= (i_const << 1);

		} else if ((*ip & 0xf000) == 0x6000) {

			*ip &= 0xfff1;

			*ip |= ((i_const >> 2) << 1);

		} else {

			ip++;

			*ip = i_const;

		}

#endif

		local_flush_icache_range((unsigned long)ip,

					 (unsigned long)ip + sizeof(*ip));

	}

	local_flush_icache_range((unsigned long)*p, (unsigned long)((*p) + 1));

}



#define asid_insn_fixup(section, const)					\
@@ -354,14 +335,6 @@ static void __cpuinit setup_asid(unsigned int inc, unsigned int mask, 
	extern asmlinkage void handle_ri_rdhwr_vivt(void);

	unsigned long *vivt_exc;



#ifdef CONFIG_CPU_MICROMIPS

	/*

	 * Worst case optimised microMIPS addiu instructions support

	 * only a 3-bit immediate value.

	 */

	if(inc > 7)

		panic("Invalid ASID increment value!");

#endif

	asid_insn_fixup(__asid_inc, inc);

	asid_insn_fixup(__asid_mask, mask);

	asid_insn_fixup(__asid_version_mask, version_mask);
@@ -369,9 +342,6 @@ static void __cpuinit setup_asid(unsigned int inc, unsigned int mask, 


	/* Patch up the 'handle_ri_rdhwr_vivt' handler. */

	vivt_exc = (unsigned long *) &handle_ri_rdhwr_vivt;

#ifdef CONFIG_CPU_MICROMIPS

	vivt_exc = (unsigned long *)((unsigned long) vivt_exc - 1);

#endif

	vivt_exc++;

	*vivt_exc = (*vivt_exc & ~mask) | mask;