Source-Changes-HG archive

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

[src/trunk]: src/sys/arch G/C



details:   https://anonhg.NetBSD.org/src/rev/2ea3619b5aec
branches:  trunk
changeset: 997638:2ea3619b5aec
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Mar 17 08:17:56 2019 +0000

description:
G/C

diffstat:

 sys/arch/arm/cavium/files.thunderx      |    9 --
 sys/arch/arm/cavium/thunderx_platform.c |  130 --------------------------------
 sys/arch/arm/cavium/thunderx_platform.h |   41 ----------
 sys/arch/evbarm/conf/GENERIC64          |    3 +-
 sys/arch/evbarm/conf/files.generic64    |    3 +-
 5 files changed, 2 insertions(+), 184 deletions(-)

diffs (227 lines):

diff -r c8bfd9d71f50 -r 2ea3619b5aec sys/arch/arm/cavium/files.thunderx
--- a/sys/arch/arm/cavium/files.thunderx        Sun Mar 17 07:22:18 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#      $NetBSD: files.thunderx,v 1.1 2018/10/03 09:24:36 skrll Exp $
-#
-# Configuration info for Cavium ThunderX based systems.
-#
-#
-
-file   arch/arm/cavium/thunderx_platform.c     soc_thunderx
-
-defflag        opt_soc.h                               SOC_THUNDERX
diff -r c8bfd9d71f50 -r 2ea3619b5aec sys/arch/arm/cavium/thunderx_platform.c
--- a/sys/arch/arm/cavium/thunderx_platform.c   Sun Mar 17 07:22:18 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*     $NetBSD: thunderx_platform.c,v 1.2 2018/10/30 16:41:52 skrll Exp $      */
-
-/*-
- * Copyright (c) 2018 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nick Hudson
- *
- * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include "opt_console.h"
-#include "opt_soc.h"
-#include "opt_multiprocessor.h"
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thunderx_platform.c,v 1.2 2018/10/30 16:41:52 skrll Exp $");
-
-#include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/cpu.h>
-#include <sys/device.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/locore.h>
-
-#include <evbarm/dev/plcomreg.h>
-#include <evbarm/dev/plcomvar.h>
-
-#include <dev/ic/ns16550reg.h>
-#include <dev/ic/comreg.h>
-
-#include <arm/cortex/gtmr_var.h>
-
-#include <arm/arm/psci.h>
-#include <arm/fdt/psci_fdtvar.h>
-
-#include <arm/cavium/thunderx_platform.h>
-
-void thunderx_platform_early_putchar(char);
-
-static const struct pmap_devmap *
-thunderx_platform_devmap(void)
-{
-       static const struct pmap_devmap devmap[] = {
-               DEVMAP_ENTRY(THUNDERX_CORE_VBASE, THUNDERX_CORE_PBASE, THUNDERX_CORE_SIZE),
-               DEVMAP_ENTRY_END
-       };
-
-       return devmap;
-}
-
-static void
-thunderx_platform_init_attach_args(struct fdt_attach_args *faa)
-{
-       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;
-
-       faa->faa_bst = &arm_generic_bs_tag;
-       faa->faa_a4x_bst = &arm_generic_a4x_bs_tag;
-       faa->faa_dmat = &arm_generic_dma_tag;
-}
-
-void
-thunderx_platform_early_putchar(char c)
-{
-#ifdef CONSADDR
-       volatile uint32_t *uartaddr = (volatile uint32_t *)CONSADDR;
-
-       while ((le32toh(uartaddr[PL01XCOM_FR / 4]) & PL01X_FR_TXFF) != 0)
-               continue;
-
-       uartaddr[PL01XCOM_DR / 4] = htole32(c);
-       arm_dsb();
-
-       while ((le32toh(uartaddr[PL01XCOM_FR / 4]) & PL01X_FR_TXFE) == 0)
-               continue;
-#endif
-}
-
-static void
-thunderx_platform_device_register(device_t self, void *aux)
-{
-}
-
-static u_int
-thunderx_platform_uart_freq(void)
-{
-
-       return 133315200;
-}
-
-static const struct arm_platform thunderx_platform = {
-       .ap_devmap = thunderx_platform_devmap,
-       .ap_bootstrap = arm_fdt_cpu_bootstrap,
-       .ap_init_attach_args = thunderx_platform_init_attach_args,
-       .ap_device_register = thunderx_platform_device_register,
-       .ap_reset = psci_fdt_reset,
-       .ap_delay = gtmr_delay,
-       .ap_uart_freq = thunderx_platform_uart_freq,
-};
-
-ARM_PLATFORM(thunderx, "cavium,thunder-88xx", &thunderx_platform);
diff -r c8bfd9d71f50 -r 2ea3619b5aec sys/arch/arm/cavium/thunderx_platform.h
--- a/sys/arch/arm/cavium/thunderx_platform.h   Sun Mar 17 07:22:18 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*     $NetBSD: thunderx_platform.h,v 1.1 2018/10/03 09:24:36 skrll Exp $      */
-
-/*-
- * Copyright (c) 2018 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Nick Hudson
- *
- * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _ARM_THUNDERX_PLATFORM_H
-#define _ARM_THUNDERX_PLATFORM_H
-
-#include <arch/evbarm/fdt/platform.h>
-
-#define        THUNDERX_CORE_VBASE             KERNEL_IO_VBASE
-#define        THUNDERX_CORE_PBASE             0x87e024000000UL
-#define        THUNDERX_CORE_SIZE                  0x01000000UL
-
-#endif /* _ARM_THUNDERX_PLATFORM_H */
diff -r c8bfd9d71f50 -r 2ea3619b5aec sys/arch/evbarm/conf/GENERIC64
--- a/sys/arch/evbarm/conf/GENERIC64    Sun Mar 17 07:22:18 2019 +0000
+++ b/sys/arch/evbarm/conf/GENERIC64    Sun Mar 17 08:17:56 2019 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC64,v 1.83 2019/03/10 11:10:21 jmcneill Exp $
+#      $NetBSD: GENERIC64,v 1.84 2019/03/17 08:17:56 skrll Exp $
 #
 #      GENERIC ARM (aarch64) kernel
 #
@@ -86,7 +86,6 @@
 options        SOC_SUN50I_H5
 options        SOC_SUN50I_H6
 options        SOC_TEGRA210
-#options       SOC_THUNDERX
 options        SOC_VIRT
 options        MULTIPROCESSOR
 
diff -r c8bfd9d71f50 -r 2ea3619b5aec sys/arch/evbarm/conf/files.generic64
--- a/sys/arch/evbarm/conf/files.generic64      Sun Mar 17 07:22:18 2019 +0000
+++ b/sys/arch/evbarm/conf/files.generic64      Sun Mar 17 08:17:56 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.generic64,v 1.11 2019/02/25 19:30:17 jmcneill Exp $
+#      $NetBSD: files.generic64,v 1.12 2019/03/17 08:17:56 skrll Exp $
 #
 # A generic (aarch64) kernel configuration info
 #
@@ -13,7 +13,6 @@
 include "arch/arm/acpi/files.acpi"
 include "arch/arm/amlogic/files.meson"
 include "arch/arm/broadcom/files.bcm2835"
-include "arch/arm/cavium/files.thunderx"
 include "arch/arm/nvidia/files.tegra"
 include "arch/arm/rockchip/files.rockchip"
 include "arch/arm/sunxi/files.sunxi"



Home | Main Index | Thread Index | Old Index