 @@ -1,14 +1,14 @@
-/* $NetBSD: cpufreq_dt.c,v 1.8 2019/05/21 22:15:26 jmcneill Exp $ */
+/* $NetBSD: cpufreq_dt.c,v 1.9 2019/10/06 11:28:24 jmcneill Exp $ */
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill@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.
 @@ -17,38 +17,39 @@
  * 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: cpufreq_dt.c,v 1.8 2019/05/21 22:15:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufreq_dt.c,v 1.9 2019/10/06 11:28:24 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 #include <sys/atomic.h>
 #include <sys/xcall.h>
 #include <sys/sysctl.h>
 #include <sys/queue.h>
 #include <sys/once.h>
 #include <sys/cpu.h>
 #include <dev/fdt/fdtvar.h>
 struct cpufreq_dt_table {
 	int			phandle;
 	TAILQ_ENTRY(cpufreq_dt_table) next;
 };
 static TAILQ_HEAD(, cpufreq_dt_table) cpufreq_dt_tables =
     TAILQ_HEAD_INITIALIZER(cpufreq_dt_tables);
 static kmutex_t cpufreq_dt_tables_lock;
 struct cpufreq_dt_opp {
 @@ -240,79 +241,96 @@ cpufreq_dt_sysctl_helper(SYSCTLFN_ARGS)
 	sc->sc_freq_target = fq;
 	if (sc->sc_freq_throttle)
 		error = 0;
 	else
 		error = cpufreq_dt_set_rate(sc, fq * 1000);
 	atomic_dec_uint(&sc->sc_busy);
 	return error;
+}
 static struct cpu_info *
 cpufreq_dt_cpu_lookup(cpuid_t mpidr)
+{
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci;
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		if (ci->ci_cpuid == mpidr)
 			return ci;
+	}
 	return NULL;
+}
 static void
 cpufreq_dt_init_sysctl(struct cpufreq_dt_softc *sc)
+{
-	const struct sysctlnode *node, *cpunode, *freqnode;
+	const struct sysctlnode *node, *cpunode;
 	struct sysctllog *cpufreq_log = NULL;
-	const char *cpunodename;
+	struct cpu_info *ci;
 	uint64_t mpidr;
 	int error, i;
 	if (fdtbus_get_reg(sc->sc_phandle, 0, &mpidr, 0) != 0)
 		return;
 	ci = cpufreq_dt_cpu_lookup(mpidr);
 	if (ci == NULL)
 		return;
 	sc->sc_freq_available = kmem_zalloc(strlen("XXXX ") * sc->sc_nopp, KM_SLEEP);
 	for (i = 0; i < sc->sc_nopp; i++) {
 		char buf[6];
 		snprintf(buf, sizeof(buf), i ? " %u" : "%u", sc->sc_opp[i].freq_khz / 1000);
 		strcat(sc->sc_freq_available, buf);
+	}
 	if (device_unit(sc->sc_dev) == 0)
 		cpunodename = "cpu";
 	else
 		cpunodename = device_xname(sc->sc_dev);
 	error = sysctl_createv(&cpufreq_log, 0, NULL, &node,
 	    CTLFLAG_PERMANENT, CTLTYPE_NODE, "machdep", NULL,
 	    NULL, 0, NULL, 0, CTL_MACHDEP, CTL_EOL);
 	if (error)
 		goto sysctl_failed;
-	error = sysctl_createv(&cpufreq_log, 0, &node, &cpunode,
+	error = sysctl_createv(&cpufreq_log, 0, &node, &node,
-, CTLTYPE_NODE, cpunodename, NULL,
+, CTLTYPE_NODE, "cpufreq", NULL,
 	    NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
 	if (error)
 		goto sysctl_failed;
-	error = sysctl_createv(&cpufreq_log, 0, &cpunode, &freqnode,
+	error = sysctl_createv(&cpufreq_log, 0, &node, &cpunode,
-, CTLTYPE_NODE, "frequency", NULL,
+, CTLTYPE_NODE, cpu_name(ci), NULL,
 	    NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
 	if (error)
 		goto sysctl_failed;
-	error = sysctl_createv(&cpufreq_log, 0, &freqnode, &node,
+	error = sysctl_createv(&cpufreq_log, 0, &cpunode, &node,
 	    CTLFLAG_READWRITE, CTLTYPE_INT, "target", NULL,
 	    cpufreq_dt_sysctl_helper, 0, (void *)sc, 0,
 	    CTL_CREATE, CTL_EOL);
 	if (error)
 		goto sysctl_failed;
 	sc->sc_node_target = node->sysctl_num;
-	error = sysctl_createv(&cpufreq_log, 0, &freqnode, &node,
+	error = sysctl_createv(&cpufreq_log, 0, &cpunode, &node,
 	    CTLFLAG_READWRITE, CTLTYPE_INT, "current", NULL,
 	    cpufreq_dt_sysctl_helper, 0, (void *)sc, 0,
 	    CTL_CREATE, CTL_EOL);
 	if (error)
 		goto sysctl_failed;
 	sc->sc_node_current = node->sysctl_num;
-	error = sysctl_createv(&cpufreq_log, 0, &freqnode, &node,
+	error = sysctl_createv(&cpufreq_log, 0, &cpunode, &node,
 , CTLTYPE_STRING, "available", NULL,
 	    NULL, 0, sc->sc_freq_available, 0,
 	    CTL_CREATE, CTL_EOL);
 	if (error)
 		goto sysctl_failed;
 	sc->sc_node_available = node->sysctl_num;
 	return;
 sysctl_failed:
 	aprint_error_dev(sc->sc_dev, "couldn't create sysctl nodes: %d\n", error);
 	sysctl_teardown(&cpufreq_log);
+}