sparc: remove CONFIG_SUN4
While doing some easy cleanups on the sparc code I noticed that the CONFIG_SUN4 code seems to be worse than the rest - there were some "I don't know how it should work, but the current code definitely cannot work." places. And while I have seen people running Linux on machines like a SPARCstation 5 a few years ago I don't recall having seen sun4 machines, even less ones running Linux. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
b69416b51b
commit
5110bd21b8
@@ -20,11 +20,7 @@
|
||||
#include <asm/memreg.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/pgtable.h>
|
||||
#ifdef CONFIG_SUN4
|
||||
#include <asm/pgtsun4.h>
|
||||
#else
|
||||
#include <asm/pgtsun4c.h>
|
||||
#endif
|
||||
#include <asm/winmacro.h>
|
||||
#include <asm/signal.h>
|
||||
#include <asm/obio.h>
|
||||
@@ -775,11 +771,7 @@ vac_linesize_patch_32: subcc %l7, 32, %l7
|
||||
* Ugly, but we cant use hardware flushing on the sun4 and we'd require
|
||||
* two instructions (Anton)
|
||||
*/
|
||||
#ifdef CONFIG_SUN4
|
||||
vac_hwflush_patch1_on: nop
|
||||
#else
|
||||
vac_hwflush_patch1_on: addcc %l7, -PAGE_SIZE, %l7
|
||||
#endif
|
||||
|
||||
vac_hwflush_patch2_on: sta %g0, [%l3 + %l7] ASI_HWFLUSHSEG
|
||||
|
||||
@@ -798,42 +790,10 @@ vac_hwflush_patch2_on: sta %g0, [%l3 + %l7] ASI_HWFLUSHSEG
|
||||
! %l7 = 1 for textfault
|
||||
! We want error in %l5, vaddr in %l6
|
||||
sun4c_fault:
|
||||
#ifdef CONFIG_SUN4
|
||||
sethi %hi(sun4c_memerr_reg), %l4
|
||||
ld [%l4+%lo(sun4c_memerr_reg)], %l4 ! memerr ctrl reg addr
|
||||
ld [%l4], %l6 ! memerr ctrl reg
|
||||
ld [%l4 + 4], %l5 ! memerr vaddr reg
|
||||
andcc %l6, 0x80, %g0 ! check for error type
|
||||
st %g0, [%l4 + 4] ! clear the error
|
||||
be 0f ! normal error
|
||||
sethi %hi(AC_BUS_ERROR), %l4 ! bus err reg addr
|
||||
|
||||
call prom_halt ! something weird happened
|
||||
! what exactly did happen?
|
||||
! what should we do here?
|
||||
|
||||
0: or %l4, %lo(AC_BUS_ERROR), %l4 ! bus err reg addr
|
||||
lduba [%l4] ASI_CONTROL, %l6 ! bus err reg
|
||||
|
||||
cmp %l7, 1 ! text fault?
|
||||
be 1f ! yes
|
||||
nop
|
||||
|
||||
ld [%l1], %l4 ! load instruction that caused fault
|
||||
srl %l4, 21, %l4
|
||||
andcc %l4, 1, %g0 ! store instruction?
|
||||
|
||||
be 1f ! no
|
||||
sethi %hi(SUN4C_SYNC_BADWRITE), %l4 ! yep
|
||||
! %lo(SUN4C_SYNC_BADWRITE) = 0
|
||||
or %l4, %l6, %l6 ! set write bit to emulate sun4c
|
||||
1:
|
||||
#else
|
||||
sethi %hi(AC_SYNC_ERR), %l4
|
||||
add %l4, 0x4, %l6 ! AC_SYNC_VA in %l6
|
||||
lda [%l6] ASI_CONTROL, %l5 ! Address
|
||||
lda [%l4] ASI_CONTROL, %l6 ! Error, retained for a bit
|
||||
#endif
|
||||
|
||||
andn %l5, 0xfff, %l5 ! Encode all info into l7
|
||||
srl %l6, 14, %l4
|
||||
@@ -880,12 +840,7 @@ sun4c_fault:
|
||||
or %l4, %lo(swapper_pg_dir), %l4
|
||||
sll %l6, 2, %l6
|
||||
ld [%l4 + %l6], %l4
|
||||
#ifdef CONFIG_SUN4
|
||||
sethi %hi(PAGE_MASK), %l6
|
||||
andcc %l4, %l6, %g0
|
||||
#else
|
||||
andcc %l4, PAGE_MASK, %g0
|
||||
#endif
|
||||
be sun4c_fault_fromuser
|
||||
lduXa [%l5] ASI_SEGMAP, %l4
|
||||
|
||||
@@ -937,11 +892,7 @@ invalid_segment_patch1:
|
||||
ld [%l6 + 0x08], %l3 ! tmp = entry->vaddr
|
||||
|
||||
! Flush segment from the cache.
|
||||
#ifdef CONFIG_SUN4
|
||||
sethi %hi((128 * 1024)), %l7
|
||||
#else
|
||||
sethi %hi((64 * 1024)), %l7
|
||||
#endif
|
||||
9:
|
||||
vac_hwflush_patch1:
|
||||
vac_linesize_patch:
|
||||
@@ -1029,12 +980,7 @@ invalid_segment_patch2:
|
||||
or %l4, %lo(swapper_pg_dir), %l4
|
||||
sll %l3, 2, %l3
|
||||
ld [%l4 + %l3], %l4
|
||||
#ifndef CONFIG_SUN4
|
||||
and %l4, PAGE_MASK, %l4
|
||||
#else
|
||||
sethi %hi(PAGE_MASK), %l6
|
||||
and %l4, %l6, %l4
|
||||
#endif
|
||||
|
||||
srl %l5, (PAGE_SHIFT - 2), %l6
|
||||
and %l6, ((SUN4C_PTRS_PER_PTE - 1) << 2), %l6
|
||||
|
Reference in New Issue
Block a user