summaryrefslogtreecommitdiff
path: root/arch/sparc/prom/console_32.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-30 20:15:58 -0800
committerDavid S. Miller <davem@davemloft.net>2010-11-30 20:15:58 -0800
commit595a251c0740785fd3c0d2156d78578c7479811e (patch)
tree513cee9d682b12c2c4e490f7e91422e82530c4b8 /arch/sparc/prom/console_32.c
parent12c7a35ee6a1c605e740733f2cbd5b5079f09f0f (diff)
sparc: Write to prom console using indirect buffer.
sparc64 systems have a restriction in that passing in buffer addressses above 4GB to prom calls is not reliable. We end up violating this when we do prom console writes, because we use an on-stack buffer to translate '\n' into '\r\n'. So instead, do this translation into an intermediate buffer, which is in the kernel image and thus below 4GB, then pass that to the PROM console write calls. On the 32-bit side we don't have to deal with any of these issues, so the new prom_console_write_buf() uses the existing prom_nbputchar() implementation. However we can now mark those routines static. Since the 64-bit side completely uses new code we can delete the putchar bits as they are now completely unused. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/prom/console_32.c')
-rw-r--r--arch/sparc/prom/console_32.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/sparc/prom/console_32.c b/arch/sparc/prom/console_32.c
index 157019e29fd4..48863108a44c 100644
--- a/arch/sparc/prom/console_32.c
+++ b/arch/sparc/prom/console_32.c
@@ -43,12 +43,14 @@ static int prom_nbputchar(const char *buf)
return i; /* Ugh, we could spin forever on unsupported proms ;( */
}
-/* Blocking version of put character routine above. */
-void prom_putchar(const char *buf)
+void prom_console_write_buf(const char *buf, int len)
{
- while (1) {
- int err = prom_nbputchar(buf);
- if (!err)
- break;
+ while (len) {
+ int n = prom_nbputchar(buf);
+ if (n)
+ continue;
+ len--;
+ buf++;
}
}
+