thermal: tsens: Refactor to use regmap_field
Subsystems (5)
v3 cover thermal: tsens: Refactor to use regmap_field
Changes pending from earlier reviews:
- Using macros from bits.h as suggested by Eduardo. I'd like to defer this change to a separate series where I can convert over all the files (v0.1, v1, v2) together. This series is getting quite long as it is.
Changes since v2:
- Simplify qcs404 device tree by changing 'passive' trips on non-throttling devices to 'hot' type. Update the trip points too.
- Replace IP version reads with just a version major number in the feature data structure. This is enough for differenting between IPs for different code paths for now.
- Fix off-by-one typo in the REG_FIELD_FOR_EACH_ macro names.
Changes since v1:
- Anything not being throttled in the kernel converted to a hot trip point (no cooling-maps)
- Don't print version number of the IP at boot
Description
-----------
Short term bandaid fixes to add support for more versions of the TSENS IP is not proving to be very scalable. Here is a series to finally convert the driver's core to use regmap_fields so that register addresses and bitfields can be abstracted away from the code.
This series is posted as one to give a complete view of where I'm going with this refactor. We can probably split it into smaller sets if required. Currently it consists of the following parts:
- Patch 01-06: Style changes to make code easier to read (mostly naming related). This has no functional change in the driver, it is a series of search and replace operations. Ideally this will get merged first, otherwise everything else will become painful :-)
- Patch 07-09: Merge the 8916 and 8974 source files into a single one called v0_1.c denoting the version of the IP and open up more opportunities for reuse.
- Patch 10: This is the core patch that adds IP-specific data based on two data structures: tsens_features has bit flags to identify if a certain feature is available in a version or not and an array of reg_field pointers.
regfield_ids list the important fields across IP versions and are used as an index.
This patch converts over all platforms except 8960 which currently doesn't use DT data for tsens and has custom functions for everything. We will get to it eventually, but it's conversion is not necessary for this series to be merged.
- Patch 11-15: Clean ups, new functionality and bugfixes based on regmap_field
- Patch 16-18: Refactor the get_temp routine. We expect to have a single get_temp routine once all the conversion is finished.
- Patch 20-22: Introduce qcs404 support using new regmap infrastructure.
Testing
-------
Since these changes affect every platform using TSENS, it should be clarified that I have only been focussing on developing/testing this on sdm845, msm8916, qcs404.
Future work
-----------
a. Get rid of get_temp_common in favour of get_temp_tsens_valid b. irq support (coming soon)
c. Convert over 8960 to use regmap_field and as a result common functions
Amit Kucheria (23):
drivers: thermal: tsens: Document the data structures
drivers: thermal: tsens: Rename tsens_data
drivers: thermal: tsens: Rename tsens_device
drivers: thermal: tsens: Rename variable tmdev
drivers: thermal: tsens: Use consistent names for variables
drivers: thermal: tsens: Function prototypes should have argument
names
drivers: thermal: tsens: Rename tsens-8916 to prepare to merge with
tsens-8974
drivers: thermal: tsens: Rename constants to prepare to merge with
tsens-8974 drivers: thermal: tsens: Merge tsens-8974 into tsens-v0_1
drivers: thermal: tsens: Introduce reg_fields to deal with register
description
drivers: thermal: tsens: Save reference to the device pointer and use
it
drivers: thermal: tsens: Don't print error message on -EPROBE_DEFER
drivers: thermal: tsens: Add new operation to check if a sensor is
enabled
drivers: thermal: tsens: change data type for sensor IDs
drivers: thermal: tsens: Introduce IP-specific max_sensor count
drivers: thermal: tsens: simplify get_temp_tsens_v2 routine
drivers: thermal: tsens: Move get_temp_tsens_v2 to allow sharing
drivers: thermal: tsens: Common get_temp() learns to do ADC conversion
dt: thermal: tsens: Add bindings for qcs404
drivers: thermal: tsens: Add generic support for TSENS v1 IP
arm64: dts: qcom: qcs404: Add tsens controller
arm64: dts: qcom: qcs404: Add thermal zones for each sensor
drivers: thermal: tsens: Move calibration constants to header file
.../bindings/thermal/qcom-tsens.txt | 14 +
arch/arm64/boot/dts/qcom/qcs404.dtsi | 272 ++++++++++++++++
drivers/thermal/qcom/Makefile | 4 +-
drivers/thermal/qcom/tsens-8916.c | 105 -------
drivers/thermal/qcom/tsens-8960.c | 84 ++---
drivers/thermal/qcom/tsens-common.c | 159 +++++++---
.../qcom/{tsens-8974.c => tsens-v0_1.c} | 166 +++++++++-
drivers/thermal/qcom/tsens-v1.c | 193 ++++++++++++
drivers/thermal/qcom/tsens-v2.c | 111 +++----
drivers/thermal/qcom/tsens.c | 100 +++---
drivers/thermal/qcom/tsens.h | 291 ++++++++++++++++--
11 files changed, 1166 insertions(+), 333 deletions(-)
delete mode 100644 drivers/thermal/qcom/tsens-8916.c
rename drivers/thermal/qcom/{tsens-8974.c => tsens-v0_1.c} (56%)
create mode 100644 drivers/thermal/qcom/tsens-v1.cSignature · 1 line
2.17.1
PATCH v3 1/23 drivers: thermal: tsens: Document the data structures
Describe how the TSENS device and the various sensors connected to it are described in the driver
--- drivers/thermal/qcom/tsens.h | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)
drivers/thermal/qcom/tsens.h +28 -3
@@ -14,6 +14,16 @@struct tsens_device ; +/** +* struct tsens_sensor - data for each sensor connected to the tsens device +* @tmdev: tsens device instance that this sensor is connected to +* @tzd: pointer to the thermal zone that this sensor is in +* @offset: offset of temperature adjustment curve +* @id: Sensor ID +* @hw_id: HW ID can be used in case of platform-specific IDs +* @slope: slope of temperature adjustment curve +* @status: 8960-specific variable to track 8960 and 8660 status register offset +*/ struct tsens_sensor {struct tsens_device *tmdev;struct thermal_zone_device *tzd;
@@ -55,8 +65,8 @@ enum reg_list { };/** -* struct tsens_data - tsens instance specific data -* @num_sensors: Max number of sensors supported by platform +* struct tsens_data - tsens platform data +* @num_sensors: Number of sensors supported by platform * @ops: operations the tsens instance supports * @hw_ids: Subset of sensors ids supported by platform, if not the first n * @reg_offsets: Register offsets for commonly used registers
@@ -68,12 +78,27 @@ struct tsens_data {unsigned int *hw_ids; }; -/* Registers to be saved/restored across a context loss */ +/** +* struct tsens_context - Registers to be saved/restored across a context loss +*/ struct tsens_context {int threshold;int control; }; +/** +* struct tsens_device - private data for each instance of the tsens IP +* @dev: pointer to struct device +* @num_sensors: number of sensors enabled on this device +* @tm_map: pointer to TM register address space +* @srot_map: pointer to SROT register address space +* @tm_offset: deal with old device trees that don't address TM and SROT +* address space separately +* @reg_offsets: array of offsets to important regs for this version of IP +* @ctx: registers to be saved and restored during suspend/resume +* @ops: pointer to list of callbacks supported by this device +* @sensor: list of sensors attached to this device +*/ struct tsens_device {struct device *dev;u32 num_sensors;
Signature · 1 line
2.17.1
PATCH v3 2/23 drivers: thermal: tsens: Rename tsens_data
In reply to Amit KucheriaRename to tsens_plat_data to denote that it is platform-data passed in at compile-time.
--- drivers/thermal/qcom/tsens-8916.c | 2 +- drivers/thermal/qcom/tsens-8960.c | 2 +- drivers/thermal/qcom/tsens-8974.c | 2 +- drivers/thermal/qcom/tsens-v2.c | 4 ++-- drivers/thermal/qcom/tsens.c | 2 +- drivers/thermal/qcom/tsens.h | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-)
drivers/thermal/qcom/tsens-8916.c +1 -1
@@ -97,7 +97,7 @@ static const struct tsens_ops ops_8916 = { .get_temp = get_temp_common, }; -const struct tsens_data data_8916 = { +const struct tsens_plat_data data_8916 = { .num_sensors =5 , .ops = &ops_8916, .reg_offsets = { [SROT_CTRL_OFFSET ] =0x0 },
drivers/thermal/qcom/tsens-8960.c +1 -1
@@ -277,7 +277,7 @@ static const struct tsens_ops ops_8960 = { .resume = resume_8960, }; -const struct tsens_data data_8960 = { +const struct tsens_plat_data data_8960 = { .num_sensors =11 , .ops = &ops_8960, };
drivers/thermal/qcom/tsens-8974.c +1 -1
@@ -229,7 +229,7 @@ static const struct tsens_ops ops_8974 = { .get_temp = get_temp_common, }; -const struct tsens_data data_8974 = { +const struct tsens_plat_data data_8974 = { .num_sensors =11 , .ops = &ops_8974, .reg_offsets = { [SROT_CTRL_OFFSET ] =0x0 },
drivers/thermal/qcom/tsens-v2.c +2 -2
@@ -66,13 +66,13 @@ static const struct tsens_ops ops_generic_v2 = { .get_temp = get_temp_tsens_v2, }; -const struct tsens_data data_tsens_v2 = { +const struct tsens_plat_data data_tsens_v2 = { .ops = &ops_generic_v2, .reg_offsets = { [SROT_CTRL_OFFSET ] =0x4 }, };/* Kept around for backward compatibility with old msm8996.dtsi */ -const struct tsens_data data_8996 = { +const struct tsens_plat_data data_8996 = { .num_sensors =13 , .ops = &ops_generic_v2, .reg_offsets = { [SROT_CTRL_OFFSET ] =0x4 },
drivers/thermal/qcom/tsens.c +1 -1
@@ -102,7 +102,7 @@ static int tsens_probe(struct platform_device *pdev)struct device *dev;struct device_node *np;struct tsens_device *tmdev; -const struct tsens_data *data; +const struct tsens_plat_data *data;const struct of_device_id *id;u32 num_sensors;
drivers/thermal/qcom/tsens.h +4 -4
@@ -65,13 +65,13 @@ enum reg_list { };/** -* struct tsens_data - tsens platform data +* struct tsens_plat_data - tsens compile-time platform data * @num_sensors: Number of sensors supported by platform * @ops: operations the tsens instance supports * @hw_ids: Subset of sensors ids supported by platform, if not the first n * @reg_offsets: Register offsets for commonly used registers */ -struct tsens_data { +struct tsens_plat_data {const u32 num_sensors;const struct tsens_ops *ops;const u16 reg_offsets[REG_ARRAY_SIZE ];
@@ -117,8 +117,8 @@ int init_common(struct tsens_device *);int get_temp_common (struct tsens_device *,int ,int *);/* TSENS v1 targets */ -extern const struct tsens_data data_8916, data_8974, data_8960; +extern const struct tsens_plat_data data_8916, data_8974, data_8960;/* TSENS v2 targets */ -extern const struct tsens_data data_8996, data_tsens_v2; +extern const struct tsens_plat_data data_8996, data_tsens_v2;#endif /* __QCOM_TSENS_H__ */
Signature · 1 line
2.17.1
PATCH v3 3/23 drivers: thermal: tsens: Rename tsens_device
In reply to Amit KucheriaRename to tsens_priv to denote that it is private data for each tsens instance.
--- drivers/thermal/qcom/tsens-8916.c | 2 +- drivers/thermal/qcom/tsens-8960.c | 14 +++++++------- drivers/thermal/qcom/tsens-8974.c | 2 +- drivers/thermal/qcom/tsens-common.c | 6 +++--- drivers/thermal/qcom/tsens-v2.c | 2 +- drivers/thermal/qcom/tsens.c | 14 +++++++------- drivers/thermal/qcom/tsens.h | 30 ++++++++++++++--------------- 7 files changed, 35 insertions(+), 35 deletions(-)
drivers/thermal/qcom/tsens-8916.c +1 -1
@@ -39,7 +39,7 @@#define CAL_SEL_MASK 0xe0000000#define CAL_SEL_SHIFT 29 -static int calibrate_8916 (struct tsens_device *tmdev) +static int calibrate_8916 (struct tsens_priv *tmdev) {int base0 =0 , base1 =0 , i;u32 p1[5 ], p2[5 ];
drivers/thermal/qcom/tsens-8960.c +7 -7
@@ -56,7 +56,7 @@#define TRDY_MASK BIT(7)#define TIMEOUT_US 100 -static int suspend_8960 (struct tsens_device *tmdev) +static int suspend_8960 (struct tsens_priv *tmdev) {int ret;unsigned int mask;
@@ -82,7 +82,7 @@ static int suspend_8960(struct tsens_device *tmdev)return 0 ; } -static int resume_8960 (struct tsens_device *tmdev) +static int resume_8960 (struct tsens_priv *tmdev) {int ret;struct regmap *map = tmdev->tm_map;
@@ -112,7 +112,7 @@ static int resume_8960(struct tsens_device *tmdev)return 0 ; } -static int enable_8960 (struct tsens_device *tmdev,int id) +static int enable_8960 (struct tsens_priv *tmdev,int id) {int ret;u32 reg, mask;
@@ -138,7 +138,7 @@ static int enable_8960(struct tsens_device *tmdev, int id)return 0 ; } -static void disable_8960 (struct tsens_device *tmdev) +static void disable_8960 (struct tsens_priv *tmdev) {int ret;u32 reg_cntl;
@@ -162,7 +162,7 @@ static void disable_8960(struct tsens_device *tmdev)regmap_write (tmdev->tm_map,CNTL_ADDR , reg_cntl); } -static int init_8960 (struct tsens_device *tmdev) +static int init_8960 (struct tsens_priv *tmdev) {int ret, i;u32 reg_cntl;
@@ -212,7 +212,7 @@ static int init_8960(struct tsens_device *tmdev)return 0 ; } -static int calibrate_8960 (struct tsens_device *tmdev) +static int calibrate_8960 (struct tsens_priv *tmdev) {int i;char *data;
@@ -243,7 +243,7 @@ static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s)return adc_code * slope + offset; } -static int get_temp_8960 (struct tsens_device *tmdev,int id,int *temp) +static int get_temp_8960 (struct tsens_priv *tmdev,int id,int *temp) {int ret;u32 code, trdy;
drivers/thermal/qcom/tsens-8974.c +1 -1
@@ -91,7 +91,7 @@#define BIT_APPEND 0x3 -static int calibrate_8974 (struct tsens_device *tmdev) +static int calibrate_8974 (struct tsens_priv *tmdev) {int base1 =0 , base2 =0 , i;u32 p1[11 ], p2[11 ];
drivers/thermal/qcom/tsens-common.c +3 -3
@@ -46,7 +46,7 @@ char *qfprom_read(struct device *dev, const char *cname)* and offset values are derived from tz->tzp->slope and tz->tzp->offset * resp. */ -void compute_intercept_slope (struct tsens_device *tmdev,u32 *p1, +void compute_intercept_slope (struct tsens_priv *tmdev,u32 *p1,u32 *p2,u32 mode) {int i;
@@ -95,7 +95,7 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s)return degc; } -int get_temp_common (struct tsens_device *tmdev,int id,int *temp) +int get_temp_common (struct tsens_priv *tmdev,int id,int *temp) {struct tsens_sensor *s = &tmdev->sensor[id];u32 code;
@@ -127,7 +127,7 @@ static const struct regmap_config tsens_srot_config = { .reg_stride = 4, }; -int __init init_common (struct tsens_device *tmdev) +int __init init_common (struct tsens_priv *tmdev) {void __iomem *tm_base, *srot_base;struct resource *res;
drivers/thermal/qcom/tsens-v2.c +1 -1
@@ -12,7 +12,7 @@#define LAST_TEMP_MASK 0xfff#define STATUS_VALID_BIT BIT(21) -static int get_temp_tsens_v2 (struct tsens_device *tmdev,int id,int *temp) +static int get_temp_tsens_v2 (struct tsens_priv *tmdev,int id,int *temp) {struct tsens_sensor *s = &tmdev->sensor[id];u32 code;
drivers/thermal/qcom/tsens.c +7 -7
@@ -15,7 +15,7 @@static int tsens_get_temp (void *data,int *temp) {const struct tsens_sensor *s = data; -struct tsens_device *tmdev = s->tmdev; +struct tsens_priv *tmdev = s->tmdev;return tmdev->ops->get_temp (tmdev, s->id, temp); }
@@ -23,7 +23,7 @@ static int tsens_get_temp(void *data, int *temp)static int tsens_get_trend (void *p,int trip,enum thermal_trend *trend) {const struct tsens_sensor *s = p; -struct tsens_device *tmdev = s->tmdev; +struct tsens_priv *tmdev = s->tmdev;if (tmdev->ops->get_trend)return tmdev->ops->get_trend (tmdev, s->id, trend);
@@ -33,7 +33,7 @@ static int tsens_get_trend(void *p, int trip, enum thermal_trend *trend)static int __maybe_unused tsens_suspend (struct device *dev) { -struct tsens_device *tmdev =dev_get_drvdata (dev); +struct tsens_priv *tmdev =dev_get_drvdata (dev);if (tmdev->ops && tmdev->ops->suspend)return tmdev->ops->suspend (tmdev);
@@ -43,7 +43,7 @@ static int __maybe_unused tsens_suspend(struct device *dev)static int __maybe_unused tsens_resume (struct device *dev) { -struct tsens_device *tmdev =dev_get_drvdata (dev); +struct tsens_priv *tmdev =dev_get_drvdata (dev);if (tmdev->ops && tmdev->ops->resume)return tmdev->ops->resume (tmdev);
@@ -76,7 +76,7 @@ static const struct thermal_zone_of_device_ops tsens_of_ops = { .get_trend = tsens_get_trend, }; -static int tsens_register (struct tsens_device *tmdev) +static int tsens_register (struct tsens_priv *tmdev) {int i;struct thermal_zone_device *tzd;
@@ -101,7 +101,7 @@ static int tsens_probe(struct platform_device *pdev)int ret, i;struct device *dev;struct device_node *np; -struct tsens_device *tmdev; +struct tsens_priv *tmdev;const struct tsens_plat_data *data;const struct of_device_id *id;u32 num_sensors;
@@ -174,7 +174,7 @@ static int tsens_probe(struct platform_device *pdev)static int tsens_remove (struct platform_device *pdev) { -struct tsens_device *tmdev =platform_get_drvdata (pdev); +struct tsens_priv *tmdev =platform_get_drvdata (pdev);if (tmdev->ops->disable) tmdev->ops->disable (tmdev);
drivers/thermal/qcom/tsens.h +15 -15
@@ -12,7 +12,7 @@#include <linux/thermal.h> -struct tsens_device ; +struct tsens_priv ;/** * struct tsens_sensor - data for each sensor connected to the tsens device
@@ -25,7 +25,7 @@ struct tsens_device;* @status: 8960-specific variable to track 8960 and 8660 status register offset */ struct tsens_sensor { -struct tsens_device *tmdev; +struct tsens_priv *tmdev;struct thermal_zone_device *tzd;int offset;int id;
@@ -47,15 +47,15 @@ struct tsens_sensor {*/ struct tsens_ops {/* mandatory callbacks */ -int (*init)(struct tsens_device *); -int (*calibrate)(struct tsens_device *); -int (*get_temp)(struct tsens_device *,int ,int *); +int (*init)(struct tsens_priv *); +int (*calibrate)(struct tsens_priv *); +int (*get_temp)(struct tsens_priv *,int ,int *);/* optional callbacks */ -int (*enable)(struct tsens_device *,int ); -void (*disable)(struct tsens_device *); -int (*suspend)(struct tsens_device *); -int (*resume)(struct tsens_device *); -int (*get_trend)(struct tsens_device *,int ,enum thermal_trend *); +int (*enable)(struct tsens_priv *,int ); +void (*disable)(struct tsens_priv *); +int (*suspend)(struct tsens_priv *); +int (*resume)(struct tsens_priv *); +int (*get_trend)(struct tsens_priv *,int ,enum thermal_trend *); };enum reg_list {
@@ -87,7 +87,7 @@ struct tsens_context { };/** -* struct tsens_device - private data for each instance of the tsens IP +* struct tsens_priv - private data for each instance of the tsens IP * @dev: pointer to struct device * @num_sensors: number of sensors enabled on this device * @tm_map: pointer to TM register address space
@@ -99,7 +99,7 @@ struct tsens_context {* @ops: pointer to list of callbacks supported by this device * @sensor: list of sensors attached to this device */ -struct tsens_device { +struct tsens_priv {struct device *dev;u32 num_sensors;struct regmap *tm_map;
@@ -112,9 +112,9 @@ struct tsens_device { };char *qfprom_read (struct device *,const char *); -void compute_intercept_slope (struct tsens_device *,u32 *,u32 *,u32 ); -int init_common (struct tsens_device *); -int get_temp_common (struct tsens_device *,int ,int *); +void compute_intercept_slope (struct tsens_priv *,u32 *,u32 *,u32 ); +int init_common (struct tsens_priv *); +int get_temp_common (struct tsens_priv *,int ,int *);/* TSENS v1 targets */ extern const struct tsens_plat_data data_8916, data_8974, data_8960;
Signature · 1 line
2.17.1
PATCH v3 4/23 drivers: thermal: tsens: Rename variable tmdev
In reply to Amit Kucheriatmdev seems to imply that this is a device pointer when in fact it is just private platform data for each tsens device. Rename it to priv improve code readability.
--- drivers/thermal/qcom/tsens-8916.c | 16 +++--- drivers/thermal/qcom/tsens-8960.c | 82 ++++++++++++++--------------- drivers/thermal/qcom/tsens-8974.c | 16 +++--- drivers/thermal/qcom/tsens-common.c | 53 +++++++++---------- drivers/thermal/qcom/tsens-v2.c | 12 ++--- drivers/thermal/qcom/tsens.c | 80 ++++++++++++++-------------- drivers/thermal/qcom/tsens.h | 4 +- 7 files changed, 131 insertions(+), 132 deletions(-)
drivers/thermal/qcom/tsens-8916.c +8 -8
@@ -39,23 +39,23 @@#define CAL_SEL_MASK 0xe0000000#define CAL_SEL_SHIFT 29 -static int calibrate_8916 (struct tsens_priv *tmdev) +static int calibrate_8916 (struct tsens_priv *priv) {int base0 =0 , base1 =0 , i;u32 p1[5 ], p2[5 ];int mode =0 ;u32 *qfprom_cdata, *qfprom_csel; - qfprom_cdata = (u32 *)qfprom_read (tmdev->dev,"calib" ); + qfprom_cdata = (u32 *)qfprom_read (priv->dev,"calib" );if (IS_ERR (qfprom_cdata))return PTR_ERR (qfprom_cdata); - qfprom_csel = (u32 *)qfprom_read (tmdev->dev,"calib_sel" ); + qfprom_csel = (u32 *)qfprom_read (priv->dev,"calib_sel" );if (IS_ERR (qfprom_csel))return PTR_ERR (qfprom_csel); mode = (qfprom_csel[0 ] &CAL_SEL_MASK ) >>CAL_SEL_SHIFT ; -dev_dbg (tmdev->dev,"calibration mode is %d\n" , mode); +dev_dbg (priv->dev,"calibration mode is %d\n" , mode);switch (mode) {case TWO_PT_CALIB :
@@ -65,7 +65,7 @@ static int calibrate_8916(struct tsens_priv *tmdev) p2[2 ] = (qfprom_cdata[1 ] &S2_P2_MASK ) >>S2_P2_SHIFT ; p2[3 ] = (qfprom_cdata[1 ] &S3_P2_MASK ) >>S3_P2_SHIFT ; p2[4 ] = (qfprom_cdata[1 ] &S4_P2_MASK ) >>S4_P2_SHIFT ; -for (i =0 ; i < tmdev->num_sensors; i++) +for (i =0 ; i < priv->num_sensors; i++) p2[i] = ((base1 + p2[i]) <<3 );/* Fall through */ case ONE_PT_CALIB2 :
@@ -75,18 +75,18 @@ static int calibrate_8916(struct tsens_priv *tmdev) p1[2 ] = (qfprom_cdata[0 ] &S2_P1_MASK ) >>S2_P1_SHIFT ; p1[3 ] = (qfprom_cdata[1 ] &S3_P1_MASK ) >>S3_P1_SHIFT ; p1[4 ] = (qfprom_cdata[1 ] &S4_P1_MASK ) >>S4_P1_SHIFT ; -for (i =0 ; i < tmdev->num_sensors; i++) +for (i =0 ; i < priv->num_sensors; i++) p1[i] = (((base0) + p1[i]) <<3 );break ;default : -for (i =0 ; i < tmdev->num_sensors; i++) { +for (i =0 ; i < priv->num_sensors; i++) { p1[i] =500 ; p2[i] =780 ; }break ; } -compute_intercept_slope (tmdev, p1, p2, mode); +compute_intercept_slope (priv, p1, p2, mode);return 0 ; }
drivers/thermal/qcom/tsens-8960.c +41 -41
224 lines not on this page · raw message
drivers/thermal/qcom/tsens-8974.c +8 -8
@@ -91,7 +91,7 @@#define BIT_APPEND 0x3 -static int calibrate_8974 (struct tsens_priv *tmdev) +static int calibrate_8974 (struct tsens_priv *priv) {int base1 =0 , base2 =0 , i;u32 p1[11 ], p2[11 ];
@@ -99,11 +99,11 @@ static int calibrate_8974(struct tsens_priv *tmdev)u32 *calib, *bkp;u32 calib_redun_sel; - calib = (u32 *)qfprom_read (tmdev->dev,"calib" ); + calib = (u32 *)qfprom_read (priv->dev,"calib" );if (IS_ERR (calib))return PTR_ERR (calib); - bkp = (u32 *)qfprom_read (tmdev->dev,"calib_backup" ); + bkp = (u32 *)qfprom_read (priv->dev,"calib_backup" );if (IS_ERR (bkp))return PTR_ERR (bkp);
@@ -184,25 +184,25 @@ static int calibrate_8974(struct tsens_priv *tmdev)switch (mode) {case ONE_PT_CALIB : -for (i =0 ; i < tmdev->num_sensors; i++) +for (i =0 ; i < priv->num_sensors; i++) p1[i] += (base1 <<2 ) |BIT_APPEND ;break ;case TWO_PT_CALIB : -for (i =0 ; i < tmdev->num_sensors; i++) { +for (i =0 ; i < priv->num_sensors; i++) { p2[i] += base2; p2[i] <<=2 ; p2[i] |=BIT_APPEND ; }/* Fall through */ case ONE_PT_CALIB2 : -for (i =0 ; i < tmdev->num_sensors; i++) { +for (i =0 ; i < priv->num_sensors; i++) { p1[i] += base1; p1[i] <<=2 ; p1[i] |=BIT_APPEND ; }break ;default : -for (i =0 ; i < tmdev->num_sensors; i++) +for (i =0 ; i < priv->num_sensors; i++) p2[i] =780 ; p1[0 ] =502 ; p1[1 ] =509 ;
@@ -218,7 +218,7 @@ static int calibrate_8974(struct tsens_priv *tmdev)break ; } -compute_intercept_slope (tmdev, p1, p2, mode); +compute_intercept_slope (priv, p1, p2, mode);return 0 ; }
drivers/thermal/qcom/tsens-common.c +26 -27
127 lines not on this page · raw message
drivers/thermal/qcom/tsens-v2.c +6 -6
@@ -12,16 +12,16 @@#define LAST_TEMP_MASK 0xfff#define STATUS_VALID_BIT BIT(21) -static int get_temp_tsens_v2 (struct tsens_priv *tmdev,int id,int *temp) +static int get_temp_tsens_v2 (struct tsens_priv *priv,int id,int *temp) { -struct tsens_sensor *s = &tmdev->sensor[id]; +struct tsens_sensor *s = &priv->sensor[id];u32 code;unsigned int status_reg;u32 last_temp =0 , last_temp2 =0 , last_temp3 =0 ;int ret; - status_reg = tmdev->tm_offset +STATUS_OFFSET + s->hw_id *4 ; - ret =regmap_read (tmdev->tm_map, status_reg, &code); + status_reg = priv->tm_offset +STATUS_OFFSET + s->hw_id *4 ; + ret =regmap_read (priv->tm_map, status_reg, &code);if (ret)return ret; last_temp = code &LAST_TEMP_MASK ;
@@ -29,7 +29,7 @@ static int get_temp_tsens_v2(struct tsens_priv *tmdev, int id, int *temp) goto done;/* Try a second time */ - ret =regmap_read (tmdev->tm_map, status_reg, &code); + ret =regmap_read (priv->tm_map, status_reg, &code);if (ret)return ret;if (code &STATUS_VALID_BIT ) {
@@ -40,7 +40,7 @@ static int get_temp_tsens_v2(struct tsens_priv *tmdev, int id, int *temp) }/* Try a third/last time */ - ret =regmap_read (tmdev->tm_map, status_reg, &code); + ret =regmap_read (priv->tm_map, status_reg, &code);if (ret)return ret;if (code &STATUS_VALID_BIT ) {
drivers/thermal/qcom/tsens.c +40 -40
162 lines not on this page · raw message
drivers/thermal/qcom/tsens.h +2 -2
@@ -16,7 +16,7 @@ struct tsens_priv;/** * struct tsens_sensor - data for each sensor connected to the tsens device -* @tmdev: tsens device instance that this sensor is connected to +* @priv: tsens device instance that this sensor is connected to * @tzd: pointer to the thermal zone that this sensor is in * @offset: offset of temperature adjustment curve * @id: Sensor ID
@@ -25,7 +25,7 @@ struct tsens_priv;* @status: 8960-specific variable to track 8960 and 8660 status register offset */ struct tsens_sensor { -struct tsens_priv *tmdev; +struct tsens_priv *priv;struct thermal_zone_device *tzd;int offset;int id;
Signature · 1 line
2.17.1
PATCH v3 5/23 drivers: thermal: tsens: Use consistent names for variables
In reply to Amit Kucheriatsens_get_temp() uses the name 'data' for the void pointer, use the same in tsens_get_trend() for consistency.
Remove a stray space while we're at it.
--- drivers/thermal/qcom/tsens.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/thermal/qcom/tsens.c +3 -3
@@ -20,13 +20,13 @@ static int tsens_get_temp(void *data, int *temp)return priv->ops->get_temp (priv, s->id, temp); } -static int tsens_get_trend (void *p,int trip,enum thermal_trend *trend) +static int tsens_get_trend (void *data,int trip,enum thermal_trend *trend) { -const struct tsens_sensor *s = p; +const struct tsens_sensor *s = data;struct tsens_priv *priv = s->priv;if (priv->ops->get_trend) -return priv->ops->get_trend (priv, s->id, trend); +return priv->ops->get_trend (priv, s->id, trend);return -ENOTSUPP ; }
Signature · 1 line
2.17.1
PATCH v3 6/23 drivers: thermal: tsens: Function prototypes should have argument names
In reply to Amit Kucheriacheck_patch complains a lot as follows:
WARNING: function definition argument 'struct tsens_priv *' should also have an identifier name
+ int (*init)(struct tsens_priv *);
Fix it.
--- drivers/thermal/qcom/tsens.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/thermal/qcom/tsens.h +12 -12
@@ -47,15 +47,15 @@ struct tsens_sensor {*/ struct tsens_ops {/* mandatory callbacks */ -int (*init)(struct tsens_priv *); -int (*calibrate)(struct tsens_priv *); -int (*get_temp)(struct tsens_priv *,int ,int *); +int (*init)(struct tsens_priv *priv); +int (*calibrate)(struct tsens_priv *priv); +int (*get_temp)(struct tsens_priv *priv,int i,int *temp);/* optional callbacks */ -int (*enable)(struct tsens_priv *,int ); -void (*disable)(struct tsens_priv *); -int (*suspend)(struct tsens_priv *); -int (*resume)(struct tsens_priv *); -int (*get_trend)(struct tsens_priv *,int ,enum thermal_trend *); +int (*enable)(struct tsens_priv *priv,int i); +void (*disable)(struct tsens_priv *priv); +int (*suspend)(struct tsens_priv *priv); +int (*resume)(struct tsens_priv *priv); +int (*get_trend)(struct tsens_priv *priv,int i,enum thermal_trend *trend); };enum reg_list {
@@ -111,10 +111,10 @@ struct tsens_priv {struct tsens_sensor sensor[0 ]; }; -char *qfprom_read (struct device *,const char *); -void compute_intercept_slope (struct tsens_priv *,u32 *,u32 *,u32 ); -int init_common (struct tsens_priv *); -int get_temp_common (struct tsens_priv *,int ,int *); +char *qfprom_read (struct device *dev,const char *cname); +void compute_intercept_slope (struct tsens_priv *priv,u32 *pt1,u32 *pt2,u32 mode); +int init_common (struct tsens_priv *priv); +int get_temp_common (struct tsens_priv *priv,int i,int *temp);/* TSENS v1 targets */ extern const struct tsens_plat_data data_8916, data_8974, data_8960;
Signature · 1 line
2.17.1
PATCH v3 7/23 drivers: thermal: tsens: Rename tsens-8916 to prepare to merge with tsens-8974
In reply to Amit Kucheria8916 and 8974 use v0.1.0 of the TSENS IP. Rename tsens-8916 to prepare it for merging with tsens-8974 in a later commit.
---
drivers/thermal/qcom/Makefile | 2 +-
drivers/thermal/qcom/{tsens-8916.c => tsens-v0_1.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/thermal/qcom/{tsens-8916.c => tsens-v0_1.c} (100%)drivers/thermal/qcom/Makefile +1 -1
@@ -1,3 +1,3 @@ obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o -qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-v2.o +qcom_tsens-y += tsens.o tsens-common.o tsens-v0_1.o tsens-8974.o tsens-8960.o tsens-v2.o obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM) += qcom-spmi-temp-alarm.o
drivers/thermal/qcom/tsens-v0_1.c renamed from drivers/thermal/qcom/tsens-8916.c +0 -0
Signature · 1 line
2.17.1
PATCH v3 8/23 drivers: thermal: tsens: Rename constants to prepare to merge with tsens-8974
In reply to Amit KucheriaSome #defines in tsens-v_0_1.c clash with those in tsens-8974.c. Prefix them with 8916 to avoid the clash so we can merge the two files.
--- drivers/thermal/qcom/tsens-v0_1.c | 88 +++++++++++++++---------------- 1 file changed, 44 insertions(+), 44 deletions(-)
drivers/thermal/qcom/tsens-v0_1.c +44 -44
@@ -7,37 +7,37 @@#include "tsens.h" /* eeprom layout data for 8916 */ -#define BASE0_MASK 0x0000007f -#define BASE1_MASK 0xfe000000 -#define BASE0_SHIFT 0 -#define BASE1_SHIFT 25 - -#define S0_P1_MASK 0x00000f80 -#define S1_P1_MASK 0x003e0000 -#define S2_P1_MASK 0xf8000000 -#define S3_P1_MASK 0x000003e0 -#define S4_P1_MASK 0x000f8000 - -#define S0_P2_MASK 0x0001f000 -#define S1_P2_MASK 0x07c00000 -#define S2_P2_MASK 0x0000001f -#define S3_P2_MASK 0x00007c00 -#define S4_P2_MASK 0x01f00000 - -#define S0_P1_SHIFT 7 -#define S1_P1_SHIFT 17 -#define S2_P1_SHIFT 27 -#define S3_P1_SHIFT 5 -#define S4_P1_SHIFT 15 - -#define S0_P2_SHIFT 12 -#define S1_P2_SHIFT 22 -#define S2_P2_SHIFT 0 -#define S3_P2_SHIFT 10 -#define S4_P2_SHIFT 20 - -#define CAL_SEL_MASK 0xe0000000 -#define CAL_SEL_SHIFT 29 +#define MSM8916_BASE0_MASK 0x0000007f +#define MSM8916_BASE1_MASK 0xfe000000 +#define MSM8916_BASE0_SHIFT 0 +#define MSM8916_BASE1_SHIFT 25 + +#define MSM8916_S0_P1_MASK 0x00000f80 +#define MSM8916_S1_P1_MASK 0x003e0000 +#define MSM8916_S2_P1_MASK 0xf8000000 +#define MSM8916_S3_P1_MASK 0x000003e0 +#define MSM8916_S4_P1_MASK 0x000f8000 + +#define MSM8916_S0_P2_MASK 0x0001f000 +#define MSM8916_S1_P2_MASK 0x07c00000 +#define MSM8916_S2_P2_MASK 0x0000001f +#define MSM8916_S3_P2_MASK 0x00007c00 +#define MSM8916_S4_P2_MASK 0x01f00000 + +#define MSM8916_S0_P1_SHIFT 7 +#define MSM8916_S1_P1_SHIFT 17 +#define MSM8916_S2_P1_SHIFT 27 +#define MSM8916_S3_P1_SHIFT 5 +#define MSM8916_S4_P1_SHIFT 15 + +#define MSM8916_S0_P2_SHIFT 12 +#define MSM8916_S1_P2_SHIFT 22 +#define MSM8916_S2_P2_SHIFT 0 +#define MSM8916_S3_P2_SHIFT 10 +#define MSM8916_S4_P2_SHIFT 20 + +#define MSM8916_CAL_SEL_MASK 0xe0000000 +#define MSM8916_CAL_SEL_SHIFT 29static int calibrate_8916 (struct tsens_priv *priv) {
@@ -54,27 +54,27 @@ static int calibrate_8916(struct tsens_priv *priv)if (IS_ERR (qfprom_csel))return PTR_ERR (qfprom_csel); - mode = (qfprom_csel[0 ] &CAL_SEL_MASK ) >>CAL_SEL_SHIFT ; + mode = (qfprom_csel[0 ] &MSM8916_CAL_SEL_MASK ) >>MSM8916_CAL_SEL_SHIFT ;dev_dbg (priv->dev,"calibration mode is %d\n" , mode);switch (mode) {case TWO_PT_CALIB : - base1 = (qfprom_cdata[1 ] &BASE1_MASK ) >>BASE1_SHIFT ; - p2[0 ] = (qfprom_cdata[0 ] &S0_P2_MASK ) >>S0_P2_SHIFT ; - p2[1 ] = (qfprom_cdata[0 ] &S1_P2_MASK ) >>S1_P2_SHIFT ; - p2[2 ] = (qfprom_cdata[1 ] &S2_P2_MASK ) >>S2_P2_SHIFT ; - p2[3 ] = (qfprom_cdata[1 ] &S3_P2_MASK ) >>S3_P2_SHIFT ; - p2[4 ] = (qfprom_cdata[1 ] &S4_P2_MASK ) >>S4_P2_SHIFT ; + base1 = (qfprom_cdata[1 ] &MSM8916_BASE1_MASK ) >>MSM8916_BASE1_SHIFT ; + p2[0 ] = (qfprom_cdata[0 ] &MSM8916_S0_P2_MASK ) >>MSM8916_S0_P2_SHIFT ; + p2[1 ] = (qfprom_cdata[0 ] &MSM8916_S1_P2_MASK ) >>MSM8916_S1_P2_SHIFT ; + p2[2 ] = (qfprom_cdata[1 ] &MSM8916_S2_P2_MASK ) >>MSM8916_S2_P2_SHIFT ; + p2[3 ] = (qfprom_cdata[1 ] &MSM8916_S3_P2_MASK ) >>MSM8916_S3_P2_SHIFT ; + p2[4 ] = (qfprom_cdata[1 ] &MSM8916_S4_P2_MASK ) >>MSM8916_S4_P2_SHIFT ;for (i =0 ; i < priv->num_sensors; i++) p2[i] = ((base1 + p2[i]) <<3 );/* Fall through */ case ONE_PT_CALIB2 : - base0 = (qfprom_cdata[0 ] &BASE0_MASK ); - p1[0 ] = (qfprom_cdata[0 ] &S0_P1_MASK ) >>S0_P1_SHIFT ; - p1[1 ] = (qfprom_cdata[0 ] &S1_P1_MASK ) >>S1_P1_SHIFT ; - p1[2 ] = (qfprom_cdata[0 ] &S2_P1_MASK ) >>S2_P1_SHIFT ; - p1[3 ] = (qfprom_cdata[1 ] &S3_P1_MASK ) >>S3_P1_SHIFT ; - p1[4 ] = (qfprom_cdata[1 ] &S4_P1_MASK ) >>S4_P1_SHIFT ; + base0 = (qfprom_cdata[0 ] &MSM8916_BASE0_MASK ); + p1[0 ] = (qfprom_cdata[0 ] &MSM8916_S0_P1_MASK ) >>MSM8916_S0_P1_SHIFT ; + p1[1 ] = (qfprom_cdata[0 ] &MSM8916_S1_P1_MASK ) >>MSM8916_S1_P1_SHIFT ; + p1[2 ] = (qfprom_cdata[0 ] &MSM8916_S2_P1_MASK ) >>MSM8916_S2_P1_SHIFT ; + p1[3 ] = (qfprom_cdata[1 ] &MSM8916_S3_P1_MASK ) >>MSM8916_S3_P1_SHIFT ; + p1[4 ] = (qfprom_cdata[1 ] &MSM8916_S4_P1_MASK ) >>MSM8916_S4_P1_SHIFT ;for (i =0 ; i < priv->num_sensors; i++) p1[i] = (((base0) + p1[i]) <<3 );break ;
Signature · 1 line
2.17.1
PATCH v3 9/23 drivers: thermal: tsens: Merge tsens-8974 into tsens-v0_1
In reply to Amit Kucheria8974 and 8916 have the same version of the TSENS IP. Merge the files to allow for better code reuse.
--- drivers/thermal/qcom/Makefile | 2 +- drivers/thermal/qcom/tsens-8974.c | 236 ------------------------------ drivers/thermal/qcom/tsens-v0_1.c | 229 +++++++++++++++++++++++++++++ drivers/thermal/qcom/tsens.h | 8 +- 4 files changed, 236 insertions(+), 239 deletions(-) delete mode 100644 drivers/thermal/qcom/tsens-8974.c
drivers/thermal/qcom/Makefile +1 -1
@@ -1,3 +1,3 @@ obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o -qcom_tsens-y += tsens.o tsens-common.o tsens-v0_1.o tsens-8974.o tsens-8960.o tsens-v2.o +qcom_tsens-y += tsens.o tsens-common.o tsens-v0_1.o tsens-8960.o tsens-v2.o obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM) += qcom-spmi-temp-alarm.o
drivers/thermal/qcom/tsens-8974.c deleted +0 -236
236 lines not on this page · raw message
drivers/thermal/qcom/tsens-v0_1.c +229 -0
244 lines not on this page · raw message
drivers/thermal/qcom/tsens.h +6 -2
@@ -116,8 +116,12 @@ void compute_intercept_slope(struct tsens_priv *priv, u32 *pt1, u32 *pt2, u32 moint init_common (struct tsens_priv *priv);int get_temp_common (struct tsens_priv *priv,int i,int *temp); -/* TSENS v1 targets */ -extern const struct tsens_plat_data data_8916, data_8974, data_8960; +/* TSENS target */ +extern const struct tsens_plat_data data_8960; + +/* TSENS v0.1 targets */ +extern const struct tsens_plat_data data_8916, data_8974; +/* TSENS v2 targets */ extern const struct tsens_plat_data data_8996, data_tsens_v2;
Signature · 1 line
2.17.1
PATCH v3 10/23 drivers: thermal: tsens: Introduce reg_fields to deal with register description
In reply to Amit KucheriaAs we add support for newer versions of the TSENS IP, the current approach isn't scaling because registers and bitfields get moved around, requiring platform-specific hacks in the code. By moving to regmap, we can hide the register level differences away from the code.
Define a common set of registers and bit-fields that we care about across the various tsens IP versions.
--- drivers/thermal/qcom/tsens-common.c | 62 +++++---- drivers/thermal/qcom/tsens-v0_1.c | 50 ++++++- drivers/thermal/qcom/tsens-v2.c | 105 ++++++++++---- drivers/thermal/qcom/tsens.c | 5 +- drivers/thermal/qcom/tsens.h | 206 +++++++++++++++++++++++++++- 5 files changed, 370 insertions(+), 58 deletions(-)
drivers/thermal/qcom/tsens-common.c +39 -23
@@ -12,13 +12,6 @@#include <linux/regmap.h> #include "tsens.h" -/* SROT */ -#define TSENS_EN BIT(0) - -/* TM */ -#define STATUS_OFFSET 0x30 -#define SN_ADDR_OFFSET 0x4 -#define SN_ST_TEMP_MASK 0x3ff#define CAL_DEGC_PT1 30#define CAL_DEGC_PT2 120#define SLOPE_FACTOR 1000
@@ -95,18 +88,14 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s)return degc; } -int get_temp_common (struct tsens_priv *priv,int id,int *temp) +int get_temp_common (struct tsens_priv *priv,int i,int *temp) { -struct tsens_sensor *s = &priv->sensor[id]; -u32 code; -unsigned int status_reg; +struct tsens_sensor *s = &priv->sensor[i];int last_temp =0 , ret; - status_reg = priv->tm_offset +STATUS_OFFSET + s->hw_id *SN_ADDR_OFFSET ; - ret =regmap_read (priv->tm_map, status_reg, &code); + ret =regmap_field_read (priv->rf[LAST_TEMP_0 + s->hw_id], &last_temp);if (ret)return ret; - last_temp = code &SN_ST_TEMP_MASK ; *temp =code_to_degc (last_temp, s) *1000 ;
@@ -131,10 +120,9 @@ int __init init_common(struct tsens_priv *priv) {void __iomem *tm_base, *srot_base;struct resource *res; -u32 code; -int ret; +u32 enabled; +int ret, i, j;struct platform_device *op =of_find_device_by_node (priv->dev->of_node); -u16 ctrl_offset = priv->reg_offsets[SROT_CTRL_OFFSET ];if (!op)return -EINVAL ;
@@ -173,13 +161,41 @@ int __init init_common(struct tsens_priv *priv) goto err_put_device; } -if (priv->srot_map) { - ret =regmap_read (priv->srot_map, ctrl_offset, &code); -if (ret) + priv->rf[TSENS_EN ] =devm_regmap_field_alloc (priv->dev, priv->srot_map, + priv->fields[TSENS_EN ]); +if (IS_ERR (priv->rf[TSENS_EN ])) { + ret =PTR_ERR (priv->rf[TSENS_EN ]); + goto err_put_device; + } + ret =regmap_field_read (priv->rf[TSENS_EN ], &enabled); +if (ret) + goto err_put_device; +if (!enabled) { +dev_err (priv->dev,"tsens device is not enabled\n" ); + ret = -ENODEV ; + goto err_put_device; + } + + priv->rf[SENSOR_EN ] =devm_regmap_field_alloc (priv->dev, priv->srot_map, + priv->fields[SENSOR_EN ]); +if (IS_ERR (priv->rf[SENSOR_EN ])) { + ret =PTR_ERR (priv->rf[SENSOR_EN ]); + goto err_put_device; + } +/* now alloc regmap_fields in tm_map */ +for (i =0 , j =LAST_TEMP_0 ; i < priv->num_sensors; i++, j++) { + priv->rf[j] =devm_regmap_field_alloc (priv->dev, priv->tm_map, + priv->fields[j]); +if (IS_ERR (priv->rf[j])) { + ret =PTR_ERR (priv->rf[j]); goto err_put_device; -if (!(code &TSENS_EN )) { -dev_err (priv->dev,"tsens device is not enabled\n" ); - ret = -ENODEV ; + } + } +for (i =0 , j =VALID_0 ; i < priv->num_sensors; i++, j++) { + priv->rf[j] =devm_regmap_field_alloc (priv->dev, priv->tm_map, + priv->fields[j]); +if (IS_ERR (priv->rf[j])) { + ret =PTR_ERR (priv->rf[j]); goto err_put_device; } }
drivers/thermal/qcom/tsens-v0_1.c +48 -2
73 lines not on this page · raw message
drivers/thermal/qcom/tsens-v2.c +82 -23
151 lines not on this page · raw message
drivers/thermal/qcom/tsens.c +2 -3
@@ -144,9 +144,8 @@ static int tsens_probe(struct platform_device *pdev)else priv->sensor[i].hw_id = i; } -for (i =0 ; i <REG_ARRAY_SIZE ; i++) { - priv->reg_offsets[i] = data->reg_offsets[i]; - } + priv->feat = data->feat; + priv->fields = data->fields;if (!priv->ops || !priv->ops->init || !priv->ops->get_temp)return -EINVAL ;
drivers/thermal/qcom/tsens.h +199 -7
247 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 11/23 drivers: thermal: tsens: Save reference to the device pointer and use it
In reply to Amit KucheriaCode cleanup making it easier to read
--- drivers/thermal/qcom/tsens-common.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/thermal/qcom/tsens-common.c +8 -7
@@ -119,6 +119,7 @@ static const struct regmap_config tsens_srot_config = {int __init init_common (struct tsens_priv *priv) {void __iomem *tm_base, *srot_base; +struct device *dev = priv->dev;struct resource *res;u32 enabled;int ret, i, j;
@@ -137,7 +138,7 @@ int __init init_common(struct tsens_priv *priv) goto err_put_device; } - priv->srot_map =devm_regmap_init_mmio (priv->dev, srot_base, + priv->srot_map =devm_regmap_init_mmio (dev, srot_base, &tsens_srot_config);if (IS_ERR (priv->srot_map)) { ret =PTR_ERR (priv->srot_map);
@@ -155,13 +156,13 @@ int __init init_common(struct tsens_priv *priv) goto err_put_device; } - priv->tm_map =devm_regmap_init_mmio (priv->dev, tm_base, &tsens_config); + priv->tm_map =devm_regmap_init_mmio (dev, tm_base, &tsens_config);if (IS_ERR (priv->tm_map)) { ret =PTR_ERR (priv->tm_map); goto err_put_device; } - priv->rf[TSENS_EN ] =devm_regmap_field_alloc (priv->dev, priv->srot_map, + priv->rf[TSENS_EN ] =devm_regmap_field_alloc (dev, priv->srot_map, priv->fields[TSENS_EN ]);if (IS_ERR (priv->rf[TSENS_EN ])) { ret =PTR_ERR (priv->rf[TSENS_EN ]);
@@ -171,12 +172,12 @@ int __init init_common(struct tsens_priv *priv)if (ret) goto err_put_device;if (!enabled) { -dev_err (priv->dev,"tsens device is not enabled\n" ); +dev_err (dev,"tsens device is not enabled\n" ); ret = -ENODEV ; goto err_put_device; } - priv->rf[SENSOR_EN ] =devm_regmap_field_alloc (priv->dev, priv->srot_map, + priv->rf[SENSOR_EN ] =devm_regmap_field_alloc (dev, priv->srot_map, priv->fields[SENSOR_EN ]);if (IS_ERR (priv->rf[SENSOR_EN ])) { ret =PTR_ERR (priv->rf[SENSOR_EN ]);
@@ -184,7 +185,7 @@ int __init init_common(struct tsens_priv *priv) }/* now alloc regmap_fields in tm_map */ for (i =0 , j =LAST_TEMP_0 ; i < priv->num_sensors; i++, j++) { - priv->rf[j] =devm_regmap_field_alloc (priv->dev, priv->tm_map, + priv->rf[j] =devm_regmap_field_alloc (dev, priv->tm_map, priv->fields[j]);if (IS_ERR (priv->rf[j])) { ret =PTR_ERR (priv->rf[j]);
@@ -192,7 +193,7 @@ int __init init_common(struct tsens_priv *priv) } }for (i =0 , j =VALID_0 ; i < priv->num_sensors; i++, j++) { - priv->rf[j] =devm_regmap_field_alloc (priv->dev, priv->tm_map, + priv->rf[j] =devm_regmap_field_alloc (dev, priv->tm_map, priv->fields[j]);if (IS_ERR (priv->rf[j])) { ret =PTR_ERR (priv->rf[j]);
Signature · 1 line
2.17.1
PATCH v3 12/23 drivers: thermal: tsens: Don't print error message on -EPROBE_DEFER
In reply to Amit KucheriaWe print a calibration failure message on -EPROBE_DEFER from nvmem/qfprom as follows:
[ 3.003090] qcom-tsens 4a9000.thermal-sensor: version: 1.4 [ 3.005376] qcom-tsens 4a9000.thermal-sensor: tsens calibration failed [ 3.113248] qcom-tsens 4a9000.thermal-sensor: version: 1.4
This confuses people when, in fact, calibration succeeds later when nvmem/qfprom device is available. Don't print this message on a -EPROBE_DEFER.
--- drivers/thermal/qcom/tsens.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/thermal/qcom/tsens.c +2 -1
@@ -159,7 +159,8 @@ static int tsens_probe(struct platform_device *pdev)if (priv->ops->calibrate) { ret = priv->ops->calibrate (priv);if (ret <0 ) { -dev_err (dev,"tsens calibration failed\n" ); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"tsens calibration failed\n" );return ret; } }
Signature · 1 line
2.17.1
PATCH v3 13/23 drivers: thermal: tsens: Add new operation to check if a sensor is enabled
In reply to Amit Kucheriais_sensor_enabled() checks if the sensors are enabled on this platform. It is possible that the SoC might choose not to enable all the sensors that the IP block is capable of supporting.
--- drivers/thermal/qcom/tsens-common.c | 14 ++++++++++++++ drivers/thermal/qcom/tsens-v0_1.c | 1 + drivers/thermal/qcom/tsens-v2.c | 1 + drivers/thermal/qcom/tsens.c | 5 +++++ drivers/thermal/qcom/tsens.h | 1 + 5 files changed, 22 insertions(+)
drivers/thermal/qcom/tsens-common.c +14 -0
@@ -69,6 +69,20 @@ void compute_intercept_slope(struct tsens_priv *priv, u32 *p1, } } +bool is_sensor_enabled (struct tsens_priv *priv,u32 hw_id) +{ +u32 val; +int ret; + +if ((hw_id > (priv->num_sensors -1 )) || (hw_id <0 )) +return -EINVAL ; + ret =regmap_field_read (priv->rf[SENSOR_EN ], &val); +if (ret) +return ret; + +return val & (1 << hw_id); +} +static inline int code_to_degc (u32 adc_code,const struct tsens_sensor *s) {int degc, num, den;
drivers/thermal/qcom/tsens-v0_1.c +1 -0
@@ -333,6 +333,7 @@ const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = { /* CTRL_OFFSET */ [TSENS_EN] = REG_FIELD(SROT_CTRL_OFF, 0, 0), [TSENS_SW_RST] = REG_FIELD(SROT_CTRL_OFF, 1, 1), + [SENSOR_EN] = REG_FIELD(SROT_CTRL_OFF, 3, 13),/* ----- TM ------ */ /* INTERRUPT ENABLE */
drivers/thermal/qcom/tsens-v2.c +1 -0
@@ -99,6 +99,7 @@ const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = { /* CTRL_OFF */ [TSENS_EN] = REG_FIELD(SROT_CTRL_OFF, 0, 0), [TSENS_SW_RST] = REG_FIELD(SROT_CTRL_OFF, 1, 1), + [SENSOR_EN] = REG_FIELD(SROT_CTRL_OFF, 3, 18),/* ----- TM ------ */ /* INTERRUPT ENABLE */
drivers/thermal/qcom/tsens.c +5 -0
@@ -82,6 +82,11 @@ static int tsens_register(struct tsens_priv *priv)struct thermal_zone_device *tzd;for (i =0 ; i < priv->num_sensors; i++) { +if (!is_sensor_enabled (priv, priv->sensor[i].hw_id)) { +dev_err (priv->dev,"sensor %d: disabled\n" , + priv->sensor[i].hw_id); +continue ; + } priv->sensor[i].priv = priv; priv->sensor[i].id = i; tzd = devm_thermal_zone_of_sensor_register(priv->dev, i,
drivers/thermal/qcom/tsens.h +1 -0
@@ -307,6 +307,7 @@ char *qfprom_read(struct device *dev, const char *cname);void compute_intercept_slope (struct tsens_priv *priv,u32 *pt1,u32 *pt2,u32 mode);int init_common (struct tsens_priv *priv);int get_temp_common (struct tsens_priv *priv,int i,int *temp); +bool is_sensor_enabled (struct tsens_priv *priv,u32 hw_id);/* TSENS target */ extern const struct tsens_plat_data data_8960;
Signature · 1 line
2.17.1
PATCH v3 14/23 drivers: thermal: tsens: change data type for sensor IDs
In reply to Amit KucheriaThe IDs cannot be negative, fix the data type.
--- drivers/thermal/qcom/tsens.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thermal/qcom/tsens.h +2 -2
@@ -35,8 +35,8 @@ struct tsens_sensor {struct tsens_priv *priv;struct thermal_zone_device *tzd;int offset; -int id; -int hw_id; +unsigned int id; +unsigned int hw_id;int slope;u32 status; };
Signature · 1 line
2.17.1
PATCH v3 15/23 drivers: thermal: tsens: Introduce IP-specific max_sensor count
In reply to Amit KucheriaThe IP can support 'm' sensors while the platform can enable 'n' sensors of the 'm' where n <= m.
Track maximum sensors supported by the IP so that we can correctly track what subset of the sensors are supported on the platform.
--- drivers/thermal/qcom/tsens-common.c | 4 ++-- drivers/thermal/qcom/tsens-v0_1.c | 1 + drivers/thermal/qcom/tsens-v2.c | 1 + drivers/thermal/qcom/tsens.h | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-)
drivers/thermal/qcom/tsens-common.c +2 -2
@@ -198,7 +198,7 @@ int __init init_common(struct tsens_priv *priv) goto err_put_device; }/* now alloc regmap_fields in tm_map */ -for (i =0 , j =LAST_TEMP_0 ; i < priv->num_sensors; i++, j++) { +for (i =0 , j =LAST_TEMP_0 ; i < priv->feat->max_sensors; i++, j++) { priv->rf[j] =devm_regmap_field_alloc (dev, priv->tm_map, priv->fields[j]);if (IS_ERR (priv->rf[j])) {
@@ -206,7 +206,7 @@ int __init init_common(struct tsens_priv *priv) goto err_put_device; } } -for (i =0 , j =VALID_0 ; i < priv->num_sensors; i++, j++) { +for (i =0 , j =VALID_0 ; i < priv->feat->max_sensors; i++, j++) { priv->rf[j] =devm_regmap_field_alloc (dev, priv->tm_map, priv->fields[j]);if (IS_ERR (priv->rf[j])) {
drivers/thermal/qcom/tsens-v0_1.c +1 -0
@@ -324,6 +324,7 @@ const struct tsens_features tsens_v0_1_feat = { .crit_int = 0, .adc = 1, .srot_split = 1, + .max_sensors = 11, };const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS ] = {
drivers/thermal/qcom/tsens-v2.c +1 -0
@@ -88,6 +88,7 @@ const struct tsens_features tsens_v2_feat = { .crit_int = 1, .adc = 0, .srot_split = 1, + .max_sensors = 16, };const struct reg_field tsens_v2_regfields[MAX_REGFIELDS ] = {
drivers/thermal/qcom/tsens.h +2 -0
@@ -242,12 +242,14 @@ enum regfield_ids {* @adc: do the sensors only output adc code (instead of temperature)? * @srot_split: does the IP neatly splits the register space into SROT and TM, * with SROT only being available to secure boot firmware? +* @max_sensors: maximum sensors supported by this version of the IP */ struct tsens_features {unsigned int ver_major;unsigned int crit_int:1 ;unsigned int adc:1 ;unsigned int srot_split:1 ; +unsigned int max_sensors; };/**
Signature · 1 line
2.17.1
PATCH v3 16/23 drivers: thermal: tsens: simplify get_temp_tsens_v2 routine
In reply to Amit KucheriaThe current implementation is based on an algorithm published in the docs. Instead of reading the temperature thrice w/o any explanation, improve the algorithm.
This will become the basis for a common get_temp routine in the future.
--- drivers/thermal/qcom/tsens-v2.c | 55 ++++++++++----------------------- 1 file changed, 17 insertions(+), 38 deletions(-)
drivers/thermal/qcom/tsens-v2.c +17 -38
@@ -25,58 +25,37 @@#define TM_Sn_STATUS_OFF 0x00a0#define TM_TRDY_OFF 0x00e4 -#define LAST_TEMP_MASK 0xfff - -static int get_temp_tsens_v2 (struct tsens_priv *priv,int id,int *temp) +static int get_temp_tsens_v2 (struct tsens_priv *priv,int i,int *temp) { -struct tsens_sensor *s = &priv->sensor[id]; +struct tsens_sensor *s = &priv->sensor[i];u32 temp_idx =LAST_TEMP_0 + s->hw_id;u32 valid_idx =VALID_0 + s->hw_id; -u32 last_temp =0 , last_temp2 =0 , last_temp3 =0 , valid; +u32 last_temp =0 , valid, mask;int ret; - ret =regmap_field_read (priv->rf[temp_idx], &last_temp); -if (ret) -return ret; - ret =regmap_field_read (priv->rf[valid_idx], &valid);if (ret)return ret; - -if (valid) - goto done; - -/* Try a second time */ - ret =regmap_field_read (priv->rf[valid_idx], &valid); -if (ret) -return ret; - ret =regmap_field_read (priv->rf[temp_idx], &last_temp2); -if (ret) -return ret; -if (valid) { - last_temp = last_temp2; - goto done; +while (!valid) { +/* Valid bit is 0 for 6 AHB clock cycles. +* At 19.2MHz, 1 AHB clock is ~60ns. +* We should enter this loop very, very rarely. +*/ +ndelay (400 ); + ret =regmap_field_read (priv->rf[valid_idx], &valid); +if (ret) +return ret; } -/* Try a third/last time */ - ret =regmap_field_read (priv->rf[valid_idx], &valid); -if (ret) -return ret; - ret =regmap_field_read (priv->rf[temp_idx], &last_temp3); +/* Valid bit is set, OK to read the temperature */ + ret =regmap_field_read (priv->rf[temp_idx], &last_temp);if (ret)return ret; -if (valid) { - last_temp = last_temp3; - goto done; - } -if (last_temp == last_temp2) - last_temp = last_temp2; -else if (last_temp2 == last_temp3) - last_temp = last_temp3; -done: + mask =GENMASK (priv->fields[LAST_TEMP_0 ].msb, + priv->fields[LAST_TEMP_0 ].lsb);/* Convert temperature from deciCelsius to milliCelsius */ - *temp =sign_extend32 (last_temp,fls (LAST_TEMP_MASK ) -1 ) *100 ; + *temp =sign_extend32 (last_temp,fls (mask) -1 ) *100 ;return 0 ; }
Signature · 1 line
2.17.1
PATCH v3 17/23 drivers: thermal: tsens: Move get_temp_tsens_v2 to allow sharing
In reply to Amit KucheriaJust rename the function and move it to allow code sharing with future versions of TSENS IP
--- drivers/thermal/qcom/tsens-common.c | 35 +++++++++++++++++++++++++++ drivers/thermal/qcom/tsens-v2.c | 37 +---------------------------- drivers/thermal/qcom/tsens.h | 1 + 3 files changed, 37 insertions(+), 36 deletions(-)
drivers/thermal/qcom/tsens-common.c +35 -0
@@ -102,6 +102,41 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s)return degc; } +int get_temp_tsens_valid (struct tsens_priv *priv,int i,int *temp) +{ +struct tsens_sensor *s = &priv->sensor[i]; +u32 temp_idx =LAST_TEMP_0 + s->hw_id; +u32 valid_idx =VALID_0 + s->hw_id; +u32 last_temp =0 , valid, mask; +int ret; + + ret =regmap_field_read (priv->rf[valid_idx], &valid); +if (ret) +return ret; +while (!valid) { +/* Valid bit is 0 for 6 AHB clock cycles. +* At 19.2MHz, 1 AHB clock is ~60ns. +* We should enter this loop very, very rarely. +*/ +ndelay (400 ); + ret =regmap_field_read (priv->rf[valid_idx], &valid); +if (ret) +return ret; + } + +/* Valid bit is set, OK to read the temperature */ + ret =regmap_field_read (priv->rf[temp_idx], &last_temp); +if (ret) +return ret; + + mask =GENMASK (priv->fields[LAST_TEMP_0 ].msb, + priv->fields[LAST_TEMP_0 ].lsb); +/* Convert temperature from deciCelsius to milliCelsius */ + *temp =sign_extend32 (last_temp,fls (mask) -1 ) *100 ; + +return 0 ; +} +int get_temp_common (struct tsens_priv *priv,int i,int *temp) {struct tsens_sensor *s = &priv->sensor[i];
drivers/thermal/qcom/tsens-v2.c +1 -36
@@ -25,41 +25,6 @@#define TM_Sn_STATUS_OFF 0x00a0#define TM_TRDY_OFF 0x00e4 -static int get_temp_tsens_v2 (struct tsens_priv *priv,int i,int *temp) -{ -struct tsens_sensor *s = &priv->sensor[i]; -u32 temp_idx =LAST_TEMP_0 + s->hw_id; -u32 valid_idx =VALID_0 + s->hw_id; -u32 last_temp =0 , valid, mask; -int ret; - - ret =regmap_field_read (priv->rf[valid_idx], &valid); -if (ret) -return ret; -while (!valid) { -/* Valid bit is 0 for 6 AHB clock cycles. -* At 19.2MHz, 1 AHB clock is ~60ns. -* We should enter this loop very, very rarely. -*/ -ndelay (400 ); - ret =regmap_field_read (priv->rf[valid_idx], &valid); -if (ret) -return ret; - } - -/* Valid bit is set, OK to read the temperature */ - ret =regmap_field_read (priv->rf[temp_idx], &last_temp); -if (ret) -return ret; - - mask =GENMASK (priv->fields[LAST_TEMP_0 ].msb, - priv->fields[LAST_TEMP_0 ].lsb); -/* Convert temperature from deciCelsius to milliCelsius */ - *temp =sign_extend32 (last_temp,fls (mask) -1 ) *100 ; - -return 0 ; -} -/* v2.x: 8996, 8998, sdm845 */ const struct tsens_features tsens_v2_feat = {
@@ -101,7 +66,7 @@ const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = {static const struct tsens_ops ops_generic_v2 = { .init = init_common, - .get_temp = get_temp_tsens_v2, + .get_temp = get_temp_tsens_valid, };const struct tsens_plat_data data_tsens_v2 = {
drivers/thermal/qcom/tsens.h +1 -0
@@ -308,6 +308,7 @@ struct tsens_priv {char *qfprom_read (struct device *dev,const char *cname);void compute_intercept_slope (struct tsens_priv *priv,u32 *pt1,u32 *pt2,u32 mode);int init_common (struct tsens_priv *priv); +int get_temp_tsens_valid (struct tsens_priv *priv,int i,int *temp);int get_temp_common (struct tsens_priv *priv,int i,int *temp);bool is_sensor_enabled (struct tsens_priv *priv,u32 hw_id);
Signature · 1 line
2.17.1
PATCH v3 18/23 drivers: thermal: tsens: Common get_temp() learns to do ADC conversion
In reply to Amit Kucheriaget_temp() learns to return temperature regardless of whether it is returned as ADC code or direct temperature.
--- drivers/thermal/qcom/tsens-common.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/thermal/qcom/tsens-common.c +9 -4
@@ -129,10 +129,15 @@ int get_temp_tsens_valid(struct tsens_priv *priv, int i, int *temp)if (ret)return ret; - mask =GENMASK (priv->fields[LAST_TEMP_0 ].msb, - priv->fields[LAST_TEMP_0 ].lsb); -/* Convert temperature from deciCelsius to milliCelsius */ - *temp =sign_extend32 (last_temp,fls (mask) -1 ) *100 ; +if (priv->feat->adc) { +/* Convert temperature from ADC code to milliCelsius */ + *temp =code_to_degc (last_temp, s) *1000 ; + }else { + mask =GENMASK (priv->fields[LAST_TEMP_0 ].msb, + priv->fields[LAST_TEMP_0 ].lsb); +/* Convert temperature from deciCelsius to milliCelsius */ + *temp =sign_extend32 (last_temp,fls (mask) -1 ) *100 ; + }return 0 ; }
Signature · 1 line
2.17.1
PATCH v3 19/23 dt: thermal: tsens: Add bindings for qcs404
In reply to Amit Kucheriaqcs404 uses v1 of the TSENS IP block. Create a fallback DT property "qcom,tsens-v1" to gather common code
--- .../devicetree/bindings/thermal/qcom-tsens.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
Documentation/devicetree/bindings/thermal/qcom-tsens.txt +14 -0
@@ -6,11 +6,14 @@ Required properties: - "qcom,msm8916-tsens" (MSM8916) - "qcom,msm8974-tsens" (MSM8974) - "qcom,msm8996-tsens" (MSM8996) + - "qcom,qcs404-tsens", "qcom,tsens-v1" (QCS404) - "qcom,msm8998-tsens", "qcom,tsens-v2" (MSM8998) - "qcom,sdm845-tsens", "qcom,tsens-v2" (SDM845) The generic "qcom,tsens-v2" property must be used as a fallback for any SoC with version 2 of the TSENS IP. MSM8996 is the only exception because the generic property did not exist when support was added. + Similarly, the generic "qcom,tsens-v1" property must be used as a fallback for + any SoC with version 1 of the TSENS IP. - reg: Address range of the thermal registers. New platforms containing v2.x.y of the TSENS IP must specify the SROT and TM
@@ -39,3 +42,14 @@ tsens0: thermal-sensor@c263000 { #qcom,sensors = <13>; #thermal-sensor-cells = <1>; }; + +Example 3 (for any platform containing v1 of the TSENS IP): +tsens: thermal-sensor@4a9000 { + compatible = "qcom,qcs404-tsens", "qcom,tsens-v1"; + reg = <0x004a9000 0x1000>, /* TM */ + <0x004a8000 0x1000>; /* SROT */ + nvmem-cells = <&tsens_caldata>; + nvmem-cell-names = "calib"; + #qcom,sensors = <10>; + #thermal-sensor-cells = <1>; + };
Signature · 1 line
2.17.1
PATCH v3 20/23 drivers: thermal: tsens: Add generic support for TSENS v1 IP
In reply to Amit Kucheriaqcs404 has a single TSENS IP block with 10 sensors. It uses version 1.4 of the TSENS IP, functionality for which is encapsulated inside the qcom,tsens-v1 compatible.
--- drivers/thermal/qcom/Makefile | 4 +- drivers/thermal/qcom/tsens-v1.c | 193 ++++++++++++++++++++++++++++++++ drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 3 + 4 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 drivers/thermal/qcom/tsens-v1.c
drivers/thermal/qcom/Makefile +3 -1
@@ -1,3 +1,5 @@ obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o -qcom_tsens-y += tsens.o tsens-common.o tsens-v0_1.o tsens-8960.o tsens-v2.o + +qcom_tsens-y += tsens.o tsens-common.o tsens-v0_1.o \ + tsens-8960.o tsens-v2.o tsens-v1.o obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM) += qcom-spmi-temp-alarm.o
drivers/thermal/qcom/tsens-v1.c new file +193 -0
193 lines not on this page · raw message
drivers/thermal/qcom/tsens.c +3 -0
@@ -63,6 +63,9 @@ static const struct of_device_id tsens_table[] = { }, { .compatible = "qcom,msm8996-tsens", .data = &data_8996, + }, { + .compatible = "qcom,tsens-v1", + .data = &data_tsens_v1, }, { .compatible = "qcom,tsens-v2", .data = &data_tsens_v2,
drivers/thermal/qcom/tsens.h +3 -0
@@ -318,6 +318,9 @@ extern const struct tsens_plat_data data_8960;/* TSENS v0.1 targets */ extern const struct tsens_plat_data data_8916, data_8974; +/* TSENS v1 targets */ +extern const struct tsens_plat_data data_tsens_v1; +/* TSENS v2 targets */ extern const struct tsens_plat_data data_8996, data_tsens_v2;
Signature · 1 line
2.17.1
PATCH v3 21/23 arm64: dts: qcom: qcs404: Add tsens controller
In reply to Amit Kucheriaqcs404 has a single TSENS IP block with 10 sensors. The calibration data is stored in an eeprom (qfprom) that is accessed through the nvmem framework. We add the qfprom node to allow the tsens sensors to be calibrated correctly.
--- arch/arm64/boot/dts/qcom/qcs404.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/arm64/boot/dts/qcom/qcs404.dtsi +20 -0
@@ -259,6 +259,16 @@ reg = <0x00060000 0x6000>; }; + qfprom: qfprom@a4000 { + compatible = "qcom,qfprom"; + reg = <0x000a4000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + tsens_caldata: caldata@d0 { + reg = <0x1f8 0x14>; + }; + }; + rng: rng@e3000 { compatible = "qcom,prng-ee"; reg = <0x000e3000 0x1000>;
@@ -266,6 +276,16 @@ clock-names = "core"; }; + tsens: thermal-sensor@4a9000 { + compatible = "qcom,qcs404-tsens", "qcom,tsens-v1"; + reg = <0x004a9000 0x1000>, /* TM */ + <0x004a8000 0x1000>; /* SROT */ + nvmem-cells = <&tsens_caldata>; + nvmem-cell-names = "calib"; + #qcom,sensors = <10>; + #thermal-sensor-cells = <1>; + }; + tlmm: pinctrl@1000000 { compatible = "qcom,qcs404-pinctrl"; reg = <0x01000000 0x200000>,
Signature · 1 line
2.17.1
PATCH v3 22/23 arm64: dts: qcom: qcs404: Add thermal zones for each sensor
In reply to Amit Kucheriaqcs404 has 10 sensors connected to the single TSENS IP. Define a thermal zone for each of those sensors to expose the temperature of each zone.
--- arch/arm64/boot/dts/qcom/qcs404.dtsi | 252 +++++++++++++++++++++++++++ 1 file changed, 252 insertions(+)
arch/arm64/boot/dts/qcom/qcs404.dtsi +252 -0
@@ -4,6 +4,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/qcom,gcc-qcs404.h> #include <dt-bindings/clock/qcom,rpmcc.h> +#include <dt-bindings/thermal/thermal.h> / { interrupt-parent = <&intc>;
@@ -31,6 +32,7 @@ reg = <0x100>; enable-method = "psci"; next-level-cache = <&L2_0>; + #cooling-cells= <2>; }; CPU1: cpu@101 {
@@ -39,6 +41,7 @@ reg = <0x101>; enable-method = "psci"; next-level-cache = <&L2_0>; + #cooling-cells= <2>; }; CPU2: cpu@102 {
@@ -47,6 +50,7 @@ reg = <0x102>; enable-method = "psci"; next-level-cache = <&L2_0>; + #cooling-cells= <2>; }; CPU3: cpu@103 {
@@ -55,6 +59,7 @@ reg = <0x103>; enable-method = "psci"; next-level-cache = <&L2_0>; + #cooling-cells= <2>; }; L2_0: l2-cache {
@@ -866,4 +871,251 @@ #interrupt-cells = <2>; }; }; + + thermal-zones { + aoss-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens 0>; + + trips { + aoss_alert0: trip-point@0 { + temperature = <105000>; + hysteresis = <2000>; + type = "hot"; + }; + }; + }; + + q6-hvx-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens 1>; + + trips { + q6_hvx_alert0: trip-point@0 { + temperature = <105000>; + hysteresis = <2000>; + type = "hot"; + }; + }; + }; + + lpass-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens 2>; + + trips { + lpass_alert0: trip-point@0 { + temperature = <105000>; + hysteresis = <2000>; + type = "hot"; + }; + }; + }; + + wlan-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens 3>; + + trips { + wlan_alert0: trip-point@0 { + temperature = <105000>; + hysteresis = <2000>; + type = "hot"; + }; + }; + }; + + cluster-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens 4>; + + trips { + cluster_alert0: trip-point@0 { + temperature = <95000>; + hysteresis = <2000>; + type = "hot"; + }; + cluster_alert1: trip-point@1 { + temperature = <105000>; + hysteresis = <2000>; + type = "passive"; + }; + cluster_crit: cluster_crit { + temperature = <120000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + cooling-maps { + map0 { + trip = <&cluster_alert1>; + cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + cpu0-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens 5>; + + trips { + cpu0_alert0: trip-point@0 { + temperature = <95000>; + hysteresis = <2000>; + type = "hot"; + }; + cpu0_alert1: trip-point@1 { + temperature = <105000>; + hysteresis = <2000>; + type = "passive"; + }; + cpu0_crit: cpu_crit { + temperature = <120000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + cooling-maps { + map0 { + trip = <&cpu0_alert1>; + cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + cpu1-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens 6>; + + trips { + cpu1_alert0: trip-point@0 { + temperature = <95000>; + hysteresis = <2000>; + type = "hot"; + }; + cpu1_alert1: trip-point@1 { + temperature = <105000>; + hysteresis = <2000>; + type = "passive"; + }; + cpu1_crit: cpu_crit { + temperature = <120000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + cooling-maps { + map0 { + trip = <&cpu1_alert1>; + cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + cpu2-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens 7>; + + trips { + cpu2_alert0: trip-point@0 { + temperature = <95000>; + hysteresis = <2000>; + type = "hot"; + }; + cpu2_alert1: trip-point@1 { + temperature = <105000>; + hysteresis = <2000>; + type = "passive"; + }; + cpu2_crit: cpu_crit { + temperature = <120000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + cooling-maps { + map0 { + trip = <&cpu2_alert1>; + cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + cpu3-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens 8>; + + trips { + cpu3_alert0: trip-point@0 { + temperature = <95000>; + hysteresis = <2000>; + type = "hot"; + }; + cpu3_alert1: trip-point@1 { + temperature = <105000>; + hysteresis = <2000>; + type = "passive"; + }; + cpu3_crit: cpu_crit { + temperature = <120000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + cooling-maps { + map0 { + trip = <&cpu3_alert1>; + cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + gpu-thermal { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&tsens 9>; + + trips { + gpu_alert0: trip-point@0 { + temperature = <95000>; + hysteresis = <2000>; + type = "hot"; + }; + }; + }; + }; };
Signature · 1 line
2.17.1
PATCH v3 23/23 drivers: thermal: tsens: Move calibration constants to header file
In reply to Amit KucheriaThis will allow calibration routines to correctly include the constants from anywhere and allow more code sharing.
--- drivers/thermal/qcom/tsens-common.c | 5 ----- drivers/thermal/qcom/tsens.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/thermal/qcom/tsens-common.c +0 -5
@@ -12,11 +12,6 @@#include <linux/regmap.h> #include "tsens.h" -#define CAL_DEGC_PT1 30 -#define CAL_DEGC_PT2 120 -#define SLOPE_FACTOR 1000 -#define SLOPE_DEFAULT 3200 -char *qfprom_read (struct device *dev,const char *cname) {struct nvmem_cell *cell;
drivers/thermal/qcom/tsens.h +5 -0
@@ -9,6 +9,11 @@#define ONE_PT_CALIB 0x1#define ONE_PT_CALIB2 0x2#define TWO_PT_CALIB 0x3 +#define CAL_DEGC_PT1 30 +#define CAL_DEGC_PT2 120 +#define SLOPE_FACTOR 1000 +#define SLOPE_DEFAULT 3200 +#include <linux/thermal.h> #include <linux/regmap.h>
Signature · 1 line
2.17.1
Re: [PATCHv3 21/23] arm64: dts: qcom: qcs404: Add tsens controller
In reply to Amit KucheriaQuoted 7 lines · Amit Kucheria
qcs404 has a single TSENS IP block with 10 sensors. The calibration data is stored in an eeprom (qfprom) that is accessed through the nvmem framework. We add the qfprom node to allow the tsens sensors to be calibrated correctly.
Signed-off-by Amit Kucheria <[email protected]>
Hi Bjorn,
Could you please pick this patch and patch 22 in this series if you have no other review comments? I can resend these separately if required.
The driver (drivers/thermal/qcom/tsens-v1.c) was merged and only these DT changes are pending.
Regards,
Amit
Quoted 45 lines
--- arch/arm64/boot/dts/qcom/qcs404.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)arch/arm64/boot/dts/qcom/qcs404.dtsi +20
-1@@ -259,6 +259,16 @@ reg = <0x00060000 0x6000>; }; + qfprom: qfprom@a4000 { + compatible = "qcom,qfprom"; + reg = <0x000a4000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + tsens_caldata: caldata@d0 { + reg = <0x1f8 0x14>; + }; + }; + rng: rng@e3000 { compatible = "qcom,prng-ee"; reg = <0x000e3000 0x1000>;@@ -266,6 +276,16 @@ clock-names = "core"; }; + tsens: thermal-sensor@4a9000 { + compatible = "qcom,qcs404-tsens", "qcom,tsens-v1"; + reg = <0x004a9000 0x1000>, /* TM */ + <0x004a8000 0x1000>; /* SROT */ + nvmem-cells = <&tsens_caldata>; + nvmem-cell-names = "calib"; + #qcom,sensors = <10>; + #thermal-sensor-cells = <1>; + }; + tlmm: pinctrl@1000000 { compatible = "qcom,qcs404-pinctrl"; reg = <0x01000000 0x200000>, --2.17.1