Import of Linux/MIPS 2.1.36

1 files changed, 15 insertions, 43 deletions

diff --git a/include/asm-sparc/pgtsrmmu.h b/include/asm-sparc/pgtsrmmu.h
index f8ca14944..fac1df5ed 100644
--- a/include/asm-sparc/pgtsrmmu.h
+++ b/include/asm-sparc/pgtsrmmu.h
@@ -1,4 +1,4 @@
-/* $Id: pgtsrmmu.h,v 1.24 1996/10/07 03:03:06 davem Exp $
+/* $Id: pgtsrmmu.h,v 1.28 1997/03/15 07:47:52 davem Exp $
  * pgtsrmmu.h:  SRMMU page table defines and code.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -7,13 +7,8 @@
 #ifndef _SPARC_PGTSRMMU_H
 #define _SPARC_PGTSRMMU_H
 
-#include <linux/config.h>
 #include <asm/page.h>
 
-#if CONFIG_AP1000
-#include <asm/ap1000/apreg.h>
-#endif
-
 /* PMD_SHIFT determines the size of the area a second-level page table can map */
 #define SRMMU_PMD_SHIFT         18
 #define SRMMU_PMD_SIZE          (1UL << SRMMU_PMD_SHIFT)
@@ -92,19 +87,7 @@
 #define SRMMU_FAULT_STATUS       0x00000300
 #define SRMMU_FAULT_ADDR         0x00000400
 
-/*
- * "normal" sun systems have their memory on bus 0. This means the top
- * 4 bits of 36 bit physical addresses are 0. We use this define to
- * determine if a piece of memory might be normal memory, or if its
- * definately some sort of device memory.  
- *
- * On the AP+ normal memory is on bus 8. Why? Ask Fujitsu :-)
-*/
-#if CONFIG_AP1000
-#define MEM_BUS_SPACE 8
-#else
-#define MEM_BUS_SPACE 0
-#endif
+#ifndef __ASSEMBLY__
 
 /* Accessing the MMU control register. */
 extern __inline__ unsigned int srmmu_get_mmureg(void)
@@ -126,9 +109,6 @@ extern __inline__ void srmmu_set_mmureg(unsigned long regval)
 extern __inline__ void srmmu_set_ctable_ptr(unsigned long paddr)
 {
 	paddr = ((paddr >> 4) & SRMMU_CTX_PMASK);
-#if MEM_BUS_SPACE
-        paddr |= (MEM_BUS_SPACE<<28);
-#endif
 	__asm__ __volatile__("sta %0, [%1] %2\n\t" : :
 			     "r" (paddr), "r" (SRMMU_CTXTBL_PTR),
 			     "i" (ASI_M_MMUREGS) :
@@ -151,11 +131,6 @@ extern __inline__ void srmmu_set_context(int context)
 	__asm__ __volatile__("sta %0, [%1] %2\n\t" : :
 			     "r" (context), "r" (SRMMU_CTX_REG),
 			     "i" (ASI_M_MMUREGS) : "memory");
-#if CONFIG_AP1000
-	/* The AP1000+ message controller also needs to know
-	   the current task's context. */
-	MSC_OUT(MSC_PID, context);
-#endif
 }
 
 extern __inline__ int srmmu_get_context(void)
@@ -191,10 +166,6 @@ extern __inline__ unsigned int srmmu_get_faddr(void)
 /* This is guaranteed on all SRMMU's. */
 extern __inline__ void srmmu_flush_whole_tlb(void)
 {
-#if CONFIG_AP1000
-	extern void mc_tlb_flush_all(void);
-	mc_tlb_flush_all();
-#endif
 	__asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
 			     "r" (0x400),        /* Flush entire TLB!! */
 			     "i" (ASI_M_FLUSH_PROBE) : "memory");
@@ -204,9 +175,6 @@ extern __inline__ void srmmu_flush_whole_tlb(void)
 /* These flush types are not available on all chips... */
 extern __inline__ void srmmu_flush_tlb_ctx(void)
 {
-#if CONFIG_AP1000
-	mc_tlb_flush_ctx();
-#endif
 	__asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
 			     "r" (0x300),        /* Flush TLB ctx.. */
 			     "i" (ASI_M_FLUSH_PROBE) : "memory");
@@ -215,9 +183,6 @@ extern __inline__ void srmmu_flush_tlb_ctx(void)
 
 extern __inline__ void srmmu_flush_tlb_region(unsigned long addr)
 {
-#if CONFIG_AP1000
-	mc_tlb_flush_region();
-#endif
 	addr &= SRMMU_PGDIR_MASK;
 	__asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
 			     "r" (addr | 0x200), /* Flush TLB region.. */
@@ -228,9 +193,6 @@ extern __inline__ void srmmu_flush_tlb_region(unsigned long addr)
 
 extern __inline__ void srmmu_flush_tlb_segment(unsigned long addr)
 {
-#if CONFIG_AP1000
-	mc_tlb_flush_segment();
-#endif
 	addr &= SRMMU_PMD_MASK;
 	__asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
 			     "r" (addr | 0x100), /* Flush TLB segment.. */
@@ -240,9 +202,6 @@ extern __inline__ void srmmu_flush_tlb_segment(unsigned long addr)
 
 extern __inline__ void srmmu_flush_tlb_page(unsigned long page)
 {
-#if CONFIG_AP1000
-	mc_tlb_flush_page(page);
-#endif
 	page &= PAGE_MASK;
 	__asm__ __volatile__("sta %%g0, [%0] %1\n\t": :
 			     "r" (page),        /* Flush TLB page.. */
@@ -262,7 +221,20 @@ extern __inline__ unsigned long srmmu_hwprobe(unsigned long vaddr)
 	return retval;
 }
 
+extern __inline__ int
+srmmu_get_pte (unsigned long addr)
+{
+	register unsigned long entry;
+        
+	__asm__ __volatile__("\n\tlda [%1] %2,%0\n\t" :
+				"=r" (entry):
+				"r" ((addr & 0xfffff000) | 0x400), "i" (ASI_M_FLUSH_PROBE));
+	return entry;
+}
+
 extern unsigned long (*srmmu_read_physical)(unsigned long paddr);
 extern void (*srmmu_write_physical)(unsigned long paddr, unsigned long word);
 
+#endif /* !(__ASSEMBLY__) */
+
 #endif /* !(_SPARC_PGTSRMMU_H) */