Module Name: src
Committed By: jmcneill
Date: Sun Jan 5 17:16:07 UTC 2020
Modified Files:
src/sys/arch/arm/fdt: arm_fdt.c arm_fdtvar.h
src/sys/arch/evbarm/conf: files.generic64
Added Files:
src/sys/arch/arm/fdt: arm64_platform.c
Log Message:
Add a generic Arm64 platform definition that is used as a fallback.
The generic platform assumes PSCI, a generic timer, pre-initialized UART
clocks, and adds a 4KB entry to the devmap for the console UART device.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/fdt/arm64_platform.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/fdt/arm_fdt.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/fdt/arm_fdtvar.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/files.generic64
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/arm/fdt/arm_fdt.c
diff -u src/sys/arch/arm/fdt/arm_fdt.c:1.9 src/sys/arch/arm/fdt/arm_fdt.c:1.10
--- src/sys/arch/arm/fdt/arm_fdt.c:1.9 Thu Jan 3 12:54:25 2019
+++ src/sys/arch/arm/fdt/arm_fdt.c Sun Jan 5 17:16:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_fdt.c,v 1.9 2019/01/03 12:54:25 jmcneill Exp $ */
+/* $NetBSD: arm_fdt.c,v 1.10 2020/01/05 17:16:07 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_arm_timer.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_fdt.c,v 1.9 2019/01/03 12:54:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_fdt.c,v 1.10 2020/01/05 17:16:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,10 +87,10 @@ const struct arm_platform *
arm_fdt_platform(void)
{
static const struct arm_platform_info *booted_platform = NULL;
+ __link_set_decl(arm_platforms, struct arm_platform_info);
+ struct arm_platform_info * const *info;
if (booted_platform == NULL) {
- __link_set_decl(arm_platforms, struct arm_platform_info);
- struct arm_platform_info * const *info;
const struct arm_platform_info *best_info = NULL;
const int phandle = OF_peer(0);
int match, best_match = 0;
@@ -107,6 +107,19 @@ arm_fdt_platform(void)
booted_platform = best_info;
}
+ /*
+ * No SoC specific platform was found. Try to find a generic
+ * platform definition and use that if available.
+ */
+ if (booted_platform == NULL) {
+ __link_set_foreach(info, arm_platforms) {
+ if (strcmp((*info)->api_compat, ARM_PLATFORM_DEFAULT) == 0) {
+ booted_platform = *info;
+ break;
+ }
+ }
+ }
+
return booted_platform == NULL ? NULL : booted_platform->api_ops;
}
Index: src/sys/arch/arm/fdt/arm_fdtvar.h
diff -u src/sys/arch/arm/fdt/arm_fdtvar.h:1.15 src/sys/arch/arm/fdt/arm_fdtvar.h:1.16
--- src/sys/arch/arm/fdt/arm_fdtvar.h:1.15 Thu Jan 31 13:06:10 2019
+++ src/sys/arch/arm/fdt/arm_fdtvar.h Sun Jan 5 17:16:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_fdtvar.h,v 1.15 2019/01/31 13:06:10 skrll Exp $ */
+/* $NetBSD: arm_fdtvar.h,v 1.16 2020/01/05 17:16:07 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -52,6 +52,8 @@ struct arm_platform_info {
const struct arm_platform * api_ops;
};
+#define ARM_PLATFORM_DEFAULT ""
+
#define _ARM_PLATFORM_REGISTER(name) \
__link_set_add_rodata(arm_platforms, __CONCAT(name,_platinfo));
Index: src/sys/arch/evbarm/conf/files.generic64
diff -u src/sys/arch/evbarm/conf/files.generic64:1.12 src/sys/arch/evbarm/conf/files.generic64:1.13
--- src/sys/arch/evbarm/conf/files.generic64:1.12 Sun Mar 17 08:17:56 2019
+++ src/sys/arch/evbarm/conf/files.generic64 Sun Jan 5 17:16:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.generic64,v 1.12 2019/03/17 08:17:56 skrll Exp $
+# $NetBSD: files.generic64,v 1.13 2020/01/05 17:16:07 jmcneill Exp $
#
# A generic (aarch64) kernel configuration info
#
@@ -8,6 +8,8 @@ include "arch/arm/cortex/files.cortex"
include "arch/evbarm/conf/files.fdt"
+file arch/arm/fdt/arm64_platform.c
+
# Add other board files here
#
include "arch/arm/acpi/files.acpi"
Added files:
Index: src/sys/arch/arm/fdt/arm64_platform.c
diff -u /dev/null src/sys/arch/arm/fdt/arm64_platform.c:1.1
--- /dev/null Sun Jan 5 17:16:07 2020
+++ src/sys/arch/arm/fdt/arm64_platform.c Sun Jan 5 17:16:07 2020
@@ -0,0 +1,122 @@
+/* $NetBSD: arm64_platform.c,v 1.1 2020/01/05 17:16:07 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2020 Jared McNeill <jmcne...@invisible.ca>
+ * 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 "opt_soc.h"
+#include "opt_multiprocessor.h"
+#include "opt_console.h"
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: arm64_platform.c,v 1.1 2020/01/05 17:16:07 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/termios.h>
+
+#include <dev/fdt/fdtvar.h>
+#include <arm/fdt/arm_fdtvar.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <machine/bootconfig.h>
+#include <arm/cpufunc.h>
+
+#include <arm/cortex/gtmr_var.h>
+
+#include <arm/arm/psci.h>
+#include <arm/fdt/psci_fdtvar.h>
+
+#include <libfdt.h>
+
+#include <arch/evbarm/fdt/platform.h>
+
+extern struct arm32_bus_dma_tag arm_generic_dma_tag;
+extern struct bus_space arm_generic_bs_tag;
+extern struct bus_space arm_generic_a4x_bs_tag;
+
+static void
+arm64_platform_init_attach_args(struct fdt_attach_args *faa)
+{
+ faa->faa_bst = &arm_generic_bs_tag;
+ faa->faa_a4x_bst = &arm_generic_a4x_bs_tag;
+ faa->faa_dmat = &arm_generic_dma_tag;
+}
+
+static void
+arm64_platform_device_register(device_t self, void *aux)
+{
+}
+
+static void
+arm64_platform_bootstrap(void)
+{
+}
+
+static const struct pmap_devmap *
+arm64_platform_devmap(void)
+{
+ static const struct pmap_devmap devmap_empty[] = {
+ DEVMAP_ENTRY_END
+ };
+ static struct pmap_devmap devmap_uart[] = {
+ DEVMAP_ENTRY(KERNEL_IO_VBASE, 0, L3_SIZE),
+ DEVMAP_ENTRY_END
+ };
+ bus_addr_t uart_base;
+
+ const int phandle = fdtbus_get_stdout_phandle();
+ if (phandle <= 0)
+ return devmap_empty;
+
+ if (fdtbus_get_reg(phandle, 0, &uart_base, NULL) != 0)
+ return devmap_empty;
+
+ devmap_uart[0].pd_pa = DEVMAP_TRUNC_ADDR(uart_base);
+
+ return devmap_uart;
+}
+
+static u_int
+arm64_platform_uart_freq(void)
+{
+ return 0;
+}
+
+static const struct arm_platform arm64_platform = {
+ .ap_devmap = arm64_platform_devmap,
+ .ap_bootstrap = arm64_platform_bootstrap,
+ .ap_init_attach_args = arm64_platform_init_attach_args,
+ .ap_device_register = arm64_platform_device_register,
+ .ap_reset = psci_fdt_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = arm64_platform_uart_freq,
+ .ap_mpstart = arm_fdt_cpu_mpstart,
+};
+
+ARM_PLATFORM(arm64, ARM_PLATFORM_DEFAULT, &arm64_platform);
