On Sun, Apr 24, 2022 at 08:00:50PM -0500, joshua stein wrote:
> Any interest in this?
>
> acpidptfs0 at acpi0: SEN2, sensor "Sensor 2 USB2"
> acpidptfs1 at acpi0: SEN4, sensor "Sensor 4 Ambience"
> acpidptfs2 at acpi0: SEN1, sensor "Thermistor CPU SOC"
> acpidptfs3 at acpi0: SEN3, sensor "Sensor 3 SSD"
> acpidptfs4 at acpi0: SEN5, sensor "Thermistor USB Type-C"
>
> hw.sensors.acpidptfs0.temp0=32.05 degC (Sensor 2 USB2)
> hw.sensors.acpidptfs1.temp0=26.05 degC (Sensor 4 Ambience)
> hw.sensors.acpidptfs2.temp0=35.05 degC (Thermistor CPU SOC)
> hw.sensors.acpidptfs3.temp0=35.05 degC (Sensor 3 SSD)
> hw.sensors.acpidptfs4.temp0=29.05 degC (Thermistor USB Type-C)
>
I like it, one question below.
otherwise ok mlarkin
-ml
>
>
> commit 959656ab8227367705adc45d73f5b6d47d552ac3
> Author: joshua stein <j...@jcs.org>
> Date: Mon Aug 9 12:45:15 2021 -0500
>
> acpidptfs: Add a driver for Dynamic Platform and Thermal Framework sensors
>
> diff --git sys/arch/amd64/conf/GENERIC sys/arch/amd64/conf/GENERIC
> index ecbf4d82305..3fc30b1e941 100644
> --- sys/arch/amd64/conf/GENERIC
> +++ sys/arch/amd64/conf/GENERIC
> @@ -85,6 +85,7 @@ acpihid* at acpi?
> ipmi0 at acpi? disable
> ccpmic* at iic?
> tipmic* at iic?
> +acpidptfs* at acpi?
>
> mpbios0 at bios0
>
> diff --git sys/dev/acpi/acpidptfs.c sys/dev/acpi/acpidptfs.c
> new file mode 100644
> index 00000000000..c863c8d1f97
> --- /dev/null
> +++ sys/dev/acpi/acpidptfs.c
> @@ -0,0 +1,173 @@
> +/* $OpenBSD$ */
> +/*
> + * Copyright (c) 2021 joshua stein <j...@jcs.org>
> + *
> + * Permission to use, copy, modify, and distribute this software for any
> + * purpose with or without fee is hereby granted, provided that the above
> + * copyright notice and this permission notice appear in all copies.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> + */
> +
> +#include <sys/param.h>
> +#include <sys/systm.h>
> +#include <sys/device.h>
> +#include <sys/kernel.h>
> +
> +#include <dev/acpi/acpivar.h>
> +#include <dev/acpi/acpidev.h>
> +#include <dev/acpi/amltypes.h>
> +#include <dev/acpi/dsdt.h>
> +
> +#include <sys/sensors.h>
> +
> +struct acpidptfs_softc {
> + struct device sc_dev;
> +
> + struct acpi_softc *sc_acpi;
> + struct aml_node *sc_devnode;
> +
> + int sc_devtype;
> +
> + struct ksensor sc_sensor;
> + struct ksensordev sc_sensdev;
> +};
> +
> +#define ACPIDPTFS_TYPE_SENSOR 0x03
> +#define ACPIDPTFS_TYPE_CHARGER 0x0B
> +#define ACPIDPTFS_TYPE_BATTERY 0x0C
> +
> +int acpidptfs_match(struct device *, void *, void *);
> +void acpidptfs_attach(struct device *, struct device *, void *);
> +void acpidptfs_sensor_add(struct acpidptfs_softc *);
> +int acpidptfs_notify(struct aml_node *, int, void *);
> +void acpidptfs_update(struct acpidptfs_softc *);
> +
> +struct cfattach acpidptfs_ca = {
> + sizeof(struct acpidptfs_softc),
> + acpidptfs_match,
> + acpidptfs_attach,
> + NULL,
> +};
> +
> +struct cfdriver acpidptfs_cd = {
> + NULL, "acpidptfs", DV_DULL
> +};
> +
> +const char *acpidptfs_hids[] = {
> + "INT3403",
> + "INTC1043",
> + "INTC1046",
> + NULL
> +};
> +
> +int
> +acpidptfs_match(struct device *parent, void *match, void *aux)
> +{
> + struct acpi_attach_args *aaa = aux;
> + struct cfdata *cf = match;
> +
> + return acpi_matchhids(aaa, acpidptfs_hids, cf->cf_driver->cd_name);
> +}
> +
> +void
> +acpidptfs_attach(struct device *parent, struct device *self, void *aux)
> +{
> + struct acpidptfs_softc *sc = (struct acpidptfs_softc *)self;
> + struct acpi_attach_args *aa = aux;
> + int64_t res;
> +
> + sc->sc_acpi = (struct acpi_softc *)parent;
> + sc->sc_devnode = aa->aaa_node;
> + sc->sc_devtype = -1;
> +
> + printf(": %s", sc->sc_devnode->name);
> +
> + if (aml_evalinteger((struct acpi_softc *)parent, aa->aaa_node,
> + "_TMP", 0, NULL, &res) == 0)
> + sc->sc_devtype = ACPIDPTFS_TYPE_SENSOR;
> + else if (aml_evalinteger((struct acpi_softc *)parent, aa->aaa_node,
> + "PTYP", 0, NULL, &res) == 0)
> + sc->sc_devtype = res;
> +
> + switch (sc->sc_devtype) {
> + case ACPIDPTFS_TYPE_SENSOR:
> + acpidptfs_sensor_add(sc);
> + break;
> + case ACPIDPTFS_TYPE_CHARGER:
> + /* TODO */
> + printf(", charger\n");
> + break;
> + case ACPIDPTFS_TYPE_BATTERY:
> + /* TODO */
> + printf(", battery\n");
> + break;
> + default:
> + printf(", unknown type\n");
> + return;
> + }
> +
> + aml_register_notify(sc->sc_devnode, aa->aaa_dev, acpidptfs_notify,
> + sc, ACPIDEV_POLL);
Do we want to do this in the charger and battery cases?
> +}
> +
> +void
> +acpidptfs_sensor_add(struct acpidptfs_softc *sc)
> +{
> + struct aml_value res;
> +
> + strlcpy(sc->sc_sensdev.xname, DEVNAME(sc),
> + sizeof(sc->sc_sensdev.xname));
> +
> + if (aml_evalname(sc->sc_acpi, sc->sc_devnode, "_STR", 0, NULL,
> + &res) == 0)
> + strlcpy(sc->sc_sensor.desc, aml_utf16_to_string(&res),
> + sizeof(sc->sc_sensor.desc));
> + else
> + strlcpy(sc->sc_sensor.desc, sc->sc_devnode->name,
> + sizeof(sc->sc_sensor.desc));
> +
> + printf(", sensor \"%s\"\n", sc->sc_sensor.desc);
> +
> + aml_freevalue(&res);
> +
> + acpidptfs_update(sc);
> +
> + sc->sc_sensor.type = SENSOR_TEMP;
> + sensor_attach(&sc->sc_sensdev, &sc->sc_sensor);
> + sensordev_install(&sc->sc_sensdev);
> +}
> +
> +void
> +acpidptfs_update(struct acpidptfs_softc *sc)
> +{
> + int64_t val;
> +
> + if (aml_evalinteger(sc->sc_acpi, sc->sc_devnode, "_TMP", 0, NULL,
> + &val) != 0) {
> + sc->sc_sensor.flags |= SENSOR_FINVALID;
> + return;
> + }
> +
> + sc->sc_sensor.value = (val * 100000); /* -> uK */
> + sc->sc_sensor.flags &= ~SENSOR_FINVALID;
> +}
> +
> +int
> +acpidptfs_notify(struct aml_node *node, int notify_type, void *arg)
> +{
> + struct acpidptfs_softc *sc = arg;
> +
> + if (notify_type == 0)
> + acpidptfs_update(sc);
> + else
> + printf("%s: %s: %d\n", sc->sc_dev.dv_xname, __func__,
> notify_type);
> +
> + return 0;
> +}
> diff --git sys/dev/acpi/dsdt.c sys/dev/acpi/dsdt.c
> index 1a5694c9e4b..4cf0aededed 100644
> --- sys/dev/acpi/dsdt.c
> +++ sys/dev/acpi/dsdt.c
> @@ -1736,6 +1736,28 @@ aml_val_to_string(const struct aml_value *val)
>
> return (buffer);
> }
> +
> +const char *
> +aml_utf16_to_string(const struct aml_value *val)
> +{
> + static char buffer[256];
> + int len, i, ui;
> +
> + if (val->type != AML_OBJTYPE_BUFFER)
> + return aml_val_to_string(val);
> +
> + len = val->length / 2;
> + if (len >= sizeof(buffer))
> + len = sizeof(buffer) - 1;
> + for (i = 0, ui = 0; i < len; i++, ui += 2) {
> + if (val->v_buffer[ui] == 255)
> + buffer[i] = '?';
> + else
> + buffer[i] = val->v_buffer[ui];
> + }
> + buffer[len] = 0;
> + return (buffer);
> +}
> #endif /* SMALL_KERNEL */
>
> int aml_error;
> diff --git sys/dev/acpi/dsdt.h sys/dev/acpi/dsdt.h
> index c2f91d22b63..7abfbcaf3ab 100644
> --- sys/dev/acpi/dsdt.h
> +++ sys/dev/acpi/dsdt.h
> @@ -321,6 +321,7 @@ void aml_foreachpkg(struct aml_value
> *, int,
> void (*fn)(struct aml_value *, void *), void *);
>
> const char *aml_val_to_string(const struct aml_value *);
> +const char *aml_utf16_to_string(const struct aml_value *);
>
> void aml_disasm(struct aml_scope *scope, int lvl,
> void (*dbprintf)(void *, const char *, ...),
> diff --git sys/dev/acpi/files.acpi sys/dev/acpi/files.acpi
> index f97eb6d4e3e..60c2997d0fe 100644
> --- sys/dev/acpi/files.acpi
> +++ sys/dev/acpi/files.acpi
> @@ -263,3 +263,8 @@ file dev/acpi/acpihid.c acpihid
> # Freescale i.MX I2C controller
> attach imxiic at acpi with imxiic_acpi
> file dev/acpi/imxiic_acpi.c imxiic_acpi
> +
> +# Dynamic Platform and Thermal Framework Sensor
> +device acpidptfs
> +attach acpidptfs at acpi
> +file dev/acpi/acpidptfs.c acpidptfs
>
