From owner-svn-src-all@FreeBSD.ORG Mon Jan 17 23:54:50 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65095106566B; Mon, 17 Jan 2011 23:54:50 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 540158FC14; Mon, 17 Jan 2011 23:54:50 +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 p0HNsods017238; Mon, 17 Jan 2011 23:54:50 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0HNsoxo017235; Mon, 17 Jan 2011 23:54:50 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201101172354.p0HNsoxo017235@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 17 Jan 2011 23:54:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217523 - head/sys/powerpc/booke X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jan 2011 23:54:50 -0000 Author: marcel Date: Mon Jan 17 23:54:50 2011 New Revision: 217523 URL: http://svn.freebsd.org/changeset/base/217523 Log: Support booting non FDT-capable loaders: 1. Allow embedding the FDT into the kernel, just like PowerPC/book-E. 2. If the loader passes us a pointer to the bootinfo structure, save it and use it to fill in the gaps (e.g. bus frequencies, etc). Modified: head/sys/powerpc/booke/machdep.c head/sys/powerpc/booke/platform_bare.c Modified: head/sys/powerpc/booke/machdep.c ============================================================================== --- head/sys/powerpc/booke/machdep.c Mon Jan 17 23:43:03 2011 (r217522) +++ head/sys/powerpc/booke/machdep.c Mon Jan 17 23:54:50 2011 (r217523) @@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_kstack_pages.h" #include "opt_msgbuf.h" +#include "opt_platform.h" #include #include @@ -163,13 +164,18 @@ extern void dcache_inval(void); extern void icache_enable(void); extern void icache_inval(void); +/* + * Bootinfo is passed to us by legacy loaders. Save the address of the + * structure to handle backward compatibility. + */ +uint32_t *bootinfo; + struct kva_md_info kmi; struct pcpu __pcpu[MAXCPU]; struct trapframe frame0; int cold = 1; long realmem = 0; long Maxmem = 0; - char machine[] = "powerpc"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, ""); @@ -294,6 +300,10 @@ e500_init(u_int32_t startkernel, u_int32 kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); dtbp = MD_FETCH(kmdp, MODINFOMD_DTBP, vm_offset_t); end = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t); + + bootinfo = (uint32_t *)preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_BOOTINFO); + #ifdef DDB ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t); ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t); @@ -313,6 +323,15 @@ e500_init(u_int32_t startkernel, u_int32 while (1); } +#if defined(FDT_DTB_STATIC) + /* + * In case the device tree blob was not retrieved (from metadata) try + * to use the statically embedded one. + */ + if (dtbp == (vm_offset_t)NULL) + dtbp = (vm_offset_t)&fdt_static_dtb; +#endif + if (OF_install(OFW_FDT, 0) == FALSE) while (1); Modified: head/sys/powerpc/booke/platform_bare.c ============================================================================== --- head/sys/powerpc/booke/platform_bare.c Mon Jan 17 23:43:03 2011 (r217522) +++ head/sys/powerpc/booke/platform_bare.c Mon Jan 17 23:54:50 2011 (r217523) @@ -59,6 +59,8 @@ extern uint8_t __boot_page[]; /* Boot p extern uint32_t kernload; /* Kernel physical load address */ #endif +extern uint32_t *bootinfo; + static int cpu, maxcpu; static int bare_probe(platform_t); @@ -160,24 +162,31 @@ bare_mem_regions(platform_t plat, struct static u_long bare_timebase_freq(platform_t plat, struct cpuref *cpuref) { - u_long ticks = -1; + u_long ticks; phandle_t cpus, child; pcell_t freq; + /* Backward compatibility. See 8-STABLE. */ + ticks = bootinfo[3] >> 3; + if ((cpus = OF_finddevice("/cpus")) == 0) goto out; if ((child = OF_child(cpus)) == 0) goto out; + freq = 0; if (OF_getprop(child, "bus-frequency", (void *)&freq, sizeof(freq)) <= 0) goto out; + /* * Time Base and Decrementer are updated every 8 CCB bus clocks. * HID0[SEL_TBCLK] = 0 */ - ticks = freq / 8; + if (freq != 0) + ticks = freq / 8; + out: if (ticks <= 0) panic("Unable to determine timebase frequency!");