Commit 25edd694 authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Get rid of indirect p1275 PROM call buffer. 



This is based upon a report by Meelis Roos showing that it's possible
that we'll try to fetch a property that is 32K in size with some
devices.  With the current fixed 3K buffer we use for moving data in
and out of the firmware during PROM calls, that simply won't work.

In fact, it will scramble random kernel data during bootup.

The reasoning behind the temporary buffer is entirely historical.  It
used to be the case that we had problems referencing dynamic kernel
memory (including the stack) early in the boot process before we
explicitly told the firwmare to switch us over to the kernel trap
table.

So what we did was always give the firmware buffers that were locked
into the main kernel image.

But we no longer have problems like that, so get rid of all of this
indirect bounce buffering.

Besides fixing Meelis's bug, this also makes the kernel data about 3K
smaller.

It was also discovered during these conversions that the
implementation of prom_retain() was completely wrong, so that was
fixed here as well.  Currently that interface is not in use.

Reported-by: default avatarMeelis Roos <mroos@linux.ee>
Tested-by: default avatarMeelis Roos <mroos@linux.ee>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 019408f9

arch/sparc/include/asm/oplib_64.h

+3 −24
Original line number Diff line number Diff line
@@ -185,9 +185,8 @@ extern int prom_getunumber(int syndrome_code, 
			   char *buf, int buflen);



/* Retain physical memory to the caller across soft resets. */

extern unsigned long prom_retain(const char *name,

				 unsigned long pa_low, unsigned long pa_high,

				 long size, long align);

extern int prom_retain(const char *name, unsigned long size,

		       unsigned long align, unsigned long *paddr);



/* Load explicit I/D TLB entries into the calling processor. */

