Author: nwhitehorn
Date: Fri Feb 19 04:37:54 2010
New Revision: 204082
URL: http://svn.freebsd.org/changeset/base/204082
Log:
Allow the SMU driver to read a variety of hardware sensors (possible
questions on the thermal calibration), and to read and set fan RPMs from
software. While here, fix a number of bugs.
Calibration code from: OpenBSD
MFC after: 2 weeks
Modified:
head/sys/powerpc/powermac/smu.c
Modified: head/sys/powerpc/powermac/smu.c
==============================================================================
--- head/sys/powerpc/powermac/smu.c Fri Feb 19 03:36:02 2010
(r204081)
+++ head/sys/powerpc/powermac/smu.c Fri Feb 19 04:37:54 2010
(r204082)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/conf.h>
#include <sys/cpu.h>
+#include <sys/ctype.h>
#include <sys/kernel.h>
#include <sys/rman.h>
#include <sys/sysctl.h>
@@ -46,11 +47,30 @@ __FBSDID("$FreeBSD$");
#include <powerpc/powermac/macgpiovar.h>
struct smu_cmd {
- uint8_t cmd;
+ volatile uint8_t cmd;
uint8_t len;
uint8_t data[254];
};
+struct smu_fan {
+ cell_t reg;
+ cell_t min_rpm;
+ cell_t max_rpm;
+ cell_t unmanaged_rpm;
+ char location[32];
+};
+
+struct smu_sensor {
+ cell_t reg;
+ char location[32];
+ enum {
+ SMU_CURRENT_SENSOR,
+ SMU_VOLTAGE_SENSOR,
+ SMU_POWER_SENSOR,
+ SMU_TEMP_SENSOR
+ } type;
+};
+
struct smu_softc {
device_t sc_dev;
struct mtx sc_mtx;
@@ -65,6 +85,23 @@ struct smu_softc {
struct smu_cmd *sc_cmd;
bus_addr_t sc_cmd_phys;
bus_dmamap_t sc_cmd_dmamap;
+
+ struct smu_fan *sc_fans;
+ int sc_nfans;
+ struct smu_sensor *sc_sensors;
+ int sc_nsensors;
+
+ /* Calibration data */
+ uint16_t sc_cpu_diode_scale;
+ int16_t sc_cpu_diode_offset;
+
+ uint16_t sc_cpu_volt_scale;
+ int16_t sc_cpu_volt_offset;
+ uint16_t sc_cpu_curr_scale;
+ int16_t sc_cpu_curr_offset;
+
+ uint16_t sc_slots_pow_scale;
+ int16_t sc_slots_pow_offset;
};
/* regular bus attachment functions */
@@ -77,6 +114,12 @@ static int smu_attach(device_t);
static void smu_cpufreq_pre_change(device_t, const struct cf_level *level);
static void smu_cpufreq_post_change(device_t, const struct cf_level *level);
+/* utility functions */
+static int smu_get_datablock(device_t dev, int8_t id, uint8_t *buf,
+ size_t len);
+static void smu_attach_fans(device_t dev, phandle_t fanroot);
+static void smu_attach_sensors(device_t dev, phandle_t sensroot);
+
/* where to find the doorbell GPIO */
static device_t smu_doorbell = NULL;
@@ -97,11 +140,31 @@ static driver_t smu_driver = {
static devclass_t smu_devclass;
DRIVER_MODULE(smu, nexus, smu_driver, smu_devclass, 0, 0);
+MALLOC_DEFINE(M_SMU, "smu", "SMU Sensor Information");
-#define SMU_MAILBOX 0x860c
+#define SMU_MAILBOX 0x8000860c
/* Command types */
-#define SMU_POWER 0xaa
+#define SMU_ADC 0xd8
+#define SMU_FAN 0x4a
+#define SMU_I2C 0x9a
+#define SMU_I2C_SIMPLE 0x00
+#define SMU_I2C_NORMAL 0x01
+#define SMU_I2C_COMBINED 0x02
+#define SMU_MISC 0xee
+#define SMU_MISC_GET_DATA 0x02
+#define SMU_POWER 0xaa
+
+/* Data blocks */
+#define SMU_CPUTEMP_CAL 0x18
+#define SMU_CPUVOLT_CAL 0x21
+#define SMU_SLOTPW_CAL 0x78
+
+/* Partitions */
+#define SMU_PARTITION 0x3e
+#define SMU_PARTITION_LATEST 0x01
+#define SMU_PARTITION_BASE 0x02
+#define SMU_PARTITION_UPDATE 0x03
static int
smu_probe(device_t dev)
@@ -127,6 +190,8 @@ static int
smu_attach(device_t dev)
{
struct smu_softc *sc;
+ phandle_t node, child;
+ uint8_t data[12];
sc = device_get_softc(dev);
@@ -139,7 +204,7 @@ smu_attach(device_t dev)
bus_dma_tag_create(NULL, 16, 0, BUS_SPACE_MAXADDR_32BIT,
BUS_SPACE_MAXADDR, NULL, NULL, PAGE_SIZE, 1, PAGE_SIZE, 0, NULL,
NULL, &(sc->sc_dmatag));
- sc->sc_bt = &bs_be_tag;
+ sc->sc_bt = &bs_le_tag;
bus_space_map(sc->sc_bt, SMU_MAILBOX, 4, 0, &sc->sc_mailbox);
/*
@@ -159,6 +224,40 @@ smu_attach(device_t dev)
EVENTHANDLER_REGISTER(cpufreq_post_change, smu_cpufreq_post_change, dev,
EVENTHANDLER_PRI_ANY);
+ /*
+ * Detect and attach child devices.
+ */
+ node = ofw_bus_get_node(dev);
+ for (child = OF_child(node); child != 0; child = OF_peer(child)) {
+ char name[32];
+ memset(name, 0, sizeof(name));
+ OF_getprop(child, "name", name, sizeof(name));
+
+ if (strncmp(name, "rpm-fans", 9) == 0 ||
+ strncmp(name, "fans", 5) == 0)
+ smu_attach_fans(dev, child);
+
+ if (strncmp(name, "sensors", 8) == 0)
+ smu_attach_sensors(dev, child);
+ }
+
+ /*
+ * Collect calibration constants.
+ */
+ smu_get_datablock(dev, SMU_CPUTEMP_CAL, data, sizeof(data));
+ sc->sc_cpu_diode_scale = (data[4] << 8) + data[5];
+ sc->sc_cpu_diode_offset = (data[6] << 8) + data[7];
+
+ smu_get_datablock(dev, SMU_CPUVOLT_CAL, data, sizeof(data));
+ sc->sc_cpu_volt_scale = (data[4] << 8) + data[5];
+ sc->sc_cpu_volt_offset = (data[6] << 8) + data[7];
+ sc->sc_cpu_curr_scale = (data[8] << 8) + data[9];
+ sc->sc_cpu_curr_offset = (data[10] << 8) + data[11];
+
+ smu_get_datablock(dev, SMU_SLOTPW_CAL, data, sizeof(data));
+ sc->sc_slots_pow_scale = (data[4] << 8) + data[5];
+ sc->sc_slots_pow_offset = (data[6] << 8) + data[7];
+
return (0);
}
@@ -166,19 +265,22 @@ static int
smu_run_cmd(device_t dev, struct smu_cmd *cmd)
{
struct smu_softc *sc;
- int doorbell_ack, result;
+ int doorbell_ack, result, oldpow;
sc = device_get_softc(dev);
mtx_lock(&sc->sc_mtx);
+ oldpow = powerpc_pow_enabled;
+ powerpc_pow_enabled = 0;
+
/* Copy the command to the mailbox */
memcpy(sc->sc_cmd, cmd, sizeof(*cmd));
bus_dmamap_sync(sc->sc_dmatag, sc->sc_cmd_dmamap, BUS_DMASYNC_PREWRITE);
bus_space_write_4(sc->sc_bt, sc->sc_mailbox, 0, sc->sc_cmd_phys);
- /* Invalidate the cacheline it is in -- SMU bypasses the cache */
- __asm __volatile("dcbst 0,%0; sync" :: "r"(sc->sc_cmd): "memory");
+ /* Flush the cacheline it is in -- SMU bypasses the cache */
+ __asm __volatile("sync; dcbf 0,%0; sync" :: "r"(sc->sc_cmd): "memory");
/* Ring SMU doorbell */
macgpio_write(smu_doorbell, GPIO_DDR_OUTPUT);
@@ -188,7 +290,7 @@ smu_run_cmd(device_t dev, struct smu_cmd
/* XXX: timeout */
DELAY(50);
doorbell_ack = macgpio_read(smu_doorbell);
- } while (!doorbell_ack);
+ } while (doorbell_ack != (GPIO_DDR_OUTPUT | GPIO_LEVEL_RO | GPIO_DATA));
/* Check result. First invalidate the cache again... */
__asm __volatile("dcbf 0,%0; sync" :: "r"(sc->sc_cmd) : "memory");
@@ -196,16 +298,49 @@ smu_run_cmd(device_t dev, struct smu_cmd
bus_dmamap_sync(sc->sc_dmatag, sc->sc_cmd_dmamap, BUS_DMASYNC_POSTREAD);
/* SMU acks the command by inverting the command bits */
- if (sc->sc_cmd->cmd == ~cmd->cmd)
+ if (sc->sc_cmd->cmd == ((~cmd->cmd) & 0xff))
result = 0;
else
result = EIO;
+ powerpc_pow_enabled = oldpow;
+
+ memcpy(cmd->data, sc->sc_cmd->data, sizeof(cmd->data));
+
mtx_unlock(&sc->sc_mtx);
return (result);
}
+static int
+smu_get_datablock(device_t dev, int8_t id, uint8_t *buf, size_t len)
+{
+ struct smu_cmd cmd;
+ uint8_t addr[4];
+
+ cmd.cmd = SMU_PARTITION;
+ cmd.len = 2;
+ cmd.data[0] = SMU_PARTITION_LATEST;
+ cmd.data[1] = id;
+
+ smu_run_cmd(dev, &cmd);
+
+ addr[0] = addr[1] = 0;
+ addr[2] = cmd.data[0];
+ addr[3] = cmd.data[1];
+
+ cmd.cmd = SMU_MISC;
+ cmd.len = 7;
+ cmd.data[0] = SMU_MISC_GET_DATA;
+ cmd.data[1] = sizeof(addr);
+ memcpy(&cmd.data[2], addr, sizeof(addr));
+ cmd.data[6] = len;
+
+ smu_run_cmd(dev, &cmd);
+ memcpy(buf, cmd.data, len);
+ return (0);
+}
+
static void
smu_slew_cpu_voltage(device_t dev, int to)
{
@@ -286,3 +421,298 @@ doorbell_attach(device_t dev)
smu_doorbell = dev;
return (0);
}
+
+/*
+ * Sensor and fan management
+ */
+
+static int
+smu_fan_set_rpm(device_t smu, struct smu_fan *fan, int rpm)
+{
+ struct smu_cmd cmd;
+
+ cmd.cmd = SMU_FAN;
+ cmd.len = 14;
+ cmd.data[0] = 0;
+ cmd.data[1] = 1 << fan->reg;
+
+ /*
+ * There are two locations used for the fan speed.
+ * Store it in both.
+ */
+
+ cmd.data[2] = cmd.data[2 + 2*fan->reg] = (rpm >> 8) & 0xff;
+ cmd.data[3] = cmd.data[3 + 2*fan->reg] = rpm & 0xff;
+
+ return (smu_run_cmd(smu, &cmd));
+}
+
+static int
+smu_fan_read_rpm(device_t smu, struct smu_fan *fan)
+{
+ struct smu_cmd cmd;
+
+ cmd.cmd = SMU_FAN;
+ cmd.len = 2;
+ cmd.data[0] = 1;
+ cmd.data[1] = 1 << fan->reg;
+
+ smu_run_cmd(smu, &cmd);
+
+ return ((cmd.data[1] << 8) | cmd.data[2]);
+}
+
+static int
+smu_fanrpm_sysctl(SYSCTL_HANDLER_ARGS)
+{
+ device_t smu;
+ struct smu_softc *sc;
+ struct smu_fan *fan;
+ int rpm, error;
+
+ smu = arg1;
+ sc = device_get_softc(smu);
+ fan = &sc->sc_fans[arg2];
+
+ rpm = smu_fan_read_rpm(smu, fan);
+ error = sysctl_handle_int(oidp, &rpm, 0, req);
+
+ if (error || !req->newptr)
+ return (error);
+
+
+ return (smu_fan_set_rpm(smu, fan, rpm));
+}
+
+static void
+smu_attach_fans(device_t dev, phandle_t fanroot)
+{
+ struct smu_fan *fan;
+ struct smu_softc *sc;
+ struct sysctl_oid *oid, *fanroot_oid;
+ struct sysctl_ctx_list *ctx;
+ phandle_t child;
+ char type[32], sysctl_name[32];
+ int i;
+
+ sc = device_get_softc(dev);
+ sc->sc_nfans = 0;
+
+ for (child = OF_child(fanroot); child != 0; child = OF_peer(child))
+ sc->sc_nfans++;
+
+ if (sc->sc_nfans == 0) {
+ device_printf(dev, "WARNING: No fans detected!\n");
+ return;
+ }
+
+ sc->sc_fans = malloc(sc->sc_nfans * sizeof(struct smu_fan), M_SMU,
+ M_WAITOK | M_ZERO);
+
+ fan = sc->sc_fans;
+ sc->sc_nfans = 0;
+
+ ctx = device_get_sysctl_ctx(dev);
+ fanroot_oid = SYSCTL_ADD_NODE(ctx,
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "fans",
+ CTLFLAG_RD, 0, "SMU Fan Information");
+
+ for (child = OF_child(fanroot); child != 0; child = OF_peer(child)) {
+ OF_getprop(child, "device_type", type, sizeof(type));
+ if (strcmp(type, "fan-rpm-control") != 0)
+ continue;
+
+ OF_getprop(child, "reg", &fan->reg, sizeof(cell_t));
+ OF_getprop(child, "min-value", &fan->min_rpm, sizeof(cell_t));
+ OF_getprop(child, "max-value", &fan->max_rpm, sizeof(cell_t));
+ OF_getprop(child, "unmanaged-value", &fan->unmanaged_rpm,
+ sizeof(cell_t));
+ OF_getprop(child, "location", fan->location,
+ sizeof(fan->location));
+
+ /* Make sure it is at a safe value initially */
+ //smu_fan_set_rpm(dev, fan, fan->unmanaged_rpm);
+
+ /* Add sysctls */
+ for (i = 0; i < strlen(fan->location); i++) {
+ sysctl_name[i] = tolower(fan->location[i]);
+ if (isspace(sysctl_name[i]))
+ sysctl_name[i] = '_';
+ }
+ sysctl_name[i] = 0;
+
+ oid = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(fanroot_oid),
+ OID_AUTO, sysctl_name, CTLFLAG_RD, 0, "Fan Information");
+ SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "minrpm",
+ CTLTYPE_INT | CTLFLAG_RD, &fan->min_rpm, sizeof(cell_t),
+ "Minimum allowed RPM");
+ SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "maxrpm",
+ CTLTYPE_INT | CTLFLAG_RD, &fan->max_rpm, sizeof(cell_t),
+ "Maximum allowed RPM");
+ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "rpm",
+ CTLTYPE_INT | CTLFLAG_RW, dev, sc->sc_nfans,
+ smu_fanrpm_sysctl, "I", "Fan RPM");
+
+ fan++;
+ sc->sc_nfans++;
+ }
+}
+
+static int
+smu_sensor_read(device_t smu, struct smu_sensor *sens)
+{
+ struct smu_cmd cmd;
+ struct smu_softc *sc;
+ int64_t value;
+
+ cmd.cmd = SMU_ADC;
+ cmd.len = 1;
+ cmd.data[0] = sens->reg;
+
+ smu_run_cmd(smu, &cmd);
+
+ sc = device_get_softc(smu);
+ value = (cmd.data[0] << 8) | cmd.data[1];
+
+ switch (sens->type) {
+ case SMU_TEMP_SENSOR:
+ value *= sc->sc_cpu_diode_scale;
+ value >>= 3;
+ value += ((int64_t)sc->sc_cpu_diode_offset) << 9;
+ value <<= 1;
+
+ /* Convert from 16.16 fixed point degC into integer C. */
+ value *= 15625;
+ value /= 1024;
+ value /= 1000000;
+ break;
+ case SMU_VOLTAGE_SENSOR:
+ value *= sc->sc_cpu_volt_scale;
+ value += sc->sc_cpu_volt_offset;
+ value <<= 4;
+
+ /* Convert from 16.16 fixed point V into mV. */
+ value *= 15625;
+ value /= 1024;
+ value /= 1000;
+ break;
+ case SMU_CURRENT_SENSOR:
+ value *= sc->sc_cpu_curr_scale;
+ value += sc->sc_cpu_curr_offset;
+ value <<= 4;
+
+ /* Convert from 16.16 fixed point A into mA. */
+ value *= 15625;
+ value /= 1024;
+ value /= 1000;
+ break;
+ case SMU_POWER_SENSOR:
+ value *= sc->sc_slots_pow_scale;
+ value += sc->sc_slots_pow_offset;
+ value <<= 4;
+
+ /* Convert from 16.16 fixed point W into mW. */
+ value *= 15625;
+ value /= 1024;
+ value /= 1000;
+ break;
+ }
+
+ return (value);
+}
+
+static int
+smu_sensor_sysctl(SYSCTL_HANDLER_ARGS)
+{
+ device_t smu;
+ struct smu_softc *sc;
+ struct smu_sensor *sens;
+ int value, error;
+
+ smu = arg1;
+ sc = device_get_softc(smu);
+ sens = &sc->sc_sensors[arg2];
+
+ value = smu_sensor_read(smu, sens);
+ error = sysctl_handle_int(oidp, &value, 0, req);
+
+ return (error);
+}
+
+static void
+smu_attach_sensors(device_t dev, phandle_t sensroot)
+{
+ struct smu_sensor *sens;
+ struct smu_softc *sc;
+ struct sysctl_oid *sensroot_oid;
+ struct sysctl_ctx_list *ctx;
+ phandle_t child;
+ char type[32];
+ int i;
+
+ sc = device_get_softc(dev);
+ sc->sc_nsensors = 0;
+
+ for (child = OF_child(sensroot); child != 0; child = OF_peer(child))
+ sc->sc_nsensors++;
+
+ if (sc->sc_nsensors == 0) {
+ device_printf(dev, "WARNING: No sensors detected!\n");
+ return;
+ }
+
+ sc->sc_fans = malloc(sc->sc_nsensors * sizeof(struct smu_sensor), M_SMU,
+ M_WAITOK | M_ZERO);
+
+ sens = sc->sc_sensors;
+ sc->sc_nsensors = 0;
+
+ ctx = device_get_sysctl_ctx(dev);
+ sensroot_oid = SYSCTL_ADD_NODE(ctx,
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "sensors",
+ CTLFLAG_RD, 0, "SMU Sensor Information");
+
+ for (child = OF_child(sensroot); child != 0; child = OF_peer(child)) {
+ char sysctl_name[40], sysctl_desc[40];
+ const char *units;
+
+ OF_getprop(child, "device_type", type, sizeof(type));
+
+ if (strcmp(type, "current-sensor") == 0) {
+ sens->type = SMU_CURRENT_SENSOR;
+ units = "mA";
+ } else if (strcmp(type, "temp-sensor") == 0) {
+ sens->type = SMU_TEMP_SENSOR;
+ units = "C";
+ } else if (strcmp(type, "voltage-sensor") == 0) {
+ sens->type = SMU_VOLTAGE_SENSOR;
+ units = "mV";
+ } else if (strcmp(type, "power-sensor") == 0) {
+ sens->type = SMU_POWER_SENSOR;
+ units = "mW";
+ } else {
+ continue;
+ }
+
+ OF_getprop(child, "reg", &sens->reg, sizeof(cell_t));
+ OF_getprop(child, "location", sens->location,
+ sizeof(sens->location));
+
+ for (i = 0; i < strlen(sens->location); i++) {
+ sysctl_name[i] = tolower(sens->location[i]);
+ if (isspace(sysctl_name[i]))
+ sysctl_name[i] = '_';
+ }
+ sysctl_name[i] = 0;
+
+ sprintf(sysctl_desc,"%s (%s)", sens->location, units);
+
+ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(sensroot_oid), OID_AUTO,
+ sysctl_name, CTLTYPE_INT | CTLFLAG_RD, dev, sc->sc_nsensors,
+ smu_sensor_sysctl, "I", sysctl_desc);
+
+ sens++;
+ sc->sc_nsensors++;
+ }
+}
+
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
