From owner-svn-src-projects@FreeBSD.ORG Tue Sep 8 04:02:34 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BEA9106566B; Tue, 8 Sep 2009 04:02:34 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF6DF8FC1C; Tue, 8 Sep 2009 04:02:33 +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 n8842XmJ035102; Tue, 8 Sep 2009 04:02:33 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8842XFY035100; Tue, 8 Sep 2009 04:02:33 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909080402.n8842XFY035100@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 8 Sep 2009 04:02:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196958 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2009 04:02:34 -0000 Author: nwhitehorn Date: Tue Sep 8 04:02:33 2009 New Revision: 196958 URL: http://svn.freebsd.org/changeset/base/196958 Log: Fix OFW translations map. The kernel now boots on my Xserve until after virtual memory is up, and then dies with a panic when trying to map the OFW bounce page, so there's a bug there for another day. Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Tue Sep 8 03:55:09 2009 (r196957) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Tue Sep 8 04:02:33 2009 (r196958) @@ -262,11 +262,11 @@ TLBIE(pmap_t pmap, vm_offset_t va) { #define ASSERT_TABLE_LOCK() mtx_assert(&moea64_table_mutex, MA_OWNED) struct ofw_map { - vm_offset_t om_va; - vm_size_t om_len; - vm_offset_t om_pa_hi; - vm_offset_t om_pa_lo; - u_int om_mode; + cell_t om_va; + cell_t om_len; + cell_t om_pa_hi; + cell_t om_pa_lo; + cell_t om_mode; }; /* @@ -1001,8 +1001,10 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o if (translations[i].om_pa_lo % PAGE_SIZE) panic("OFW translation not page-aligned!"); + #ifndef __powerpc64__ if (translations[i].om_pa_hi) panic("OFW translations above 32-bit boundary!"); + #endif /* Now enter the pages for this mapping */