hwmon: Add support for Raspberry Pi voltage sensor
Subsystems (5)
v3 cover hwmon: Add support for Raspberry Pi voltage sensor
A common issue for the Raspberry Pi is an inadequate power supply. Noralf Tr?nnes started a discussion [1] about writing such undervoltage conditions into the kernel log.
Changes in V3:
- rebase
- simplify probing
Changes in V2:
- simplified Kconfig dependency suggested by Robin Murphy
- replace dt-binding by probing from firmware driver
- add hwmon documentation
- minor improvements suggested by Guenter Roeck
[1] - https://github.com/raspberrypi/linux/issues/2367
Stefan Wahren (6):
ARM: bcm2835: Add GET_THROTTLED firmware property
hwmon: Add support for RPi voltage sensor
firmware: raspberrypi: Register hwmon driver
ARM: bcm2835_defconfig: Enable RPi voltage sensor
ARM: multi_v7_defconfig: Enable RPi voltage sensor
arm64: defconfig: Enable RPi voltage sensor
Documentation/hwmon/raspberrypi-hwmon | 22 ++++ arch/arm/configs/bcm2835_defconfig | 2 +- arch/arm/configs/multi_v7_defconfig | 1 + arch/arm64/configs/defconfig | 1 + drivers/firmware/raspberrypi.c | 19 ++++ drivers/hwmon/Kconfig | 10 ++ drivers/hwmon/Makefile | 1 + drivers/hwmon/raspberrypi-hwmon.c | 166 +++++++++++++++++++++++++++++ include/soc/bcm2835/raspberrypi-firmware.h | 1 + 9 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 Documentation/hwmon/raspberrypi-hwmon create mode 100644 drivers/hwmon/raspberrypi-hwmon.c
Signature · 1 line
2.7.4
PATCH v3 1/6 ARM: bcm2835: Add GET_THROTTLED firmware property
Recent Raspberry Pi firmware provides a mailbox property to detect under-voltage conditions. Here is the current definition.
The u32 value returned by the firmware is divided into 2 parts:
- lower 16-bits are the live value
- upper 16-bits are the history or sticky value
Bits:
0: undervoltage
1: arm frequency capped
2: currently throttled
16: undervoltage has occurred
17: arm frequency capped has occurred
18: throttling has occurred
--- include/soc/bcm2835/raspberrypi-firmware.h | 1 + 1 file changed, 1 insertion(+)
include/soc/bcm2835/raspberrypi-firmware.h +1 -0
@@ -75,6 +75,7 @@ enum rpi_firmware_property_tag {RPI_FIRMWARE_GET_EDID_BLOCK =0x00030020 ,RPI_FIRMWARE_GET_CUSTOMER_OTP =0x00030021 ,RPI_FIRMWARE_GET_DOMAIN_STATE =0x00030030 , +RPI_FIRMWARE_GET_THROTTLED =0x00030046 ,RPI_FIRMWARE_SET_CLOCK_STATE =0x00038001 ,RPI_FIRMWARE_SET_CLOCK_RATE =0x00038002 , RPI_FIRMWARE_SET_VOLTAGE = 0x00038003,
Signature · 1 line
2.7.4
PATCH v3 2/6 hwmon: Add support for RPi voltage sensor
In reply to Stefan WahrenCurrently there is no easy way to detect undervoltage conditions on a remote Raspberry Pi. This hwmon driver retrieves the state of the undervoltage sensor via mailbox interface. The handling based on Noralf's modifications to the downstream firmware driver. In case of an undervoltage condition only an entry is written to the kernel log.
--- Documentation/hwmon/raspberrypi-hwmon | 22 +++++ drivers/hwmon/Kconfig | 10 ++ drivers/hwmon/Makefile | 1 + drivers/hwmon/raspberrypi-hwmon.c | 166 ++++++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+) create mode 100644 Documentation/hwmon/raspberrypi-hwmon create mode 100644 drivers/hwmon/raspberrypi-hwmon.c
Documentation/hwmon/raspberrypi-hwmon new file +22 -0
@@ -0,0 +1,22 @@ +Kernel driver raspberrypi-hwmon +=============================== + +Supported boards: + * Raspberry Pi A+ (via GPIO on SoC) + * Raspberry Pi B+ (via GPIO on SoC) + * Raspberry Pi 2 B (via GPIO on SoC) + * Raspberry Pi 3 B (via GPIO on port expander) + * Raspberry Pi 3 B+ (via PMIC) + +Author: Stefan Wahren <[email protected]> + +Description +----------- + +This driver periodically polls a mailbox property of the VC4 firmware to detect +undervoltage conditions. + +Sysfs entries +------------- + +in0_lcrit_alarm Undervoltage alarm
drivers/hwmon/Kconfig +10 -0
@@ -1298,6 +1298,16 @@ config SENSORS_PWM_FAN This driver can also be built as a module. If so, the module will be called pwm-fan. +config SENSORS_RASPBERRYPI_HWMON + tristate "Raspberry Pi voltage monitor" + depends on RASPBERRYPI_FIRMWARE || COMPILE_TEST + help + If you say yes here you get support for voltage sensor on the + Raspberry Pi. + + This driver can also be built as a module. If so, the module + will be called raspberrypi-hwmon. + config SENSORS_SHT15 tristate "Sensiron humidity and temperature sensors. SHT15 and compat." depends on GPIOLIB || COMPILE_TEST
drivers/hwmon/Makefile +1 -0
@@ -141,6 +141,7 @@ obj-$(CONFIG_SENSORS_PC87427) += pc87427.o obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o obj-$(CONFIG_SENSORS_POWR1220) += powr1220.o obj-$(CONFIG_SENSORS_PWM_FAN) += pwm-fan.o +obj-$(CONFIG_SENSORS_RASPBERRYPI_HWMON) += raspberrypi-hwmon.o obj-$(CONFIG_SENSORS_S3C) += s3c-hwmon.o obj-$(CONFIG_SENSORS_SCH56XX_COMMON)+= sch56xx-common.o obj-$(CONFIG_SENSORS_SCH5627) += sch5627.o
drivers/hwmon/raspberrypi-hwmon.c new file +166 -0
166 lines not on this page · raw message
Signature · 1 line
2.7.4
Guenter Roeck
maintainerPATCH v3 2/6 hwmon: Add support for RPi voltage sensor
Quoted 8 lines · Stefan Wahren
Currently there is no easy way to detect undervoltage conditions on a remote Raspberry Pi. This hwmon driver retrieves the state of the undervoltage sensor via mailbox interface. The handling based on Noralf's modifications to the downstream firmware driver. In case of an undervoltage condition only an entry is written to the kernel log.
CC "Noralf Tr?nnes" <[email protected]>Signed-off-by Stefan Wahren <[email protected]>
... assuming this will go through some arm tree.
Quoted 245 lines
--- Documentation/hwmon/raspberrypi-hwmon | 22 +++++ drivers/hwmon/Kconfig | 10 ++ drivers/hwmon/Makefile | 1 + drivers/hwmon/raspberrypi-hwmon.c | 166 ++++++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+) create mode 100644 Documentation/hwmon/raspberrypi-hwmon create mode 100644 drivers/hwmon/raspberrypi-hwmon.cDocumentation/hwmon/raspberrypi-hwmon new file +22
-0@@ -0,0 +1,22 @@ +Kernel driver raspberrypi-hwmon +=============================== + +Supported boards: + * Raspberry Pi A+ (via GPIO on SoC) + * Raspberry Pi B+ (via GPIO on SoC) + * Raspberry Pi 2 B (via GPIO on SoC) + * Raspberry Pi 3 B (via GPIO on port expander) + * Raspberry Pi 3 B+ (via PMIC) + +Author: Stefan Wahren <[email protected]> + +Description +----------- + +This driver periodically polls a mailbox property of the VC4 firmware to detect +undervoltage conditions. + +Sysfs entries +------------- + +in0_lcrit_alarm Undervoltage alarmdrivers/hwmon/Kconfig +10
-0@@ -1298,6 +1298,16 @@ config SENSORS_PWM_FAN This driver can also be built as a module. If so, the module will be called pwm-fan. +config SENSORS_RASPBERRYPI_HWMON + tristate "Raspberry Pi voltage monitor" + depends on RASPBERRYPI_FIRMWARE || COMPILE_TEST + help + If you say yes here you get support for voltage sensor on the + Raspberry Pi. + + This driver can also be built as a module. If so, the module + will be called raspberrypi-hwmon. + config SENSORS_SHT15 tristate "Sensiron humidity and temperature sensors. SHT15 and compat." depends on GPIOLIB || COMPILE_TESTdrivers/hwmon/Makefile +1
-0@@ -141,6 +141,7 @@ obj-$(CONFIG_SENSORS_PC87427) += pc87427.o obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o obj-$(CONFIG_SENSORS_POWR1220) += powr1220.o obj-$(CONFIG_SENSORS_PWM_FAN) += pwm-fan.o +obj-$(CONFIG_SENSORS_RASPBERRYPI_HWMON) += raspberrypi-hwmon.o obj-$(CONFIG_SENSORS_S3C) += s3c-hwmon.o obj-$(CONFIG_SENSORS_SCH56XX_COMMON)+= sch56xx-common.o obj-$(CONFIG_SENSORS_SCH5627) += sch5627.odrivers/hwmon/raspberrypi-hwmon.c new file +166
-0@@ -0,0 +1,166 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Raspberry Pi voltage sensor driver +* +* Based on firmware/raspberrypi.c by Noralf Tr?nnes +* +* Copyright (C) 2018 Stefan Wahren <[email protected]> +*/ +#include <linux/device.h> +#include <linux/err.h> +#include <linux/hwmon.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/workqueue.h> +#include <soc/bcm2835/raspberrypi-firmware.h> + +#define UNDERVOLTAGE_STICKY_BIT BIT(16) + +struct rpi_hwmon_data { +struct device *hwmon_dev; +struct rpi_firmware *fw; +u32 last_throttled; +struct delayed_work get_values_poll_work; +}; + +static void rpi_firmware_get_throttled (struct rpi_hwmon_data *data) +{ +u32 new_uv, old_uv, value; +int ret; + +/* Request firmware to clear sticky bits */ + value =0xffff ; + + ret =rpi_firmware_property (data->fw,RPI_FIRMWARE_GET_THROTTLED , + &value,sizeof (value)); +if (ret) { +dev_err_once (data->hwmon_dev,"Failed to get throttled (%d)\n" , + ret); +return ; + } + + new_uv = value &UNDERVOLTAGE_STICKY_BIT ; + old_uv = data->last_throttled &UNDERVOLTAGE_STICKY_BIT ; + data->last_throttled = value; + +if (new_uv == old_uv) +return ; + +if (new_uv) +dev_crit (data->hwmon_dev,"Undervoltage detected!\n" ); +else +dev_info (data->hwmon_dev,"Voltage normalised\n" ); + +sysfs_notify (&data->hwmon_dev->kobj,NULL ,"in0_lcrit_alarm" ); +} + +static void get_values_poll (struct work_struct *work) +{ +struct rpi_hwmon_data *data; + + data = container_of(work, struct rpi_hwmon_data, + get_values_poll_work.work); + +rpi_firmware_get_throttled (data); + +/* +* We can't run faster than the sticky shift (100ms) since we get +* flipping in the sticky bits that are cleared. +*/ +schedule_delayed_work (&data->get_values_poll_work,2 *HZ ); +} + +static int rpi_read (struct device *dev,enum hwmon_sensor_types type, +u32 attr,int channel,long *val) +{ +struct rpi_hwmon_data *data =dev_get_drvdata (dev); + + *val = !!(data->last_throttled &UNDERVOLTAGE_STICKY_BIT ); +return 0 ; +} + +static umode_t rpi_is_visible (const void *_data,enum hwmon_sensor_types type, +u32 attr,int channel) +{ +return 0444 ; +} + +static const u32 rpi_in_config[] = { +HWMON_I_LCRIT_ALARM , +0 +}; + +static const struct hwmon_channel_info rpi_in = { + .type = hwmon_in, + .config = rpi_in_config, +}; + +static const struct hwmon_channel_info *rpi_info[] = { + &rpi_in, +NULL +}; + +static const struct hwmon_ops rpi_hwmon_ops = { + .is_visible = rpi_is_visible, + .read = rpi_read, +}; + +static const struct hwmon_chip_info rpi_chip_info = { + .ops = &rpi_hwmon_ops, + .info = rpi_info, +}; + +static int rpi_hwmon_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct rpi_hwmon_data *data; +int ret; + + data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + +/* Parent driver assure that firmware is correct */ + data->fw =dev_get_drvdata (dev->parent); + +/* Init throttled */ + ret =rpi_firmware_property (data->fw,RPI_FIRMWARE_GET_THROTTLED , + &data->last_throttled, +sizeof (data->last_throttled)); + + data->hwmon_dev =devm_hwmon_device_register_with_info (dev,"rpi_volt" , + data, + &rpi_chip_info, +NULL ); + +INIT_DELAYED_WORK (&data->get_values_poll_work, get_values_poll); +platform_set_drvdata (pdev, data); + +if (!PTR_ERR_OR_ZERO (data->hwmon_dev)) +schedule_delayed_work (&data->get_values_poll_work,2 *HZ ); + +return PTR_ERR_OR_ZERO (data->hwmon_dev); +} + +static int rpi_hwmon_remove (struct platform_device *pdev) +{ +struct rpi_hwmon_data *data =platform_get_drvdata (pdev); + +cancel_delayed_work_sync (&data->get_values_poll_work); + +return 0 ; +} + +static struct platform_driver rpi_hwmon_driver = { + .probe = rpi_hwmon_probe, + .remove = rpi_hwmon_remove, + .driver = { + .name ="raspberrypi-hwmon" , + }, +}; +module_platform_driver (rpi_hwmon_driver); + +MODULE_AUTHOR ("Stefan Wahren <[email protected]>" ); +MODULE_DESCRIPTION ("Raspberry Pi voltage sensor driver" ); +MODULE_LICENSE ("GPL v2" );Signature · 1 line
2.7.4
PATCH v3 2/6 hwmon: Add support for RPi voltage sensor
Quoted 7 lines · Guenter Roeck
Quoted 6 lines · Stefan Wahren
Currently there is no easy way to detect undervoltage conditions on a remote Raspberry Pi. This hwmon driver retrieves the state of the undervoltage sensor via mailbox interface. The handling based on Noralf's modifications to the downstream firmware driver. In case of an undervoltage condition only an entry is written to the kernel log.
Quoted 6 lines
Quoted 2 lines
CC "Noralf Tr?nnes" <[email protected]>Signed-off-by Stefan Wahren <[email protected]>Acked-by Guenter Roeck <[email protected]>... assuming this will go through some arm tree.
That's fine with me, I can pull this whole set for 4.19. Thanks!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180530/0d120acc/attachment.sig>
PATCH v3 3/6 firmware: raspberrypi: Register hwmon driver
In reply to Stefan WahrenSince the raspberrypi-hwmon driver is tied to the VC4 firmware instead of particular hardware its registration should be in the firmware driver.
--- drivers/firmware/raspberrypi.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/firmware/raspberrypi.c +19 -0
@@ -21,6 +21,8 @@#define MBOX_DATA28 (msg) ((msg) & ~0xf)#define MBOX_CHAN_PROPERTY 8 +static struct platform_device *rpi_hwmon; +struct rpi_firmware {struct mbox_client cl;struct mbox_chan *chan;/* The property channel. */
@@ -183,6 +185,20 @@ rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) } } +static void +rpi_register_hwmon_driver (struct device *dev,struct rpi_firmware *fw) +{ +u32 packet; +int ret =rpi_firmware_property (fw,RPI_FIRMWARE_GET_THROTTLED , + &packet,sizeof (packet)); + +if (ret) +return ; + + rpi_hwmon =platform_device_register_data (dev,"raspberrypi-hwmon" , +-1 ,NULL ,0 ); +} +static int rpi_firmware_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -209,6 +225,7 @@ static int rpi_firmware_probe(struct platform_device *pdev)platform_set_drvdata (pdev, fw);rpi_firmware_print_firmware_revision (fw); +rpi_register_hwmon_driver (dev, fw);return 0 ; }
@@ -217,6 +234,8 @@ static int rpi_firmware_remove(struct platform_device *pdev) {struct rpi_firmware *fw =platform_get_drvdata (pdev); +platform_device_unregister (rpi_hwmon); + rpi_hwmon =NULL ;mbox_free_channel (fw->chan);return 0 ;
Signature · 1 line
2.7.4
PATCH v3 4/6 ARM: bcm2835_defconfig: Enable RPi voltage sensor
In reply to Stefan WahrenThe patch enables the hwmon driver for the Raspberry Pi.
--- arch/arm/configs/bcm2835_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/configs/bcm2835_defconfig +1 -1
@@ -86,7 +86,7 @@ CONFIG_SPI=y CONFIG_SPI_BCM2835=y CONFIG_SPI_BCM2835AUX=y CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set +CONFIG_SENSORS_RASPBERRYPI_HWMON=m CONFIG_THERMAL=y CONFIG_BCM2835_THERMAL=y CONFIG_WATCHDOG=y
Signature · 1 line
2.7.4
PATCH v3 5/6 ARM: multi_v7_defconfig: Enable RPi voltage sensor
In reply to Stefan WahrenThe patch enables the hwmon driver for the Raspberry Pi.
--- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v7_defconfig +1 -0
@@ -449,6 +449,7 @@ CONFIG_SENSORS_LM90=y CONFIG_SENSORS_LM95245=y CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PWM_FAN=m +CONFIG_SENSORS_RASPBERRYPI_HWMON=m CONFIG_SENSORS_INA2XX=m CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y
Signature · 1 line
2.7.4
PATCH v3 6/6 arm64: defconfig: Enable RPi voltage sensor
In reply to Stefan WahrenThe patch enables the hwmon driver for the Raspberry Pi.
--- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
@@ -353,6 +353,7 @@ CONFIG_BATTERY_BQ27XXX=y CONFIG_SENSORS_ARM_SCPI=y CONFIG_SENSORS_LM90=m CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_RASPBERRYPI_HWMON=m CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_CPU_THERMAL=y CONFIG_THERMAL_EMULATION=y
Signature · 1 line
2.7.4
PATCH v3 6/6 arm64: defconfig: Enable RPi voltage sensor
Quoted 3 lines · Stefan Wahren
The patch enables the hwmon driver for the Raspberry Pi.
Signed-off-by Stefan Wahren <[email protected]>
I've pulled this series to our -next branches now.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180621/fac36b3d/attachment.sig>