svn commit: r257995 - in head/sys: conf powerpc/booke powerpc/mpc85xx
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Mon Nov 11 16:14:27 UTC 2013
Author: nwhitehorn
Date: Mon Nov 11 16:14:25 2013
New Revision: 257995
URL: http://svnweb.freebsd.org/changeset/base/257995
Log:
Rename the "bare" platform "mpc85xx", which is what it actually is, and
add actual platform probing based on PVR. Still needs a little more work:
in particular, the CCRS setup should move here.
Also turn "bare" into a truly bare platform that doesn't pretend to know how
to do anything except get the memory map. This should also be enhanced to
process the FDT reserved memory list, but that is for another day.
Added:
head/sys/powerpc/mpc85xx/platform_mpc85xx.c
- copied, changed from r257990, head/sys/powerpc/booke/platform_bare.c
Modified:
head/sys/conf/files.powerpc
head/sys/powerpc/booke/platform_bare.c
Modified: head/sys/conf/files.powerpc
==============================================================================
--- head/sys/conf/files.powerpc Mon Nov 11 15:44:20 2013 (r257994)
+++ head/sys/conf/files.powerpc Mon Nov 11 16:14:25 2013 (r257995)
@@ -106,7 +106,7 @@ powerpc/booke/locore.S optional booke n
powerpc/booke/machdep.c optional booke
powerpc/booke/machdep_e500.c optional booke_e500
powerpc/booke/mp_cpudep.c optional booke smp
-powerpc/booke/platform_bare.c optional mpc85xx
+powerpc/booke/platform_bare.c optional booke
powerpc/booke/pmap.c optional booke
powerpc/booke/swtch.S optional booke
powerpc/booke/trap.c optional booke
@@ -132,6 +132,7 @@ powerpc/mpc85xx/i2c.c optional iicbus f
powerpc/mpc85xx/isa.c optional mpc85xx isa
powerpc/mpc85xx/lbc.c optional mpc85xx
powerpc/mpc85xx/mpc85xx.c optional mpc85xx
+powerpc/mpc85xx/platform_mpc85xx.c optional mpc85xx
powerpc/mpc85xx/pci_mpc85xx.c optional pci mpc85xx
powerpc/ofw/ofw_cpu.c optional aim
powerpc/ofw/ofw_machdep.c standard
Modified: head/sys/powerpc/booke/platform_bare.c
==============================================================================
--- head/sys/powerpc/booke/platform_bare.c Mon Nov 11 15:44:20 2013 (r257994)
+++ head/sys/powerpc/booke/platform_bare.c Mon Nov 11 16:14:25 2013 (r257995)
@@ -35,65 +35,34 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h>
#include <sys/smp.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 <dev/fdt/fdt_common.h>
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/ofw_bus_subr.h>
#include <dev/ofw/openfirm.h>
-#include <powerpc/mpc85xx/mpc85xx.h>
+#include <machine/platform.h>
+#include <machine/platformvar.h>
#include "platform_if.h"
-#ifdef SMP
-extern void *ap_pcpu;
-extern vm_paddr_t kernload; /* Kernel physical load address */
-extern uint8_t __boot_page[]; /* Boot page body */
-extern uint32_t bp_ntlb1s;
-extern uint32_t bp_tlb1[];
-extern uint32_t bp_tlb1_end[];
-#endif
-
extern uint32_t *bootinfo;
-static int cpu, maxcpu;
-
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 void booke_reset(platform_t);
+static void bare_reset(platform_t);
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),
-
- PLATFORMMETHOD(platform_reset, booke_reset),
+ PLATFORMMETHOD(platform_reset, bare_reset),
PLATFORMMETHOD_END
};
static platform_def_t bare_platform = {
- "bare metal",
+ "bare",
bare_methods,
0
};
@@ -103,65 +72,19 @@ PLATFORM_DEF(bare_platform);
static int
bare_probe(platform_t plat)
{
- phandle_t cpus, child;
- uint32_t sr;
- int i, law_max, tgt;
- if ((cpus = OF_finddevice("/cpus")) != 0) {
- for (maxcpu = 0, child = OF_child(cpus); child != 0;
- child = OF_peer(child), maxcpu++)
- ;
- } else
- maxcpu = 1;
-
- /*
- * Clear local access windows. Skip DRAM entries, so we don't shoot
- * ourselves in the foot.
- */
- law_max = law_getmax();
- for (i = 0; i < law_max; i++) {
- sr = ccsr_read4(OCP85XX_LAWSR(i));
- if ((sr & 0x80000000) == 0)
- continue;
- tgt = (sr & 0x01f00000) >> 20;
- if (tgt == OCP85XX_TGTIF_RAM1 || tgt == OCP85XX_TGTIF_RAM2 ||
- tgt == OCP85XX_TGTIF_RAM_INTL)
- continue;
-
- ccsr_write4(OCP85XX_LAWSR(i), sr & 0x7fffffff);
- }
+ if (OF_peer(0) == -1) /* Needs device tree to work */
+ return (ENXIO);
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)
{
- uint32_t memsize;
- int i, rv;
- rv = fdt_get_mem_regions(avail_regions, availsz, &memsize);
- if (rv != 0)
- panic("%s: could not retrieve mem regions from the 'memory' "
- "node, error: %d", __func__, rv);
-
- for (i = 0; i < *availsz; i++) {
- if (avail_regions[i].mr_start < 1048576) {
- avail_regions[i].mr_size =
- avail_regions[i].mr_size -
- (1048576 - avail_regions[i].mr_start);
- avail_regions[i].mr_start = 1048576;
- }
- }
- *avail = avail_regions;
-
- /* On the bare metal platform phys == avail memory */
- *physsz = *availsz;
- *phys = *avail;
+ ofw_mem_regions(phys, physsz, avail, availsz);
}
static u_long
@@ -226,138 +149,10 @@ out:
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)
-{
-#ifdef SMP
- uint32_t *tlb1;
- uint32_t bptr, eebpcr;
- int i, timeout;
-
- eebpcr = ccsr_read4(OCP85XX_EEBPCR);
- if ((eebpcr & (1 << (pc->pc_cpuid + 24))) != 0) {
- printf("SMP: CPU %d already out of hold-off state!\n",
- pc->pc_cpuid);
- return (ENXIO);
- }
-
- ap_pcpu = pc;
-
- i = 0;
- tlb1 = bp_tlb1;
- while (i < bp_ntlb1s && tlb1 < bp_tlb1_end) {
- mtspr(SPR_MAS0, MAS0_TLBSEL(1) | MAS0_ESEL(i));
- __asm __volatile("isync; tlbre");
- tlb1[0] = mfspr(SPR_MAS1);
- tlb1[1] = mfspr(SPR_MAS2);
- tlb1[2] = mfspr(SPR_MAS3);
- i++;
- tlb1 += 3;
- }
- if (i < bp_ntlb1s)
- bp_ntlb1s = i;
-
- /*
- * Set BPTR to the physical address of the boot page
- */
- bptr = ((uint32_t)__boot_page - KERNBASE) + kernload;
- KASSERT((bptr & 0xfff) == 0,
- ("%s: boot page is not aligned (%#x)", __func__, bptr));
- bptr = (bptr >> 12) | 0x80000000u;
- ccsr_write4(OCP85XX_BPTR, bptr);
- __asm __volatile("isync; msync");
-
- /* Flush caches to have our changes hit DRAM. */
- cpu_flush_dcache(__boot_page, 4096);
-
- /*
- * Release AP from hold-off state
- */
- eebpcr |= (1 << (pc->pc_cpuid + 24));
- ccsr_write4(OCP85XX_EEBPCR, eebpcr);
- __asm __volatile("isync; msync");
-
- timeout = 500;
- while (!pc->pc_awake && timeout--)
- DELAY(1000); /* wait 1ms */
-
- /*
- * Disable boot page translation so that the 4K page at the default
- * address (= 0xfffff000) isn't permanently remapped and thus not
- * usable otherwise.
- */
- ccsr_write4(OCP85XX_BPTR, 0);
- __asm __volatile("isync; msync");
-
- if (!pc->pc_awake)
- printf("SMP: CPU %d didn't wake up.\n", pc->pc_cpuid);
- return ((pc->pc_awake) ? 0 : EBUSY);
-#else
- /* No SMP support */
- return (ENXIO);
-#endif
-}
-
static void
-booke_reset(platform_t plat)
+bare_reset(platform_t plat)
{
- /*
- * Try the dedicated reset register first.
- * If the SoC doesn't have one, we'll fall
- * back to using the debug control register.
- */
- ccsr_write4(OCP85XX_RSTCR, 2);
-
- /* Clear DBCR0, disables debug interrupts and events. */
- mtspr(SPR_DBCR0, 0);
- __asm __volatile("isync");
-
- /* Enable Debug Interrupts in MSR. */
- mtmsr(mfmsr() | PSL_DE);
-
- /* Enable debug interrupts and issue reset. */
- mtspr(SPR_DBCR0, mfspr(SPR_DBCR0) | DBCR0_IDM | DBCR0_RST_SYSTEM);
-
printf("Reset failed...\n");
while (1)
;
Copied and modified: head/sys/powerpc/mpc85xx/platform_mpc85xx.c (from r257990, head/sys/powerpc/booke/platform_bare.c)
==============================================================================
--- head/sys/powerpc/booke/platform_bare.c Mon Nov 11 14:08:25 2013 (r257990, copy source)
+++ head/sys/powerpc/mpc85xx/platform_mpc85xx.c Mon Nov 11 16:14:25 2013 (r257995)
@@ -66,48 +66,61 @@ extern uint32_t *bootinfo;
static int cpu, maxcpu;
-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 void booke_reset(platform_t);
-
-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),
+static int mpc85xx_probe(platform_t);
+static int mpc85xx_attach(platform_t);
+static void mpc85xx_mem_regions(platform_t, struct mem_region **phys,
+ int *physsz, struct mem_region **avail, int *availsz);
+static u_long mpc85xx_timebase_freq(platform_t, struct cpuref *cpuref);
+static int mpc85xx_smp_first_cpu(platform_t, struct cpuref *cpuref);
+static int mpc85xx_smp_next_cpu(platform_t, struct cpuref *cpuref);
+static int mpc85xx_smp_get_bsp(platform_t, struct cpuref *cpuref);
+static int mpc85xx_smp_start_cpu(platform_t, struct pcpu *cpu);
+
+static void mpc85xx_reset(platform_t);
+
+static platform_method_t mpc85xx_methods[] = {
+ PLATFORMMETHOD(platform_probe, mpc85xx_probe),
+ PLATFORMMETHOD(platform_attach, mpc85xx_attach),
+ PLATFORMMETHOD(platform_mem_regions, mpc85xx_mem_regions),
+ PLATFORMMETHOD(platform_timebase_freq, mpc85xx_timebase_freq),
+
+ PLATFORMMETHOD(platform_smp_first_cpu, mpc85xx_smp_first_cpu),
+ PLATFORMMETHOD(platform_smp_next_cpu, mpc85xx_smp_next_cpu),
+ PLATFORMMETHOD(platform_smp_get_bsp, mpc85xx_smp_get_bsp),
+ PLATFORMMETHOD(platform_smp_start_cpu, mpc85xx_smp_start_cpu),
- PLATFORMMETHOD(platform_reset, booke_reset),
+ PLATFORMMETHOD(platform_reset, mpc85xx_reset),
PLATFORMMETHOD_END
};
-static platform_def_t bare_platform = {
- "bare metal",
- bare_methods,
+static platform_def_t mpc85xx_platform = {
+ "mpc85xx",
+ mpc85xx_methods,
0
};
-PLATFORM_DEF(bare_platform);
+PLATFORM_DEF(mpc85xx_platform);
static int
-bare_probe(platform_t plat)
+mpc85xx_probe(platform_t plat)
+{
+ u_int pvr = mfpvr() >> 16;
+
+ if ((pvr & 0xfff0) == FSL_E500v1)
+ return (BUS_PROBE_DEFAULT);
+
+ return (ENXIO);
+}
+
+static int
+mpc85xx_attach(platform_t plat)
{
phandle_t cpus, child;
uint32_t sr;
int i, law_max, tgt;
- if ((cpus = OF_finddevice("/cpus")) != 0) {
+ if ((cpus = OF_finddevice("/cpus")) != -1) {
for (maxcpu = 0, child = OF_child(cpus); child != 0;
child = OF_peer(child), maxcpu++)
;
@@ -131,41 +144,19 @@ bare_probe(platform_t plat)
ccsr_write4(OCP85XX_LAWSR(i), sr & 0x7fffffff);
}
- return (BUS_PROBE_GENERIC);
+ return (0);
}
-#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,
+mpc85xx_mem_regions(platform_t plat, struct mem_region **phys, int *physsz,
struct mem_region **avail, int *availsz)
{
- uint32_t memsize;
- int i, rv;
-
- rv = fdt_get_mem_regions(avail_regions, availsz, &memsize);
- if (rv != 0)
- panic("%s: could not retrieve mem regions from the 'memory' "
- "node, error: %d", __func__, rv);
-
- for (i = 0; i < *availsz; i++) {
- if (avail_regions[i].mr_start < 1048576) {
- avail_regions[i].mr_size =
- avail_regions[i].mr_size -
- (1048576 - avail_regions[i].mr_start);
- avail_regions[i].mr_start = 1048576;
- }
- }
- *avail = avail_regions;
- /* On the bare metal platform phys == avail memory */
- *physsz = *availsz;
- *phys = *avail;
+ ofw_mem_regions(phys, physsz, avail, availsz);
}
static u_long
-bare_timebase_freq(platform_t plat, struct cpuref *cpuref)
+mpc85xx_timebase_freq(platform_t plat, struct cpuref *cpuref)
{
u_long ticks;
phandle_t cpus, child;
@@ -227,7 +218,7 @@ out:
}
static int
-bare_smp_first_cpu(platform_t plat, struct cpuref *cpuref)
+mpc85xx_smp_first_cpu(platform_t plat, struct cpuref *cpuref)
{
cpu = 0;
@@ -241,7 +232,7 @@ bare_smp_first_cpu(platform_t plat, stru
}
static int
-bare_smp_next_cpu(platform_t plat, struct cpuref *cpuref)
+mpc85xx_smp_next_cpu(platform_t plat, struct cpuref *cpuref)
{
if (cpu >= maxcpu)
@@ -256,7 +247,7 @@ bare_smp_next_cpu(platform_t plat, struc
}
static int
-bare_smp_get_bsp(platform_t plat, struct cpuref *cpuref)
+mpc85xx_smp_get_bsp(platform_t plat, struct cpuref *cpuref)
{
cpuref->cr_cpuid = mfspr(SPR_PIR);
@@ -266,7 +257,7 @@ bare_smp_get_bsp(platform_t plat, struct
}
static int
-bare_smp_start_cpu(platform_t plat, struct pcpu *pc)
+mpc85xx_smp_start_cpu(platform_t plat, struct pcpu *pc)
{
#ifdef SMP
uint32_t *tlb1;
@@ -338,7 +329,7 @@ bare_smp_start_cpu(platform_t plat, stru
}
static void
-booke_reset(platform_t plat)
+mpc85xx_reset(platform_t plat)
{
/*
More information about the svn-src-all
mailing list