diff options
| author | kanoj <kanoj> | 2001-11-29 16:42:10 +0000 |
|---|---|---|
| committer | kanoj <kanoj> | 2001-11-29 16:42:10 +0000 |
| commit | e4aaab6871d3272a934fb6da122af4f6ca650800 (patch) | |
| tree | fb2801ee795233e1ff60fdb262d3137b31473f51 | |
| parent | 0e49c3417c2e5850cb7bf2b0a940d9557406a3f3 (diff) | |
| download | netdev-vger-cvs-e4aaab6871d3272a934fb6da122af4f6ca650800.tar.gz | |
Make the spitfire #tlb entries dependency clear in the tlbflush code.
| -rw-r--r-- | arch/sparc64/mm/ultra.S | 6 | ||||
| -rw-r--r-- | include/asm-sparc64/spitfire.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index c615bdf93..a6f2c19ba 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S @@ -1,4 +1,4 @@ -/* $Id: ultra.S,v 1.69 2001-11-15 10:37:14 davem Exp $ +/* $Id: ultra.S,v 1.70 2001-11-29 16:42:10 kanoj Exp $ * ultra.S: Don't expand these all over the place... * * Copyright (C) 1997, 2000 David S. Miller (davem@redhat.com) @@ -117,7 +117,7 @@ __spitfire_flush_tlb_range_constant_time: /* %o0=ctx, %o1=start, %o3=end */ wrpr %g1, PSTATE_IE, %pstate mov TLB_TAG_ACCESS, %g3 /* XXX Spitfire dependency... */ - mov (62 << 3), %g2 + mov ((SPITFIRE_HIGHEST_LOCKED_TLBENT-1) << 3), %g2 /* Spitfire Errata #32 workaround. */ mov 0x8, %o4 @@ -642,7 +642,7 @@ __spitfire_xcall_flush_tlb_all: stx %g0, [%g4 + %lo(errata32_hwbug)] 2: add %g2, 1, %g2 - cmp %g2, 63 + cmp %g2, SPITFIRE_HIGHEST_LOCKED_TLBENT ble,pt %icc, 1b sll %g2, 3, %g3 flush %g6 diff --git a/include/asm-sparc64/spitfire.h b/include/asm-sparc64/spitfire.h index f918ba101..107398e13 100644 --- a/include/asm-sparc64/spitfire.h +++ b/include/asm-sparc64/spitfire.h @@ -1,4 +1,4 @@ -/* $Id: spitfire.h,v 1.17 2001-11-28 23:25:17 davem Exp $ +/* $Id: spitfire.h,v 1.18 2001-11-29 16:42:10 kanoj Exp $ * spitfire.h: SpitFire/BlackBird/Cheetah inline MMU operations. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) @@ -32,6 +32,8 @@ #define VIRT_WATCHPOINT 0x0000000000000038 #define PHYS_WATCHPOINT 0x0000000000000040 +#define SPITFIRE_HIGHEST_LOCKED_TLBENT (64 - 1) + #ifndef __ASSEMBLY__ enum ultra_tlb_layout { @@ -43,7 +45,6 @@ extern enum ultra_tlb_layout tlb_type; #define SPARC64_USE_STICK (tlb_type == cheetah) -#define SPITFIRE_HIGHEST_LOCKED_TLBENT (64 - 1) #define CHEETAH_HIGHEST_LOCKED_TLBENT (16 - 1) #define L1DCACHE_SIZE 0x4000 |