Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Make the generic Arm platform available for arm32 a...



details:   https://anonhg.NetBSD.org/src/rev/401adeb96940
branches:  trunk
changeset: 1006216:401adeb96940
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jan 05 17:26:31 2020 +0000

description:
Make the generic Arm platform available for arm32 as well.

diffstat:

 sys/arch/arm/fdt/arm64_platform.c    |  117 ---------------------------------
 sys/arch/arm/fdt/arm_platform.c      |  122 +++++++++++++++++++++++++++++++++++
 sys/arch/arm/fdt/files.fdt           |    3 +-
 sys/arch/evbarm/conf/files.generic64 |    4 +-
 4 files changed, 125 insertions(+), 121 deletions(-)

diffs (281 lines):

diff -r cf69b82c9596 -r 401adeb96940 sys/arch/arm/fdt/arm64_platform.c
--- a/sys/arch/arm/fdt/arm64_platform.c Sun Jan 05 17:20:01 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/* $NetBSD: arm64_platform.c,v 1.2 2020/01/05 17:20:01 jmcneill Exp $ */
-
-/*-
- * Copyright (c) 2020 Jared McNeill <jmcneill%invisible.ca@localhost>
- * 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.2 2020/01/05 17:20:01 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 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 = arm_fdt_cpu_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);
diff -r cf69b82c9596 -r 401adeb96940 sys/arch/arm/fdt/arm_platform.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/fdt/arm_platform.c   Sun Jan 05 17:26:31 2020 +0000
@@ -0,0 +1,122 @@
+/* $NetBSD: arm_platform.c,v 1.1 2020/01/05 17:26:31 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2020 Jared McNeill <jmcneill%invisible.ca@localhost>
+ * 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.
+ */
+
+/*
+ * This is the default Arm FDT platform implementation. It assumes the
+ * following:
+ *
+ *  - Generic timer
+ *  - PSCI support
+ *  - Console UART is pre-configured by firmware
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: arm_platform.c,v 1.1 2020/01/05 17:26:31 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
+arm_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
+arm_platform_device_register(device_t self, void *aux)
+{
+}
+
+static const struct pmap_devmap *
+arm_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
+arm_platform_uart_freq(void)
+{
+       return 0;
+}
+
+static const struct arm_platform arm_platform = {
+       .ap_devmap = arm_platform_devmap,
+       .ap_bootstrap = arm_fdt_cpu_bootstrap,
+       .ap_init_attach_args = arm_platform_init_attach_args,
+       .ap_device_register = arm_platform_device_register,
+       .ap_reset = psci_fdt_reset,
+       .ap_delay = gtmr_delay,
+       .ap_uart_freq = arm_platform_uart_freq,
+       .ap_mpstart = arm_fdt_cpu_mpstart,
+};
+
+ARM_PLATFORM(arm, ARM_PLATFORM_DEFAULT, &arm_platform);
diff -r cf69b82c9596 -r 401adeb96940 sys/arch/arm/fdt/files.fdt
--- a/sys/arch/arm/fdt/files.fdt        Sun Jan 05 17:20:01 2020 +0000
+++ b/sys/arch/arm/fdt/files.fdt        Sun Jan 05 17:26:31 2020 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: files.fdt,v 1.29 2019/08/10 17:03:59 skrll Exp $
+# $NetBSD: files.fdt,v 1.30 2020/01/05 17:26:31 jmcneill Exp $
 
 include        "dev/pckbport/files.pckbport"
 
 device armfdt { }: bus_space_generic, fdt
 attach armfdt at root with arm_fdt
 file   arch/arm/fdt/arm_fdt.c                  arm_fdt
+file   arch/arm/fdt/arm_platform.c             arm_fdt
 
 attach cpu at fdt with cpu_fdt
 file   arch/arm/fdt/cpu_fdt.c                  cpu_fdt
diff -r cf69b82c9596 -r 401adeb96940 sys/arch/evbarm/conf/files.generic64
--- a/sys/arch/evbarm/conf/files.generic64      Sun Jan 05 17:20:01 2020 +0000
+++ b/sys/arch/evbarm/conf/files.generic64      Sun Jan 05 17:26:31 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.generic64,v 1.13 2020/01/05 17:16:07 jmcneill Exp $
+#      $NetBSD: files.generic64,v 1.14 2020/01/05 17:26:31 jmcneill Exp $
 #
 # A generic (aarch64) kernel configuration info
 #
@@ -8,8 +8,6 @@
 
 include "arch/evbarm/conf/files.fdt"
 
-file   arch/arm/fdt/arm64_platform.c
-
 # Add other board files here
 #
 include "arch/arm/acpi/files.acpi"



Home | Main Index | Thread Index | Old Index