svn commit: r192067 - in head/sys: conf powerpc/aim powerpc/booke
powerpc/include powerpc/powerpc
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Thu May 14 00:34:28 UTC 2009
Author: nwhitehorn
Date: Thu May 14 00:34:26 2009
New Revision: 192067
URL: http://svn.freebsd.org/changeset/base/192067
Log:
Factor out platform dependent things unrelated to device drivers into a
new platform module. These are probed in early boot, and have the
responsibility of determining the layout of physical memory, determining
the CPU timebase frequency, and handling the zoo of SMP mechanisms
found on PowerPC.
Reviewed by: marcel, raj
Book-E parts by: raj
Added:
head/sys/powerpc/aim/platform_chrp.c (contents, props changed)
head/sys/powerpc/booke/platform_bare.c (contents, props changed)
head/sys/powerpc/include/platform.h
- copied, changed from r192066, head/sys/powerpc/include/powerpc.h
head/sys/powerpc/include/platformvar.h (contents, props changed)
head/sys/powerpc/powerpc/platform.c (contents, props changed)
head/sys/powerpc/powerpc/platform_if.m (contents, props changed)
Deleted:
head/sys/powerpc/include/powerpc.h
Modified:
head/sys/conf/files.powerpc
head/sys/powerpc/aim/clock.c
head/sys/powerpc/aim/machdep.c
head/sys/powerpc/aim/mmu_oea.c
head/sys/powerpc/aim/mmu_oea64.c
head/sys/powerpc/aim/mp_cpudep.c
head/sys/powerpc/aim/ofw_machdep.c
head/sys/powerpc/aim/vm_machdep.c
head/sys/powerpc/booke/clock.c
head/sys/powerpc/booke/machdep.c
head/sys/powerpc/booke/pmap.c
head/sys/powerpc/booke/vm_machdep.c
head/sys/powerpc/include/md_var.h
head/sys/powerpc/include/ofw_machdep.h
head/sys/powerpc/include/pmap.h
head/sys/powerpc/include/smp.h
head/sys/powerpc/include/spr.h
head/sys/powerpc/powerpc/mp_machdep.c
head/sys/powerpc/powerpc/pmap_dispatch.c
Modified: head/sys/conf/files.powerpc
==============================================================================
--- head/sys/conf/files.powerpc Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/conf/files.powerpc Thu May 14 00:34:26 2009 (r192067)
@@ -81,6 +81,7 @@ powerpc/aim/mp_cpudep.c optional aim sm
powerpc/aim/nexus.c optional aim
powerpc/aim/ofw_machdep.c optional aim
powerpc/aim/ofwmagic.S optional aim
+powerpc/aim/platform_chrp.c optional aim
powerpc/aim/swtch.S optional aim
powerpc/aim/trap.c optional aim
powerpc/aim/uma_machdep.c optional aim
@@ -90,6 +91,7 @@ powerpc/booke/copyinout.c optional e500
powerpc/booke/interrupt.c optional e500
powerpc/booke/locore.S optional e500 no-obj
powerpc/booke/machdep.c optional e500
+powerpc/booke/platform_bare.c optional mpc85xx
powerpc/booke/pmap.c optional e500
powerpc/booke/swtch.S optional e500
powerpc/booke/trap.c optional e500
@@ -155,6 +157,8 @@ powerpc/powerpc/mp_machdep.c optional sm
powerpc/powerpc/openpic.c standard
powerpc/powerpc/pic_if.m standard
powerpc/powerpc/pmap_dispatch.c standard
+powerpc/powerpc/platform.c standard
+powerpc/powerpc/platform_if.m standard
powerpc/powerpc/sc_machdep.c optional sc
powerpc/powerpc/setjmp.S standard
powerpc/powerpc/sigcode.S standard
Modified: head/sys/powerpc/aim/clock.c
==============================================================================
--- head/sys/powerpc/aim/clock.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/aim/clock.c Thu May 14 00:34:26 2009 (r192067)
@@ -125,44 +125,27 @@ decr_intr(struct trapframe *frame)
void
decr_init(void)
{
- int qhandle, phandle;
- char name[32];
- unsigned int msr;
-
- phandle = 0;
+ struct cpuref cpu;
+ register_t msr;
/*
- * Get this info during autoconf? XXX
+ * Check the BSP's timebase frequency. Sometimes we can't find the BSP, so fall
+ * back to the first CPU in this case.
*/
- for (qhandle = OF_peer(0); qhandle; qhandle = phandle) {
- if (OF_getprop(qhandle, "device_type", name, sizeof name) >= 0
- && !strcmp(name, "cpu")
- && OF_getprop(qhandle, "timebase-frequency",
- &ticks_per_sec, sizeof ticks_per_sec) >= 0) {
- /*
- * Should check for correct CPU here? XXX
- */
- msr = mfmsr();
- mtmsr(msr & ~PSL_EE);
-
- ns_per_tick = 1000000000 / ticks_per_sec;
- ticks_per_intr = ticks_per_sec / hz;
- mtdec(ticks_per_intr);
-
- mtmsr(msr);
-
- break;
- }
- if ((phandle = OF_child(qhandle)))
- continue;
- while (qhandle) {
- if ((phandle = OF_peer(qhandle)))
- break;
- qhandle = OF_parent(qhandle);
- }
- }
- if (!phandle)
- panic("no cpu node");
+
+ if (platform_smp_get_bsp(&cpu) != 0)
+ platform_smp_first_cpu(&cpu);
+
+ ticks_per_sec = platform_timebase_freq(&cpu);
+
+ msr = mfmsr();
+ mtmsr(msr & ~PSL_EE);
+
+ ns_per_tick = 1000000000 / ticks_per_sec;
+ ticks_per_intr = ticks_per_sec / hz;
+ mtdec(ticks_per_intr);
+
+ mtmsr(msr);
}
void
Modified: head/sys/powerpc/aim/machdep.c
==============================================================================
--- head/sys/powerpc/aim/machdep.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/aim/machdep.c Thu May 14 00:34:26 2009 (r192067)
@@ -114,7 +114,6 @@ __FBSDID("$FreeBSD$");
#include <machine/metadata.h>
#include <machine/mmuvar.h>
#include <machine/pcb.h>
-#include <machine/powerpc.h>
#include <machine/reg.h>
#include <machine/sigframe.h>
#include <machine/spr.h>
@@ -472,14 +471,22 @@ powerpc_init(u_int startkernel, u_int en
*/
mtmsr(msr);
isync();
+
+ /*
+ * Choose a platform module so we can get the physical memory map.
+ */
+
+ platform_probe_and_attach();
/*
- * Initialise virtual memory.
+ * Initialise virtual memory. Use BUS_PROBE_GENERIC priority
+ * in case the platform module had a better idea of what we
+ * should do.
*/
if (ppc64)
- pmap_mmu_install(MMU_TYPE_G5, 0);
+ pmap_mmu_install(MMU_TYPE_G5, BUS_PROBE_GENERIC);
else
- pmap_mmu_install(MMU_TYPE_OEA, 0);
+ pmap_mmu_install(MMU_TYPE_OEA, BUS_PROBE_GENERIC);
pmap_bootstrap(startkernel, endkernel);
mtmsr(mfmsr() | PSL_IR|PSL_DR|PSL_ME|PSL_RI);
Modified: head/sys/powerpc/aim/mmu_oea.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/aim/mmu_oea.c Thu May 14 00:34:26 2009 (r192067)
@@ -141,7 +141,7 @@ __FBSDID("$FreeBSD$");
#include <vm/uma.h>
#include <machine/cpu.h>
-#include <machine/powerpc.h>
+#include <machine/platform.h>
#include <machine/bat.h>
#include <machine/frame.h>
#include <machine/md_var.h>
Modified: head/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea64.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/aim/mmu_oea64.c Thu May 14 00:34:26 2009 (r192067)
@@ -143,7 +143,7 @@ __FBSDID("$FreeBSD$");
#include <vm/uma.h>
#include <machine/cpu.h>
-#include <machine/powerpc.h>
+#include <machine/platform.h>
#include <machine/frame.h>
#include <machine/md_var.h>
#include <machine/psl.h>
Modified: head/sys/powerpc/aim/mp_cpudep.c
==============================================================================
--- head/sys/powerpc/aim/mp_cpudep.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/aim/mp_cpudep.c Thu May 14 00:34:26 2009 (r192067)
@@ -54,91 +54,6 @@ extern register_t l3cr_config;
void *ap_pcpu;
-static int
-powerpc_smp_fill_cpuref(struct cpuref *cpuref, phandle_t cpu)
-{
- int cpuid, res;
-
- cpuref->cr_hwref = cpu;
- res = OF_getprop(cpu, "reg", &cpuid, sizeof(cpuid));
- if (res < 0)
- return (ENOENT);
-
- cpuref->cr_cpuid = cpuid & 0xff;
- return (0);
-}
-
-int
-powerpc_smp_first_cpu(struct cpuref *cpuref)
-{
- char buf[8];
- phandle_t cpu, dev, root;
- int res;
-
- root = OF_peer(0);
-
- dev = OF_child(root);
- while (dev != 0) {
- res = OF_getprop(dev, "name", buf, sizeof(buf));
- if (res > 0 && strcmp(buf, "cpus") == 0)
- break;
- dev = OF_peer(dev);
- }
- if (dev == 0)
- return (ENOENT);
-
- cpu = OF_child(dev);
- while (cpu != 0) {
- res = OF_getprop(cpu, "device_type", buf, sizeof(buf));
- if (res > 0 && strcmp(buf, "cpu") == 0)
- break;
- cpu = OF_peer(cpu);
- }
- if (cpu == 0)
- return (ENOENT);
-
- return (powerpc_smp_fill_cpuref(cpuref, cpu));
-}
-
-int
-powerpc_smp_next_cpu(struct cpuref *cpuref)
-{
- char buf[8];
- phandle_t cpu;
- int res;
-
- cpu = OF_peer(cpuref->cr_hwref);
- while (cpu != 0) {
- res = OF_getprop(cpu, "device_type", buf, sizeof(buf));
- if (res > 0 && strcmp(buf, "cpu") == 0)
- break;
- cpu = OF_peer(cpu);
- }
- if (cpu == 0)
- return (ENOENT);
-
- return (powerpc_smp_fill_cpuref(cpuref, cpu));
-}
-
-int
-powerpc_smp_get_bsp(struct cpuref *cpuref)
-{
- ihandle_t inst;
- phandle_t bsp, chosen;
- int res;
-
- chosen = OF_finddevice("/chosen");
- if (chosen == 0)
- return (ENXIO);
-
- res = OF_getprop(chosen, "cpu", &inst, sizeof(inst));
- if (res < 0)
- return (ENXIO);
-
- bsp = OF_instance_to_package(inst);
- return (powerpc_smp_fill_cpuref(cpuref, bsp));
-}
-
static register_t
l2_enable(void)
{
@@ -269,31 +184,3 @@ cpudep_ap_bootstrap(void)
return (sp);
}
-int
-powerpc_smp_start_cpu(struct pcpu *pc)
-{
- phandle_t cpu;
- volatile uint8_t *rstvec;
- int res, reset, timeout;
-
- cpu = pc->pc_hwref;
- res = OF_getprop(cpu, "soft-reset", &reset, sizeof(reset));
- if (res < 0)
- return (ENXIO);
-
- ap_pcpu = pc;
-
- rstvec = (uint8_t *)(0x80000000 + reset);
-
- *rstvec = 4;
- powerpc_sync();
- DELAY(1);
- *rstvec = 0;
- powerpc_sync();
-
- timeout = 1000;
- while (!pc->pc_awake && timeout--)
- DELAY(100);
-
- return ((pc->pc_awake) ? 0 : EBUSY);
-}
Modified: head/sys/powerpc/aim/ofw_machdep.c
==============================================================================
--- head/sys/powerpc/aim/ofw_machdep.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/aim/ofw_machdep.c Thu May 14 00:34:26 2009 (r192067)
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/md_var.h>
-#include <machine/powerpc.h>
+#include <machine/platform.h>
#include <machine/ofw_machdep.h>
#define OFMEM_REGIONS 32
@@ -144,7 +144,7 @@ memr_merge(struct mem_region *from, stru
* to provide space for two additional entry beyond the terminating one.
*/
void
-mem_regions(struct mem_region **memp, int *memsz,
+ofw_mem_regions(struct mem_region **memp, int *memsz,
struct mem_region **availp, int *availsz)
{
phandle_t phandle;
Added: head/sys/powerpc/aim/platform_chrp.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/powerpc/aim/platform_chrp.c Thu May 14 00:34:26 2009 (r192067)
@@ -0,0 +1,236 @@
+/*-
+ * Copyright (c) 2008 Marcel Moolenaar
+ * Copyright (c) 2009 Nathan Whitehorn
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/pcpu.h>
+#include <sys/proc.h>
+#include <sys/smp.h>
+
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/hid.h>
+#include <machine/platformvar.h>
+#include <machine/smp.h>
+#include <machine/spr.h>
+
+#include <dev/ofw/openfirm.h>
+#include <machine/ofw_machdep.h>
+
+#include "platform_if.h"
+
+#ifdef SMP
+extern void *ap_pcpu;
+#endif
+
+static int chrp_probe(platform_t);
+void chrp_mem_regions(platform_t, struct mem_region **phys, int *physsz,
+ struct mem_region **avail, int *availsz);
+static u_long chrp_timebase_freq(platform_t, struct cpuref *cpuref);
+static int chrp_smp_first_cpu(platform_t, struct cpuref *cpuref);
+static int chrp_smp_next_cpu(platform_t, struct cpuref *cpuref);
+static int chrp_smp_get_bsp(platform_t, struct cpuref *cpuref);
+static int chrp_smp_start_cpu(platform_t, struct pcpu *cpu);
+
+static platform_method_t chrp_methods[] = {
+ PLATFORMMETHOD(platform_probe, chrp_probe),
+ PLATFORMMETHOD(platform_mem_regions, chrp_mem_regions),
+ PLATFORMMETHOD(platform_timebase_freq, chrp_timebase_freq),
+
+ PLATFORMMETHOD(platform_smp_first_cpu, chrp_smp_first_cpu),
+ PLATFORMMETHOD(platform_smp_next_cpu, chrp_smp_next_cpu),
+ PLATFORMMETHOD(platform_smp_get_bsp, chrp_smp_get_bsp),
+ PLATFORMMETHOD(platform_smp_start_cpu, chrp_smp_start_cpu),
+
+ { 0, 0 }
+};
+
+static platform_def_t chrp_platform = {
+ "chrp",
+ chrp_methods,
+ 0
+};
+
+PLATFORM_DEF(chrp_platform);
+
+static int
+chrp_probe(platform_t plat)
+{
+ if (OF_finddevice("/memory") != -1)
+ return (BUS_PROBE_GENERIC);
+
+ return (ENXIO);
+}
+
+void
+chrp_mem_regions(platform_t plat, struct mem_region **phys, int *physsz,
+ struct mem_region **avail, int *availsz)
+{
+ ofw_mem_regions(phys,physsz,avail,availsz);
+}
+
+static u_long
+chrp_timebase_freq(platform_t plat, struct cpuref *cpuref)
+{
+ phandle_t phandle;
+ u_long ticks = -1;
+
+ phandle = cpuref->cr_hwref;
+
+ OF_getprop(phandle, "timebase-frequency", &ticks, sizeof(ticks));
+
+ if (ticks <= 0)
+ panic("Unable to determine timebase frequency!");
+
+ return (ticks);
+}
+
+
+static int
+chrp_smp_fill_cpuref(struct cpuref *cpuref, phandle_t cpu)
+{
+ int cpuid, res;
+
+ cpuref->cr_hwref = cpu;
+ res = OF_getprop(cpu, "reg", &cpuid, sizeof(cpuid));
+ if (res < 0)
+ return (ENOENT);
+
+ cpuref->cr_cpuid = cpuid & 0xff;
+ return (0);
+}
+
+static int
+chrp_smp_first_cpu(platform_t plat, struct cpuref *cpuref)
+{
+ char buf[8];
+ phandle_t cpu, dev, root;
+ int res;
+
+ root = OF_peer(0);
+
+ dev = OF_child(root);
+ while (dev != 0) {
+ res = OF_getprop(dev, "name", buf, sizeof(buf));
+ if (res > 0 && strcmp(buf, "cpus") == 0)
+ break;
+ dev = OF_peer(dev);
+ }
+ if (dev == 0)
+ return (ENOENT);
+
+ cpu = OF_child(dev);
+ while (cpu != 0) {
+ res = OF_getprop(cpu, "device_type", buf, sizeof(buf));
+ if (res > 0 && strcmp(buf, "cpu") == 0)
+ break;
+ cpu = OF_peer(cpu);
+ }
+ if (cpu == 0)
+ return (ENOENT);
+
+ return (chrp_smp_fill_cpuref(cpuref, cpu));
+}
+
+static int
+chrp_smp_next_cpu(platform_t plat, struct cpuref *cpuref)
+{
+ char buf[8];
+ phandle_t cpu;
+ int res;
+
+ cpu = OF_peer(cpuref->cr_hwref);
+ while (cpu != 0) {
+ res = OF_getprop(cpu, "device_type", buf, sizeof(buf));
+ if (res > 0 && strcmp(buf, "cpu") == 0)
+ break;
+ cpu = OF_peer(cpu);
+ }
+ if (cpu == 0)
+ return (ENOENT);
+
+ return (chrp_smp_fill_cpuref(cpuref, cpu));
+}
+
+static int
+chrp_smp_get_bsp(platform_t plat, struct cpuref *cpuref)
+{
+ ihandle_t inst;
+ phandle_t bsp, chosen;
+ int res;
+
+ chosen = OF_finddevice("/chosen");
+ if (chosen == 0)
+ return (ENXIO);
+
+ res = OF_getprop(chosen, "cpu", &inst, sizeof(inst));
+ if (res < 0)
+ return (ENXIO);
+
+ bsp = OF_instance_to_package(inst);
+ return (chrp_smp_fill_cpuref(cpuref, bsp));
+}
+
+static int
+chrp_smp_start_cpu(platform_t plat, struct pcpu *pc)
+{
+#ifdef SMP
+ phandle_t cpu;
+ volatile uint8_t *rstvec;
+ int res, reset, timeout;
+
+ cpu = pc->pc_hwref;
+ res = OF_getprop(cpu, "soft-reset", &reset, sizeof(reset));
+ if (res < 0)
+ return (ENXIO);
+
+ ap_pcpu = pc;
+
+ rstvec = (uint8_t *)(0x80000000 + reset);
+
+ *rstvec = 4;
+ powerpc_sync();
+ DELAY(1);
+ *rstvec = 0;
+ powerpc_sync();
+
+ timeout = 1000;
+ while (!pc->pc_awake && timeout--)
+ DELAY(100);
+
+ return ((pc->pc_awake) ? 0 : EBUSY);
+#else
+ /* No SMP support */
+ return (ENXIO);
+#endif
+}
+
Modified: head/sys/powerpc/aim/vm_machdep.c
==============================================================================
--- head/sys/powerpc/aim/vm_machdep.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/aim/vm_machdep.c Thu May 14 00:34:26 2009 (r192067)
@@ -89,7 +89,6 @@
#include <machine/frame.h>
#include <machine/md_var.h>
#include <machine/pcb.h>
-#include <machine/powerpc.h>
#include <dev/ofw/openfirm.h>
Modified: head/sys/powerpc/booke/clock.c
==============================================================================
--- head/sys/powerpc/booke/clock.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/booke/clock.c Thu May 14 00:34:26 2009 (r192067)
@@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$");
#include <sys/interrupt.h>
#include <machine/clock.h>
+#include <machine/platform.h>
#include <machine/psl.h>
#include <machine/spr.h>
#include <machine/cpu.h>
@@ -123,29 +124,22 @@ void
cpu_initclocks(void)
{
- return;
-}
-
-void
-decr_config (unsigned long freq)
-{
- ticks_per_sec = freq;
- decr_timecounter.tc_frequency = freq;
+ decr_tc_init();
}
void
decr_init (void)
{
+ struct cpuref cpu;
unsigned int msr;
- /*
- * Should check for correct CPU here? XXX
- */
+ if (platform_smp_get_bsp(&cpu) != 0)
+ platform_smp_first_cpu(&cpu);
+ ticks_per_sec = platform_timebase_freq(&cpu);
+
msr = mfmsr();
mtmsr(msr & ~(PSL_EE));
- tc_init(&decr_timecounter);
-
ns_per_tick = 1000000000 / ticks_per_sec;
ticks_per_intr = ticks_per_sec / hz;
@@ -173,6 +167,15 @@ mftb (void)
return tb;
}
+void
+decr_tc_init(void)
+{
+
+ decr_timecounter.tc_frequency = ticks_per_sec;
+ tc_init(&decr_timecounter);
+}
+
+
static unsigned
decr_get_timecount(struct timecounter *tc)
{
Modified: head/sys/powerpc/booke/machdep.c
==============================================================================
--- head/sys/powerpc/booke/machdep.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/booke/machdep.c Thu May 14 00:34:26 2009 (r192067)
@@ -127,11 +127,10 @@ __FBSDID("$FreeBSD$");
#include <machine/trap.h>
#include <machine/md_var.h>
#include <machine/mmuvar.h>
-#include <machine/pmap.h>
#include <machine/sigframe.h>
#include <machine/metadata.h>
#include <machine/bootinfo.h>
-#include <machine/powerpc.h>
+#include <machine/platform.h>
#include <sys/linker.h>
#include <sys/reboot.h>
@@ -157,9 +156,6 @@ extern unsigned char __sbss_start[];
extern unsigned char __sbss_end[];
extern unsigned char _end[];
-extern struct mem_region availmem_regions[];
-extern int availmem_regions_sz;
-
extern void dcache_enable(void);
extern void dcache_inval(void);
extern void icache_enable(void);
@@ -339,9 +335,7 @@ e500_init(u_int32_t startkernel, u_int32
struct pcpu *pc;
void *kmdp;
vm_offset_t end;
- struct bi_mem_region *mr;
uint32_t csr;
- int i;
kmdp = NULL;
@@ -381,31 +375,9 @@ e500_init(u_int32_t startkernel, u_int32
while(1);
}
- /* Initialize memory regions table */
- mr = bootinfo_mr();
- for (i = 0; i < bootinfo->bi_mem_reg_no; i++, mr++) {
- if (i == MEM_REGIONS)
- break;
- if (mr->mem_base < 1048576) {
- availmem_regions[i].mr_start = 1048576;
- availmem_regions[i].mr_size = mr->mem_size -
- (1048576 - mr->mem_base);
- } else {
- availmem_regions[i].mr_start = mr->mem_base;
- availmem_regions[i].mr_size = mr->mem_size;
- }
- }
- availmem_regions_sz = i;
-
/* Initialize TLB1 handling */
tlb1_init(bootinfo->bi_bar_base);
- /*
- * Time Base and Decrementer are updated every 8 CCB bus clocks.
- * HID0[SEL_TBCLK] = 0
- */
- decr_config(bootinfo->bi_bus_clk / 8);
-
/* Init params/tunables that can be overridden by the loader. */
init_param1();
@@ -450,6 +422,9 @@ e500_init(u_int32_t startkernel, u_int32
kdb_enter(KDB_WHY_BOOTFLAGS, "Boot flags requested debugger");
#endif
+ /* Initialise platform module */
+ platform_probe_and_attach();
+
/* Initialise virtual memory. */
pmap_mmu_install(MMU_TYPE_BOOKE, 0);
pmap_bootstrap(startkernel, end);
Added: head/sys/powerpc/booke/platform_bare.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/powerpc/booke/platform_bare.c Thu May 14 00:34:26 2009 (r192067)
@@ -0,0 +1,185 @@
+/*-
+ * Copyright (c) 2008-2009 Semihalf, Rafal Jaworowski
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/pcpu.h>
+#include <sys/proc.h>
+#include <sys/smp.h>
+
+#include <machine/bootinfo.h>
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/hid.h>
+#include <machine/platform.h>
+#include <machine/platformvar.h>
+#include <machine/smp.h>
+#include <machine/spr.h>
+#include <machine/vmparam.h>
+
+#include <powerpc/mpc85xx/mpc85xx.h>
+#include <powerpc/mpc85xx/ocpbus.h>
+
+#include "platform_if.h"
+
+static int cpu;
+
+static int bare_probe(platform_t);
+static void bare_mem_regions(platform_t, struct mem_region **phys, int *physsz,
+ struct mem_region **avail, int *availsz);
+static u_long bare_timebase_freq(platform_t, struct cpuref *cpuref);
+static int bare_smp_first_cpu(platform_t, struct cpuref *cpuref);
+static int bare_smp_next_cpu(platform_t, struct cpuref *cpuref);
+static int bare_smp_get_bsp(platform_t, struct cpuref *cpuref);
+static int bare_smp_start_cpu(platform_t, struct pcpu *cpu);
+
+static platform_method_t bare_methods[] = {
+ PLATFORMMETHOD(platform_probe, bare_probe),
+ PLATFORMMETHOD(platform_mem_regions, bare_mem_regions),
+ PLATFORMMETHOD(platform_timebase_freq, bare_timebase_freq),
+
+ PLATFORMMETHOD(platform_smp_first_cpu, bare_smp_first_cpu),
+ PLATFORMMETHOD(platform_smp_next_cpu, bare_smp_next_cpu),
+ PLATFORMMETHOD(platform_smp_get_bsp, bare_smp_get_bsp),
+ PLATFORMMETHOD(platform_smp_start_cpu, bare_smp_start_cpu),
+
+ { 0, 0 }
+};
+
+static platform_def_t bare_platform = {
+ "bare metal",
+ bare_methods,
+ 0
+};
+
+PLATFORM_DEF(bare_platform);
+
+static int
+bare_probe(platform_t plat)
+{
+
+ return (BUS_PROBE_GENERIC);
+}
+
+#define MEM_REGIONS 8
+static struct mem_region avail_regions[MEM_REGIONS];
+
+void
+bare_mem_regions(platform_t plat, struct mem_region **phys, int *physsz,
+ struct mem_region **avail, int *availsz)
+{
+ struct bi_mem_region *mr;
+ int i;
+
+ /* Initialize memory regions table */
+ mr = bootinfo_mr();
+ for (i = 0; i < bootinfo->bi_mem_reg_no; i++, mr++) {
+ if (i == MEM_REGIONS)
+ break;
+ if (mr->mem_base < 1048576) {
+ avail_regions[i].mr_start = 1048576;
+ avail_regions[i].mr_size = mr->mem_size -
+ (1048576 - mr->mem_base);
+ } else {
+ avail_regions[i].mr_start = mr->mem_base;
+ avail_regions[i].mr_size = mr->mem_size;
+ }
+ }
+ *availsz = i;
+ *avail = avail_regions;
+
+ /* On the bare metal platform phys == avail memory */
+ *physsz = *availsz;
+ *phys = *avail;
+}
+
+static u_long
+bare_timebase_freq(platform_t plat, struct cpuref *cpuref)
+{
+ u_long ticks = -1;
+
+ /*
+ * Time Base and Decrementer are updated every 8 CCB bus clocks.
+ * HID0[SEL_TBCLK] = 0
+ */
+ ticks = bootinfo->bi_bus_clk / 8;
+ if (ticks <= 0)
+ panic("Unable to determine timebase frequency!");
+
+ return (ticks);
+}
+
+static int
+bare_smp_first_cpu(platform_t plat, struct cpuref *cpuref)
+{
+
+ cpu = 0;
+ cpuref->cr_cpuid = cpu;
+ cpuref->cr_hwref = cpuref->cr_cpuid;
+ if (bootverbose)
+ printf("powerpc_smp_first_cpu: cpuid %d\n", cpuref->cr_cpuid);
+ cpu++;
+
+ return (0);
+}
+
+static int
+bare_smp_next_cpu(platform_t plat, struct cpuref *cpuref)
+{
+
+ if (cpu >= MAXCPU)
+ return (ENOENT);
+
+ cpuref->cr_cpuid = cpu++;
+ cpuref->cr_hwref = cpuref->cr_cpuid;
+ if (bootverbose)
+ printf("powerpc_smp_next_cpu: cpuid %d\n", cpuref->cr_cpuid);
+
+ return (0);
+}
+
+static int
+bare_smp_get_bsp(platform_t plat, struct cpuref *cpuref)
+{
+
+ cpuref->cr_cpuid = mfspr(SPR_PIR);
+ cpuref->cr_hwref = cpuref->cr_cpuid;
+
+ return (0);
+}
+
+static int
+bare_smp_start_cpu(platform_t plat, struct pcpu *pc)
+{
+
+ /* No SMP support */
+ return (ENXIO);
+}
Modified: head/sys/powerpc/booke/pmap.c
==============================================================================
--- head/sys/powerpc/booke/pmap.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/booke/pmap.c Thu May 14 00:34:26 2009 (r192067)
@@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$");
#include <machine/bootinfo.h>
#include <machine/cpu.h>
#include <machine/pcb.h>
-#include <machine/powerpc.h>
+#include <machine/platform.h>
#include <machine/tlb.h>
#include <machine/spr.h>
@@ -122,8 +122,11 @@ vm_size_t kernsize;
static vm_offset_t data_start;
static vm_size_t data_end;
-struct mem_region availmem_regions[MEM_REGIONS];
-int availmem_regions_sz;
+/* Phys/avail memory regions. */
+static struct mem_region *availmem_regions;
+static int availmem_regions_sz;
+static struct mem_region *physmem_regions;
+static int physmem_regions_sz;
/* Reserved KVA space and mutex for mmu_booke_zero_page. */
static vm_offset_t zero_page_va;
@@ -1013,6 +1016,10 @@ mmu_booke_bootstrap(mmu_t mmu, vm_offset
* align all regions. Non-page aligned memory isn't very interesting
* to us. Also, sort the entries for ascending addresses.
*/
+
+ /* Retrieve phys/avail mem regions */
+ mem_regions(&physmem_regions, &physmem_regions_sz,
+ &availmem_regions, &availmem_regions_sz);
sz = 0;
cnt = availmem_regions_sz;
debugf("processing avail regions:\n");
Modified: head/sys/powerpc/booke/vm_machdep.c
==============================================================================
--- head/sys/powerpc/booke/vm_machdep.c Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/booke/vm_machdep.c Thu May 14 00:34:26 2009 (r192067)
@@ -124,7 +124,7 @@ __FBSDID("$FreeBSD$");
#include <machine/md_var.h>
#include <machine/pcb.h>
#include <machine/spr.h>
-#include <machine/powerpc.h>
+#include <machine/platform.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
Modified: head/sys/powerpc/include/md_var.h
==============================================================================
--- head/sys/powerpc/include/md_var.h Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/include/md_var.h Thu May 14 00:34:26 2009 (r192067)
@@ -55,7 +55,6 @@ void busdma_swi(void);
int is_physical_memory(vm_offset_t addr);
int mem_valid(vm_offset_t addr, int len);
-void decr_config(unsigned long);
void decr_init(void);
void decr_tc_init(void);
Modified: head/sys/powerpc/include/ofw_machdep.h
==============================================================================
--- head/sys/powerpc/include/ofw_machdep.h Wed May 13 22:31:25 2009 (r192066)
+++ head/sys/powerpc/include/ofw_machdep.h Thu May 14 00:34:26 2009 (r192067)
@@ -33,6 +33,7 @@
#include <sys/rman.h>
#include <sys/bus.h>
#include <dev/ofw/openfirm.h>
+#include <machine/platform.h>
typedef uint32_t cell_t;
@@ -42,4 +43,9 @@ void OF_getetheraddr(device_t dev, u_cha
void OF_initial_setup(void *fdt_ptr, void *junk, int (*openfirm)(void *));
boolean_t OF_bootstrap(void);
+void OF_halt(void);
+void OF_reboot(void);
+
+void ofw_mem_regions(struct mem_region **, int *, struct mem_region **, int *);
+
#endif /* _MACHINE_OFW_MACHDEP_H_ */
Copied and modified: head/sys/powerpc/include/platform.h (from r192066, head/sys/powerpc/include/powerpc.h)
==============================================================================
--- head/sys/powerpc/include/powerpc.h Wed May 13 22:31:25 2009 (r192066, copy source)
+++ head/sys/powerpc/include/platform.h Thu May 14 00:34:26 2009 (r192067)
@@ -32,8 +32,11 @@
* $FreeBSD$
*/
-#ifndef _MACHINE_POWERPC_H_
-#define _MACHINE_POWERPC_H_
+#ifndef _MACHINE_PLATFORM_H_
+#define _MACHINE_PLATFORM_H_
+
+#include <machine/smp.h>
+#include <machine/pcpu.h>
struct mem_region {
vm_offset_t mr_start;
@@ -42,18 +45,14 @@ struct mem_region {
void mem_regions(struct mem_region **, int *, struct mem_region **, int *);
-/*
- * These two functions get used solely in boot() in machdep.c.
- *
- * Not sure whether boot itself should be implementation dependent instead. XXX
- */
-void OF_halt(void);
-void OF_reboot(void);
-
-int dk_match(char *name);
-
-void ofrootfound(void);
-
-extern int booted_partition;
-
-#endif /* _MACHINE_POWERPC_H_ */
+u_long platform_timebase_freq(struct cpuref *);
+
+int platform_smp_first_cpu(struct cpuref *);
+int platform_smp_next_cpu(struct cpuref *);
+int platform_smp_get_bsp(struct cpuref *);
+int platform_smp_start_cpu(struct pcpu *);
+
+const char *installed_platform(void);
+void platform_probe_and_attach(void);
+
+#endif /* _MACHINE_PLATFORM_H_ */
Added: head/sys/powerpc/include/platformvar.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/powerpc/include/platformvar.h Thu May 14 00:34:26 2009 (r192067)
@@ -0,0 +1,88 @@
+/*-
+ * Copyright (c) 2005 Peter Grehan
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list