Date: Tue, 8 Sep 2009 04:02:33 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r196958 - projects/ppc64/sys/powerpc/aim64 Message-ID: <200909080402.n8842XFY035100@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909080402.n8842XFY035100>