Module Name: src
Committed By: jmcneill
Date: Sat Jun 30 16:30:35 UTC 2018
Modified Files:
src/sys/arch/arm/fdt: files.fdt
src/sys/arch/evbarm/conf: EXYNOS GENERIC GENERIC64 RPI RPI64 SUNXI
TEGRA TI VEXPRESS_A15 VIRT
src/sys/dev/fdt: cpus.c
Log Message:
cpus: use fdt_add_bus
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/fdt/files.fdt
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/EXYNOS
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/GENERIC \
src/sys/arch/evbarm/conf/RPI64
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/evbarm/conf/SUNXI
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/TEGRA
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/TI
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/VEXPRESS_A15
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/VIRT
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/cpus.c
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/files.fdt
diff -u src/sys/arch/arm/fdt/files.fdt:1.18 src/sys/arch/arm/fdt/files.fdt:1.19
--- src/sys/arch/arm/fdt/files.fdt:1.18 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/arm/fdt/files.fdt Sat Jun 30 16:30:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.18 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.19 2018/06/30 16:30:35 jmcneill Exp $
include "dev/pckbport/files.pckbport"
@@ -6,7 +6,7 @@ device armfdt { }: bus_space_generic, fd
attach armfdt at root with arm_fdt
file arch/arm/fdt/arm_fdt.c arm_fdt
-attach cpu at cpus with cpu_fdt
+attach cpu at fdt with cpu_fdt
file arch/arm/fdt/cpu_fdt.c cpu_fdt
device cpufreqdt
Index: src/sys/arch/evbarm/conf/EXYNOS
diff -u src/sys/arch/evbarm/conf/EXYNOS:1.23 src/sys/arch/evbarm/conf/EXYNOS:1.24
--- src/sys/arch/evbarm/conf/EXYNOS:1.23 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/evbarm/conf/EXYNOS Sat Jun 30 16:30:35 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: EXYNOS,v 1.23 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: EXYNOS,v 1.24 2018/06/30 16:30:35 jmcneill Exp $
#
# Samsung Exynos SoC kernel
#
@@ -42,7 +42,7 @@ simplebus* at fdt?
# CPUs
cpus* at fdt? pass 0
-cpu* at cpus?
+cpu* at fdt? pass 0
fclock* at fdt? pass 4
fregulator* at fdt? pass 4
Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.2 src/sys/arch/evbarm/conf/GENERIC:1.3
--- src/sys/arch/evbarm/conf/GENERIC:1.2 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/evbarm/conf/GENERIC Sat Jun 30 16:30:35 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.2 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.3 2018/06/30 16:30:35 jmcneill Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -58,7 +58,7 @@ simplebus* at fdt?
# CPUs
cpus* at fdt? pass 0
-cpu* at cpus?
+cpu* at fdt? pass 0
# CPU frequency scaling
cpufreqdt* at cpu?
Index: src/sys/arch/evbarm/conf/RPI64
diff -u src/sys/arch/evbarm/conf/RPI64:1.2 src/sys/arch/evbarm/conf/RPI64:1.3
--- src/sys/arch/evbarm/conf/RPI64:1.2 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/evbarm/conf/RPI64 Sat Jun 30 16:30:35 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI64,v 1.2 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: RPI64,v 1.3 2018/06/30 16:30:35 jmcneill Exp $
#
# RPI64 - Raspberry Pi 3 and Pi 2 v1.2 in AARCH64 mode
#
@@ -65,7 +65,7 @@ simplebus* at fdt?
# The CPU(s)
cpus* at fdt? pass 0
-cpu* at cpus?
+cpu* at fdt? pass 0
gtmr* at fdt? pass 1 # ARM Generic Timer
armgtmr0 at gtmr?
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.21 src/sys/arch/evbarm/conf/GENERIC64:1.22
--- src/sys/arch/evbarm/conf/GENERIC64:1.21 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/evbarm/conf/GENERIC64 Sat Jun 30 16:30:35 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.21 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: GENERIC64,v 1.22 2018/06/30 16:30:35 jmcneill Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -84,7 +84,7 @@ simplebus* at fdt?
# CPUs
cpus* at fdt? pass 0
-cpu* at cpus?
+cpu* at fdt? pass 0
# CPU frequency scaling
cpufreqdt* at cpu?
Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.79 src/sys/arch/evbarm/conf/RPI:1.80
--- src/sys/arch/evbarm/conf/RPI:1.79 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/evbarm/conf/RPI Sat Jun 30 16:30:35 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI,v 1.79 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: RPI,v 1.80 2018/06/30 16:30:35 jmcneill Exp $
#
# RPi -- Raspberry Pi
#
@@ -59,7 +59,7 @@ simplebus* at fdt?
# The CPU(s)
cpus* at fdt? pass 0
-cpu* at cpus?
+cpu* at fdt? pass 0
fclock* at fdt? pass 0
Index: src/sys/arch/evbarm/conf/SUNXI
diff -u src/sys/arch/evbarm/conf/SUNXI:1.76 src/sys/arch/evbarm/conf/SUNXI:1.77
--- src/sys/arch/evbarm/conf/SUNXI:1.76 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/evbarm/conf/SUNXI Sat Jun 30 16:30:35 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: SUNXI,v 1.76 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: SUNXI,v 1.77 2018/06/30 16:30:35 jmcneill Exp $
#
# Allwinner sunxi family
#
@@ -172,7 +172,7 @@ simplebus* at fdt?
# CPUs
cpus* at fdt? pass 0
-cpu* at cpus?
+cpu* at fdt? pass 0
cpufreqdt* at cpu?
# Power state coordination interface
Index: src/sys/arch/evbarm/conf/TEGRA
diff -u src/sys/arch/evbarm/conf/TEGRA:1.34 src/sys/arch/evbarm/conf/TEGRA:1.35
--- src/sys/arch/evbarm/conf/TEGRA:1.34 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/evbarm/conf/TEGRA Sat Jun 30 16:30:35 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: TEGRA,v 1.34 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: TEGRA,v 1.35 2018/06/30 16:30:35 jmcneill Exp $
#
# NVIDIA Tegra family SoCs
#
@@ -50,7 +50,7 @@ simplebus* at fdt?
# CPUs
cpus* at fdt? pass 0
-cpu* at cpus?
+cpu* at fdt? pass 0
# CPU frequency scaling
tegra124cpu* at cpu?
Index: src/sys/arch/evbarm/conf/TI
diff -u src/sys/arch/evbarm/conf/TI:1.3 src/sys/arch/evbarm/conf/TI:1.4
--- src/sys/arch/evbarm/conf/TI:1.3 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/evbarm/conf/TI Sat Jun 30 16:30:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: TI,v 1.3 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: TI,v 1.4 2018/06/30 16:30:35 jmcneill Exp $
#
include "arch/evbarm/conf/std.ti"
@@ -32,7 +32,7 @@ armfdt0 at root
simplebus* at fdt?
cpus* at fdt? pass 0
-cpu* at cpus?
+cpu* at fdt? pass 0
am3prcm* at fdt? pass 1
Index: src/sys/arch/evbarm/conf/VEXPRESS_A15
diff -u src/sys/arch/evbarm/conf/VEXPRESS_A15:1.20 src/sys/arch/evbarm/conf/VEXPRESS_A15:1.21
--- src/sys/arch/evbarm/conf/VEXPRESS_A15:1.20 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/evbarm/conf/VEXPRESS_A15 Sat Jun 30 16:30:35 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: VEXPRESS_A15,v 1.20 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: VEXPRESS_A15,v 1.21 2018/06/30 16:30:35 jmcneill Exp $
#
# ARM Versatile Express A15
#
@@ -33,7 +33,7 @@ simplebus* at fdt?
# CPUs
cpus* at fdt? pass 0
-cpu* at cpus?
+cpu* at fdt? pass 0
fclock* at fdt? pass 4
fregulator* at fdt? pass 4
Index: src/sys/arch/evbarm/conf/VIRT
diff -u src/sys/arch/evbarm/conf/VIRT:1.4 src/sys/arch/evbarm/conf/VIRT:1.5
--- src/sys/arch/evbarm/conf/VIRT:1.4 Sat Jun 30 16:22:56 2018
+++ src/sys/arch/evbarm/conf/VIRT Sat Jun 30 16:30:35 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: VIRT,v 1.4 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: VIRT,v 1.5 2018/06/30 16:30:35 jmcneill Exp $
#
# QEMU ARM 'virt' virtual machine
#
@@ -34,7 +34,7 @@ simplebus* at fdt?
# CPUs
cpus* at fdt? pass 0
-cpu* at cpus?
+cpu* at fdt? pass 0
fclock* at fdt? pass 4
fregulator* at fdt? pass 4
Index: src/sys/dev/fdt/cpus.c
diff -u src/sys/dev/fdt/cpus.c:1.2 src/sys/dev/fdt/cpus.c:1.3
--- src/sys/dev/fdt/cpus.c:1.2 Fri Jun 2 00:01:00 2017
+++ src/sys/dev/fdt/cpus.c Sat Jun 30 16:30:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpus.c,v 1.2 2017/06/02 00:01:00 jmcneill Exp $ */
+/* $NetBSD: cpus.c,v 1.3 2018/06/30 16:30:35 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpus.c,v 1.2 2017/06/02 00:01:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpus.c,v 1.3 2018/06/30 16:30:35 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -57,22 +57,9 @@ cpus_attach(device_t parent, device_t se
{
struct fdt_attach_args * const faa = aux;
const int phandle = faa->faa_phandle;
- int child;
aprint_naive("\n");
aprint_normal("\n");
- for (child = OF_child(phandle); child; child = OF_peer(child)) {
- if (!fdtbus_status_okay(child))
- continue;
-
- struct fdt_attach_args cfaa = *faa;
- cfaa.faa_phandle = child;
- cfaa.faa_name = "cpu";
- cfaa.faa_quiet = 0;
-
- device_t cpu = config_found(self, &cfaa, fdtbus_print);
- if (cpu)
- config_found(cpu, &cfaa, NULL);
- }
+ fdt_add_bus(self, phandle, faa);
}
