Support for booting XLP using FDT.
- update xlp_machdep.c to read arguments from FDT if FDT support is compiled in. - define rmi_uart_bus_space, and use it as fdtbus_bs_tag - update conf files for FDT support - add default dts file xlp-basic.dts
This commit is contained in:
Jayachandran C.
parent
a185bd12f3
commit
8291dd8a41
67
sys/boot/fdt/dts/xlp-basic.dts
Normal file
67
sys/boot/fdt/dts/xlp-basic.dts
Normal file
@ -0,0 +1,67 @@
|
||||
/*
|
||||
* Copyright (c) 2010 The FreeBSD Foundation
|
||||
* 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
|
||||
*
|
||||
* Netlogic Microsystems XLP8xx Device Tree Source.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
/ {
|
||||
model = "netl,XLP8XX";
|
||||
compatible = "XLP8XX";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
aliases {
|
||||
serial0 = &serial0;
|
||||
};
|
||||
|
||||
soc {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "simple-bus";
|
||||
ranges = <0x0>;
|
||||
bus-frequency = <0>;
|
||||
|
||||
serial0: serial@30100 {
|
||||
compatible = "ns16550";
|
||||
reg = <0x30100 0x200>;
|
||||
reg-shift = <2>;
|
||||
current-speed = <115200>;
|
||||
clock-frequency = <133000000>;
|
||||
interrupts = <9>;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdin = "serial0";
|
||||
stdout = "serial0";
|
||||
cpumask = <0xffffffff>;
|
||||
bootargs = "-v";
|
||||
};
|
||||
};
|
||||
@ -93,3 +93,8 @@ device pci
|
||||
|
||||
# Network
|
||||
device ether
|
||||
#
|
||||
# FDT support
|
||||
options FDT
|
||||
options FDT_DTB_STATIC
|
||||
makeoptions FDT_DTS_FILE=xlp-basic.dts
|
||||
|
||||
@ -95,3 +95,8 @@ device pci
|
||||
|
||||
# Network
|
||||
device ether
|
||||
|
||||
# FDT support
|
||||
options FDT
|
||||
options FDT_DTB_STATIC
|
||||
makeoptions FDT_DTS_FILE=xlp-basic.dts
|
||||
|
||||
@ -724,6 +724,7 @@ extern bus_space_tag_t mips_bus_space_generic;
|
||||
#if defined(CPU_RMI) || defined (CPU_NLM)
|
||||
extern bus_space_tag_t rmi_bus_space;
|
||||
extern bus_space_tag_t rmi_pci_bus_space;
|
||||
extern bus_space_tag_t rmi_uart_bus_space;
|
||||
#endif
|
||||
|
||||
#include <machine/bus_dma.h>
|
||||
|
||||
@ -48,6 +48,10 @@
|
||||
/*
|
||||
* Bus space tag. XXX endianess info needs to be derived from the blob.
|
||||
*/
|
||||
#if defined(CPU_RMI) || defined(CPU_NLM)
|
||||
#define fdtbus_bs_tag rmi_uart_bus_space
|
||||
#else
|
||||
#define fdtbus_bs_tag NULL
|
||||
#endif
|
||||
|
||||
#endif /* _MACHINE_FDT_H_ */
|
||||
|
||||
@ -686,3 +686,87 @@ rmi_bus_space_barrier(void *tag __unused, bus_space_handle_t bsh __unused,
|
||||
bus_size_t offset __unused, bus_size_t len __unused, int flags)
|
||||
{
|
||||
}
|
||||
|
||||
/*
|
||||
* need a special bus space for this, because the Netlogic SoC
|
||||
* UART allows only 32 bit access to its registers
|
||||
*/
|
||||
|
||||
static u_int8_t
|
||||
rmi_uart_bus_space_read_1(void *tag, bus_space_handle_t handle,
|
||||
bus_size_t offset)
|
||||
{
|
||||
return (u_int8_t)(*(volatile u_int32_t *)(handle + offset));
|
||||
}
|
||||
|
||||
static void
|
||||
rmi_uart_bus_space_write_1(void *tag, bus_space_handle_t handle,
|
||||
bus_size_t offset, u_int8_t value)
|
||||
{
|
||||
*(volatile u_int32_t *)(handle + offset) = value;
|
||||
}
|
||||
|
||||
static struct bus_space local_rmi_uart_bus_space = {
|
||||
/* cookie */
|
||||
(void *)0,
|
||||
|
||||
/* mapping/unmapping */
|
||||
rmi_bus_space_map,
|
||||
rmi_bus_space_unmap,
|
||||
rmi_bus_space_subregion,
|
||||
|
||||
/* allocation/deallocation */
|
||||
NULL,
|
||||
NULL,
|
||||
|
||||
/* barrier */
|
||||
rmi_bus_space_barrier,
|
||||
|
||||
/* read (single) */
|
||||
rmi_uart_bus_space_read_1, NULL, NULL, NULL,
|
||||
|
||||
/* read multiple */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* read region */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* write (single) */
|
||||
rmi_uart_bus_space_write_1, NULL, NULL, NULL,
|
||||
|
||||
/* write multiple */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* write region */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* set multiple */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* set region */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* copy */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* read (single) stream */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* read multiple stream */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* read region stream */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* write (single) stream */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* write multiple stream */
|
||||
NULL, NULL, NULL, NULL,
|
||||
|
||||
/* write region stream */
|
||||
NULL, NULL, NULL, NULL,
|
||||
};
|
||||
|
||||
/* generic bus_space tag */
|
||||
bus_space_tag_t rmi_uart_bus_space = &local_rmi_uart_bus_space;
|
||||
|
||||
@ -34,6 +34,9 @@
|
||||
/*
|
||||
* XLRMIPS: This file is hacked from arm/...
|
||||
*/
|
||||
#include "opt_platform.h"
|
||||
|
||||
#ifndef FDT /* use FDT uart when fdt is enable */
|
||||
#include "opt_uart.h"
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
@ -60,26 +63,6 @@ __FBSDID("$FreeBSD$");
|
||||
bus_space_tag_t uart_bus_space_io;
|
||||
bus_space_tag_t uart_bus_space_mem;
|
||||
|
||||
/*
|
||||
* need a special bus space for this, because the Netlogic SoC
|
||||
* UART allows only 32 bit access to its registers
|
||||
*/
|
||||
static struct bus_space nlm_uart_bussp;
|
||||
|
||||
static u_int8_t
|
||||
nlm_uart_bussp_read_1(void *tag, bus_space_handle_t handle,
|
||||
bus_size_t offset)
|
||||
{
|
||||
return (u_int8_t)(*(volatile u_int32_t *)(handle + offset));
|
||||
}
|
||||
|
||||
static void
|
||||
nlm_uart_bussp_write_1(void *tag, bus_space_handle_t handle,
|
||||
bus_size_t offset, u_int8_t value)
|
||||
{
|
||||
*(volatile u_int32_t *)(handle + offset) = value;
|
||||
}
|
||||
|
||||
int
|
||||
uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
|
||||
{
|
||||
@ -89,14 +72,9 @@ uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
|
||||
int
|
||||
uart_cpu_getdev(int devtype, struct uart_devinfo *di)
|
||||
{
|
||||
/* Create custom bus space */
|
||||
memcpy(&nlm_uart_bussp, rmi_bus_space, sizeof(nlm_uart_bussp));
|
||||
nlm_uart_bussp.bs_r_1 = nlm_uart_bussp_read_1;
|
||||
nlm_uart_bussp.bs_w_1 = nlm_uart_bussp_write_1;
|
||||
|
||||
di->ops = uart_getops(&uart_ns8250_class);
|
||||
di->bas.chan = 0;
|
||||
di->bas.bst = &nlm_uart_bussp;
|
||||
di->bas.bst = rmi_uart_bus_space;
|
||||
di->bas.bsh = nlm_get_uart_regbase(0, 0);
|
||||
|
||||
di->bas.regshft = 2;
|
||||
@ -108,6 +86,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
|
||||
di->parity = UART_PARITY_NONE;
|
||||
|
||||
uart_bus_space_io = NULL;
|
||||
uart_bus_space_mem = &nlm_uart_bussp;
|
||||
uart_bus_space_mem = rmi_uart_bus_space;
|
||||
return (0);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#include "opt_platform.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/bus.h>
|
||||
@ -85,11 +86,14 @@ __FBSDID("$FreeBSD$");
|
||||
#include <mips/nlm/board.h>
|
||||
#include <mips/nlm/xlp.h>
|
||||
|
||||
#ifdef FDT
|
||||
#include <dev/fdt/fdt_common.h>
|
||||
#include <dev/ofw/openfirm.h>
|
||||
#endif
|
||||
|
||||
/* 4KB static data aread to keep a copy of the bootload env until
|
||||
the dynamic kenv is setup */
|
||||
char boot1_env[4096];
|
||||
int xlp_argc;
|
||||
char **xlp_argv, **xlp_envp;
|
||||
|
||||
uint64_t xlp_cpu_frequency;
|
||||
uint64_t xlp_io_base = MIPS_PHYS_TO_KSEG1(XLP_DEFAULT_IO_BASE);
|
||||
@ -147,8 +151,13 @@ xlp_parse_mmu_options(void)
|
||||
uint32_t cpu_map = xlp_hw_thread_mask;
|
||||
uint32_t core0_thr_mask, core_thr_mask;
|
||||
|
||||
#ifndef SMP /* Uniprocessor! */
|
||||
if (cpu_map != 0x1) {
|
||||
#ifdef SMP
|
||||
if (cpu_map == 0)
|
||||
cpu_map = 0xffffffff;
|
||||
#else /* Uniprocessor! */
|
||||
if (cpu_map == 0)
|
||||
cpu_map = 0x1;
|
||||
else if (cpu_map != 0x1) {
|
||||
printf("WARNING: Starting uniprocessor kernel on cpumask [0x%lx]!\n"
|
||||
"WARNING: Other CPUs will be unused.\n", (u_long)cpu_map);
|
||||
cpu_map = 0x1;
|
||||
@ -219,45 +228,107 @@ xlp_parse_mmu_options(void)
|
||||
return;
|
||||
}
|
||||
|
||||
static void
|
||||
xlp_set_boot_flags(void)
|
||||
/* Parse cmd line args as env - copied from ar71xx */
|
||||
static void
|
||||
xlp_parse_bootargs(char *cmdline)
|
||||
{
|
||||
char *p;
|
||||
char *n, *v;
|
||||
|
||||
p = getenv("bootflags");
|
||||
if (p == NULL)
|
||||
return;
|
||||
|
||||
for (; p && *p != '\0'; p++) {
|
||||
switch (*p) {
|
||||
case 'd':
|
||||
case 'D':
|
||||
boothowto |= RB_KDB;
|
||||
break;
|
||||
case 'g':
|
||||
case 'G':
|
||||
boothowto |= RB_GDB;
|
||||
break;
|
||||
case 'v':
|
||||
case 'V':
|
||||
boothowto |= RB_VERBOSE;
|
||||
break;
|
||||
|
||||
case 's': /* single-user (default, supported for sanity) */
|
||||
case 'S':
|
||||
boothowto |= RB_SINGLE;
|
||||
break;
|
||||
|
||||
default:
|
||||
printf("Unrecognized boot flag '%c'.\n", *p);
|
||||
break;
|
||||
while ((v = strsep(&cmdline, " \n")) != NULL) {
|
||||
if (*v == '\0')
|
||||
continue;
|
||||
if (*v == '-') {
|
||||
while (*v != '\0') {
|
||||
v++;
|
||||
switch (*v) {
|
||||
case 'a': boothowto |= RB_ASKNAME; break;
|
||||
case 'd': boothowto |= RB_KDB; break;
|
||||
case 'g': boothowto |= RB_GDB; break;
|
||||
case 's': boothowto |= RB_SINGLE; break;
|
||||
case 'v': boothowto |= RB_VERBOSE; break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
n = strsep(&v, "=");
|
||||
if (v == NULL)
|
||||
setenv(n, "1");
|
||||
else
|
||||
setenv(n, v);
|
||||
}
|
||||
}
|
||||
|
||||
freeenv(p);
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef FDT
|
||||
static void
|
||||
xlp_bootargs_init(__register_t arg)
|
||||
{
|
||||
char buf[2048]; /* early stack is big enough */
|
||||
void *dtbp;
|
||||
phandle_t chosen;
|
||||
ihandle_t mask;
|
||||
|
||||
dtbp = (void *)arg;
|
||||
#if defined(FDT_DTB_STATIC)
|
||||
/*
|
||||
* In case the device tree blob was not passed as argument try
|
||||
* to use the statically embedded one.
|
||||
*/
|
||||
if (dtbp == NULL)
|
||||
dtbp = &fdt_static_dtb;
|
||||
#endif
|
||||
if (OF_install(OFW_FDT, 0) == FALSE)
|
||||
while (1);
|
||||
if (OF_init((void *)dtbp) != 0)
|
||||
while (1);
|
||||
if (fdt_immr_addr(xlp_io_base) != 0)
|
||||
while (1);
|
||||
OF_interpret("perform-fixup", 0);
|
||||
|
||||
chosen = OF_finddevice("/chosen");
|
||||
if (OF_getprop(chosen, "cpumask", &mask, sizeof(mask)) == 0)
|
||||
xlp_hw_thread_mask = mask;
|
||||
|
||||
if (OF_getprop(chosen, "bootargs", buf, sizeof(buf)) == 0)
|
||||
xlp_parse_bootargs(buf);
|
||||
}
|
||||
#else
|
||||
/*
|
||||
* arg is a pointer to the environment block, the format of the block is
|
||||
* a=xyz\0b=pqr\0\0
|
||||
*/
|
||||
static void
|
||||
xlp_bootargs_init(__register_t arg)
|
||||
{
|
||||
char buf[2048]; /* early stack is big enough */
|
||||
char *p, *v, *n;
|
||||
uint32_t mask;
|
||||
|
||||
p = (void *)arg;
|
||||
while (*p != '\0') {
|
||||
strlcpy(buf, p, sizeof(buf));
|
||||
v = buf;
|
||||
n = strsep(&v, "=");
|
||||
if (v == NULL)
|
||||
setenv(n, "1");
|
||||
else
|
||||
setenv(n, v);
|
||||
p += strlen(p) + 1;
|
||||
}
|
||||
|
||||
/* CPU mask can be passed thru env */
|
||||
if (getenv_uint("cpumask", &mask) != 0)
|
||||
xlp_hw_thread_mask = mask;
|
||||
|
||||
/* command line argument */
|
||||
v = getenv("bootargs");
|
||||
if (v != NULL) {
|
||||
strlcpy(buf, v, sizeof(buf));
|
||||
xlp_parse_bootargs(buf);
|
||||
freeenv(v);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
mips_init(void)
|
||||
{
|
||||
@ -428,14 +499,6 @@ platform_start(__register_t a0 __unused,
|
||||
__register_t a2 __unused,
|
||||
__register_t a3 __unused)
|
||||
{
|
||||
int i;
|
||||
|
||||
xlp_argc = 1;
|
||||
/*
|
||||
* argv and envp are passed in array of 32bit pointers
|
||||
*/
|
||||
xlp_argv = NULL;
|
||||
xlp_envp = NULL;
|
||||
|
||||
/* Initialize pcpu stuff */
|
||||
mips_pcpu0_init();
|
||||
@ -443,10 +506,8 @@ platform_start(__register_t a0 __unused,
|
||||
/* initialize console so that we have printf */
|
||||
boothowto |= (RB_SERIAL | RB_MULTIPLE); /* Use multiple consoles */
|
||||
|
||||
/* For now */
|
||||
boothowto |= RB_VERBOSE;
|
||||
boothowto |= RB_SINGLE;
|
||||
bootverbose++;
|
||||
init_static_kenv(boot1_env, sizeof(boot1_env));
|
||||
xlp_bootargs_init(a0);
|
||||
|
||||
/* clockrate used by delay, so initialize it here */
|
||||
xlp_cpu_frequency = xlp_get_cpu_frequency();
|
||||
@ -456,32 +517,10 @@ platform_start(__register_t a0 __unused,
|
||||
/* Init console please */
|
||||
cninit();
|
||||
|
||||
/* Environment */
|
||||
printf("Args %#jx %#jx %#jx %#jx:\n", (intmax_t)a0,
|
||||
(intmax_t)a1, (intmax_t)a2, (intmax_t)a3);
|
||||
xlp_hw_thread_mask = a0;
|
||||
init_static_kenv(boot1_env, sizeof(boot1_env));
|
||||
printf("Environment (from %d args):\n", xlp_argc - 1);
|
||||
if (xlp_argc == 1)
|
||||
printf("\tNone\n");
|
||||
for (i = 1; i < xlp_argc; i++) {
|
||||
char *n, *arg;
|
||||
|
||||
arg = (char *)(intptr_t)xlp_argv[i];
|
||||
printf("\t%s\n", arg);
|
||||
n = strsep(&arg, "=");
|
||||
if (arg == NULL)
|
||||
setenv(n, "1");
|
||||
else
|
||||
setenv(n, arg);
|
||||
}
|
||||
|
||||
/* Early core init and fixes for errata */
|
||||
xlp_setup_core();
|
||||
|
||||
xlp_set_boot_flags();
|
||||
xlp_parse_mmu_options();
|
||||
|
||||
xlp_mem_init();
|
||||
|
||||
bcopy(XLPResetEntry, (void *)MIPS_RESET_EXC_VEC,
|
||||
@ -491,6 +530,7 @@ platform_start(__register_t a0 __unused,
|
||||
* MIPS generic init
|
||||
*/
|
||||
mips_init();
|
||||
|
||||
/*
|
||||
* XLP specific post initialization
|
||||
* initialize other on chip stuff
|
||||
|
||||
Loading…
Reference in New Issue
Block a user