QorIQ TMU multi-sensor and HWMON support
v7 cover QorIQ TMU multi-sensor and HWMON support
Everyone:
This series contains patches adding support for HWMON integration, bug fixes and general improvements (hopefully) for TMU driver I made while working on it on i.MX8MQ.
Feedback is welcome!
Thanks,
Andrey Smirnov
Changes since [v6]:
- Rebased on top of Zhang's "next" branch
- Added "thermal: qoriq: Drop unnecessary drvdata cleanup"
Changes since [v5]
- Rebased on recent linux-next, dropped "thermal: qoriq: Remove unnecessary DT node is NULL check" since it is already in the tree
- Dropped dependency on [rfc]
Changes since [v4]
- Collected Tested-by from Lucas
- Collected Reviewed-by from Daniel
- Converted "thermal: qoriq: Enable all sensors before registering them" to use if instead of switch statement for error checking
Changes since [v3]
- Series reabse on top of [rfc]
- Fixed incorrect goto label in "thermal: qoriq: Pass data to qoriq_tmu_calibration()"
- Added REGS_TRITSR() register description to "thermal: qoriq: Do not report invalid temperature reading"
- Reworded commit message of "thermal: qoriq: Remove unnecessary DT node is NULL check"
Changes since [v2]
- Patches rebased on v5.1-rc1
Changes since [v1]
- Rebased on "linus" branch of git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git that included latest chagnes adding multi-sensors support
- Dropped
thermal: qoriq: Add support for multiple thremal sites
thermal: qoriq: Be more strict when parsing
thermal: qoriq: Simplify error handling in qoriq_tmu_get_sensor_id()
since they are no longer relevant
- Added
thermal: qoriq: Don't store struct thermal_zone_device reference
thermal: qoriq: Add local struct qoriq_sensor pointer
thermal: qoriq: Embed per-sensor data into struct qoriq_tmu_data
thermal: qoriq: Pass data to qoriq_tmu_register_tmu_zone() directly
to simplify latest codebase
- Changed "thermal: qoriq: Do not report invalid temperature reading" to use regmap_read_poll_timeout() to make sure that tmu_get_temp() waits for fist sample to be ready before reporting it. This case is triggered on my setup if qoriq_thermal is compiled as a module
[v1] lore.kernel.org/lkml/[email protected] [v2] lore.kernel.org/lkml/[email protected] [v3] lore.kernel.org/lkml/[email protected] [v4] lore.kernel.org/lkml/[email protected] [v5] lore.kernel.org/lkml/[email protected] [v6] lore.kernel.org/lkml/[email protected] [rfc] lore.kernel.org/lkml/[email protected]
Andrey Smirnov (12):
thermal: qoriq: Add local struct device pointer
thermal: qoriq: Don't store struct thermal_zone_device reference
thermal: qoriq: Add local struct qoriq_sensor pointer
thermal: qoriq: Embed per-sensor data into struct qoriq_tmu_data
thermal: qoriq: Pass data to qoriq_tmu_register_tmu_zone() directly
thermal: qoriq: Pass data to qoriq_tmu_calibration() directly
thermal: qoriq: Drop unnecessary drvdata cleanup
thermal: qoriq: Convert driver to use regmap API
thermal: qoriq: Enable all sensors before registering them
thermal: qoriq: Do not report invalid temperature reading
thermal_hwmon: Add devres wrapper for thermal_add_hwmon_sysfs()
thermal: qoriq: Add hwmon support
drivers/thermal/qoriq_thermal.c | 252 +++++++++++++++++--------------- drivers/thermal/thermal_hwmon.c | 28 ++++ drivers/thermal/thermal_hwmon.h | 7 + 3 files changed, 167 insertions(+), 120 deletions(-)
Signature · 1 line
2.21.0
PATCH v7 1/12 thermal: qoriq: Add local struct device pointer
Use a local "struct device *dev" for brevity. No functional change intended.
--- drivers/thermal/qoriq_thermal.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/thermal/qoriq_thermal.c +6 -5
@@ -194,8 +194,9 @@ static int qoriq_tmu_probe(struct platform_device *pdev)int ret;struct qoriq_tmu_data *data;struct device_node *np = pdev->dev.of_node; +struct device *dev = &pdev->dev; - data =devm_kzalloc (&pdev->dev,sizeof (struct qoriq_tmu_data ), + data =devm_kzalloc (dev,sizeof (struct qoriq_tmu_data ),GFP_KERNEL );if (!data)return -ENOMEM ;
@@ -206,17 +207,17 @@ static int qoriq_tmu_probe(struct platform_device *pdev) data->regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (data->regs)) { -dev_err (&pdev->dev,"Failed to get memory region\n" ); +dev_err (dev,"Failed to get memory region\n" );return PTR_ERR (data->regs); } - data->clk =devm_clk_get_optional (&pdev->dev,NULL ); + data->clk =devm_clk_get_optional (dev,NULL );if (IS_ERR (data->clk))return PTR_ERR (data->clk); ret =clk_prepare_enable (data->clk);if (ret) { -dev_err (&pdev->dev,"Failed to enable clock\n" ); +dev_err (dev,"Failed to enable clock\n" );return ret; }
@@ -228,7 +229,7 @@ static int qoriq_tmu_probe(struct platform_device *pdev) ret =qoriq_tmu_register_tmu_zone (pdev);if (ret <0 ) { -dev_err (&pdev->dev,"Failed to register sensors\n" ); +dev_err (dev,"Failed to register sensors\n" ); ret = -ENODEV ; goto err; }
Signature · 1 line
2.21.0
PATCH v7 2/12 thermal: qoriq: Don't store struct thermal_zone_device reference
In reply to Andrey SmirnovStruct thermal_zone_device reference stored as sensor's private data isn't really used anywhere in the code. Drop it.
--- drivers/thermal/qoriq_thermal.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/thermal/qoriq_thermal.c +11 -6
@@ -66,7 +66,6 @@ struct qoriq_tmu_data;* Thermal zone data */ struct qoriq_sensor { -struct thermal_zone_device *tzd;struct qoriq_tmu_data *qdata;int id; };
@@ -116,6 +115,9 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev)int id, sites =0 ;for (id =0 ; id <SITES_MAX ; id++) { +struct thermal_zone_device *tzd; +int ret; + qdata->sensor[id] =devm_kzalloc (&pdev->dev,sizeof (struct qoriq_sensor ),GFP_KERNEL );if (!qdata->sensor[id])
@@ -123,13 +125,16 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev) qdata->sensor[id]->id = id; qdata->sensor[id]->qdata = qdata; - qdata->sensor[id]->tzd =devm_thermal_zone_of_sensor_register ( - &pdev->dev, id, qdata->sensor[id], &tmu_tz_ops); -if (IS_ERR (qdata->sensor[id]->tzd)) { -if (PTR_ERR (qdata->sensor[id]->tzd) == -ENODEV ) + + tzd =devm_thermal_zone_of_sensor_register (&pdev->dev, id, + qdata->sensor[id], + &tmu_tz_ops); + ret =PTR_ERR_OR_ZERO (tzd); +if (ret) { +if (ret == -ENODEV )continue ;else -return PTR_ERR (qdata->sensor[id]->tzd); +return ret; } sites |=0x1 << (15 - id);
Signature · 1 line
2.21.0
PATCH v7 3/12 thermal: qoriq: Add local struct qoriq_sensor pointer
In reply to Andrey SmirnovAdd local struct qoriq_sensor pointer in qoriq_tmu_register_tmu_zone() for brevity.
--- drivers/thermal/qoriq_thermal.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/thermal/qoriq_thermal.c +9 -5
@@ -116,18 +116,22 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev)for (id =0 ; id <SITES_MAX ; id++) {struct thermal_zone_device *tzd; +struct qoriq_sensor *sensor;int ret; - qdata->sensor[id] =devm_kzalloc (&pdev->dev, -sizeof (struct qoriq_sensor ),GFP_KERNEL ); + sensor =devm_kzalloc (&pdev->dev, +sizeof (struct qoriq_sensor ), +GFP_KERNEL );if (!qdata->sensor[id])return -ENOMEM ; - qdata->sensor[id]->id = id; - qdata->sensor[id]->qdata = qdata; + qdata->sensor[id] = sensor; + + sensor->id = id; + sensor->qdata = qdata; tzd =devm_thermal_zone_of_sensor_register (&pdev->dev, id, - qdata->sensor[id], + sensor, &tmu_tz_ops); ret =PTR_ERR_OR_ZERO (tzd);if (ret) {
Signature · 1 line
2.21.0
PATCH v7 4/12 thermal: qoriq: Embed per-sensor data into struct qoriq_tmu_data
In reply to Andrey SmirnovEmbed per-sensor data into struct qoriq_tmu_data so we can drop the code allocating it. This also allows us to get rid of per-sensor back reference to struct qoriq_tmu_data since now its address can be calculated using container_of().
--- drivers/thermal/qoriq_thermal.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
drivers/thermal/qoriq_thermal.c +8 -15
@@ -60,13 +60,10 @@ struct qoriq_tmu_regs {u32 ttr3cr;/* Temperature Range 3 Control Register */ }; -struct qoriq_tmu_data ; -/* * Thermal zone data */ struct qoriq_sensor { -struct qoriq_tmu_data *qdata;int id; };
@@ -74,9 +71,14 @@ struct qoriq_tmu_data {struct qoriq_tmu_regs __iomem *regs;struct clk *clk;bool little_endian; -struct qoriq_sensor *sensor[SITES_MAX ]; +struct qoriq_sensor sensor[SITES_MAX ]; }; +static struct qoriq_tmu_data *qoriq_sensor_to_data (struct qoriq_sensor *s) +{ + return container_of(s, struct qoriq_tmu_data, sensor[s->id]); +} +static void tmu_write (struct qoriq_tmu_data *p,u32 val,void __iomem *addr) {if (p->little_endian)
@@ -96,7 +98,7 @@ static u32 tmu_read(struct qoriq_tmu_data *p, void __iomem *addr)static int tmu_get_temp (void *p,int *temp) {struct qoriq_sensor *qsensor = p; -struct qoriq_tmu_data *qdata = qsensor->qdata; +struct qoriq_tmu_data *qdata =qoriq_sensor_to_data (qsensor);u32 val; val =tmu_read (qdata, &qdata->regs->site[qsensor->id].tritsr);
@@ -116,19 +118,10 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev)for (id =0 ; id <SITES_MAX ; id++) {struct thermal_zone_device *tzd; -struct qoriq_sensor *sensor; +struct qoriq_sensor *sensor = &qdata->sensor[id];int ret; - sensor =devm_kzalloc (&pdev->dev, -sizeof (struct qoriq_sensor ), -GFP_KERNEL ); -if (!qdata->sensor[id]) -return -ENOMEM ; - - qdata->sensor[id] = sensor; - sensor->id = id; - sensor->qdata = qdata; tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id, sensor,
Signature · 1 line
2.21.0
PATCH v7 5/12 thermal: qoriq: Pass data to qoriq_tmu_register_tmu_zone() directly
In reply to Andrey SmirnovPass all necessary data to qoriq_tmu_register_tmu_zone() directly instead of passing a platform device and then deriving it. This is done as a first step to simplify resource deallocation code.
--- drivers/thermal/qoriq_thermal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/thermal/qoriq_thermal.c +4 -4
@@ -111,9 +111,9 @@ static const struct thermal_zone_of_device_ops tmu_tz_ops = { .get_temp = tmu_get_temp, }; -static int qoriq_tmu_register_tmu_zone (struct platform_device *pdev) +static int qoriq_tmu_register_tmu_zone (struct device *dev, +struct qoriq_tmu_data *qdata) { -struct qoriq_tmu_data *qdata =platform_get_drvdata (pdev);int id, sites =0 ;for (id =0 ; id <SITES_MAX ; id++) {
@@ -123,7 +123,7 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev) sensor->id = id; - tzd =devm_thermal_zone_of_sensor_register (&pdev->dev, id, + tzd =devm_thermal_zone_of_sensor_register (dev, id, sensor, &tmu_tz_ops); ret =PTR_ERR_OR_ZERO (tzd);
@@ -229,7 +229,7 @@ static int qoriq_tmu_probe(struct platform_device *pdev)if (ret <0 ) goto err; - ret =qoriq_tmu_register_tmu_zone (pdev); + ret =qoriq_tmu_register_tmu_zone (dev, data);if (ret <0 ) {dev_err (dev,"Failed to register sensors\n" ); ret = -ENODEV ;
Signature · 1 line
2.21.0
PATCH v7 6/12 thermal: qoriq: Pass data to qoriq_tmu_calibration() directly
In reply to Andrey SmirnovWe can simplify error cleanup code if instead of passing a "struct platform_device *" to qoriq_tmu_calibration() and deriving a bunch of pointers from it, we pass those pointers directly. This way we won't be force to call platform_set_drvdata() as early in qoriq_tmu_probe() and need to have "platform_set_drvdata(pdev, NULL);" in error path.
--- drivers/thermal/qoriq_thermal.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/thermal/qoriq_thermal.c +8 -9
@@ -144,16 +144,16 @@ static int qoriq_tmu_register_tmu_zone(struct device *dev,return 0 ; } -static int qoriq_tmu_calibration (struct platform_device *pdev) +static int qoriq_tmu_calibration (struct device *dev, +struct qoriq_tmu_data *data) {int i, val, len;u32 range[4 ];const u32 *calibration; -struct device_node *np = pdev->dev.of_node; -struct qoriq_tmu_data *data =platform_get_drvdata (pdev); +struct device_node *np = dev->of_node;if (of_property_read_u32_array (np,"fsl,tmu-range" , range,4 )) { -dev_err (&pdev->dev,"missing calibration range.\n" ); +dev_err (dev,"missing calibration range.\n" );return -ENODEV ; }
@@ -165,7 +165,7 @@ static int qoriq_tmu_calibration(struct platform_device *pdev) calibration =of_get_property (np,"fsl,tmu-calibration" , &len);if (calibration ==NULL || len %8 ) { -dev_err (&pdev->dev,"invalid calibration data.\n" ); +dev_err (dev,"invalid calibration data.\n" );return -ENODEV ; }
@@ -203,8 +203,6 @@ static int qoriq_tmu_probe(struct platform_device *pdev)if (!data)return -ENOMEM ; -platform_set_drvdata (pdev, data); - data->little_endian =of_property_read_bool (np,"little-endian" ); data->regs =devm_platform_ioremap_resource (pdev,0 );
@@ -225,7 +223,7 @@ static int qoriq_tmu_probe(struct platform_device *pdev)qoriq_tmu_init_device (data);/* TMU initialization */ - ret =qoriq_tmu_calibration (pdev);/* TMU calibration */ + ret =qoriq_tmu_calibration (dev, data);/* TMU calibration */ if (ret <0 ) goto err;
@@ -236,11 +234,12 @@ static int qoriq_tmu_probe(struct platform_device *pdev) goto err; } +platform_set_drvdata (pdev, data); +return 0 ; err:clk_disable_unprepare (data->clk); -platform_set_drvdata (pdev,NULL );return ret; }
Signature · 1 line
2.21.0
PATCH v7 7/12 thermal: qoriq: Drop unnecessary drvdata cleanup
In reply to Andrey SmirnovDriver data of underlying struct device will be set to NULL by Linux's driver infrastructure. Clearing it here is unnecessary.
--- drivers/thermal/qoriq_thermal.c | 2 -- 1 file changed, 2 deletions(-)
drivers/thermal/qoriq_thermal.c +0 -2
@@ -253,8 +253,6 @@ static int qoriq_tmu_remove(struct platform_device *pdev)clk_disable_unprepare (data->clk); -platform_set_drvdata (pdev,NULL ); -return 0 ; }
Signature · 1 line
2.21.0
PATCH v7 8/12 thermal: qoriq: Convert driver to use regmap API
Convert driver to use regmap API, drop custom LE/BE IO helpers and simplify bit manipulation using regmap_update_bits(). This also allows us to convert some register initialization to use loops and adds convenient debug access to TMU registers via debugfs.
--- drivers/thermal/qoriq_thermal.c | 153 +++++++++++++++----------------- 1 file changed, 72 insertions(+), 81 deletions(-)
drivers/thermal/qoriq_thermal.c +72 -81
@@ -9,6 +9,7 @@#include <linux/io.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/regmap.h> #include <linux/thermal.h> #include "thermal_core.h"
@@ -18,48 +19,27 @@/* * QorIQ TMU Registers */ -struct qoriq_tmu_site_regs { -u32 tritsr;/* Immediate Temperature Site Register */ -u32 tratsr;/* Average Temperature Site Register */ -u8 res0[0x8 ]; -}; -struct qoriq_tmu_regs { -u32 tmr;/* Mode Register */ +#define REGS_TMR 0x000/* Mode Register */ #define TMR_DISABLE 0x0#define TMR_ME 0x80000000#define TMR_ALPF 0x0c000000 -u32 tsr;/* Status Register */ -u32 tmtmir;/* Temperature measurement interval Register */ + +#define REGS_TMTMIR 0x008/* Temperature measurement interval Register */ #define TMTMIR_DEFAULT 0x0000000f -u8 res0[0x14 ]; -u32 tier;/* Interrupt Enable Register */ + +#define REGS_TIER 0x020/* Interrupt Enable Register */ #define TIER_DISABLE 0x0 -u32 tidr;/* Interrupt Detect Register */ -u32 tiscr;/* Interrupt Site Capture Register */ -u32 ticscr;/* Interrupt Critical Site Capture Register */ -u8 res1[0x10 ]; -u32 tmhtcrh;/* High Temperature Capture Register */ -u32 tmhtcrl;/* Low Temperature Capture Register */ -u8 res2[0x8 ]; -u32 tmhtitr;/* High Temperature Immediate Threshold */ -u32 tmhtatr;/* High Temperature Average Threshold */ -u32 tmhtactr;/* High Temperature Average Crit Threshold */ -u8 res3[0x24 ]; -u32 ttcfgr;/* Temperature Configuration Register */ -u32 tscfgr;/* Sensor Configuration Register */ -u8 res4[0x78 ]; -struct qoriq_tmu_site_regs site[SITES_MAX ]; -u8 res5[0x9f8 ]; -u32 ipbrr0;/* IP Block Revision Register 0 */ -u32 ipbrr1;/* IP Block Revision Register 1 */ -u8 res6[0x310 ]; -u32 ttr0cr;/* Temperature Range 0 Control Register */ -u32 ttr1cr;/* Temperature Range 1 Control Register */ -u32 ttr2cr;/* Temperature Range 2 Control Register */ -u32 ttr3cr;/* Temperature Range 3 Control Register */ -}; +#define REGS_TTCFGR 0x080/* Temperature Configuration Register */ +#define REGS_TSCFGR 0x084/* Sensor Configuration Register */ + +#define REGS_TRITSR (n) (0x100 + 16 * (n))/* Immediate Temperature +* Site Register +*/ +#define REGS_TTRnCR (n) (0xf10 + 4 * (n))/* Temperature Range n +* Control Register +*/ /* * Thermal zone data */
@@ -68,9 +48,8 @@ struct qoriq_sensor { };struct qoriq_tmu_data { -struct qoriq_tmu_regs __iomem *regs; +struct regmap *regmap;struct clk *clk; -bool little_endian;struct qoriq_sensor sensor[SITES_MAX ]; };
@@ -79,29 +58,13 @@ static struct qoriq_tmu_data *qoriq_sensor_to_data(struct qoriq_sensor *s) return container_of(s, struct qoriq_tmu_data, sensor[s->id]); } -static void tmu_write (struct qoriq_tmu_data *p,u32 val,void __iomem *addr) -{ -if (p->little_endian) -iowrite32 (val, addr); -else -iowrite32be (val, addr); -} - -static u32 tmu_read (struct qoriq_tmu_data *p,void __iomem *addr) -{ -if (p->little_endian) -return ioread32 (addr); -else -return ioread32be (addr); -} -static int tmu_get_temp (void *p,int *temp) {struct qoriq_sensor *qsensor = p;struct qoriq_tmu_data *qdata =qoriq_sensor_to_data (qsensor);u32 val; - val =tmu_read (qdata, &qdata->regs->site[qsensor->id].tritsr); +regmap_read (qdata->regmap,REGS_TRITSR (qsensor->id), &val); *temp = (val &0xff ) *1000 ;return 0 ;
@@ -139,7 +102,8 @@ static int qoriq_tmu_register_tmu_zone(struct device *dev,/* Enable monitoring */ if (sites !=0 ) -tmu_write (qdata, sites |TMR_ME |TMR_ALPF , &qdata->regs->tmr); +regmap_write (qdata->regmap,REGS_TMR , + sites |TMR_ME |TMR_ALPF );return 0 ; }
@@ -158,10 +122,8 @@ static int qoriq_tmu_calibration(struct device *dev, }/* Init temperature range registers */ -tmu_write (data, range[0 ], &data->regs->ttr0cr); -tmu_write (data, range[1 ], &data->regs->ttr1cr); -tmu_write (data, range[2 ], &data->regs->ttr2cr); -tmu_write (data, range[3 ], &data->regs->ttr3cr); +for (i =0 ; i <ARRAY_SIZE (range); i++) +regmap_write (data->regmap,REGS_TTRnCR (i), range[i]); calibration =of_get_property (np,"fsl,tmu-calibration" , &len);if (calibration ==NULL || len %8 ) {
@@ -171,9 +133,9 @@ static int qoriq_tmu_calibration(struct device *dev,for (i =0 ; i < len; i +=8 , calibration +=2 ) { val =of_read_number (calibration,1 ); -tmu_write (data, val, &data->regs->ttcfgr); +regmap_write (data->regmap,REGS_TTCFGR , val); val =of_read_number (calibration +1 ,1 ); -tmu_write (data, val, &data->regs->tscfgr); +regmap_write (data->regmap,REGS_TSCFGR , val); }return 0 ;
@@ -182,33 +144,68 @@ static int qoriq_tmu_calibration(struct device *dev,static void qoriq_tmu_init_device (struct qoriq_tmu_data *data) {/* Disable interrupt, using polling instead */ -tmu_write (data,TIER_DISABLE , &data->regs->tier); +regmap_write (data->regmap,REGS_TIER ,TIER_DISABLE );/* Set update_interval */ -tmu_write (data,TMTMIR_DEFAULT , &data->regs->tmtmir); +regmap_write (data->regmap,REGS_TMTMIR ,TMTMIR_DEFAULT );/* Disable monitoring */ -tmu_write (data,TMR_DISABLE , &data->regs->tmr); +regmap_write (data->regmap,REGS_TMR ,TMR_DISABLE ); } +static const struct regmap_range qoriq_yes_ranges[] = { +regmap_reg_range (REGS_TMR ,REGS_TSCFGR ), +regmap_reg_range (REGS_TTRnCR (0 ),REGS_TTRnCR (3 )), +/* Read only registers below */ +regmap_reg_range (REGS_TRITSR (0 ),REGS_TRITSR (15 )), +}; + +static const struct regmap_access_table qoriq_wr_table = { + .yes_ranges = qoriq_yes_ranges, + .n_yes_ranges =ARRAY_SIZE (qoriq_yes_ranges) -1 , +}; + +static const struct regmap_access_table qoriq_rd_table = { + .yes_ranges = qoriq_yes_ranges, + .n_yes_ranges =ARRAY_SIZE (qoriq_yes_ranges), +}; +static int qoriq_tmu_probe (struct platform_device *pdev) {int ret;struct qoriq_tmu_data *data;struct device_node *np = pdev->dev.of_node;struct device *dev = &pdev->dev; +const bool little_endian =of_property_read_bool (np,"little-endian" ); +const enum regmap_endian format_endian = + little_endian ?REGMAP_ENDIAN_LITTLE :REGMAP_ENDIAN_BIG ; +const struct regmap_config regmap_config = { + .reg_bits =32 , + .val_bits =32 , + .reg_stride =4 , + .rd_table = &qoriq_rd_table, + .wr_table = &qoriq_wr_table, + .val_format_endian = format_endian, + .max_register =SZ_4K , + }; +void __iomem *base; data =devm_kzalloc (dev,sizeof (struct qoriq_tmu_data ),GFP_KERNEL );if (!data)return -ENOMEM ; - data->little_endian =of_property_read_bool (np,"little-endian" ); - - data->regs =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (data->regs)) { + base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (base)) {dev_err (dev,"Failed to get memory region\n" ); -return PTR_ERR (data->regs); +return PTR_ERR (base); + } + + data->regmap =devm_regmap_init_mmio (dev, base, ®map_config); + ret =PTR_ERR_OR_ZERO (data->regmap); +if (ret) { +dev_err (dev,"Failed to init regmap (%d)\n" , ret); +return ret; } data->clk =devm_clk_get_optional (dev,NULL );
@@ -249,7 +246,7 @@ static int qoriq_tmu_remove(struct platform_device *pdev)struct qoriq_tmu_data *data =platform_get_drvdata (pdev);/* Disable monitoring */ -tmu_write (data,TMR_DISABLE , &data->regs->tmr); +regmap_write (data->regmap,REGS_TMR ,TMR_DISABLE );clk_disable_unprepare (data->clk);
@@ -258,13 +255,12 @@ static int qoriq_tmu_remove(struct platform_device *pdev)static int __maybe_unused qoriq_tmu_suspend (struct device *dev) { -u32 tmr;struct qoriq_tmu_data *data =dev_get_drvdata (dev); +int ret; -/* Disable monitoring */ - tmr =tmu_read (data, &data->regs->tmr); - tmr &= ~TMR_ME ; -tmu_write (data, tmr, &data->regs->tmr); + ret =regmap_update_bits (data->regmap,REGS_TMR ,TMR_ME ,0 ); +if (ret) +return ret;clk_disable_unprepare (data->clk);
@@ -273,7 +269,6 @@ static int __maybe_unused qoriq_tmu_suspend(struct device *dev)static int __maybe_unused qoriq_tmu_resume (struct device *dev) { -u32 tmr;int ret;struct qoriq_tmu_data *data =dev_get_drvdata (dev);
@@ -282,11 +277,7 @@ static int __maybe_unused qoriq_tmu_resume(struct device *dev)return ret;/* Enable monitoring */ - tmr =tmu_read (data, &data->regs->tmr); - tmr |=TMR_ME ; -tmu_write (data, tmr, &data->regs->tmr); - -return 0 ; +return regmap_update_bits (data->regmap,REGS_TMR ,TMR_ME ,TMR_ME ); } static SIMPLE_DEV_PM_OPS(qoriq_tmu_pm_ops,
Signature · 1 line
2.21.0
PATCH v7 9/12 thermal: qoriq: Enable all sensors before registering them
In reply to Andrey SmirnovTmu_get_temp will get called as a part of sensor registration via devm_thermal_zone_of_sensor_register(). To prevent it from retruning bogus data we need to enable sensor monitoring before that. Looking at the datasheet (i.MX8MQ RM) there doesn't seem to be any harm in enabling them all, so, for the sake of simplicity, change the code to do just that.
--- drivers/thermal/qoriq_thermal.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/thermal/qoriq_thermal.c +8 -10
@@ -24,6 +24,7 @@#define TMR_DISABLE 0x0#define TMR_ME 0x80000000#define TMR_ALPF 0x0c000000 +#define TMR_MSITE_ALL GENMASK(15, 0)#define REGS_TMTMIR 0x008/* Temperature measurement interval Register */ #define TMTMIR_DEFAULT 0x0000000f
@@ -77,7 +78,10 @@ static const struct thermal_zone_of_device_ops tmu_tz_ops = {static int qoriq_tmu_register_tmu_zone (struct device *dev,struct qoriq_tmu_data *qdata) { -int id, sites =0 ; +int id; + +regmap_write (qdata->regmap,REGS_TMR , +TMR_MSITE_ALL |TMR_ME |TMR_ALPF );for (id =0 ; id <SITES_MAX ; id++) {struct thermal_zone_device *tzd;
@@ -93,18 +97,12 @@ static int qoriq_tmu_register_tmu_zone(struct device *dev,if (ret) {if (ret == -ENODEV )continue ; -else -return ret; - } - sites |=0x1 << (15 - id); +regmap_write (qdata->regmap,REGS_TMR ,TMR_DISABLE ); +return ret; + } } -/* Enable monitoring */ -if (sites !=0 ) -regmap_write (qdata->regmap,REGS_TMR , - sites |TMR_ME |TMR_ALPF ); -return 0 ; }
Signature · 1 line
2.21.0
PATCH v7 10/12 thermal: qoriq: Do not report invalid temperature reading
In reply to Andrey SmirnovBefore returning measured temperature data to upper layer we need to make sure that the reading was marked as "valid" to avoid reporting bogus data.
--- drivers/thermal/qoriq_thermal.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/thermal/qoriq_thermal.c +18 -1
@@ -38,6 +38,7 @@#define REGS_TRITSR (n) (0x100 + 16 * (n))/* Immediate Temperature * Site Register */ +#define TRITSR_V BIT(31)#define REGS_TTRnCR (n) (0xf10 + 4 * (n))/* Temperature Range n * Control Register */
@@ -64,8 +65,24 @@ static int tmu_get_temp(void *p, int *temp)struct qoriq_sensor *qsensor = p;struct qoriq_tmu_data *qdata =qoriq_sensor_to_data (qsensor);u32 val; +/* +* REGS_TRITSR(id) has the following layout: +* +* 31 ... 7 6 5 4 3 2 1 0 +* V TEMP +* +* Where V bit signifies if the measurement is ready and is +* within sensor range. TEMP is an 8 bit value representing +* temperature in C. +*/ +if (regmap_read_poll_timeout (qdata->regmap, +REGS_TRITSR (qsensor->id), + val, + val &TRITSR_V , +USEC_PER_MSEC , +10 *USEC_PER_MSEC )) +return -ENODATA ; -regmap_read (qdata->regmap,REGS_TRITSR (qsensor->id), &val); *temp = (val &0xff ) *1000 ;return 0 ;
Signature · 1 line
2.21.0
PATCH v7 11/12 thermal_hwmon: Add devres wrapper for thermal_add_hwmon_sysfs()
In reply to Andrey SmirnovAdd devres wrapper for thermal_add_hwmon_sysfs() to simplify driver code.
--- drivers/thermal/thermal_hwmon.c | 28 ++++++++++++++++++++++++++++ drivers/thermal/thermal_hwmon.h | 7 +++++++ 2 files changed, 35 insertions(+)
drivers/thermal/thermal_hwmon.c +28 -0
@@ -248,3 +248,31 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)kfree (hwmon); }EXPORT_SYMBOL_GPL (thermal_remove_hwmon_sysfs); + +static void devm_thermal_hwmon_release (struct device *dev,void *res) +{ +thermal_remove_hwmon_sysfs (*(struct thermal_zone_device **)res); +} + +int devm_thermal_add_hwmon_sysfs (struct thermal_zone_device *tz) +{ +struct thermal_zone_device **ptr; +int ret; + + ptr =devres_alloc (devm_thermal_hwmon_release,sizeof (*ptr), +GFP_KERNEL ); +if (!ptr) +return -ENOMEM ; + + ret =thermal_add_hwmon_sysfs (tz); +if (ret) { +devres_free (ptr); +return ret; + } + + *ptr = tz; +devres_add (&tz->device, ptr); + +return ret; +} +EXPORT_SYMBOL_GPL (devm_thermal_add_hwmon_sysfs);
drivers/thermal/thermal_hwmon.h +7 -0
@@ -17,6 +17,7 @@#ifdef CONFIG_THERMAL_HWMON int thermal_add_hwmon_sysfs (struct thermal_zone_device *tz); +int devm_thermal_add_hwmon_sysfs (struct thermal_zone_device *tz);void thermal_remove_hwmon_sysfs (struct thermal_zone_device *tz);#else static inline int
@@ -25,6 +26,12 @@ thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)return 0 ; } +static inline int +devm_thermal_add_hwmon_sysfs (struct thermal_zone_device *tz) +{ +return 0 ; +} +static inline void thermal_remove_hwmon_sysfs (struct thermal_zone_device *tz) {
Signature · 1 line
2.21.0
PATCH v7 12/12 thermal: qoriq: Add hwmon support
In reply to Andrey SmirnovExpose thermal readings as a HWMON device, so that it could be accessed using lm-sensors.
--- drivers/thermal/qoriq_thermal.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/thermal/qoriq_thermal.c +6 -0
@@ -13,6 +13,7 @@#include <linux/thermal.h> #include "thermal_core.h" +#include "thermal_hwmon.h" #define SITES_MAX 16
@@ -118,6 +119,11 @@ static int qoriq_tmu_register_tmu_zone(struct device *dev,regmap_write (qdata->regmap,REGS_TMR ,TMR_DISABLE );return ret; } + +if (devm_thermal_add_hwmon_sysfs (tzd)) +dev_warn (dev, +"Failed to add hwmon sysfs attributes\n" ); + }return 0 ;
Signature · 1 line
2.21.0
Hi all,
can this series be considered for mainline inclusion? It has been tested and works well in our i.MX8M kernel setup.
Regards,
Lucas
Quoted 107 lines · Andrey Smirnov
Everyone:
This series contains patches adding support for HWMON integration, bug fixes and general improvements (hopefully) for TMU driver I made while working on it on i.MX8MQ.
Feedback is welcome!
Thanks,
Andrey SmirnovChanges since [v6]:
- Rebased on top of Zhang's "next" branch
- Added "thermal: qoriq: Drop unnecessary drvdata cleanup"
Changes since [v5]
- Rebased on recent linux-next, dropped "thermal: qoriq: Remove unnecessary DT node is NULL check" since it is already in the tree
- Dropped dependency on [rfc]
Changes since [v4]
- Collected Tested-by from Lucas
- Collected Reviewed-by from Daniel
- Converted "thermal: qoriq: Enable all sensors before registering them" to use if instead of switch statement for error checking
Changes since [v3]
- Series reabse on top of [rfc]
- Fixed incorrect goto label in "thermal: qoriq: Pass data to
qoriq_tmu_calibration()"- Added
REGS_TRITSR()register description to "thermal: qoriq: Do not report invalid temperature reading"- Reworded commit message of "thermal: qoriq: Remove unnecessary DT node is NULL check"
Changes since [v2]
- Patches rebased on v5.1-rc1
Changes since [v1]
- Rebased on "linus" branch of git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git that included latest chagnes adding multi-sensors support
- Dropped
thermal: qoriq: Add support for multiple thremal sites
thermal: qoriq: Be more strict when parsing
thermal: qoriq: Simplify error handling inqoriq_tmu_get_sensor_id()since they are no longer relevant
- Added
thermal: qoriq: Don't store struct
thermal_zone_devicereference
thermal: qoriq: Add local structqoriq_sensorpointer
thermal: qoriq: Embed per-sensor data into structqoriq_tmu_data
thermal: qoriq: Pass data toqoriq_tmu_register_tmu_zone()directlyto simplify latest codebase
- Changed "thermal: qoriq: Do not report invalid temperature reading" to use
regmap_read_poll_timeout()to make sure thattmu_get_temp()waits for fist sample to be ready before reporting it. This case is triggered on my setup ifqoriq_thermalis compiled as a module[v1] lore.kernel.org/lkml/[email protected] [v2] lore.kernel.org/lkml/[email protected] [v3] lore.kernel.org/lkml/[email protected] [v4] lore.kernel.org/lkml/[email protected] [v5] lore.kernel.org/lkml/[email protected] [v6] lore.kernel.org/lkml/[email protected] [rfc] lore.kernel.org/lkml/[email protected]
Andrey Smirnov (12):
thermal: qoriq: Add local struct device pointer
thermal: qoriq: Don't store structthermal_zone_devicereference
thermal: qoriq: Add local structqoriq_sensorpointer
thermal: qoriq: Embed per-sensor data into structqoriq_tmu_data
thermal: qoriq: Pass data toqoriq_tmu_register_tmu_zone()directly
thermal: qoriq: Pass data toqoriq_tmu_calibration()directly
thermal: qoriq: Drop unnecessary drvdata cleanup
thermal: qoriq: Convert driver to use regmap API
thermal: qoriq: Enable all sensors before registering them
thermal: qoriq: Do not report invalid temperature reading
thermal_hwmon: Add devres wrapper forthermal_add_hwmon_sysfs()
thermal: qoriq: Add hwmon supportdrivers/thermal/qoriq_thermal.c | 252 +++++++++++++++++--------------- drivers/thermal/thermal_hwmon.c | 28 ++++ drivers/thermal/thermal_hwmon.h | 7 + 3 files changed, 167 insertions(+), 120 deletions(-)
Hi Luca,
Quoted 4 lines · Lucas Stach
Hi all,
can this series be considered for mainline inclusion? It has been tested and works well in our i.MX8M kernel setup.
thanks for the reminder. I'll take care of it soon.
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Hi Lucas,
Quoted 4 lines · Lucas Stach
Hi all,
can this series be considered for mainline inclusion? It has been tested and works well in our i.MX8M kernel setup.
I'm fine with the changes but the series does not longer apply. I tried to solve the conflicts but got too many of them.
Is it possible to respin the series?
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Quoted 7 lines · Daniel Lezcano
Hi Lucas,
Quoted 2 lines · Lucas Stach
Hi all,
Quoted 8 lines
Quoted 2 lines
can this series be considered for mainline inclusion? It has been tested and works well in our i.MX8M kernel setup.
I'm fine with the changes but the series does not longer apply. I tried to solve the conflicts but got too many of them.
Is it possible to respin the series?
Yeah, no problem. Will do.
Thanks,
Andrey Smirnov
Quoted 12 lines · Andrey Smirnov
Quoted 10 lines · Daniel Lezcano
Hi Lucas,
Quoted 4 lines · Lucas Stach
Hi all,
can this series be considered for mainline inclusion? It has been tested and works well in our i.MX8M kernel setup.
Quoted 7 lines
Quoted 5 lines
I'm fine with the changes but the series does not longer apply. I tried to solve the conflicts but got too many of them.
Is it possible to respin the series?
Yeah, no problem. Will do.
Thanks and sorry for the delay.
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog