From owner-svn-src-user@FreeBSD.ORG Mon Apr 5 19:43:27 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B5F0106566B; Mon, 5 Apr 2010 19:43:27 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4073F8FC13; Mon, 5 Apr 2010 19:43:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o35JhRfu025734; Mon, 5 Apr 2010 19:43:27 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o35JhRkF025732; Mon, 5 Apr 2010 19:43:27 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201004051943.o35JhRkF025732@svn.freebsd.org> From: Juli Mallett Date: Mon, 5 Apr 2010 19:43:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206207 - user/jmallett/octeon/sys/mips/mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Apr 2010 19:43:27 -0000 Author: jmallett Date: Mon Apr 5 19:43:26 2010 New Revision: 206207 URL: http://svn.freebsd.org/changeset/base/206207 Log: Save and restore ASID and PageMask. Modified: user/jmallett/octeon/sys/mips/mips/tlb.c Modified: user/jmallett/octeon/sys/mips/mips/tlb.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/tlb.c Mon Apr 5 19:40:13 2010 (r206206) +++ user/jmallett/octeon/sys/mips/mips/tlb.c Mon Apr 5 19:43:26 2010 (r206207) @@ -50,6 +50,7 @@ static inline void tlb_probe(void) { __asm __volatile ("tlbp" : : : "memory"); + mips_cp0_sync(); mips_barrier(); } @@ -57,6 +58,7 @@ static inline void tlb_read(void) { __asm __volatile ("tlbr" : : : "memory"); + mips_cp0_sync(); mips_barrier(); } @@ -64,6 +66,7 @@ static inline void tlb_write_indexed(void) { __asm __volatile ("tlbwi" : : : "memory"); + mips_cp0_sync(); mips_barrier(); } @@ -71,6 +74,7 @@ static inline void tlb_write_random(void) { __asm __volatile ("tlbwr" : : : "memory"); + mips_cp0_sync(); mips_barrier(); } @@ -79,43 +83,56 @@ static void tlb_invalidate_one(unsigned) void tlb_invalidate_address(struct pmap *pmap, vm_offset_t va) { + register_t mask, asid; register_t s; int i; va &= ~PAGE_MASK; s = intr_disable(); + mask = mips_rd_pagemask(); + asid = mips_rd_entryhi() & TLBHI_ASID_MASK; + mips_wr_pagemask(0); mips_wr_entryhi(TLBHI_ENTRY(va, pmap_asid(pmap))); tlb_probe(); i = mips_rd_index(); if (i >= 0) tlb_invalidate_one(i); + mips_wr_entryhi(asid); + mips_wr_pagemask(mask); intr_restore(s); } void tlb_invalidate_all(void) { + register_t mask, asid; register_t s; unsigned i; s = intr_disable(); + mask = mips_rd_pagemask(); + asid = mips_rd_entryhi() & TLBHI_ASID_MASK; for (i = mips_rd_wired(); i < num_tlbentries; i++) tlb_invalidate_one(i); + mips_wr_entryhi(asid); + mips_wr_pagemask(mask); intr_restore(s); } void tlb_update(struct pmap *pmap, vm_offset_t va, pt_entry_t pte) { - register_t asid; + register_t mask, asid; register_t s; int i; va &= ~PAGE_MASK; s = intr_disable(); - asid = mips_rd_entryhi(); + mask = mips_rd_pagemask(); + asid = mips_rd_entryhi() & TLBHI_ASID_MASK; + mips_wr_pagemask(0); mips_wr_entryhi(TLBHI_ENTRY(va, pmap_asid(pmap))); tlb_probe(); i = mips_rd_index(); @@ -126,6 +143,7 @@ tlb_update(struct pmap *pmap, vm_offset_ else tlb_write_random(); mips_wr_entryhi(asid); + mips_wr_pagemask(mask); intr_restore(s); } @@ -136,6 +154,7 @@ tlb_invalidate_one(unsigned i) mips_wr_entryhi(TLBHI_ENTRY(MIPS_KSEG0_START + (i * PAGE_SIZE), 0)); mips_wr_entrylo0(0); mips_wr_entrylo1(0); + mips_wr_pagemask(0); mips_wr_index(i); tlb_write_indexed(); }