From owner-p4-projects@FreeBSD.ORG Wed Mar 1 08:27:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACF4116A423; Wed, 1 Mar 2006 08:27:48 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 7A3B316A420 for ; Wed, 1 Mar 2006 08:27:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 452B943D46 for ; Wed, 1 Mar 2006 08:27:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k218RmPw009376 for ; Wed, 1 Mar 2006 08:27:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k218RlPb009373 for perforce@freebsd.org; Wed, 1 Mar 2006 08:27:47 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 08:27:47 GMT Message-Id: <200603010827.k218RlPb009373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92589 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: Wed, 01 Mar 2006 08:27:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=92589 Change 92589 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 08:26:46 add missing TTE flags Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte.h#5 (text+ko) ==== @@ -110,9 +110,11 @@ #define VTD_X (1UL << 7) #define VTD_W (1UL << 6) -#define VTD_REF ((1UL << 3) << VTD_SOFT_SHIFT) /* XXX WRONG */ -#define VTD_SW ((1UL << 1) << VTD_SOFT_SHIFT) /* XXX WRONG */ -#define VTD_WIRED ((1UL << 0) << VTD_SOFT_SHIFT) +#define VTD_REF (1UL << 5) +#define VTD_WR_PERM (1UL << 4) +#define VTD_MANAGED (1UL << 58) +#define VTD_WIRED (1UL << 57) +#define VTD_LOCK (1UL << 56) @@ -126,7 +128,8 @@ /* * default flags for kernel pages */ -#define TTE_KERNEL VTD_V | VTD_CP | VTD_CV | VTD_P | VTD_X | VTD_W +#define TTE_KERNEL VTD_V | VTD_CP | VTD_CV | VTD_P | VTD_X | VTD_W | VTD_WR_PERM | VTD_REF | VTD_WIRED +#define TTE_KERNEL_MINFLAGS VTD_V | VTD_CP | VTD_CV | VTD_P #define VTD_SIZE_BITS (4) #define VTD_SIZE_MASK ((1 << VTD_SIZE_BITS) - 1) @@ -140,12 +143,13 @@ #define TTE_GET_PAGE_SHIFT(tte_data) \ TTE_PAGE_SHIFT(TTE_GET_SIZE(tte_data)) - +#ifdef notyet typedef union { struct tte { unsigned int v:1; /* <63> valid */ unsigned int nfo:1; /* <62> non-fault only */ - unsigned int sw:4; /* <61:58> sw */ + unsigned int sw:3; /* <61:59> sw */ + unsigned int managed:1; /* <58> managed */ unsigned int wired:1; /* <57> wired */ unsigned int lock:1; /* <56> sw - locked */ unsigned long pa:43; /* <55:13> pa */ @@ -163,6 +167,7 @@ } tte_bit; uint64_t ll; } tte_t; +#endif #define tte_val tte_bit.v /* use < 0 check in asm */ #define tte_size tte_bit.sz