diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-23 23:10:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-23 23:10:57 -0700 |
| commit | 25edd6946a1d74e5e77813c2324a0908c68bcf9e (patch) | |
| tree | 29afc2a7287df17776e4e2b4a6ee78b108c09f10 /arch/sparc/prom/cif.S | |
| parent | 019408f9b89c68cd7b8ddb904960dc17ccf7e531 (diff) | |
| download | op-kernel-dev-25edd6946a1d74e5e77813c2324a0908c68bcf9e.zip op-kernel-dev-25edd6946a1d74e5e77813c2324a0908c68bcf9e.tar.gz | |
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: Meelis Roos <mroos@linux.ee>
Tested-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/prom/cif.S')
| -rw-r--r-- | arch/sparc/prom/cif.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sparc/prom/cif.S b/arch/sparc/prom/cif.S index 5f27ad7..9c86b4b 100644 --- a/arch/sparc/prom/cif.S +++ b/arch/sparc/prom/cif.S @@ -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 |
