Module Name: src
Committed By: jmcneill
Date: Tue May 30 10:27:54 UTC 2017
Modified Files:
src/sys/arch/evbarm/conf: files.tegra
src/sys/arch/evbarm/tegra: tegra_start.S
Added Files:
src/sys/arch/evbarm/conf: files.fdt
src/sys/arch/evbarm/fdt: fdt_machdep.c platform.h
Removed Files:
src/sys/arch/evbarm/tegra: platform.h tegra_machdep.c
Log Message:
Rename tegra_machdep.c to fdt_machdep.c now that it no longer has any
Tegra-specific code in it.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/files.fdt
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/files.tegra
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/fdt/fdt_machdep.c \
src/sys/arch/evbarm/fdt/platform.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/tegra/platform.h
cvs rdiff -u -r1.48 -r0 src/sys/arch/evbarm/tegra/tegra_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/tegra/tegra_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/files.tegra
diff -u src/sys/arch/evbarm/conf/files.tegra:1.2 src/sys/arch/evbarm/conf/files.tegra:1.3
--- src/sys/arch/evbarm/conf/files.tegra:1.2 Sun Dec 13 17:39:19 2015
+++ src/sys/arch/evbarm/conf/files.tegra Tue May 30 10:27:53 2017
@@ -1,14 +1,8 @@
-# $NetBSD: files.tegra,v 1.2 2015/12/13 17:39:19 jmcneill Exp $
+# $NetBSD: files.tegra,v 1.3 2017/05/30 10:27:53 jmcneill Exp $
#
# NVIDIA Tegra configuration info
#
-file arch/evbarm/tegra/tegra_machdep.c
-
-defparam opt_machdep.h BOOT_ARGS
-
-include "dev/ofw/files.ofw"
-include "dev/fdt/files.fdt"
-include "arch/arm/fdt/files.fdt"
+include "arch/evbarm/conf/files.fdt"
include "arch/arm/nvidia/files.tegra"
Index: src/sys/arch/evbarm/tegra/tegra_start.S
diff -u src/sys/arch/evbarm/tegra/tegra_start.S:1.12 src/sys/arch/evbarm/tegra/tegra_start.S:1.13
--- src/sys/arch/evbarm/tegra/tegra_start.S:1.12 Fri May 26 20:04:56 2017
+++ src/sys/arch/evbarm/tegra/tegra_start.S Tue May 30 10:27:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_start.S,v 1.12 2017/05/26 20:04:56 jmcneill Exp $ */
+/* $NetBSD: tegra_start.S,v 1.13 2017/05/30 10:27:53 jmcneill Exp $ */
/*-
* Copyright (c) 2014, 2015 The NetBSD Foundation, Inc.
@@ -41,9 +41,8 @@
#include "assym.h"
#include <arm/nvidia/tegra_reg.h>
-#include <evbarm/tegra/platform.h>
-RCSID("$NetBSD: tegra_start.S,v 1.12 2017/05/26 20:04:56 jmcneill Exp $")
+RCSID("$NetBSD: tegra_start.S,v 1.13 2017/05/30 10:27:53 jmcneill Exp $")
#if defined(VERBOSE_INIT_ARM) && defined(CONSADDR)
#define XPUTC(n) mov r0, n; bl xputc
Added files:
Index: src/sys/arch/evbarm/conf/files.fdt
diff -u /dev/null src/sys/arch/evbarm/conf/files.fdt:1.1
--- /dev/null Tue May 30 10:27:54 2017
+++ src/sys/arch/evbarm/conf/files.fdt Tue May 30 10:27:53 2017
@@ -0,0 +1,12 @@
+# $NetBSD: files.fdt,v 1.1 2017/05/30 10:27:53 jmcneill Exp $
+#
+# FDT-based kernel configuration info
+#
+
+file arch/evbarm/fdt/fdt_machdep.c
+
+defparam opt_machdep.h BOOT_ARGS
+
+include "dev/ofw/files.ofw"
+include "dev/fdt/files.fdt"
+include "arch/arm/fdt/files.fdt"
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u /dev/null src/sys/arch/evbarm/fdt/fdt_machdep.c:1.1
--- /dev/null Tue May 30 10:27:54 2017
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Tue May 30 10:27:53 2017
@@ -0,0 +1,309 @@
+/* $NetBSD: fdt_machdep.c,v 1.1 2017/05/30 10:27:53 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015-2017 Jared McNeill <[email protected]>
+ * 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>
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.1 2017/05/30 10:27:53 jmcneill Exp $");
+
+#include "opt_machdep.h"
+#include "opt_ddb.h"
+#include "opt_md.h"
+#include "opt_arm_debug.h"
+#include "opt_multiprocessor.h"
+#include "opt_cpuoptions.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/atomic.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/exec.h>
+#include <sys/kernel.h>
+#include <sys/kmem.h>
+#include <sys/ksyms.h>
+#include <sys/msgbuf.h>
+#include <sys/proc.h>
+#include <sys/reboot.h>
+#include <sys/termios.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <sys/conf.h>
+
+#include <machine/db_machdep.h>
+#include <ddb/db_sym.h>
+#include <ddb/db_extern.h>
+
+#include <machine/bootconfig.h>
+#include <arm/armreg.h>
+#include <arm/undefined.h>
+
+#include <arm/arm32/machdep.h>
+
+#include <evbarm/include/autoconf.h>
+#include <evbarm/fdt/platform.h>
+
+#include <arm/fdt/arm_fdtvar.h>
+
+#ifndef FDT_MAX_BOOT_STRING
+#define FDT_MAX_BOOT_STRING 1024
+#endif
+
+BootConfig bootconfig;
+char bootargs[FDT_MAX_BOOT_STRING] = "";
+char *boot_args = NULL;
+u_int uboot_args[4] = { 0 }; /* filled in by xxx_start.S (not in bss) */
+
+#include <libfdt.h>
+#include <dev/fdt/fdtvar.h>
+#define FDT_BUF_SIZE (128*1024)
+static uint8_t fdt_data[FDT_BUF_SIZE];
+
+extern char KERNEL_BASE_phys[];
+#define KERNEL_BASE_PHYS ((paddr_t)KERNEL_BASE_phys)
+
+static void fdt_device_register(device_t, void *);
+static void fdt_reset(void);
+static void fdt_powerdown(void);
+
+#ifdef PMAP_NEED_ALLOC_POOLPAGE
+static struct boot_physmem bp_lowgig = {
+ .bp_pages = (KERNEL_VM_BASE - KERNEL_BASE) / NBPG,
+ .bp_freelist = VM_FREELIST_ISADMA,
+ .bp_flags = 0
+};
+#endif
+
+#ifdef VERBOSE_INIT_ARM
+static void
+fdt_putchar(char c)
+{
+ const struct arm_platform *plat = arm_fdt_platform();
+ if (plat && plat->early_purchar)
+ plat->early_putchar(c);
+}
+
+static void
+fdt_putstr(const char *s)
+{
+ for (const char *p = s; *p; p++)
+ fdt_putchar(*p);
+}
+
+static void
+fdt_printn(u_int n, int base)
+{
+ char *p, buf[(sizeof(u_int) * NBBY / 3) + 1 + 2 /* ALT + SIGN */];
+
+ p = buf;
+ do {
+ *p++ = hexdigits[n % base];
+ } while (n /= base);
+
+ do {
+ fdt_putchar(*--p);
+ } while (p > buf);
+}
+#define DPRINTF(...) printf(__VA_ARGS__)
+#define DPRINT(x) fdt_putstr(x)
+#define DPRINTN(x,b) fdt_printn((x), (b))
+#else
+#define DPRINTF(...)
+#define DPRINT(x)
+#define DPRINTN(x,b)
+#endif
+
+u_int
+initarm(void *arg)
+{
+ const struct arm_platform *plat;
+ uint64_t memory_addr, memory_size;
+ psize_t ram_size = 0;
+
+ /* Load FDT */
+ const uint8_t *fdt_addr_r = (const uint8_t *)uboot_args[2];
+ int error = fdt_check_header(fdt_addr_r);
+ if (error == 0) {
+ error = fdt_move(fdt_addr_r, fdt_data, sizeof(fdt_data));
+ if (error != 0)
+ panic("fdt_move failed: %s", fdt_strerror(error));
+ fdtbus_set_data(fdt_data);
+ } else {
+ panic("fdt_check_header failed: %s", fdt_strerror(error));
+ }
+
+ /* Lookup platform specific backend */
+ plat = arm_fdt_platform();
+ if (plat == NULL)
+ panic("Kernel does not support this device");
+
+ /* Early console may be available, announce ourselves. */
+ DPRINT("NetBSD FDT init");
+
+ DPRINT(" devmap");
+ pmap_devmap_register(plat->devmap());
+
+ DPRINT(" bootstrap");
+ plat->bootstrap();
+
+ /* Heads up ... Setup the CPU / MMU / TLB functions. */
+ DPRINT(" cpufunc");
+ if (set_cpufuncs())
+ panic("cpu not recognized!");
+
+ DPRINT(" consinit");
+ consinit();
+
+ DPRINTF(" ok\n");
+
+ DPRINTF("uboot: args %#x, %#x, %#x, %#x\n",
+ uboot_args[0], uboot_args[1], uboot_args[2], uboot_args[3]);
+
+ cpu_reset_address = fdt_reset;
+ cpu_powerdown_address = fdt_powerdown;
+ evbarm_device_register = fdt_device_register;
+
+ /* Talk to the user */
+ DPRINTF("\nNetBSD/evbarm (fdt) booting ...\n");
+
+#ifdef BOOT_ARGS
+ char mi_bootargs[] = BOOT_ARGS;
+ parse_mi_bootargs(mi_bootargs);
+#endif
+
+ DPRINTF("KERNEL_BASE=0x%x, "
+ "KERNEL_VM_BASE=0x%x, "
+ "KERNEL_VM_BASE - KERNEL_BASE=0x%x, "
+ "KERNEL_BASE_VOFFSET=0x%x\n",
+ KERNEL_BASE,
+ KERNEL_VM_BASE,
+ KERNEL_VM_BASE - KERNEL_BASE,
+ KERNEL_BASE_VOFFSET);
+
+ const int memory = OF_finddevice("/memory");
+ if (fdtbus_get_reg64(memory, 0, &memory_addr, &memory_size) != 0)
+ panic("Cannot determine memory size");
+
+#if !defined(_LP64)
+ /* Cannot map memory above 4GB */
+ if (memory_addr + memory_size > 0x100000000)
+ memory_size = 0x100000000 - memory_addr;
+#endif
+
+ ram_size = (bus_size_t)memory_size;
+
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+ const bool mapallmem_p = true;
+#ifndef PMAP_NEED_ALLOC_POOLPAGE
+ if (ram_size > KERNEL_VM_BASE - KERNEL_BASE) {
+ DPRINTF("%s: dropping RAM size from %luMB to %uMB\n",
+ __func__, (unsigned long) (ram_size >> 20),
+ (KERNEL_VM_BASE - KERNEL_BASE) >> 20);
+ ram_size = KERNEL_VM_BASE - KERNEL_BASE;
+ }
+#endif
+#else
+ const bool mapallmem_p = false;
+#endif
+
+ /* Fake bootconfig structure for the benefit of pmap.c. */
+ bootconfig.dramblocks = 1;
+ bootconfig.dram[0].address = (bus_addr_t)memory_addr;
+ bootconfig.dram[0].pages = ram_size / PAGE_SIZE;
+
+ arm32_bootmem_init(bootconfig.dram[0].address, ram_size,
+ KERNEL_BASE_PHYS);
+ arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0,
+ plat->devmap(), mapallmem_p);
+
+ const int chosen = OF_finddevice("/chosen");
+ if (chosen >= 0)
+ OF_getprop(chosen, "bootargs", bootargs, sizeof(bootargs));
+
+ DPRINTF("bootargs: %s\n", bootargs);
+
+ boot_args = bootargs;
+ parse_mi_bootargs(boot_args);
+
+#ifdef PMAP_NEED_ALLOC_POOLPAGE
+ bp_lowgig.bp_start = memory_addr / NBPG;
+ if (atop(ram_size) > bp_lowgig.bp_pages) {
+ arm_poolpage_vmfreelist = bp_lowgig.bp_freelist;
+ return initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE,
+ &bp_lowgig, 1);
+ }
+#endif
+
+ return initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
+
+}
+
+void
+consinit(void)
+{
+ static bool initialized = false;
+ const struct arm_platform *plat = arm_fdt_platform();
+ const struct fdt_console *cons = fdtbus_get_console();
+ struct fdt_attach_args faa;
+
+ if (initialized || cons == NULL)
+ return;
+
+ plat->init_attach_args(&faa);
+ faa.faa_phandle = fdtbus_get_stdout_phandle();
+
+ cons->consinit(&faa);
+
+ initialized = true;
+}
+
+static void
+fdt_device_register(device_t self, void *aux)
+{
+ const struct arm_platform *plat = arm_fdt_platform();
+
+ if (plat && plat->device_register)
+ plat->device_register(self, aux);
+}
+
+static void
+fdt_reset(void)
+{
+ const struct arm_platform *plat = arm_fdt_platform();
+
+ fdtbus_power_reset();
+
+ if (plat && plat->reset)
+ plat->reset();
+}
+
+static void
+fdt_powerdown(void)
+{
+ fdtbus_power_poweroff();
+}
Index: src/sys/arch/evbarm/fdt/platform.h
diff -u /dev/null src/sys/arch/evbarm/fdt/platform.h:1.1
--- /dev/null Tue May 30 10:27:54 2017
+++ src/sys/arch/evbarm/fdt/platform.h Tue May 30 10:27:53 2017
@@ -0,0 +1,40 @@
+/* $NetBSD: platform.h,v 1.1 2017/05/30 10:27:53 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015-2017 Jared McNeill <[email protected]>
+ * 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.
+ */
+
+#ifndef _EVBARM_FDT_PLATFORM_H
+#define _EVBARM_FDT_PLATFORM_H
+
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+#define KERNEL_VM_BASE 0xc0000000
+#define KERNEL_VM_SIZE 0x20000000 /* 0x20000000 = 512MB */
+#else
+#define KERNEL_VM_BASE 0x90000000
+#define KERNEL_VM_SIZE 0x50000000 /* 0x50000000 = 1.25GB */
+#endif
+
+#endif /* _EVBARM_FDT_PLATFORM_H */
