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

MIPS: fw: arc: workaround 64bit kernel/32bit ARC problems



Pointer arguments for 32bit ARC PROMs must reside in CKSEG0/1. While
the initial stack resides in CKSEG0 the first kernel thread stack
is already placed at a XKPHYS address, which ARC32 can't handle.
The workaround here is to use static variables, which are placed
into BSS and linked to a CKSEG0 address.

Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
parent 39b2d756
Loading
Loading
Loading
Loading
+21 −4
Original line number Diff line number Diff line
@@ -11,6 +11,21 @@
#include <asm/bcache.h>
#include <asm/setup.h>

#if defined(CONFIG_64BIT) && defined(CONFIG_FW_ARC32)
/*
 * For 64bit kernels working with a 32bit ARC PROM pointer arguments
 * for ARC calls need to reside in CKEG0/1. But as soon as the kernel
 * switches to it's first kernel thread stack is set to an address in
 * XKPHYS, so anything on stack can't be used anymore. This is solved
 * by using a * static declartion variables are put into BSS, which is
 * linked to a CKSEG0 address. Since this is only used on UP platforms
 * there is not spinlock needed
 */
#define O32_STATIC	static
#else
#define O32_STATIC
#endif

/*
 * IP22 boardcache is not compatible with board caches.	 Thus we disable it
 * during romvec action.  Since r4xx0.c is always compiled and linked with your
@@ -23,8 +38,10 @@

void prom_putchar(char c)
{
	ULONG cnt;
	CHAR it = c;
	O32_STATIC ULONG cnt;
	O32_STATIC CHAR it;

	it = c;

	bc_disable();
	ArcWrite(1, &it, 1, &cnt);
@@ -33,8 +50,8 @@ void prom_putchar(char c)

char prom_getchar(void)
{
	ULONG cnt;
	CHAR c;
	O32_STATIC ULONG cnt;
	O32_STATIC CHAR c;

	bc_disable();
	ArcRead(0, &c, 1, &cnt);