Unverified Commit 63734674 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Paul Burton
Browse files

MIPS: SGI-IP27: fix exception handler replication 



Commit 775b089a ("MIPS: tlbex: Remove cpu_has_local_ebase") removed
generating tlb refill handlers for every CPU, which was needed for
generating per node exception handlers on IP27. Instead of resurrecting
(and fixing) refill handler generation, we simply copy all exception
vectors from the boot node to the other nodes. Also remove the config
option since the memory tradeoff for expection handler replication
is just 8k per node.

Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
parent d6d5df1d

arch/mips/sgi-ip27/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -38,10 +38,3 @@ config REPLICATE_KTEXT 
	  Say Y here to enable replicating the kernel text across multiple

	  nodes in a NUMA cluster.  This trades memory for speed.

config REPLICATE_EXHANDLERS

	bool "Exception handler replication support"

	depends on SGI_IP27

	help

	  Say Y here to enable replicating the kernel exception handlers

	  across multiple nodes in a NUMA cluster. This trades memory for

	  speed.

arch/mips/sgi-ip27/ip27-init.c

+6 −15
Original line number Diff line number Diff line
@@ -69,23 +69,14 @@ static void per_hub_init(cnodeid_t cnode) 


	hub_rtc_init(cnode);



#ifdef CONFIG_REPLICATE_EXHANDLERS

	/*

	 * If this is not a headless node initialization,

	 * copy over the caliased exception handlers.

	 */

	if (get_compact_nodeid() == cnode) {

		extern char except_vec2_generic, except_vec3_generic;

		extern void build_tlb_refill_handler(void);



		memcpy((void *)(CKSEG0 + 0x100), &except_vec2_generic, 0x80);

		memcpy((void *)(CKSEG0 + 0x180), &except_vec3_generic, 0x80);

		build_tlb_refill_handler();

		memcpy((void *)(CKSEG0 + 0x100), (void *) CKSEG0, 0x80);

		memcpy((void *)(CKSEG0 + 0x180), &except_vec3_generic, 0x100);

	if (nasid) {

		/* copy exception handlers from first node to current node */

		memcpy((void *)NODE_OFFSET_TO_K0(nasid, 0),

		       (void *)CKSEG0, 0x200);

		__flush_cache_all();

		/* switch to node local exception handlers */

		REMOTE_HUB_S(nasid, PI_CALIAS_SIZE, PI_CALIAS_SIZE_8K);

	}

#endif

}



void per_cpu_init(void)

arch/mips/sgi-ip27/ip27-memory.c

+0 −4
Original line number Diff line number Diff line
@@ -332,11 +332,7 @@ static void __init mlreset(void) 
		 * thinks it is a node 0 address.

		 */

		REMOTE_HUB_S(nasid, PI_REGION_PRESENT, (region_mask | 1));

#ifdef CONFIG_REPLICATE_EXHANDLERS

		REMOTE_HUB_S(nasid, PI_CALIAS_SIZE, PI_CALIAS_SIZE_8K);

#else

		REMOTE_HUB_S(nasid, PI_CALIAS_SIZE, PI_CALIAS_SIZE_0);

#endif



#ifdef LATER

		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE