svn commit: r334011 - in head/sys: conf powerpc/powernv
Justin Hibbits
jhibbits at FreeBSD.org
Tue May 22 02:42:55 UTC 2018
Author: jhibbits
Date: Tue May 22 02:42:53 2018
New Revision: 334011
URL: https://svnweb.freebsd.org/changeset/base/334011
Log:
Basic OPAL sensor support for POWER9 platforms
Summary:
PowerNV architectures (in the test case POWER9) export sensors via the device
tree, which are accessed via OPAL calls. This adds sysctl nodes for each
device in a generic fashion. New sysctl nodes are:
dev.opal_sensor.N.sensor
dev.opal_sensor.N.sensor_min
dev.opal_sensor.N.sensor_max
dev.opal_sensor.N.type
dev.opal_sensor.N.label
These are rooted at a parent attachment under opal, called opalsens. This does
not add support for the "sensor groups" defined in the device tree.
Reviewed by: breno.leitao_gmail.com
Differential Revision: https://reviews.freebsd.org/D15362
Added:
head/sys/powerpc/powernv/opal_sensor.c (contents, props changed)
Modified:
head/sys/conf/files.powerpc
head/sys/powerpc/powernv/opal.h
Modified: head/sys/conf/files.powerpc
==============================================================================
--- head/sys/conf/files.powerpc Tue May 22 02:13:04 2018 (r334010)
+++ head/sys/conf/files.powerpc Tue May 22 02:42:53 2018 (r334011)
@@ -189,6 +189,7 @@ powerpc/powernv/opal_dev.c optional powernv
powerpc/powernv/opal_i2c.c optional iicbus fdt powernv
powerpc/powernv/opal_i2cm.c optional iicbus fdt powernv
powerpc/powernv/opal_pci.c optional powernv pci
+powerpc/powernv/opal_sensor.c optional powernv
powerpc/powernv/opalcall.S optional powernv
powerpc/powernv/platform_powernv.c optional powernv
powerpc/powernv/powernv_centaur.c optional powernv
Modified: head/sys/powerpc/powernv/opal.h
==============================================================================
--- head/sys/powerpc/powernv/opal.h Tue May 22 02:13:04 2018 (r334010)
+++ head/sys/powerpc/powernv/opal.h Tue May 22 02:42:53 2018 (r334011)
@@ -72,6 +72,7 @@ int opal_call(uint64_t token, ...);
#define OPAL_RETURN_CPU 69
#define OPAL_REINIT_CPUS 70
#define OPAL_CHECK_ASYNC_COMPLETION 86
+#define OPAL_SENSOR_READ 88
#define OPAL_I2C_REQUEST 109
#define OPAL_INT_GET_XIRR 122
#define OPAL_INT_SET_CPPR 123
@@ -79,6 +80,9 @@ int opal_call(uint64_t token, ...);
#define OPAL_INT_SET_MFRR 125
#define OPAL_PCI_TCE_KILL 126
#define OPAL_XIVE_RESET 128
+#define OPAL_SENSOR_GROUP_CLEAR 156
+#define OPAL_SENSOR_READ_U64 162
+#define OPAL_SENSOR_GROUP_ENABLE 163
/* For OPAL_PCI_SET_PE */
#define OPAL_UNMAP_PE 0
Added: head/sys/powerpc/powernv/opal_sensor.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/powerpc/powernv/opal_sensor.c Tue May 22 02:42:53 2018 (r334011)
@@ -0,0 +1,336 @@
+/*-
+ * Copyright (C) 2018 Justin Hibbits
+ *
+ * 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 TOOLS GMBH 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>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
+#include <sys/module.h>
+#include <sys/types.h>
+#include <sys/proc.h>
+#include <sys/sysctl.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <machine/bus.h>
+
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include "opal.h"
+
+struct opal_sensor_softc {
+ device_t sc_dev;
+ struct mtx sc_mtx;
+ uint32_t sc_handle;
+ uint32_t sc_min_handle;
+ uint32_t sc_max_handle;
+ char *sc_label;
+ int sc_type;
+};
+
+#define SENSOR_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
+#define SENSOR_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
+#define SENSOR_LOCK_INIT(_sc) \
+ mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), \
+ "opal-sensor", MTX_DEF)
+
+/*
+ * A bit confusing, maybe. There are two types of nodes with compatible strings
+ * of "ibm,opal-sensor". One hangs off /ibm,opal/, named "sensors", the other
+ * hangs off of this node. For newbus attachments, we have one node (opalsens)
+ * attach from opal0, and the others (opal_sensor) attach from opalsens. These
+ * are the real sensors.
+ */
+enum opal_sensor_type {
+ OPAL_SENSOR_TEMP = 0, /* From OPAL: degC */
+ OPAL_SENSOR_FAN = 1, /* From OPAL: RPM */
+ OPAL_SENSOR_POWER = 2, /* From OPAL: W */
+ OPAL_SENSOR_IN = 3, /* From OPAL: mV */
+ OPAL_SENSOR_ENERGY = 4, /* From OPAL: uJ */
+ OPAL_SENSOR_CURR = 5, /* From OPAL: mA */
+ OPAL_SENSOR_MAX
+};
+
+/* This must be kept sorted with the enum above. */
+const char *opal_sensor_types[] = {
+ "temp",
+ "fan",
+ "power",
+ "in",
+ "energy",
+ "curr"
+};
+
+/*
+ * Retrieve the raw value from OPAL. This will be cooked by the sysctl handler.
+ */
+static int
+opal_sensor_get_val(uint32_t key, uint64_t *val)
+{
+ struct opal_msg msg;
+ uint32_t val32;
+ int i, rv;
+
+ rv = opal_call(OPAL_SENSOR_READ, key, key, vtophys(&val32));
+
+ if (rv == OPAL_ASYNC_COMPLETION) {
+ /* Sleep a little to let things settle. */
+ DELAY(100);
+ bzero(&msg, sizeof(msg));
+ i = 0;
+ do {
+ rv = opal_call(OPAL_CHECK_ASYNC_COMPLETION,
+ vtophys(&msg), sizeof(msg), key);
+ /* Sleep for ~100us if necessary. */
+ if (rv == OPAL_BUSY)
+ DELAY(100);
+ } while (rv == OPAL_BUSY && ++i < 10);
+ if (rv != OPAL_SUCCESS)
+ return (EIO);
+ val32 = msg.params[0];
+ }
+
+ if (rv != OPAL_SUCCESS)
+ return (EIO);
+
+ *val = val32;
+
+ return (0);
+}
+
+static int
+opal_sensor_sysctl(SYSCTL_HANDLER_ARGS)
+{
+ struct opal_sensor_softc *sc;
+ int error, result;
+ uint32_t sensor;
+ uint64_t sensval;
+
+ sc = arg1;
+ sensor = arg2;
+
+ SENSOR_LOCK(sc);
+ error = opal_sensor_get_val(sensor, &sensval);
+ SENSOR_UNLOCK(sc);
+
+ if (error)
+ return (error);
+
+ result = sensval;
+
+ switch (sc->sc_type) {
+ case OPAL_SENSOR_TEMP:
+ result = result * 10 + 2731; /* Convert to K */
+ break;
+ case OPAL_SENSOR_POWER:
+ result = result * 1000; /* Convert to mW */
+ break;
+ }
+
+ error = sysctl_handle_int(oidp, &result, 0, req);
+
+ return (error);
+}
+
+static int
+opal_sensor_probe(device_t dev)
+{
+ if (!ofw_bus_is_compatible(dev, "ibm,opal-sensor"))
+ return (ENXIO);
+
+ device_set_desc(dev, "OPAL sensor");
+ return (BUS_PROBE_GENERIC);
+}
+
+static int
+opal_sensor_attach(device_t dev)
+{
+ struct opal_sensor_softc *sc;
+ struct sysctl_ctx_list *ctx;
+ struct sysctl_oid *tree;
+ char type[8];
+ phandle_t node;
+ cell_t sensor_id;
+ int i;
+
+ sc = device_get_softc(dev);
+ sc->sc_dev = dev;
+
+ node = ofw_bus_get_node(dev);
+
+ if (OF_getencprop(node, "sensor-data", &sensor_id, sizeof(sensor_id)) < 0) {
+ device_printf(dev, "Missing sensor ID\n");
+ return (ENXIO);
+ }
+ if (OF_getprop(node, "sensor-type", type, sizeof(type)) < 0) {
+ device_printf(dev, "Missing sensor type\n");
+ return (ENXIO);
+ }
+
+ sc->sc_type = -1;
+ for (i = 0; i < OPAL_SENSOR_MAX; i++) {
+ if (strcmp(type, opal_sensor_types[i]) == 0) {
+ sc->sc_type = i;
+ break;
+ }
+ }
+ if (sc->sc_type == -1) {
+ device_printf(dev, "Unknown sensor type '%s'\n", type);
+ return (ENXIO);
+ }
+
+ ctx = device_get_sysctl_ctx(dev);
+ tree = device_get_sysctl_tree(dev);
+
+ sc->sc_handle = sensor_id;
+ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ "sensor", CTLTYPE_INT | CTLFLAG_RD, sc, sensor_id,
+ opal_sensor_sysctl, (sc->sc_type == OPAL_MSG_TYPE_MAX) ? "IK" : "I",
+ "current value");
+
+ SYSCTL_ADD_STRING(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "type",
+ CTLFLAG_RD, __DECONST(char *, opal_sensor_types[sc->sc_type]),
+ 0, "");
+
+ OF_getprop_alloc(node, "label", (void **)&sc->sc_label);
+ SYSCTL_ADD_STRING(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "label",
+ CTLFLAG_RD, sc->sc_label, 0, "");
+
+ if (OF_getprop(node, "sensor-data-min",
+ &sensor_id, sizeof(sensor_id)) > 0) {
+ sc->sc_min_handle = sensor_id;
+ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ "sensor_min", CTLTYPE_INT | CTLFLAG_RD, sc, sensor_id,
+ opal_sensor_sysctl,
+ (sc->sc_type == OPAL_MSG_TYPE_MAX) ? "IK" : "I",
+ "minimum value");
+ }
+
+ if (OF_getprop(node, "sensor-data-max",
+ &sensor_id, sizeof(sensor_id)) > 0) {
+ sc->sc_max_handle = sensor_id;
+ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ "sensor_max", CTLTYPE_INT | CTLFLAG_RD, sc, sensor_id,
+ opal_sensor_sysctl,
+ (sc->sc_type == OPAL_MSG_TYPE_MAX) ? "IK" : "I",
+ "maximum value");
+ }
+
+ SENSOR_LOCK_INIT(sc);
+
+ return (0);
+}
+
+static device_method_t opal_sensor_methods[] = {
+ DEVMETHOD(device_probe, opal_sensor_probe),
+ DEVMETHOD(device_attach, opal_sensor_attach),
+};
+
+static driver_t opal_sensor_driver = {
+ "opal_sensor",
+ opal_sensor_methods,
+ sizeof(struct opal_sensor_softc)
+};
+
+static devclass_t opal_sensor_devclass;
+
+DRIVER_MODULE(opal_sensor, opalsens, opal_sensor_driver, opal_sensor_devclass,
+ NULL, NULL);
+
+
+static int
+opalsens_probe(device_t dev)
+{
+
+ if (!ofw_bus_is_compatible(dev, "ibm,opal-sensor"))
+ return (ENXIO);
+
+ device_set_desc(dev, "OPAL Sensors");
+ return (BUS_PROBE_GENERIC);
+}
+
+static int
+opalsens_attach(device_t dev)
+{
+ phandle_t child;
+ device_t cdev;
+ struct ofw_bus_devinfo *dinfo;
+
+ for (child = OF_child(ofw_bus_get_node(dev)); child != 0;
+ child = OF_peer(child)) {
+ dinfo = malloc(sizeof(*dinfo), M_DEVBUF, M_WAITOK | M_ZERO);
+ if (ofw_bus_gen_setup_devinfo(dinfo, child) != 0) {
+ free(dinfo, M_DEVBUF);
+ continue;
+ }
+ cdev = device_add_child(dev, NULL, -1);
+ if (cdev == NULL) {
+ device_printf(dev, "<%s>: device_add_child failed\n",
+ dinfo->obd_name);
+ ofw_bus_gen_destroy_devinfo(dinfo);
+ free(dinfo, M_DEVBUF);
+ continue;
+ }
+ device_set_ivars(cdev, dinfo);
+ }
+
+ return (bus_generic_attach(dev));
+}
+
+static const struct ofw_bus_devinfo *
+opalsens_get_devinfo(device_t dev, device_t child)
+{
+ return (device_get_ivars(child));
+}
+
+static device_method_t opalsens_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, opalsens_probe),
+ DEVMETHOD(device_attach, opalsens_attach),
+
+ /* ofw_bus interface */
+ DEVMETHOD(ofw_bus_get_devinfo, opalsens_get_devinfo),
+ DEVMETHOD(ofw_bus_get_compat, ofw_bus_gen_get_compat),
+ DEVMETHOD(ofw_bus_get_model, ofw_bus_gen_get_model),
+ DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name),
+ DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node),
+ DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type),
+
+ DEVMETHOD_END
+};
+
+static driver_t opalsens_driver = {
+ "opalsens",
+ opalsens_methods,
+ 0
+};
+
+static devclass_t opalsens_devclass;
+
+DRIVER_MODULE(opalsens, opal, opalsens_driver, opalsens_devclass, NULL, NULL);
More information about the svn-src-all
mailing list