From owner-p4-projects@FreeBSD.ORG  Wed Nov 12 00:31:54 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9121916A4D0; Wed, 12 Nov 2003 00:31:54 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6CF2A16A4CE
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 00:31:54 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DF90043F93
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 00:31:53 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAC8VrXJ056202
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 00:31:53 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAC8VrBR056199
	for perforce@freebsd.org; Wed, 12 Nov 2003 00:31:53 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Wed, 12 Nov 2003 00:31:53 -0800 (PST)
Message-Id: <200311120831.hAC8VrBR056199@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42113 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Nov 2003 08:31:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=42113

Change 42113 by jmallett@jmallett_dalek on 2003/11/12 00:31:48

	Clarify some things that are page size relative.  Badly need to init
	PageMask as necessary.  Have some patches, but don't trust them.

Affected files ...

.. //depot/projects/mips/sys/mips/include/pte.h#16 edit

Differences ...

==== //depot/projects/mips/sys/mips/include/pte.h#16 (text+ko) ====

@@ -46,8 +46,9 @@
 
 /*
  * VPN for EntryHi register.  Upper two bits select user, supervisor,
- * or kernel.  Bits 61 to 40 copy bit 63.  VPN2 is bits 39 to 13.  From
- * bit 12 to bit 8 there is a 5-bit 0 field.  Low byte is ASID.
+ * or kernel.  Bits 61 to 40 copy bit 63.  VPN2 is bits 39 and down to
+ * as low as 13, down to PAGE_SHIFT + 1, to index 2 pages.  From bit 12
+ * to bit 8 there is a 5-bit 0 field.  Low byte is ASID.
  */
 #define	MIPS_HI_R_SHIFT		62
 #ifdef LOCORE
@@ -64,7 +65,8 @@
 #define	MIPS_HI_FILL_SHIFT	40
 #define	MIPS_HI_FILL_MASK	((0x800000UL - 1) << MIPS_HI_FILL_SHIFT)
 #define	MIPS_HI_VA_FILL(va)	((((va) & (1ULL << 63)) != 0 ? MIPS_HI_FILL_MASK : 0))
-#define	MIPS_HI_VPN2_SHIFT	13
+#define	MIPS_HI_VPN2_SHIFT	(PAGE_SHIFT + 1)
+/* XXX VPN2 masking is wrong.  Should trim off below VPN2_SHIFT, and from FILL_SHIFT up. */
 #ifdef LOCORE
 #define	MIPS_HI_VPN2_BMASK	0xFFFFFFF
 #else