1 files changed, 44 insertions, 16 deletions

diff --git a/arch/sh/mm/tlb-sh5.c b/arch/sh/mm/tlb-sh5.c
index dae131243bcc..f27dbe1c1599 100644
--- a/arch/sh/mm/tlb-sh5.c
+++ b/arch/sh/mm/tlb-sh5.c
@@ -117,26 +117,15 @@ int sh64_put_wired_dtlb_entry(unsigned long long entry)
  * Load up a virtual<->physical translation for @eaddr<->@paddr in the
  * pre-allocated TLB slot @config_addr (see sh64_get_wired_dtlb_entry).
  */
-inline void sh64_setup_tlb_slot(unsigned long long config_addr,
-                                unsigned long eaddr,
-                                unsigned long asid,
-                                unsigned long paddr)
+void sh64_setup_tlb_slot(unsigned long long config_addr, unsigned long eaddr,
+                         unsigned long asid, unsigned long paddr)
 {
         unsigned long long pteh, ptel;
 
-        /* Sign extension */
-#if (NEFF == 32)
-        pteh = (unsigned long long)(signed long long)(signed long) eaddr;
-#else
-#error "Can't sign extend more than 32 bits yet"
-#endif
+        pteh = neff_sign_extend(eaddr);
         pteh &= PAGE_MASK;
         pteh |= (asid << PTEH_ASID_SHIFT) | PTEH_VALID;
-#if (NEFF == 32)
-        ptel = (unsigned long long)(signed long long)(signed long) paddr;
-#else
-#error "Can't sign extend more than 32 bits yet"
-#endif
+        ptel = neff_sign_extend(paddr);
         ptel &= PAGE_MASK;
         ptel |= (_PAGE_CACHABLE | _PAGE_READ | _PAGE_WRITE);
 
@@ -152,5 +141,44 @@ inline void sh64_setup_tlb_slot(unsigned long long config_addr,
  *
  * Teardown any existing mapping in the TLB slot @config_addr.
  */
-inline void sh64_teardown_tlb_slot(unsigned long long config_addr)
+void sh64_teardown_tlb_slot(unsigned long long config_addr)
         __attribute__ ((alias("__flush_tlb_slot")));
+
+static int dtlb_entry;
+static unsigned long long dtlb_entries[64];
+
+void tlb_wire_entry(struct vm_area_struct *vma, unsigned long addr, pte_t pte)
+{
+        unsigned long long entry;
+        unsigned long paddr, flags;
+
+        BUG_ON(dtlb_entry == ARRAY_SIZE(dtlb_entries));
+
+        local_irq_save(flags);
+
+        entry = sh64_get_wired_dtlb_entry();
+        dtlb_entries[dtlb_entry++] = entry;
+
+        paddr = pte_val(pte) & _PAGE_FLAGS_HARDWARE_MASK;
+        paddr &= ~PAGE_MASK;
+
+        sh64_setup_tlb_slot(entry, addr, get_asid(), paddr);
+
+        local_irq_restore(flags);
+}
+
+void tlb_unwire_entry(void)
+{
+        unsigned long long entry;
+        unsigned long flags;
+
+        BUG_ON(!dtlb_entry);
+
+        local_irq_save(flags);
+        entry = dtlb_entries[dtlb_entry--];
+
+        sh64_teardown_tlb_slot(entry);
+        sh64_put_wired_dtlb_entry(entry);
+
+        local_irq_restore(flags);
+}