From c54b694de93c657f7cfac350315d20f3f3ee0d67 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 2 Dec 2019 14:48:05 +0000 Subject: [PATCH 1/3] Add Raspberry Pi PoE+ HAT support Signed-off-by: Serge Schneider --- drivers/hwmon/rpi-poe-fan.c | 35 +++- drivers/power/supply/Kconfig | 6 + drivers/power/supply/Makefile | 1 + drivers/power/supply/rpi_poe_power.c | 227 +++++++++++++++++++++ include/soc/bcm2835/raspberrypi-firmware.h | 3 +- 5 files changed, 261 insertions(+), 11 deletions(-) create mode 100644 drivers/power/supply/rpi_poe_power.c diff --git a/drivers/hwmon/rpi-poe-fan.c b/drivers/hwmon/rpi-poe-fan.c index c9654e9e9f2d0..8483b6ce1db83 100644 --- a/drivers/hwmon/rpi-poe-fan.c +++ b/drivers/hwmon/rpi-poe-fan.c @@ -28,6 +28,7 @@ struct rpi_poe_fan_ctx { struct mutex lock; struct rpi_firmware *fw; + u32 set_tag; unsigned int pwm_value; unsigned int def_pwm_value; unsigned int rpi_poe_fan_state; @@ -43,13 +44,15 @@ struct fw_tag_data_s{ u32 ret; }; -static int write_reg(struct rpi_firmware *fw, u32 reg, u32 *val){ +static int write_reg(struct rpi_firmware *fw, u32 reg, u32 *val, u32 set_tag) +{ struct fw_tag_data_s fw_tag_data = { .reg = reg, .val = *val }; int ret; - ret = rpi_firmware_property(fw, RPI_FIRMWARE_SET_POE_HAT_VAL, + + ret = rpi_firmware_property(fw, set_tag, &fw_tag_data, sizeof(fw_tag_data)); if (ret) { return ret; @@ -82,7 +85,7 @@ static int rpi_poe_reboot(struct notifier_block *nb, unsigned long code, nb); if (ctx->pwm_value != ctx->def_pwm_value) - write_reg(ctx->fw, POE_CUR_PWM, &ctx->def_pwm_value); + write_reg(ctx->fw, POE_CUR_PWM, &ctx->def_pwm_value, ctx->set_tag); return NOTIFY_DONE; } @@ -95,7 +98,7 @@ static int __set_pwm(struct rpi_poe_fan_ctx *ctx, u32 pwm) if (ctx->pwm_value == pwm) goto exit_set_pwm_err; - ret = write_reg(ctx->fw, POE_CUR_PWM, &pwm); + ret = write_reg(ctx->fw, POE_CUR_PWM, &pwm, ctx->set_tag); if (!ret) ctx->pwm_value = pwm; exit_set_pwm_err: @@ -110,7 +113,7 @@ static int __set_def_pwm(struct rpi_poe_fan_ctx *ctx, u32 def_pwm) if (ctx->def_pwm_value == def_pwm) goto exit_set_def_pwm_err; - ret = write_reg(ctx->fw, POE_DEF_PWM, &def_pwm); + ret = write_reg(ctx->fw, POE_DEF_PWM, &def_pwm, ctx->set_tag); if (!ret) ctx->def_pwm_value = def_pwm; exit_set_def_pwm_err: @@ -297,6 +300,7 @@ static int rpi_poe_fan_probe(struct platform_device *pdev) struct device *hwmon; struct device_node *np = pdev->dev.of_node; struct device_node *fw_node; + u32 revision; int ret; fw_node = of_parse_phandle(np, "firmware", 0); @@ -314,6 +318,17 @@ static int rpi_poe_fan_probe(struct platform_device *pdev) ctx->fw = rpi_firmware_get(fw_node); if (!ctx->fw) return -EPROBE_DEFER; + ret = rpi_firmware_property(ctx->fw, + RPI_FIRMWARE_GET_FIRMWARE_REVISION, + &revision, sizeof(revision)); + if (ret) { + dev_err(&pdev->dev, "Failed to get firmware revision: %i\n", ret); + return ret; + } + if (revision < 0x60af72e8) + ctx->set_tag = RPI_FIRMWARE_SET_POE_HAT_VAL_OLD; + else + ctx->set_tag = RPI_FIRMWARE_SET_POE_HAT_VAL; platform_set_drvdata(pdev, ctx); @@ -378,9 +393,9 @@ static int rpi_poe_fan_remove(struct platform_device *pdev) unregister_reboot_notifier(&ctx->nb); thermal_cooling_device_unregister(ctx->cdev); - if (ctx->pwm_value != value) { - write_reg(ctx->fw, POE_CUR_PWM, &value); - } + if (ctx->pwm_value != value) + write_reg(ctx->fw, POE_CUR_PWM, &value, ctx->set_tag); + return 0; } @@ -392,7 +407,7 @@ static int rpi_poe_fan_suspend(struct device *dev) int ret = 0; if (ctx->pwm_value != value) - ret = write_reg(ctx->fw, POE_CUR_PWM, &value); + ret = write_reg(ctx->fw, POE_CUR_PWM, &value, ctx->set_tag); return ret; } @@ -403,7 +418,7 @@ static int rpi_poe_fan_resume(struct device *dev) int ret = 0; if (value != 0) - ret = write_reg(ctx->fw, POE_CUR_PWM, &value); + ret = write_reg(ctx->fw, POE_CUR_PWM, &value, ctx->set_tag); return ret; } diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 1699b9269a78e..718eebc793e59 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -28,6 +28,12 @@ config POWER_SUPPLY_HWMON Say 'Y' here if you want power supplies to have hwmon sysfs interface too. +config RPI_POE_POWER + tristate "Raspberry Pi PoE+ HAT power supply driver" + depends on RASPBERRYPI_FIRMWARE + help + Say Y here to enable support for Raspberry Pi PoE+ (Power over Ethernet + Plus) HAT current measurement. config PDA_POWER tristate "Generic PDA/phone power driver" diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index dd4b86318cd9b..f881637da4f72 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_POWER_SUPPLY) += power_supply.o obj-$(CONFIG_POWER_SUPPLY_HWMON) += power_supply_hwmon.o obj-$(CONFIG_GENERIC_ADC_BATTERY) += generic-adc-battery.o +obj-$(CONFIG_RPI_POE_POWER) += rpi_poe_power.o obj-$(CONFIG_PDA_POWER) += pda_power.o obj-$(CONFIG_APM_POWER) += apm_power.o obj-$(CONFIG_AXP20X_POWER) += axp20x_usb_power.o diff --git a/drivers/power/supply/rpi_poe_power.c b/drivers/power/supply/rpi_poe_power.c new file mode 100644 index 0000000000000..0c96b2c1e8ab6 --- /dev/null +++ b/drivers/power/supply/rpi_poe_power.c @@ -0,0 +1,227 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * rpi-poe-power.c - Raspberry Pi PoE+ HAT power supply driver. + * + * Copyright (C) 2019 Raspberry Pi (Trading) Ltd. + * Based on axp20x_ac_power.c by Quentin Schulz + * + * Author: Serge Schneider + */ + +#include +#include +#include +#include +#include + +#define RPI_POE_ADC_REG 0x2 +#define RPI_POE_FLAG_REG 0x4 + +#define RPI_POE_FLAG_AT BIT(0) +#define RPI_POE_FLAG_OC BIT(1) + +#define RPI_POE_CURRENT_AF_MAX (2500 * 1000) +#define RPI_POE_CURRENT_AT_MAX (5000 * 1000) + +#define DRVNAME "rpi-poe-power-supply" + +struct rpi_poe_power_supply_ctx { + struct power_supply *supply; + struct rpi_firmware *fw; +}; + +struct fw_tag_data_s { + u32 reg; + u32 val; + u32 ret; +}; + +static int write_reg(struct rpi_firmware *fw, u32 reg, u32 *val) +{ + struct fw_tag_data_s fw_tag_data = { + .reg = reg, + .val = *val + }; + int ret; + + ret = rpi_firmware_property(fw, RPI_FIRMWARE_SET_POE_HAT_VAL, + &fw_tag_data, sizeof(fw_tag_data)); + if (ret) + return ret; + else if (fw_tag_data.ret) + return -EIO; + return 0; +} + +static int read_reg(struct rpi_firmware *fw, u32 reg, u32 *val) +{ + struct fw_tag_data_s fw_tag_data = { + .reg = reg, + .val = *val + }; + int ret; + + ret = rpi_firmware_property(fw, RPI_FIRMWARE_GET_POE_HAT_VAL, + &fw_tag_data, sizeof(fw_tag_data)); + if (ret) + return ret; + else if (fw_tag_data.ret) + return -EIO; + + *val = fw_tag_data.val; + return 0; +} + +static int rpi_poe_power_supply_get_property(struct power_supply *psy, + enum power_supply_property psp, + union power_supply_propval *r_val) +{ + struct rpi_poe_power_supply_ctx *ctx = power_supply_get_drvdata(psy); + int ret; + unsigned int val = 0; + + switch (psp) { + case POWER_SUPPLY_PROP_HEALTH: + ret = read_reg(ctx->fw, RPI_POE_FLAG_REG, &val); + if (ret) + return ret; + + if (val & RPI_POE_FLAG_OC) { + r_val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE; + val = RPI_POE_FLAG_OC; + ret = write_reg(ctx->fw, RPI_POE_FLAG_REG, &val); + if (ret) + return ret; + return 0; + } + + r_val->intval = POWER_SUPPLY_HEALTH_GOOD; + return 0; + + case POWER_SUPPLY_PROP_ONLINE: + ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val); + if (ret) + return ret; + + r_val->intval = (val > 5); + return 0; + + case POWER_SUPPLY_PROP_CURRENT_AVG: + val = 50; + ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val); + if (ret) + return ret; + val = (val * 3300)/9821; + r_val->intval = val * 1000; + return 0; + + case POWER_SUPPLY_PROP_CURRENT_NOW: + ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val); + if (ret) + return ret; + val = (val * 3300)/9821; + r_val->intval = val * 1000; + return 0; + + case POWER_SUPPLY_PROP_CURRENT_MAX: + ret = read_reg(ctx->fw, RPI_POE_FLAG_REG, &val); + if (ret) + return ret; + + if (val & RPI_POE_FLAG_AT) { + r_val->intval = RPI_POE_CURRENT_AT_MAX; + return 0; + } + r_val->intval = RPI_POE_CURRENT_AF_MAX; + return 0; + + default: + return -EINVAL; + } + + return -EINVAL; +} + +static enum power_supply_property rpi_poe_power_supply_properties[] = { + POWER_SUPPLY_PROP_HEALTH, + POWER_SUPPLY_PROP_ONLINE, + POWER_SUPPLY_PROP_CURRENT_AVG, + POWER_SUPPLY_PROP_CURRENT_NOW, + POWER_SUPPLY_PROP_CURRENT_MAX, +}; + +static const struct power_supply_desc rpi_poe_power_supply_desc = { + .name = "rpi-poe", + .type = POWER_SUPPLY_TYPE_MAINS, + .properties = rpi_poe_power_supply_properties, + .num_properties = ARRAY_SIZE(rpi_poe_power_supply_properties), + .get_property = rpi_poe_power_supply_get_property, +}; + +static int rpi_poe_power_supply_probe(struct platform_device *pdev) +{ + struct power_supply_config psy_cfg = {}; + struct rpi_poe_power_supply_ctx *ctx; + struct device_node *fw_node; + u32 revision; + + if (!of_device_is_available(pdev->dev.of_node)) + return -ENODEV; + + fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0); + if (!fw_node) { + dev_err(&pdev->dev, "Missing firmware node\n"); + return -ENOENT; + } + + ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); + if (!ctx) + return -ENOMEM; + + ctx->fw = rpi_firmware_get(fw_node); + if (!ctx->fw) + return -EPROBE_DEFER; + if (rpi_firmware_property(ctx->fw, + RPI_FIRMWARE_GET_FIRMWARE_REVISION, + &revision, sizeof(revision))) { + dev_err(&pdev->dev, "Failed to get firmware revision\n"); + return -ENOENT; + } + if (revision < 0x60af72e8) { + dev_err(&pdev->dev, "Unsupported firmware\n"); + return -ENOENT; + } + platform_set_drvdata(pdev, ctx); + + psy_cfg.of_node = pdev->dev.of_node; + psy_cfg.drv_data = ctx; + + ctx->supply = devm_power_supply_register(&pdev->dev, + &rpi_poe_power_supply_desc, + &psy_cfg); + if (IS_ERR(ctx->supply)) + return PTR_ERR(ctx->supply); + + return 0; +} + +static const struct of_device_id of_rpi_poe_power_supply_match[] = { + { .compatible = "raspberrypi,rpi-poe-power-supply", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, of_rpi_poe_power_supply_match); + +static struct platform_driver rpi_poe_power_supply_driver = { + .probe = rpi_poe_power_supply_probe, + .driver = { + .name = DRVNAME, + .of_match_table = of_rpi_poe_power_supply_match + }, +}; + +module_platform_driver(rpi_poe_power_supply_driver); + +MODULE_AUTHOR("Serge Schneider "); +MODULE_ALIAS("platform:" DRVNAME); +MODULE_DESCRIPTION("Raspberry Pi PoE+ HAT power supply driver"); +MODULE_LICENSE("GPL"); diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h index 6b393bbe7f529..97ff2a59aa03f 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -94,7 +94,8 @@ enum rpi_firmware_property_tag { RPI_FIRMWARE_GET_PERIPH_REG = 0x00030045, RPI_FIRMWARE_SET_PERIPH_REG = 0x00038045, RPI_FIRMWARE_GET_POE_HAT_VAL = 0x00030049, - RPI_FIRMWARE_SET_POE_HAT_VAL = 0x00030050, + RPI_FIRMWARE_SET_POE_HAT_VAL = 0x00038049, + RPI_FIRMWARE_SET_POE_HAT_VAL_OLD = 0x00030050, RPI_FIRMWARE_NOTIFY_XHCI_RESET = 0x00030058, RPI_FIRMWARE_GET_REBOOT_FLAGS = 0x00030064, RPI_FIRMWARE_SET_REBOOT_FLAGS = 0x00038064, From 9cd936fddc8b6f6f339da32c6d7e83e5712a1aee Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 2 Dec 2019 14:48:05 +0000 Subject: [PATCH 2/3] configs: Enable Raspberry Pi PoE+ HAT support Signed-off-by: Serge Schneider --- arch/arm/configs/bcm2709_defconfig | 1 + arch/arm/configs/bcm2711_defconfig | 1 + arch/arm/configs/bcmrpi_defconfig | 1 + arch/arm64/configs/bcm2711_defconfig | 1 + arch/arm64/configs/bcmrpi3_defconfig | 1 + 5 files changed, 5 insertions(+) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig index 4e9e2be025dbd..ed73cff35897a 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -718,6 +718,7 @@ CONFIG_W1_SLAVE_DS28E04=m CONFIG_W1_SLAVE_DS28E17=m CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y +CONFIG_RPI_POE_POWER=m CONFIG_BATTERY_DS2760=m CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_GAUGE_LTC2941=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig index b14f4eeab389e..08bdf82c0425a 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -731,6 +731,7 @@ CONFIG_W1_SLAVE_DS28E04=m CONFIG_W1_SLAVE_DS28E17=m CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y +CONFIG_RPI_POE_POWER=m CONFIG_BATTERY_DS2760=m CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_GAUGE_LTC2941=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig index dc0bcc4d17fd3..04d6afe5bd11a 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -711,6 +711,7 @@ CONFIG_W1_SLAVE_DS28E04=m CONFIG_W1_SLAVE_DS28E17=m CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y +CONFIG_RPI_POE_POWER=m CONFIG_BATTERY_DS2760=m CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_GAUGE_LTC2941=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index 71c1fc8c3f7aa..aad387e7e76c4 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -724,6 +724,7 @@ CONFIG_W1_SLAVE_DS2781=m CONFIG_W1_SLAVE_DS28E04=m CONFIG_W1_SLAVE_DS28E17=m CONFIG_POWER_RESET_GPIO=y +CONFIG_RPI_POE_POWER=m CONFIG_BATTERY_DS2760=m CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_GAUGE_LTC2941=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig index 3200cc4c7225e..10243e0e06583 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -695,6 +695,7 @@ CONFIG_W1_SLAVE_DS2781=m CONFIG_W1_SLAVE_DS28E04=m CONFIG_W1_SLAVE_DS28E17=m CONFIG_POWER_RESET_GPIO=y +CONFIG_RPI_POE_POWER=m CONFIG_BATTERY_DS2760=m CONFIG_BATTERY_MAX17040=m CONFIG_SENSORS_IIO_HWMON=m From f5d14b0e967eb3e3033948c9f1752a1a59d1facf Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 2 Dec 2019 14:48:05 +0000 Subject: [PATCH 3/3] overlays: Add rpi-poe-plus overlay Signed-off-by: Serge Schneider --- arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 21 +++++++++++++++++++ .../dts/overlays/rpi-poe-plus-overlay.dts | 19 +++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile index 823f14ee96ffa..cc5728568a085 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -156,6 +156,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ rpi-display.dtbo \ rpi-ft5406.dtbo \ rpi-poe.dtbo \ + rpi-poe-plus.dtbo \ rpi-proto.dtbo \ rpi-sense.dtbo \ rpi-tv.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index 4ec61a83f0328..84960aa52fd86 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2505,6 +2505,27 @@ Params: poe_fan_temp0 Temperature (in millicelcius) at which the fan the fan slows down (default 5000) +Name: rpi-poe-plus +Info: Raspberry Pi PoE+ HAT fan +Load: dtoverlay=rpi-poe-plus,[=] +Params: poe_fan_temp0 Temperature (in millicelcius) at which the fan + turns on (default 40000) + poe_fan_temp0_hyst Temperature delta (in millicelcius) at which + the fan turns off (default 2000) + poe_fan_temp1 Temperature (in millicelcius) at which the fan + speeds up (default 45000) + poe_fan_temp1_hyst Temperature delta (in millicelcius) at which + the fan slows down (default 2000) + poe_fan_temp2 Temperature (in millicelcius) at which the fan + speeds up (default 50000) + poe_fan_temp2_hyst Temperature delta (in millicelcius) at which + the fan slows down (default 2000) + poe_fan_temp3 Temperature (in millicelcius) at which the fan + speeds up (default 55000) + poe_fan_temp3_hyst Temperature delta (in millicelcius) at which + the fan slows down (default 5000) + + Name: rpi-proto Info: Configures the RPi Proto audio card Load: dtoverlay=rpi-proto diff --git a/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts new file mode 100644 index 0000000000000..e0138847093b0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +// Overlay for the Raspberry Pi PoE+ HAT. + +#include "rpi-poe-overlay.dts" + +/ { + compatible = "brcm,bcm2835"; + + fragment@3 { + target-path = "/"; + __overlay__ { + rpi_poe_power_supply: rpi-poe-power-supply@0 { + compatible = "raspberrypi,rpi-poe-power-supply"; + firmware = <&firmware>; + status = "okay"; + }; + }; + }; +};