From owner-p4-projects@FreeBSD.ORG Mon Feb 23 20:23:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66EA8106568C; Mon, 23 Feb 2009 20:23:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A9B81065673 for ; Mon, 23 Feb 2009 20:23:47 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E20C08FC0C for ; Mon, 23 Feb 2009 20:23:46 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1NKNkYn008572 for ; Mon, 23 Feb 2009 20:23:46 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NKNkep008570 for perforce@freebsd.org; Mon, 23 Feb 2009 20:23:46 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 23 Feb 2009 20:23:46 GMT Message-Id: <200902232023.n1NKNkep008570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Feb 2009 20:23:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=158149 Change 158149 by lulf@lulf_carrot on 2009/02/23 20:23:17 - Point PTBR to the actual pmap instead of the directory. This allows code referring to the PRBR to become a bit simpler, allowing tlb_miss to call pmap_pte for retrieving page. - Simplify restorectx a bit, removing a few unneeded instructions, using register+offset addressing directly, and free one register. - Allocate memory for msgbufp. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#7 edit .. //depot/projects/avr32/src/sys/avr32/avr32/switch.S#6 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#7 (text+ko) ==== @@ -96,11 +96,14 @@ kernel_pmap->pm_pd[j] = (pd_entry_t)(pagetables + (i * NPTEPG)); } + msgbufp = (struct msgbuf *)pmap_steal_memory(MSGBUF_SIZE); + msgbufinit(msgbufp, MSGBUF_SIZE); + kernel_vm_end = VM_MAX_KERNEL_ADDRESS; /* Enable paging */ tlb_flush(); - sysreg_write(PTBR, (uint32_t)kernel_pmap->pm_pd); + sysreg_write(PTBR, (uint32_t)kernel_pmap); sysreg_write(MMUCR, bit_offset(SYS, MMUCR, S) | bit_offset(SYS, MMUCR, E) | @@ -817,15 +820,11 @@ */ static int tlb_at = KSTACK_PAGES; void pmap_tlb_miss(uint32_t ecr, uint32_t tlbear, uint32_t tlbehi) { - pd_entry_t* pd = (pd_entry_t *)sysreg_read(PTBR); + pmap_t pmap = (pmap_t)sysreg_read(PTBR); pt_entry_t *ent; register_t mmucr; - ent = (pt_entry_t *)pd[pd_index_from_va(tlbear)]; - if (ent) { - ent += pt_index_from_va(tlbear); - } - + ent = pmap_pte(pmap, tlbear); if (!ent || !*ent) { breakpoint(); /* printf("\nTLB miss: %x\n", ecr); ==== //depot/projects/avr32/src/sys/avr32/avr32/switch.S#6 (text+ko) ==== @@ -55,7 +55,6 @@ retal sp /* return 0 */ END(savectx) - /** * r12: Pointer struct thread * r11: Pmap @@ -73,26 +72,20 @@ * r4: Misc * r3: tlbehi save * r2: Address of PCB - * r1: Pointer to PD */ /* Load PCB and PD address */ ld.w r2, r12[TD_PCB] - sub r1, r11, -(PMAP_PD) - ld.w r1, r1 - - /* Check if stack is in stack is is P3 */ - sub r10, r12, -(TD_KSTACK) - ld.w r10, r10 + /* Check if stack is in P3 */ + ld.w r10, r12[TD_KSTACK] mov r9, r10 lsr r9, 29 cp r9, 0x6 brne restore_finish /* Add ASID and V flag to kstack value */ - sub r4, r11, -(PMAP_ASID) - ld.w r4, r4 + ld.w r4, r11[PMAP_ASID] add r10, r4 sbr r10, AT32_SYS_TLBEHI_V @@ -140,7 +133,7 @@ brne 1b /* Or not */ restore_finish: - mtsr AT32_SYS_PTBR, r1 /* Point lookups to new pmap */ + mtsr AT32_SYS_PTBR, r11 /* Point lookups to new pmap */ mtsr AT32_SYS_TLBEHI, r10 /* Set TLBEHI (ASID for new td) */ nop /* Wait for mtsr */ ld.w r4, r2++ /* Load status register */