extern long prom_itlb_load(unsigned long index,
@@ -287,26 +286,6 @@ extern void prom_sun4v_guest_soft_state(void); 
extern int prom_ihandle2path(int handle, char *buffer, int bufsize);



/* Client interface level routines. */

extern long p1275_cmd(const char *, long, ...);



#if 0

#define P1275_SIZE(x) ((((long)((x) / 32)) << 32) | (x))

#else

#define P1275_SIZE(x) x

#endif



/* We support at most 16 input and 1 output argument */

#define P1275_ARG_NUMBER		0

#define P1275_ARG_IN_STRING		1

#define P1275_ARG_OUT_BUF		2

#define P1275_ARG_OUT_32B		3

#define P1275_ARG_IN_FUNCTION		4

#define P1275_ARG_IN_BUF		5

#define P1275_ARG_IN_64B		6



#define P1275_IN(x) ((x) & 0xf)

#define P1275_OUT(x) (((x) << 4) & 0xf0)

#define P1275_INOUT(i,o) (P1275_IN(i)|P1275_OUT(o))

#define P1275_ARG(n,x) ((x) << ((n)*3 + 8))

extern void p1275_cmd_direct(unsigned long *);



#endif /* !(__SPARC64_OPLIB_H) */

arch/sparc/prom/cif.S

+8 −8
Original line number Diff line number Diff line
@@ -9,18 +9,18 @@ 
#include <asm/thread_info.h>



	.text

	.globl	prom_cif_interface

prom_cif_interface:

	sethi	%hi(p1275buf), %o0

	or	%o0, %lo(p1275buf), %o0

	ldx	[%o0 + 0x010], %o1	! prom_cif_stack

	save	%o1, -192, %sp

	ldx	[%i0 + 0x008], %l2	! prom_cif_handler

	.globl	prom_cif_direct

prom_cif_direct:

	sethi	%hi(p1275buf), %o1

	or	%o1, %lo(p1275buf), %o1

	ldx	[%o1 + 0x0010], %o2	! prom_cif_stack

	save	%o2, -192, %sp

	ldx	[%i1 + 0x0008], %l2	! prom_cif_handler

	mov	%g4, %l0

	mov	%g5, %l1

	mov	%g6, %l3

	call	%l2

	 add	%i0, 0x018, %o0		! prom_args

	 mov	%i0, %o0		! prom_args

	mov	%l0, %g4

	mov	%l1, %g5

	mov	%l3, %g6

arch/sparc/prom/console_64.c

+37 −11
Original line number Diff line number Diff line
@@ -21,13 +21,21 @@ extern int prom_stdin, prom_stdout; 
inline int

prom_nbgetchar(void)

{

	unsigned long args[7];

	char inc;



	if (p1275_cmd("read", P1275_ARG(1,P1275_ARG_OUT_BUF)|

			      P1275_INOUT(3,1),

			      prom_stdin, &inc, P1275_SIZE(1)) == 1)

	args[0] = (unsigned long) "read";

	args[1] = 3;

	args[2] = 1;

	args[3] = (unsigned int) prom_stdin;

	args[4] = (unsigned long) &inc;

	args[5] = 1;

	args[6] = (unsigned long) -1;



	p1275_cmd_direct(args);



	if (args[6] == 1)

		return inc;

	else

	return -1;

}
@@ -37,12 +45,22 @@ prom_nbgetchar(void) 
inline int

prom_nbputchar(char c)

{

	unsigned long args[7];

	char outc;

	

	outc = c;

	if (p1275_cmd("write", P1275_ARG(1,P1275_ARG_IN_BUF)|

			       P1275_INOUT(3,1),

			       prom_stdout, &outc, P1275_SIZE(1)) == 1)



	args[0] = (unsigned long) "write";

	args[1] = 3;

	args[2] = 1;

	args[3] = (unsigned int) prom_stdout;

	args[4] = (unsigned long) &outc;

	args[5] = 1;

	args[6] = (unsigned long) -1;



	p1275_cmd_direct(args);



	if (args[6] == 1)

		return 0;

	else

		return -1;
@@ -67,7 +85,15 @@ prom_putchar(char c) 
void

prom_puts(const char *s, int len)

{

	p1275_cmd("write", P1275_ARG(1,P1275_ARG_IN_BUF)|

			   P1275_INOUT(3,1),

			   prom_stdout, s, P1275_SIZE(len));

	unsigned long args[7];



	args[0] = (unsigned long) "write";

	args[1] = 3;

	args[2] = 1;

	args[3] = (unsigned int) prom_stdout;

	args[4] = (unsigned long) s;

	args[5] = len;

	args[6] = (unsigned long) -1;



	p1275_cmd_direct(args);

}

arch/sparc/prom/devops_64.c

+31 −5
Original line number Diff line number Diff line
@@ -18,16 +18,32 @@ 
int

prom_devopen(const char *dstr)

{

	return p1275_cmd ("open", P1275_ARG(0,P1275_ARG_IN_STRING)|

				  P1275_INOUT(1,1),

				  dstr);

	unsigned long args[5];



	args[0] = (unsigned long) "open";

	args[1] = 1;

	args[2] = 1;

	args[3] = (unsigned long) dstr;

	args[4] = (unsigned long) -1;



	p1275_cmd_direct(args);



	return (int) args[4];

}



/* Close the device described by device handle 'dhandle'. */

int

prom_devclose(int dhandle)

{

	p1275_cmd ("close", P1275_INOUT(1,0), dhandle);

	unsigned long args[4];



	args[0] = (unsigned long) "close";

	args[1] = 1;

	args[2] = 0;

	args[3] = (unsigned int) dhandle;



	p1275_cmd_direct(args);



	return 0;

}
@@ -37,5 +53,15 @@ prom_devclose(int dhandle) 
void

prom_seek(int dhandle, unsigned int seekhi, unsigned int seeklo)

{

	p1275_cmd ("seek", P1275_INOUT(3,1), dhandle, seekhi, seeklo);

	unsigned long args[7];



	args[0] = (unsigned long) "seek";

	args[1] = 3;

	args[2] = 1;

	args[3] = (unsigned int) dhandle;

	args[4] = seekhi;

	args[5] = seeklo;

	args[6] = (unsigned long) -1;



	p1275_cmd_direct(args);

}

arch/sparc/prom/misc_64.c

+220 −94
Original line number Diff line number Diff line
@@ -20,10 +20,17 @@ 


int prom_service_exists(const char *service_name)

{

	int err = p1275_cmd("test", P1275_ARG(0, P1275_ARG_IN_STRING) |

			    P1275_INOUT(1, 1), service_name);

	unsigned long args[5];



	if (err)

	args[0] = (unsigned long) "test";

	args[1] = 1;

	args[2] = 1;

	args[3] = (unsigned long) service_name;

	args[4] = (unsigned long) -1;



	p1275_cmd_direct(args);



	if (args[4])

		return 0;

	return 1;

}
@@ -31,30 +38,47 @@ int prom_service_exists(const char *service_name) 
void prom_sun4v_guest_soft_state(void)

{

	const char *svc = "SUNW,soft-state-supported";

	unsigned long args[3];



	if (!prom_service_exists(svc))

		return;

	p1275_cmd(svc, P1275_INOUT(0, 0));

	args[0] = (unsigned long) svc;

	args[1] = 0;

	args[2] = 0;

	p1275_cmd_direct(args);

}



/* Reset and reboot the machine with the command 'bcommand'. */

void prom_reboot(const char *bcommand)

{

	unsigned long args[4];



#ifdef CONFIG_SUN_LDOMS

	if (ldom_domaining_enabled)

		ldom_reboot(bcommand);

#endif

	p1275_cmd("boot", P1275_ARG(0, P1275_ARG_IN_STRING) |

		  P1275_INOUT(1, 0), bcommand);

	args[0] = (unsigned long) "boot";

	args[1] = 1;

	args[2] = 0;

	args[3] = (unsigned long) bcommand;



	p1275_cmd_direct(args);

}



/* Forth evaluate the expression contained in 'fstring'. */

void prom_feval(const char *fstring)

{

	unsigned long args[5];



	if (!fstring || fstring[0] == 0)

		return;

	p1275_cmd("interpret", P1275_ARG(0, P1275_ARG_IN_STRING) |

		  P1275_INOUT(1, 1), fstring);

	args[0] = (unsigned long) "interpret";

	args[1] = 1;

	args[2] = 1;

	args[3] = (unsigned long) fstring;

	args[4] = (unsigned long) -1;



	p1275_cmd_direct(args);

}

EXPORT_SYMBOL(prom_feval);
@@ -68,6 +92,7 @@ extern void smp_release(void); 
 */

void prom_cmdline(void)

{

	unsigned long args[3];

	unsigned long flags;



	local_irq_save(flags);
@@ -76,7 +101,11 @@ void prom_cmdline(void) 
	smp_capture();

#endif



	p1275_cmd("enter", P1275_INOUT(0, 0));

	args[0] = (unsigned long) "enter";

	args[1] = 0;

	args[2] = 0;



	p1275_cmd_direct(args);



#ifdef CONFIG_SMP

	smp_release();
@@ -90,22 +119,32 @@ void prom_cmdline(void) 
 */

void notrace prom_halt(void)

{

	unsigned long args[3];



#ifdef CONFIG_SUN_LDOMS

	if (ldom_domaining_enabled)

		ldom_power_off();

#endif

again:

	p1275_cmd("exit", P1275_INOUT(0, 0));

	args[0] = (unsigned long) "exit";

	args[1] = 0;

	args[2] = 0;

	p1275_cmd_direct(args);

	goto again; /* PROM is out to get me -DaveM */

}



void prom_halt_power_off(void)

{

	unsigned long args[3];



#ifdef CONFIG_SUN_LDOMS

	if (ldom_domaining_enabled)

		ldom_power_off();

#endif

	p1275_cmd("SUNW,power-off", P1275_INOUT(0, 0));

	args[0] = (unsigned long) "SUNW,power-off";

	args[1] = 0;

	args[2] = 0;

	p1275_cmd_direct(args);



	/* if nothing else helps, we just halt */

	prom_halt();
@@ -114,10 +153,15 @@ void prom_halt_power_off(void) 
/* Set prom sync handler to call function 'funcp'. */

void prom_setcallback(callback_func_t funcp)

{

	unsigned long args[5];

	if (!funcp)

		return;

	p1275_cmd("set-callback", P1275_ARG(0, P1275_ARG_IN_FUNCTION) |

		  P1275_INOUT(1, 1), funcp);

	args[0] = (unsigned long) "set-callback";

	args[1] = 1;

	args[2] = 1;

	args[3] = (unsigned long) funcp;

	args[4] = (unsigned long) -1;

	p1275_cmd_direct(args);

}



/* Get the idprom and stuff it into buffer 'idbuf'.  Returns the
@@ -173,57 +217,61 @@ static int prom_get_memory_ihandle(void) 
}



/* Load explicit I/D TLB entries. */

static long tlb_load(const char *type, unsigned long index,

		     unsigned long tte_data, unsigned long vaddr)

{

	unsigned long args[9];



	args[0] = (unsigned long) prom_callmethod_name;

	args[1] = 5;

	args[2] = 1;

	args[3] = (unsigned long) type;

	args[4] = (unsigned int) prom_get_mmu_ihandle();

	args[5] = vaddr;

	args[6] = tte_data;

	args[7] = index;

	args[8] = (unsigned long) -1;



	p1275_cmd_direct(args);



	return (long) args[8];

}



long prom_itlb_load(unsigned long index,

		    unsigned long tte_data,

		    unsigned long vaddr)

{

	return p1275_cmd(prom_callmethod_name,

			 (P1275_ARG(0, P1275_ARG_IN_STRING) |

			  P1275_ARG(2, P1275_ARG_IN_64B) |

			  P1275_ARG(3, P1275_ARG_IN_64B) |

			  P1275_INOUT(5, 1)),

			 "SUNW,itlb-load",

			 prom_get_mmu_ihandle(),

			 /* And then our actual args are pushed backwards. */

			 vaddr,

			 tte_data,

			 index);

	return tlb_load("SUNW,itlb-load", index, tte_data, vaddr);

}



long prom_dtlb_load(unsigned long index,

		    unsigned long tte_data,

		    unsigned long vaddr)

{

	return p1275_cmd(prom_callmethod_name,

			 (P1275_ARG(0, P1275_ARG_IN_STRING) |

			  P1275_ARG(2, P1275_ARG_IN_64B) |

			  P1275_ARG(3, P1275_ARG_IN_64B) |

			  P1275_INOUT(5, 1)),

			 "SUNW,dtlb-load",

			 prom_get_mmu_ihandle(),

			 /* And then our actual args are pushed backwards. */

			 vaddr,

			 tte_data,

			 index);

	return tlb_load("SUNW,dtlb-load", index, tte_data, vaddr);

}



int prom_map(int mode, unsigned long size,

	     unsigned long vaddr, unsigned long paddr)

{

	int ret = p1275_cmd(prom_callmethod_name,

			    (P1275_ARG(0, P1275_ARG_IN_STRING) |

			     P1275_ARG(3, P1275_ARG_IN_64B) |

			     P1275_ARG(4, P1275_ARG_IN_64B) |

			     P1275_ARG(6, P1275_ARG_IN_64B) |

			     P1275_INOUT(7, 1)),

			    prom_map_name,

			    prom_get_mmu_ihandle(),

			    mode,

			    size,

			    vaddr,

			    0,

			    paddr);



	unsigned long args[11];

	int ret;



	args[0] = (unsigned long) prom_callmethod_name;

	args[1] = 7;

	args[2] = 1;

	args[3] = (unsigned long) prom_map_name;

	args[4] = (unsigned int) prom_get_mmu_ihandle();

	args[5] = (unsigned int) mode;

	args[6] = size;

	args[7] = vaddr;

	args[8] = 0;

	args[9] = paddr;

	args[10] = (unsigned long) -1;



	p1275_cmd_direct(args);



	ret = (int) args[10];

	if (ret == 0)

		ret = -1;

	return ret;
@@ -231,40 +279,51 @@ int prom_map(int mode, unsigned long size, 


void prom_unmap(unsigned long size, unsigned long vaddr)

{

	p1275_cmd(prom_callmethod_name,

		  (P1275_ARG(0, P1275_ARG_IN_STRING) |

		   P1275_ARG(2, P1275_ARG_IN_64B) |

		   P1275_ARG(3, P1275_ARG_IN_64B) |

		   P1275_INOUT(4, 0)),

		  prom_unmap_name,

		  prom_get_mmu_ihandle(),

		  size,

		  vaddr);

	unsigned long args[7];



	args[0] = (unsigned long) prom_callmethod_name;

	args[1] = 4;

	args[2] = 0;

	args[3] = (unsigned long) prom_unmap_name;

	args[4] = (unsigned int) prom_get_mmu_ihandle();

	args[5] = size;

	args[6] = vaddr;



	p1275_cmd_direct(args);

}



/* Set aside physical memory which is not touched or modified

 * across soft resets.

 */

unsigned long prom_retain(const char *name,

			  unsigned long pa_low, unsigned long pa_high,

			  long size, long align)

int prom_retain(const char *name, unsigned long size,

		unsigned long align, unsigned long *paddr)

{

	/* XXX I don't think we return multiple values correctly.

	 * XXX OBP supposedly returns pa_low/pa_high here, how does

	 * XXX it work?

	unsigned long args[11];



	args[0] = (unsigned long) prom_callmethod_name;

	args[1] = 5;

	args[2] = 3;

	args[3] = (unsigned long) "SUNW,retain";

	args[4] = (unsigned int) prom_get_memory_ihandle();

	args[5] = align;

	args[6] = size;

	args[7] = (unsigned long) name;

	args[8] = (unsigned long) -1;

	args[9] = (unsigned long) -1;

	args[10] = (unsigned long) -1;



	p1275_cmd_direct(args);



	if (args[8])

		return (int) args[8];



	/* Next we get "phys_high" then "phys_low".  On 64-bit

	 * the phys_high cell is don't care since the phys_low

	 * cell has the full value.

	 */

	*paddr = args[10];



	/* If align is zero, the pa_low/pa_high args are passed,

	 * else they are not.

	 */

	if (align == 0)

		return p1275_cmd("SUNW,retain",

				 (P1275_ARG(0, P1275_ARG_IN_BUF) | P1275_INOUT(5, 2)),

				 name, pa_low, pa_high, size, align);

	else

		return p1275_cmd("SUNW,retain",

				 (P1275_ARG(0, P1275_ARG_IN_BUF) | P1275_INOUT(3, 2)),

				 name, size, align);

	return 0;

}



/* Get "Unumber" string for the SIMM at the given
@@ -277,62 +336,129 @@ int prom_getunumber(int syndrome_code, 
		    unsigned long phys_addr,

		    char *buf, int buflen)

{

	return p1275_cmd(prom_callmethod_name,

			 (P1275_ARG(0, P1275_ARG_IN_STRING)	|

			  P1275_ARG(3, P1275_ARG_OUT_BUF)	|

			  P1275_ARG(6, P1275_ARG_IN_64B)	|

			  P1275_INOUT(8, 2)),

			 "SUNW,get-unumber", prom_get_memory_ihandle(),

			 buflen, buf, P1275_SIZE(buflen),

			 0, phys_addr, syndrome_code);

	unsigned long args[12];



	args[0] = (unsigned long) prom_callmethod_name;

	args[1] = 7;

	args[2] = 2;

	args[3] = (unsigned long) "SUNW,get-unumber";

	args[4] = (unsigned int) prom_get_memory_ihandle();

	args[5] = buflen;

	args[6] = (unsigned long) buf;

	args[7] = 0;

	args[8] = phys_addr;

	args[9] = (unsigned int) syndrome_code;

	args[10] = (unsigned long) -1;

	args[11] = (unsigned long) -1;



	p1275_cmd_direct(args);



	return (int) args[10];

}



/* Power management extensions. */

void prom_sleepself(void)

{

	p1275_cmd("SUNW,sleep-self", P1275_INOUT(0, 0));

	unsigned long args[3];



	args[0] = (unsigned long) "SUNW,sleep-self";

	args[1] = 0;

	args[2] = 0;

	p1275_cmd_direct(args);

}



int prom_sleepsystem(void)

{

	return p1275_cmd("SUNW,sleep-system", P1275_INOUT(0, 1));

	unsigned long args[4];



	args[0] = (unsigned long) "SUNW,sleep-system";

	args[1] = 0;

	args[2] = 1;

	args[3] = (unsigned long) -1;

	p1275_cmd_direct(args);



	return (int) args[3];

}



int prom_wakeupsystem(void)

{

	return p1275_cmd("SUNW,wakeup-system", P1275_INOUT(0, 1));

	unsigned long args[4];



	args[0] = (unsigned long) "SUNW,wakeup-system";

	args[1] = 0;

	args[2] = 1;

	args[3] = (unsigned long) -1;

	p1275_cmd_direct(args);



	return (int) args[3];

}



#ifdef CONFIG_SMP

void prom_startcpu(int cpunode, unsigned long pc, unsigned long arg)

{

	p1275_cmd("SUNW,start-cpu", P1275_INOUT(3, 0), cpunode, pc, arg);

	unsigned long args[6];



	args[0] = (unsigned long) "SUNW,start-cpu";

	args[1] = 3;

	args[2] = 0;

	args[3] = (unsigned int) cpunode;

	args[4] = pc;

	args[5] = arg;

	p1275_cmd_direct(args);

}



void prom_startcpu_cpuid(int cpuid, unsigned long pc, unsigned long arg)

{

	p1275_cmd("SUNW,start-cpu-by-cpuid", P1275_INOUT(3, 0),

		  cpuid, pc, arg);

	unsigned long args[6];



	args[0] = (unsigned long) "SUNW,start-cpu-by-cpuid";

	args[1] = 3;

	args[2] = 0;

	args[3] = (unsigned int) cpuid;

	args[4] = pc;

	args[5] = arg;

	p1275_cmd_direct(args);

}



void prom_stopcpu_cpuid(int cpuid)

{

	p1275_cmd("SUNW,stop-cpu-by-cpuid", P1275_INOUT(1, 0),

		  cpuid);

	unsigned long args[4];



	args[0] = (unsigned long) "SUNW,stop-cpu-by-cpuid";

	args[1] = 1;

	args[2] = 0;

	args[3] = (unsigned int) cpuid;

	p1275_cmd_direct(args);

}



void prom_stopself(void)

{

	p1275_cmd("SUNW,stop-self", P1275_INOUT(0, 0));

	unsigned long args[3];



	args[0] = (unsigned long) "SUNW,stop-self";

	args[1] = 0;

	args[2] = 0;

	p1275_cmd_direct(args);

}



void prom_idleself(void)

{

	p1275_cmd("SUNW,idle-self", P1275_INOUT(0, 0));

	unsigned long args[3];



	args[0] = (unsigned long) "SUNW,idle-self";

	args[1] = 0;

	args[2] = 0;

	p1275_cmd_direct(args);

}



void prom_resumecpu(int cpunode)

{

	p1275_cmd("SUNW,resume-cpu", P1275_INOUT(1, 0), cpunode);

	unsigned long args[4];



	args[0] = (unsigned long) "SUNW,resume-cpu";

	args[1] = 1;

	args[2] = 0;

	args[3] = (unsigned int) cpunode;

	p1275_cmd_direct(args);

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE