* [PATCH v3 0/3] Add TSENS support for MSM8956/76
@ 2019-10-05 10:41 kholk11
2019-10-05 10:41 ` [PATCH v3 1/3] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976 kholk11
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: kholk11 @ 2019-10-05 10:41 UTC (permalink / raw)
To: linux-arm-msm
Cc: kholk11, marijns95, agross, daniel.lezcano, robh+dt,
mark.rutland, amit.kucheria
From: AngeloGioacchino Del Regno <kholk11@gmail.com>
Add the TSENS support for MSM8956/76 using TSENS IP v1.
This code has been tested on two Sony phones featuring the Qualcomm
MSM8956 SoC.
Changes in v2:
- Switched documentation to YAML (Amit)
- Changed code style as per request (Amit)
Changes in v3:
- Added suggested kfree in calibrate_8976 (Amit)
- Also fixed the calibrate_v1 for missing kfree(s).
AngeloGioacchino Del Regno (3):
thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976
dt: thermal: tsens: Document compatible for MSM8976/56
thermal: qcom: tsens-v1: Free memory in calibrate_v1 where required
.../bindings/thermal/qcom-tsens.yaml | 2 +
drivers/thermal/qcom/tsens-v1.c | 176 +++++++++++++++++-
drivers/thermal/qcom/tsens.c | 3 +
drivers/thermal/qcom/tsens.h | 2 +-
4 files changed, 180 insertions(+), 3 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v3 1/3] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976 2019-10-05 10:41 [PATCH v3 0/3] Add TSENS support for MSM8956/76 kholk11 @ 2019-10-05 10:41 ` kholk11 2019-10-07 5:12 ` Amit Kucheria 2019-10-05 10:41 ` [PATCH v3 2/3] dt: thermal: tsens: Document compatible for MSM8976/56 kholk11 2019-10-05 10:41 ` [PATCH v3 3/3] thermal: qcom: tsens-v1: Free memory in calibrate_v1 where required kholk11 2 siblings, 1 reply; 9+ messages in thread From: kholk11 @ 2019-10-05 10:41 UTC (permalink / raw) To: linux-arm-msm Cc: kholk11, marijns95, agross, daniel.lezcano, robh+dt, mark.rutland, amit.kucheria From: AngeloGioacchino Del Regno <kholk11@gmail.com> Add support for reading calibrated value from thermistors in MSM8956, MSM8976 and their APQ variants. Signed-off-by: AngeloGioacchino Del Regno <kholk11@gmail.com> --- drivers/thermal/qcom/tsens-v1.c | 171 +++++++++++++++++++++++++++++++- drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 2 +- 3 files changed, 174 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c index 10b595d4f619..3c85a698123a 100644 --- a/drivers/thermal/qcom/tsens-v1.c +++ b/drivers/thermal/qcom/tsens-v1.c @@ -6,6 +6,7 @@ #include <linux/bitops.h> #include <linux/regmap.h> #include <linux/delay.h> +#include <linux/slab.h> #include "tsens.h" /* ----- SROT ------ */ @@ -18,6 +19,68 @@ #define TM_Sn_STATUS_OFF 0x0044 #define TM_TRDY_OFF 0x0084 +/* eeprom layout data for msm8956/76 (v1) */ +#define MSM8976_BASE0_MASK 0xff +#define MSM8976_BASE1_MASK 0xff +#define MSM8976_BASE1_SHIFT 8 + +#define MSM8976_S0_P1_MASK 0x3f00 +#define MSM8976_S1_P1_MASK 0x3f00000 +#define MSM8976_S2_P1_MASK 0x3f +#define MSM8976_S3_P1_MASK 0x3f000 +#define MSM8976_S4_P1_MASK 0x3f00 +#define MSM8976_S5_P1_MASK 0x3f00000 +#define MSM8976_S6_P1_MASK 0x3f +#define MSM8976_S7_P1_MASK 0x3f000 +#define MSM8976_S8_P1_MASK 0x1f8 +#define MSM8976_S9_P1_MASK 0x1f8000 +#define MSM8976_S10_P1_MASK 0xf8000000 +#define MSM8976_S10_P1_MASK_1 0x1 + +#define MSM8976_S0_P2_MASK 0xfc000 +#define MSM8976_S1_P2_MASK 0xfc000000 +#define MSM8976_S2_P2_MASK 0xfc0 +#define MSM8976_S3_P2_MASK 0xfc0000 +#define MSM8976_S4_P2_MASK 0xfc000 +#define MSM8976_S5_P2_MASK 0xfc000000 +#define MSM8976_S6_P2_MASK 0xfc0 +#define MSM8976_S7_P2_MASK 0xfc0000 +#define MSM8976_S8_P2_MASK 0x7e00 +#define MSM8976_S9_P2_MASK 0x7e00000 +#define MSM8976_S10_P2_MASK 0x7e + +#define MSM8976_S0_P1_SHIFT 8 +#define MSM8976_S1_P1_SHIFT 20 +#define MSM8976_S2_P1_SHIFT 0 +#define MSM8976_S3_P1_SHIFT 12 +#define MSM8976_S4_P1_SHIFT 8 +#define MSM8976_S5_P1_SHIFT 20 +#define MSM8976_S6_P1_SHIFT 0 +#define MSM8976_S7_P1_SHIFT 12 +#define MSM8976_S8_P1_SHIFT 3 +#define MSM8976_S9_P1_SHIFT 15 +#define MSM8976_S10_P1_SHIFT 27 +#define MSM8976_S10_P1_SHIFT_1 0 + +#define MSM8976_S0_P2_SHIFT 14 +#define MSM8976_S1_P2_SHIFT 26 +#define MSM8976_S2_P2_SHIFT 6 +#define MSM8976_S3_P2_SHIFT 18 +#define MSM8976_S4_P2_SHIFT 14 +#define MSM8976_S5_P2_SHIFT 26 +#define MSM8976_S6_P2_SHIFT 6 +#define MSM8976_S7_P2_SHIFT 18 +#define MSM8976_S8_P2_SHIFT 9 +#define MSM8976_S9_P2_SHIFT 21 +#define MSM8976_S10_P2_SHIFT 1 + +#define MSM8976_CAL_SEL_MASK 0x3 + +#define MSM8976_CAL_DEGC_PT1 30 +#define MSM8976_CAL_DEGC_PT2 120 +#define MSM8976_SLOPE_FACTOR 1000 +#define MSM8976_SLOPE_DEFAULT 3200 + /* eeprom layout data for qcs404/405 (v1) */ #define BASE0_MASK 0x000007f8 #define BASE1_MASK 0x0007f800 @@ -77,6 +140,30 @@ #define CAL_SEL_MASK 7 #define CAL_SEL_SHIFT 0 +static void compute_intercept_slope_8976(struct tsens_priv *priv, + u32 *p1, u32 *p2, u32 mode) +{ + int i; + + priv->sensor[0].slope = 3313; + priv->sensor[1].slope = 3275; + priv->sensor[2].slope = 3320; + priv->sensor[3].slope = 3246; + priv->sensor[4].slope = 3279; + priv->sensor[5].slope = 3257; + priv->sensor[6].slope = 3234; + priv->sensor[7].slope = 3269; + priv->sensor[8].slope = 3255; + priv->sensor[9].slope = 3239; + priv->sensor[10].slope = 3286; + + for (i = 0; i < priv->num_sensors; i++) { + priv->sensor[i].offset = (p1[i] * MSM8976_SLOPE_FACTOR) - + (MSM8976_CAL_DEGC_PT1 * + priv->sensor[i].slope); + } +} + static int calibrate_v1(struct tsens_priv *priv) { u32 base0 = 0, base1 = 0; @@ -142,7 +229,74 @@ static int calibrate_v1(struct tsens_priv *priv) return 0; } -/* v1.x: qcs404,405 */ +static int calibrate_8976(struct tsens_priv *priv) +{ + int base0 = 0, base1 = 0, i; + u32 p1[11], p2[11]; + int mode = 0, tmp = 0; + u32 *qfprom_cdata; + + qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); + if (IS_ERR(qfprom_cdata)) { + kfree(qfprom_cdata); + return PTR_ERR(qfprom_cdata); + } + + mode = (qfprom_cdata[4] & MSM8976_CAL_SEL_MASK); + dev_dbg(priv->dev, "calibration mode is %d\n", mode); + + switch (mode) { + case TWO_PT_CALIB: + base1 = (qfprom_cdata[2] & MSM8976_BASE1_MASK) >> MSM8976_BASE1_SHIFT; + p2[0] = (qfprom_cdata[0] & MSM8976_S0_P2_MASK) >> MSM8976_S0_P2_SHIFT; + p2[1] = (qfprom_cdata[0] & MSM8976_S1_P2_MASK) >> MSM8976_S1_P2_SHIFT; + p2[2] = (qfprom_cdata[1] & MSM8976_S2_P2_MASK) >> MSM8976_S2_P2_SHIFT; + p2[3] = (qfprom_cdata[1] & MSM8976_S3_P2_MASK) >> MSM8976_S3_P2_SHIFT; + p2[4] = (qfprom_cdata[2] & MSM8976_S4_P2_MASK) >> MSM8976_S4_P2_SHIFT; + p2[5] = (qfprom_cdata[2] & MSM8976_S5_P2_MASK) >> MSM8976_S5_P2_SHIFT; + p2[6] = (qfprom_cdata[3] & MSM8976_S6_P2_MASK) >> MSM8976_S6_P2_SHIFT; + p2[7] = (qfprom_cdata[3] & MSM8976_S7_P2_MASK) >> MSM8976_S7_P2_SHIFT; + p2[8] = (qfprom_cdata[4] & MSM8976_S8_P2_MASK) >> MSM8976_S8_P2_SHIFT; + p2[9] = (qfprom_cdata[4] & MSM8976_S9_P2_MASK) >> MSM8976_S9_P2_SHIFT; + p2[10] = (qfprom_cdata[5] & MSM8976_S10_P2_MASK) >> MSM8976_S10_P2_SHIFT; + + for (i = 0; i < priv->num_sensors; i++) + p2[i] = ((base1 + p2[i]) << 2); + /* Fall through */ + case ONE_PT_CALIB2: + base0 = qfprom_cdata[0] & MSM8976_BASE0_MASK; + p1[0] = (qfprom_cdata[0] & MSM8976_S0_P1_MASK) >> MSM8976_S0_P1_SHIFT; + p1[1] = (qfprom_cdata[0] & MSM8976_S1_P1_MASK) >> MSM8976_S1_P1_SHIFT; + p1[2] = (qfprom_cdata[1] & MSM8976_S2_P1_MASK) >> MSM8976_S2_P1_SHIFT; + p1[3] = (qfprom_cdata[1] & MSM8976_S3_P1_MASK) >> MSM8976_S3_P1_SHIFT; + p1[4] = (qfprom_cdata[2] & MSM8976_S4_P1_MASK) >> MSM8976_S4_P1_SHIFT; + p1[5] = (qfprom_cdata[2] & MSM8976_S5_P1_MASK) >> MSM8976_S5_P1_SHIFT; + p1[6] = (qfprom_cdata[3] & MSM8976_S6_P1_MASK) >> MSM8976_S6_P1_SHIFT; + p1[7] = (qfprom_cdata[3] & MSM8976_S7_P1_MASK) >> MSM8976_S7_P1_SHIFT; + p1[8] = (qfprom_cdata[4] & MSM8976_S8_P1_MASK) >> MSM8976_S8_P1_SHIFT; + p1[9] = (qfprom_cdata[4] & MSM8976_S9_P1_MASK) >> MSM8976_S9_P1_SHIFT; + p1[10] = (qfprom_cdata[4] & MSM8976_S10_P1_MASK) >> MSM8976_S10_P1_SHIFT; + tmp = (qfprom_cdata[5] & MSM8976_S10_P1_MASK_1) << MSM8976_S10_P1_SHIFT_1; + p1[10] |= tmp; + + for (i = 0; i < priv->num_sensors; i++) + p1[i] = (((base0) + p1[i]) << 2); + break; + default: + for (i = 0; i < priv->num_sensors; i++) { + p1[i] = 500; + p2[i] = 780; + } + break; + } + + compute_intercept_slope_8976(priv, p1, p2, mode); + kfree(qfprom_cdata); + + return 0; +} + +/* v1.x: msm8956,8976,qcs404,405 */ static const struct tsens_features tsens_v1_feat = { .ver_major = VER_1_X, @@ -191,3 +345,18 @@ const struct tsens_plat_data data_tsens_v1 = { .feat = &tsens_v1_feat, .fields = tsens_v1_regfields, }; + +static const struct tsens_ops ops_8976 = { + .init = init_common, + .calibrate = calibrate_8976, + .get_temp = get_temp_tsens_valid, +}; + +/* Valid for both MSM8956 and MSM8976. Sensor ID 3 is unused. */ +const struct tsens_plat_data data_8976 = { + .num_sensors = 11, + .ops = &ops_8976, + .hw_ids = (unsigned int[]){0, 1, 2, 4, 5, 6, 7, 8, 9, 10}, + .feat = &tsens_v1_feat, + .fields = tsens_v1_regfields, +}; diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 0627d8615c30..24bb05e0eaf8 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -60,6 +60,9 @@ static const struct of_device_id tsens_table[] = { }, { .compatible = "qcom,msm8974-tsens", .data = &data_8974, + }, { + .compatible = "qcom,msm8976-tsens", + .data = &data_8976, }, { .compatible = "qcom,msm8996-tsens", .data = &data_8996, diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index 2fd94997245b..8efec747bfcb 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -323,7 +323,7 @@ extern const struct tsens_plat_data data_8960; extern const struct tsens_plat_data data_8916, data_8974; /* TSENS v1 targets */ -extern const struct tsens_plat_data data_tsens_v1; +extern const struct tsens_plat_data data_tsens_v1, data_8976; /* TSENS v2 targets */ extern const struct tsens_plat_data data_8996, data_tsens_v2; -- 2.21.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/3] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976 2019-10-05 10:41 ` [PATCH v3 1/3] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976 kholk11 @ 2019-10-07 5:12 ` Amit Kucheria 2019-10-16 17:20 ` Amit Kucheria 0 siblings, 1 reply; 9+ messages in thread From: Amit Kucheria @ 2019-10-07 5:12 UTC (permalink / raw) To: kholk11 Cc: linux-arm-msm, marijns95, Andy Gross, Daniel Lezcano, Rob Herring, Mark Rutland On Sat, Oct 5, 2019 at 4:11 PM <kholk11@gmail.com> wrote: > > From: AngeloGioacchino Del Regno <kholk11@gmail.com> > > Add support for reading calibrated value from thermistors in > MSM8956, MSM8976 and their APQ variants. > > Signed-off-by: AngeloGioacchino Del Regno <kholk11@gmail.com> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> > --- > drivers/thermal/qcom/tsens-v1.c | 171 +++++++++++++++++++++++++++++++- > drivers/thermal/qcom/tsens.c | 3 + > drivers/thermal/qcom/tsens.h | 2 +- > 3 files changed, 174 insertions(+), 2 deletions(-) > > diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c > index 10b595d4f619..3c85a698123a 100644 > --- a/drivers/thermal/qcom/tsens-v1.c > +++ b/drivers/thermal/qcom/tsens-v1.c > @@ -6,6 +6,7 @@ > #include <linux/bitops.h> > #include <linux/regmap.h> > #include <linux/delay.h> > +#include <linux/slab.h> > #include "tsens.h" > > /* ----- SROT ------ */ > @@ -18,6 +19,68 @@ > #define TM_Sn_STATUS_OFF 0x0044 > #define TM_TRDY_OFF 0x0084 > > +/* eeprom layout data for msm8956/76 (v1) */ > +#define MSM8976_BASE0_MASK 0xff > +#define MSM8976_BASE1_MASK 0xff > +#define MSM8976_BASE1_SHIFT 8 > + > +#define MSM8976_S0_P1_MASK 0x3f00 > +#define MSM8976_S1_P1_MASK 0x3f00000 > +#define MSM8976_S2_P1_MASK 0x3f > +#define MSM8976_S3_P1_MASK 0x3f000 > +#define MSM8976_S4_P1_MASK 0x3f00 > +#define MSM8976_S5_P1_MASK 0x3f00000 > +#define MSM8976_S6_P1_MASK 0x3f > +#define MSM8976_S7_P1_MASK 0x3f000 > +#define MSM8976_S8_P1_MASK 0x1f8 > +#define MSM8976_S9_P1_MASK 0x1f8000 > +#define MSM8976_S10_P1_MASK 0xf8000000 > +#define MSM8976_S10_P1_MASK_1 0x1 > + > +#define MSM8976_S0_P2_MASK 0xfc000 > +#define MSM8976_S1_P2_MASK 0xfc000000 > +#define MSM8976_S2_P2_MASK 0xfc0 > +#define MSM8976_S3_P2_MASK 0xfc0000 > +#define MSM8976_S4_P2_MASK 0xfc000 > +#define MSM8976_S5_P2_MASK 0xfc000000 > +#define MSM8976_S6_P2_MASK 0xfc0 > +#define MSM8976_S7_P2_MASK 0xfc0000 > +#define MSM8976_S8_P2_MASK 0x7e00 > +#define MSM8976_S9_P2_MASK 0x7e00000 > +#define MSM8976_S10_P2_MASK 0x7e > + > +#define MSM8976_S0_P1_SHIFT 8 > +#define MSM8976_S1_P1_SHIFT 20 > +#define MSM8976_S2_P1_SHIFT 0 > +#define MSM8976_S3_P1_SHIFT 12 > +#define MSM8976_S4_P1_SHIFT 8 > +#define MSM8976_S5_P1_SHIFT 20 > +#define MSM8976_S6_P1_SHIFT 0 > +#define MSM8976_S7_P1_SHIFT 12 > +#define MSM8976_S8_P1_SHIFT 3 > +#define MSM8976_S9_P1_SHIFT 15 > +#define MSM8976_S10_P1_SHIFT 27 > +#define MSM8976_S10_P1_SHIFT_1 0 > + > +#define MSM8976_S0_P2_SHIFT 14 > +#define MSM8976_S1_P2_SHIFT 26 > +#define MSM8976_S2_P2_SHIFT 6 > +#define MSM8976_S3_P2_SHIFT 18 > +#define MSM8976_S4_P2_SHIFT 14 > +#define MSM8976_S5_P2_SHIFT 26 > +#define MSM8976_S6_P2_SHIFT 6 > +#define MSM8976_S7_P2_SHIFT 18 > +#define MSM8976_S8_P2_SHIFT 9 > +#define MSM8976_S9_P2_SHIFT 21 > +#define MSM8976_S10_P2_SHIFT 1 > + > +#define MSM8976_CAL_SEL_MASK 0x3 > + > +#define MSM8976_CAL_DEGC_PT1 30 > +#define MSM8976_CAL_DEGC_PT2 120 > +#define MSM8976_SLOPE_FACTOR 1000 > +#define MSM8976_SLOPE_DEFAULT 3200 > + > /* eeprom layout data for qcs404/405 (v1) */ > #define BASE0_MASK 0x000007f8 > #define BASE1_MASK 0x0007f800 > @@ -77,6 +140,30 @@ > #define CAL_SEL_MASK 7 > #define CAL_SEL_SHIFT 0 > > +static void compute_intercept_slope_8976(struct tsens_priv *priv, > + u32 *p1, u32 *p2, u32 mode) > +{ > + int i; > + > + priv->sensor[0].slope = 3313; > + priv->sensor[1].slope = 3275; > + priv->sensor[2].slope = 3320; > + priv->sensor[3].slope = 3246; > + priv->sensor[4].slope = 3279; > + priv->sensor[5].slope = 3257; > + priv->sensor[6].slope = 3234; > + priv->sensor[7].slope = 3269; > + priv->sensor[8].slope = 3255; > + priv->sensor[9].slope = 3239; > + priv->sensor[10].slope = 3286; > + > + for (i = 0; i < priv->num_sensors; i++) { > + priv->sensor[i].offset = (p1[i] * MSM8976_SLOPE_FACTOR) - > + (MSM8976_CAL_DEGC_PT1 * > + priv->sensor[i].slope); > + } > +} > + > static int calibrate_v1(struct tsens_priv *priv) > { > u32 base0 = 0, base1 = 0; > @@ -142,7 +229,74 @@ static int calibrate_v1(struct tsens_priv *priv) > return 0; > } > > -/* v1.x: qcs404,405 */ > +static int calibrate_8976(struct tsens_priv *priv) > +{ > + int base0 = 0, base1 = 0, i; > + u32 p1[11], p2[11]; > + int mode = 0, tmp = 0; > + u32 *qfprom_cdata; > + > + qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); > + if (IS_ERR(qfprom_cdata)) { > + kfree(qfprom_cdata); > + return PTR_ERR(qfprom_cdata); > + } > + > + mode = (qfprom_cdata[4] & MSM8976_CAL_SEL_MASK); > + dev_dbg(priv->dev, "calibration mode is %d\n", mode); > + > + switch (mode) { > + case TWO_PT_CALIB: > + base1 = (qfprom_cdata[2] & MSM8976_BASE1_MASK) >> MSM8976_BASE1_SHIFT; > + p2[0] = (qfprom_cdata[0] & MSM8976_S0_P2_MASK) >> MSM8976_S0_P2_SHIFT; > + p2[1] = (qfprom_cdata[0] & MSM8976_S1_P2_MASK) >> MSM8976_S1_P2_SHIFT; > + p2[2] = (qfprom_cdata[1] & MSM8976_S2_P2_MASK) >> MSM8976_S2_P2_SHIFT; > + p2[3] = (qfprom_cdata[1] & MSM8976_S3_P2_MASK) >> MSM8976_S3_P2_SHIFT; > + p2[4] = (qfprom_cdata[2] & MSM8976_S4_P2_MASK) >> MSM8976_S4_P2_SHIFT; > + p2[5] = (qfprom_cdata[2] & MSM8976_S5_P2_MASK) >> MSM8976_S5_P2_SHIFT; > + p2[6] = (qfprom_cdata[3] & MSM8976_S6_P2_MASK) >> MSM8976_S6_P2_SHIFT; > + p2[7] = (qfprom_cdata[3] & MSM8976_S7_P2_MASK) >> MSM8976_S7_P2_SHIFT; > + p2[8] = (qfprom_cdata[4] & MSM8976_S8_P2_MASK) >> MSM8976_S8_P2_SHIFT; > + p2[9] = (qfprom_cdata[4] & MSM8976_S9_P2_MASK) >> MSM8976_S9_P2_SHIFT; > + p2[10] = (qfprom_cdata[5] & MSM8976_S10_P2_MASK) >> MSM8976_S10_P2_SHIFT; > + > + for (i = 0; i < priv->num_sensors; i++) > + p2[i] = ((base1 + p2[i]) << 2); > + /* Fall through */ > + case ONE_PT_CALIB2: > + base0 = qfprom_cdata[0] & MSM8976_BASE0_MASK; > + p1[0] = (qfprom_cdata[0] & MSM8976_S0_P1_MASK) >> MSM8976_S0_P1_SHIFT; > + p1[1] = (qfprom_cdata[0] & MSM8976_S1_P1_MASK) >> MSM8976_S1_P1_SHIFT; > + p1[2] = (qfprom_cdata[1] & MSM8976_S2_P1_MASK) >> MSM8976_S2_P1_SHIFT; > + p1[3] = (qfprom_cdata[1] & MSM8976_S3_P1_MASK) >> MSM8976_S3_P1_SHIFT; > + p1[4] = (qfprom_cdata[2] & MSM8976_S4_P1_MASK) >> MSM8976_S4_P1_SHIFT; > + p1[5] = (qfprom_cdata[2] & MSM8976_S5_P1_MASK) >> MSM8976_S5_P1_SHIFT; > + p1[6] = (qfprom_cdata[3] & MSM8976_S6_P1_MASK) >> MSM8976_S6_P1_SHIFT; > + p1[7] = (qfprom_cdata[3] & MSM8976_S7_P1_MASK) >> MSM8976_S7_P1_SHIFT; > + p1[8] = (qfprom_cdata[4] & MSM8976_S8_P1_MASK) >> MSM8976_S8_P1_SHIFT; > + p1[9] = (qfprom_cdata[4] & MSM8976_S9_P1_MASK) >> MSM8976_S9_P1_SHIFT; > + p1[10] = (qfprom_cdata[4] & MSM8976_S10_P1_MASK) >> MSM8976_S10_P1_SHIFT; > + tmp = (qfprom_cdata[5] & MSM8976_S10_P1_MASK_1) << MSM8976_S10_P1_SHIFT_1; > + p1[10] |= tmp; > + > + for (i = 0; i < priv->num_sensors; i++) > + p1[i] = (((base0) + p1[i]) << 2); > + break; > + default: > + for (i = 0; i < priv->num_sensors; i++) { > + p1[i] = 500; > + p2[i] = 780; > + } > + break; > + } > + > + compute_intercept_slope_8976(priv, p1, p2, mode); > + kfree(qfprom_cdata); > + > + return 0; > +} > + > +/* v1.x: msm8956,8976,qcs404,405 */ > > static const struct tsens_features tsens_v1_feat = { > .ver_major = VER_1_X, > @@ -191,3 +345,18 @@ const struct tsens_plat_data data_tsens_v1 = { > .feat = &tsens_v1_feat, > .fields = tsens_v1_regfields, > }; > + > +static const struct tsens_ops ops_8976 = { > + .init = init_common, > + .calibrate = calibrate_8976, > + .get_temp = get_temp_tsens_valid, > +}; > + > +/* Valid for both MSM8956 and MSM8976. Sensor ID 3 is unused. */ > +const struct tsens_plat_data data_8976 = { > + .num_sensors = 11, > + .ops = &ops_8976, > + .hw_ids = (unsigned int[]){0, 1, 2, 4, 5, 6, 7, 8, 9, 10}, > + .feat = &tsens_v1_feat, > + .fields = tsens_v1_regfields, > +}; > diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c > index 0627d8615c30..24bb05e0eaf8 100644 > --- a/drivers/thermal/qcom/tsens.c > +++ b/drivers/thermal/qcom/tsens.c > @@ -60,6 +60,9 @@ static const struct of_device_id tsens_table[] = { > }, { > .compatible = "qcom,msm8974-tsens", > .data = &data_8974, > + }, { > + .compatible = "qcom,msm8976-tsens", > + .data = &data_8976, > }, { > .compatible = "qcom,msm8996-tsens", > .data = &data_8996, > diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h > index 2fd94997245b..8efec747bfcb 100644 > --- a/drivers/thermal/qcom/tsens.h > +++ b/drivers/thermal/qcom/tsens.h > @@ -323,7 +323,7 @@ extern const struct tsens_plat_data data_8960; > extern const struct tsens_plat_data data_8916, data_8974; > > /* TSENS v1 targets */ > -extern const struct tsens_plat_data data_tsens_v1; > +extern const struct tsens_plat_data data_tsens_v1, data_8976; > > /* TSENS v2 targets */ > extern const struct tsens_plat_data data_8996, data_tsens_v2; > -- > 2.21.0 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/3] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976 2019-10-07 5:12 ` Amit Kucheria @ 2019-10-16 17:20 ` Amit Kucheria 2019-10-16 18:18 ` Daniel Lezcano 0 siblings, 1 reply; 9+ messages in thread From: Amit Kucheria @ 2019-10-16 17:20 UTC (permalink / raw) To: kholk11 Cc: linux-arm-msm, marijns95, Andy Gross, Daniel Lezcano, Rob Herring, Mark Rutland On Mon, Oct 7, 2019 at 10:42 AM Amit Kucheria <amit.kucheria@linaro.org> wrote: > > On Sat, Oct 5, 2019 at 4:11 PM <kholk11@gmail.com> wrote: > > > > From: AngeloGioacchino Del Regno <kholk11@gmail.com> > > > > Add support for reading calibrated value from thermistors in > > MSM8956, MSM8976 and their APQ variants. > > > > Signed-off-by: AngeloGioacchino Del Regno <kholk11@gmail.com> > > Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> Daniel, Could you also pick up patches 1 and 2 in this series with my review tags? Regards, Amit > > --- > > drivers/thermal/qcom/tsens-v1.c | 171 +++++++++++++++++++++++++++++++- > > drivers/thermal/qcom/tsens.c | 3 + > > drivers/thermal/qcom/tsens.h | 2 +- > > 3 files changed, 174 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c > > index 10b595d4f619..3c85a698123a 100644 > > --- a/drivers/thermal/qcom/tsens-v1.c > > +++ b/drivers/thermal/qcom/tsens-v1.c > > @@ -6,6 +6,7 @@ > > #include <linux/bitops.h> > > #include <linux/regmap.h> > > #include <linux/delay.h> > > +#include <linux/slab.h> > > #include "tsens.h" > > > > /* ----- SROT ------ */ > > @@ -18,6 +19,68 @@ > > #define TM_Sn_STATUS_OFF 0x0044 > > #define TM_TRDY_OFF 0x0084 > > > > +/* eeprom layout data for msm8956/76 (v1) */ > > +#define MSM8976_BASE0_MASK 0xff > > +#define MSM8976_BASE1_MASK 0xff > > +#define MSM8976_BASE1_SHIFT 8 > > + > > +#define MSM8976_S0_P1_MASK 0x3f00 > > +#define MSM8976_S1_P1_MASK 0x3f00000 > > +#define MSM8976_S2_P1_MASK 0x3f > > +#define MSM8976_S3_P1_MASK 0x3f000 > > +#define MSM8976_S4_P1_MASK 0x3f00 > > +#define MSM8976_S5_P1_MASK 0x3f00000 > > +#define MSM8976_S6_P1_MASK 0x3f > > +#define MSM8976_S7_P1_MASK 0x3f000 > > +#define MSM8976_S8_P1_MASK 0x1f8 > > +#define MSM8976_S9_P1_MASK 0x1f8000 > > +#define MSM8976_S10_P1_MASK 0xf8000000 > > +#define MSM8976_S10_P1_MASK_1 0x1 > > + > > +#define MSM8976_S0_P2_MASK 0xfc000 > > +#define MSM8976_S1_P2_MASK 0xfc000000 > > +#define MSM8976_S2_P2_MASK 0xfc0 > > +#define MSM8976_S3_P2_MASK 0xfc0000 > > +#define MSM8976_S4_P2_MASK 0xfc000 > > +#define MSM8976_S5_P2_MASK 0xfc000000 > > +#define MSM8976_S6_P2_MASK 0xfc0 > > +#define MSM8976_S7_P2_MASK 0xfc0000 > > +#define MSM8976_S8_P2_MASK 0x7e00 > > +#define MSM8976_S9_P2_MASK 0x7e00000 > > +#define MSM8976_S10_P2_MASK 0x7e > > + > > +#define MSM8976_S0_P1_SHIFT 8 > > +#define MSM8976_S1_P1_SHIFT 20 > > +#define MSM8976_S2_P1_SHIFT 0 > > +#define MSM8976_S3_P1_SHIFT 12 > > +#define MSM8976_S4_P1_SHIFT 8 > > +#define MSM8976_S5_P1_SHIFT 20 > > +#define MSM8976_S6_P1_SHIFT 0 > > +#define MSM8976_S7_P1_SHIFT 12 > > +#define MSM8976_S8_P1_SHIFT 3 > > +#define MSM8976_S9_P1_SHIFT 15 > > +#define MSM8976_S10_P1_SHIFT 27 > > +#define MSM8976_S10_P1_SHIFT_1 0 > > + > > +#define MSM8976_S0_P2_SHIFT 14 > > +#define MSM8976_S1_P2_SHIFT 26 > > +#define MSM8976_S2_P2_SHIFT 6 > > +#define MSM8976_S3_P2_SHIFT 18 > > +#define MSM8976_S4_P2_SHIFT 14 > > +#define MSM8976_S5_P2_SHIFT 26 > > +#define MSM8976_S6_P2_SHIFT 6 > > +#define MSM8976_S7_P2_SHIFT 18 > > +#define MSM8976_S8_P2_SHIFT 9 > > +#define MSM8976_S9_P2_SHIFT 21 > > +#define MSM8976_S10_P2_SHIFT 1 > > + > > +#define MSM8976_CAL_SEL_MASK 0x3 > > + > > +#define MSM8976_CAL_DEGC_PT1 30 > > +#define MSM8976_CAL_DEGC_PT2 120 > > +#define MSM8976_SLOPE_FACTOR 1000 > > +#define MSM8976_SLOPE_DEFAULT 3200 > > + > > /* eeprom layout data for qcs404/405 (v1) */ > > #define BASE0_MASK 0x000007f8 > > #define BASE1_MASK 0x0007f800 > > @@ -77,6 +140,30 @@ > > #define CAL_SEL_MASK 7 > > #define CAL_SEL_SHIFT 0 > > > > +static void compute_intercept_slope_8976(struct tsens_priv *priv, > > + u32 *p1, u32 *p2, u32 mode) > > +{ > > + int i; > > + > > + priv->sensor[0].slope = 3313; > > + priv->sensor[1].slope = 3275; > > + priv->sensor[2].slope = 3320; > > + priv->sensor[3].slope = 3246; > > + priv->sensor[4].slope = 3279; > > + priv->sensor[5].slope = 3257; > > + priv->sensor[6].slope = 3234; > > + priv->sensor[7].slope = 3269; > > + priv->sensor[8].slope = 3255; > > + priv->sensor[9].slope = 3239; > > + priv->sensor[10].slope = 3286; > > + > > + for (i = 0; i < priv->num_sensors; i++) { > > + priv->sensor[i].offset = (p1[i] * MSM8976_SLOPE_FACTOR) - > > + (MSM8976_CAL_DEGC_PT1 * > > + priv->sensor[i].slope); > > + } > > +} > > + > > static int calibrate_v1(struct tsens_priv *priv) > > { > > u32 base0 = 0, base1 = 0; > > @@ -142,7 +229,74 @@ static int calibrate_v1(struct tsens_priv *priv) > > return 0; > > } > > > > -/* v1.x: qcs404,405 */ > > +static int calibrate_8976(struct tsens_priv *priv) > > +{ > > + int base0 = 0, base1 = 0, i; > > + u32 p1[11], p2[11]; > > + int mode = 0, tmp = 0; > > + u32 *qfprom_cdata; > > + > > + qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); > > + if (IS_ERR(qfprom_cdata)) { > > + kfree(qfprom_cdata); > > + return PTR_ERR(qfprom_cdata); > > + } > > + > > + mode = (qfprom_cdata[4] & MSM8976_CAL_SEL_MASK); > > + dev_dbg(priv->dev, "calibration mode is %d\n", mode); > > + > > + switch (mode) { > > + case TWO_PT_CALIB: > > + base1 = (qfprom_cdata[2] & MSM8976_BASE1_MASK) >> MSM8976_BASE1_SHIFT; > > + p2[0] = (qfprom_cdata[0] & MSM8976_S0_P2_MASK) >> MSM8976_S0_P2_SHIFT; > > + p2[1] = (qfprom_cdata[0] & MSM8976_S1_P2_MASK) >> MSM8976_S1_P2_SHIFT; > > + p2[2] = (qfprom_cdata[1] & MSM8976_S2_P2_MASK) >> MSM8976_S2_P2_SHIFT; > > + p2[3] = (qfprom_cdata[1] & MSM8976_S3_P2_MASK) >> MSM8976_S3_P2_SHIFT; > > + p2[4] = (qfprom_cdata[2] & MSM8976_S4_P2_MASK) >> MSM8976_S4_P2_SHIFT; > > + p2[5] = (qfprom_cdata[2] & MSM8976_S5_P2_MASK) >> MSM8976_S5_P2_SHIFT; > > + p2[6] = (qfprom_cdata[3] & MSM8976_S6_P2_MASK) >> MSM8976_S6_P2_SHIFT; > > + p2[7] = (qfprom_cdata[3] & MSM8976_S7_P2_MASK) >> MSM8976_S7_P2_SHIFT; > > + p2[8] = (qfprom_cdata[4] & MSM8976_S8_P2_MASK) >> MSM8976_S8_P2_SHIFT; > > + p2[9] = (qfprom_cdata[4] & MSM8976_S9_P2_MASK) >> MSM8976_S9_P2_SHIFT; > > + p2[10] = (qfprom_cdata[5] & MSM8976_S10_P2_MASK) >> MSM8976_S10_P2_SHIFT; > > + > > + for (i = 0; i < priv->num_sensors; i++) > > + p2[i] = ((base1 + p2[i]) << 2); > > + /* Fall through */ > > + case ONE_PT_CALIB2: > > + base0 = qfprom_cdata[0] & MSM8976_BASE0_MASK; > > + p1[0] = (qfprom_cdata[0] & MSM8976_S0_P1_MASK) >> MSM8976_S0_P1_SHIFT; > > + p1[1] = (qfprom_cdata[0] & MSM8976_S1_P1_MASK) >> MSM8976_S1_P1_SHIFT; > > + p1[2] = (qfprom_cdata[1] & MSM8976_S2_P1_MASK) >> MSM8976_S2_P1_SHIFT; > > + p1[3] = (qfprom_cdata[1] & MSM8976_S3_P1_MASK) >> MSM8976_S3_P1_SHIFT; > > + p1[4] = (qfprom_cdata[2] & MSM8976_S4_P1_MASK) >> MSM8976_S4_P1_SHIFT; > > + p1[5] = (qfprom_cdata[2] & MSM8976_S5_P1_MASK) >> MSM8976_S5_P1_SHIFT; > > + p1[6] = (qfprom_cdata[3] & MSM8976_S6_P1_MASK) >> MSM8976_S6_P1_SHIFT; > > + p1[7] = (qfprom_cdata[3] & MSM8976_S7_P1_MASK) >> MSM8976_S7_P1_SHIFT; > > + p1[8] = (qfprom_cdata[4] & MSM8976_S8_P1_MASK) >> MSM8976_S8_P1_SHIFT; > > + p1[9] = (qfprom_cdata[4] & MSM8976_S9_P1_MASK) >> MSM8976_S9_P1_SHIFT; > > + p1[10] = (qfprom_cdata[4] & MSM8976_S10_P1_MASK) >> MSM8976_S10_P1_SHIFT; > > + tmp = (qfprom_cdata[5] & MSM8976_S10_P1_MASK_1) << MSM8976_S10_P1_SHIFT_1; > > + p1[10] |= tmp; > > + > > + for (i = 0; i < priv->num_sensors; i++) > > + p1[i] = (((base0) + p1[i]) << 2); > > + break; > > + default: > > + for (i = 0; i < priv->num_sensors; i++) { > > + p1[i] = 500; > > + p2[i] = 780; > > + } > > + break; > > + } > > + > > + compute_intercept_slope_8976(priv, p1, p2, mode); > > + kfree(qfprom_cdata); > > + > > + return 0; > > +} > > + > > +/* v1.x: msm8956,8976,qcs404,405 */ > > > > static const struct tsens_features tsens_v1_feat = { > > .ver_major = VER_1_X, > > @@ -191,3 +345,18 @@ const struct tsens_plat_data data_tsens_v1 = { > > .feat = &tsens_v1_feat, > > .fields = tsens_v1_regfields, > > }; > > + > > +static const struct tsens_ops ops_8976 = { > > + .init = init_common, > > + .calibrate = calibrate_8976, > > + .get_temp = get_temp_tsens_valid, > > +}; > > + > > +/* Valid for both MSM8956 and MSM8976. Sensor ID 3 is unused. */ > > +const struct tsens_plat_data data_8976 = { > > + .num_sensors = 11, > > + .ops = &ops_8976, > > + .hw_ids = (unsigned int[]){0, 1, 2, 4, 5, 6, 7, 8, 9, 10}, > > + .feat = &tsens_v1_feat, > > + .fields = tsens_v1_regfields, > > +}; > > diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c > > index 0627d8615c30..24bb05e0eaf8 100644 > > --- a/drivers/thermal/qcom/tsens.c > > +++ b/drivers/thermal/qcom/tsens.c > > @@ -60,6 +60,9 @@ static const struct of_device_id tsens_table[] = { > > }, { > > .compatible = "qcom,msm8974-tsens", > > .data = &data_8974, > > + }, { > > + .compatible = "qcom,msm8976-tsens", > > + .data = &data_8976, > > }, { > > .compatible = "qcom,msm8996-tsens", > > .data = &data_8996, > > diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h > > index 2fd94997245b..8efec747bfcb 100644 > > --- a/drivers/thermal/qcom/tsens.h > > +++ b/drivers/thermal/qcom/tsens.h > > @@ -323,7 +323,7 @@ extern const struct tsens_plat_data data_8960; > > extern const struct tsens_plat_data data_8916, data_8974; > > > > /* TSENS v1 targets */ > > -extern const struct tsens_plat_data data_tsens_v1; > > +extern const struct tsens_plat_data data_tsens_v1, data_8976; > > > > /* TSENS v2 targets */ > > extern const struct tsens_plat_data data_8996, data_tsens_v2; > > -- > > 2.21.0 > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/3] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976 2019-10-16 17:20 ` Amit Kucheria @ 2019-10-16 18:18 ` Daniel Lezcano 0 siblings, 0 replies; 9+ messages in thread From: Daniel Lezcano @ 2019-10-16 18:18 UTC (permalink / raw) To: Amit Kucheria, kholk11 Cc: linux-arm-msm, marijns95, Andy Gross, Rob Herring, Mark Rutland On 16/10/2019 19:20, Amit Kucheria wrote: > On Mon, Oct 7, 2019 at 10:42 AM Amit Kucheria <amit.kucheria@linaro.org> wrote: >> >> On Sat, Oct 5, 2019 at 4:11 PM <kholk11@gmail.com> wrote: >>> >>> From: AngeloGioacchino Del Regno <kholk11@gmail.com> >>> >>> Add support for reading calibrated value from thermistors in >>> MSM8956, MSM8976 and their APQ variants. >>> >>> Signed-off-by: AngeloGioacchino Del Regno <kholk11@gmail.com> >> >> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> > > Daniel, > > Could you also pick up patches 1 and 2 in this series with my review tags? > Done, they are added to the 'testing' branch. They will go to linux-next after a kernelci loop. -- <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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 2/3] dt: thermal: tsens: Document compatible for MSM8976/56 2019-10-05 10:41 [PATCH v3 0/3] Add TSENS support for MSM8956/76 kholk11 2019-10-05 10:41 ` [PATCH v3 1/3] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976 kholk11 @ 2019-10-05 10:41 ` kholk11 2019-10-07 5:11 ` Amit Kucheria 2019-10-05 10:41 ` [PATCH v3 3/3] thermal: qcom: tsens-v1: Free memory in calibrate_v1 where required kholk11 2 siblings, 1 reply; 9+ messages in thread From: kholk11 @ 2019-10-05 10:41 UTC (permalink / raw) To: linux-arm-msm Cc: kholk11, marijns95, agross, daniel.lezcano, robh+dt, mark.rutland, amit.kucheria From: AngeloGioacchino Del Regno <kholk11@gmail.com> Support for MSM8976 and MSM8956 (having tsens ip version 1) has been added to the qcom tsens driver: document the addition here. Signed-off-by: AngeloGioacchino Del Regno <kholk11@gmail.com> --- Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml index 23afc7bf5a44..eef13b9446a8 100644 --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml @@ -29,6 +29,7 @@ properties: - description: v1 of TSENS items: - enum: + - qcom,msm8976-tsens - qcom,qcs404-tsens - const: qcom,tsens-v1 @@ -82,6 +83,7 @@ allOf: enum: - qcom,msm8916-tsens - qcom,msm8974-tsens + - qcom,msm8976-tsens - qcom,qcs404-tsens - qcom,tsens-v0_1 - qcom,tsens-v1 -- 2.21.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/3] dt: thermal: tsens: Document compatible for MSM8976/56 2019-10-05 10:41 ` [PATCH v3 2/3] dt: thermal: tsens: Document compatible for MSM8976/56 kholk11 @ 2019-10-07 5:11 ` Amit Kucheria 0 siblings, 0 replies; 9+ messages in thread From: Amit Kucheria @ 2019-10-07 5:11 UTC (permalink / raw) To: kholk11 Cc: linux-arm-msm, marijns95, Andy Gross, Daniel Lezcano, Rob Herring, Mark Rutland On Sat, Oct 5, 2019 at 4:11 PM <kholk11@gmail.com> wrote: > > From: AngeloGioacchino Del Regno <kholk11@gmail.com> > > Support for MSM8976 and MSM8956 (having tsens ip version 1) has > been added to the qcom tsens driver: document the addition here. > > Signed-off-by: AngeloGioacchino Del Regno <kholk11@gmail.com> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> with the caveat that it needs my yaml conversion patch (part of tsens irq series) to get merged first. > --- > Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml > index 23afc7bf5a44..eef13b9446a8 100644 > --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml > +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml > @@ -29,6 +29,7 @@ properties: > - description: v1 of TSENS > items: > - enum: > + - qcom,msm8976-tsens > - qcom,qcs404-tsens > - const: qcom,tsens-v1 > > @@ -82,6 +83,7 @@ allOf: > enum: > - qcom,msm8916-tsens > - qcom,msm8974-tsens > + - qcom,msm8976-tsens > - qcom,qcs404-tsens > - qcom,tsens-v0_1 > - qcom,tsens-v1 > -- > 2.21.0 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 3/3] thermal: qcom: tsens-v1: Free memory in calibrate_v1 where required 2019-10-05 10:41 [PATCH v3 0/3] Add TSENS support for MSM8956/76 kholk11 2019-10-05 10:41 ` [PATCH v3 1/3] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976 kholk11 2019-10-05 10:41 ` [PATCH v3 2/3] dt: thermal: tsens: Document compatible for MSM8976/56 kholk11 @ 2019-10-05 10:41 ` kholk11 2019-10-07 5:09 ` Amit Kucheria 2 siblings, 1 reply; 9+ messages in thread From: kholk11 @ 2019-10-05 10:41 UTC (permalink / raw) To: linux-arm-msm Cc: kholk11, marijns95, agross, daniel.lezcano, robh+dt, mark.rutland, amit.kucheria From: AngeloGioacchino Del Regno <kholk11@gmail.com> The calibrate_v1 function allocates the qfprom_cdata variable during qfprom_read, but it never gets freed: properly kfree it. Signed-off-by: AngeloGioacchino Del Regno <kholk11@gmail.com> --- drivers/thermal/qcom/tsens-v1.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c index 3c85a698123a..017501f37a41 100644 --- a/drivers/thermal/qcom/tsens-v1.c +++ b/drivers/thermal/qcom/tsens-v1.c @@ -173,8 +173,10 @@ static int calibrate_v1(struct tsens_priv *priv) int i; qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); - if (IS_ERR(qfprom_cdata)) + if (IS_ERR(qfprom_cdata)) { + kfree(qfprom_cdata); return PTR_ERR(qfprom_cdata); + } mode = (qfprom_cdata[4] & CAL_SEL_MASK) >> CAL_SEL_SHIFT; dev_dbg(priv->dev, "calibration mode is %d\n", mode); @@ -225,6 +227,7 @@ static int calibrate_v1(struct tsens_priv *priv) } compute_intercept_slope(priv, p1, p2, mode); + kfree(qfprom_cdata); return 0; } -- 2.21.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 3/3] thermal: qcom: tsens-v1: Free memory in calibrate_v1 where required 2019-10-05 10:41 ` [PATCH v3 3/3] thermal: qcom: tsens-v1: Free memory in calibrate_v1 where required kholk11 @ 2019-10-07 5:09 ` Amit Kucheria 0 siblings, 0 replies; 9+ messages in thread From: Amit Kucheria @ 2019-10-07 5:09 UTC (permalink / raw) To: kholk11 Cc: linux-arm-msm, marijns95, Andy Gross, Daniel Lezcano, Rob Herring, Mark Rutland On Sat, Oct 5, 2019 at 4:11 PM <kholk11@gmail.com> wrote: > > From: AngeloGioacchino Del Regno <kholk11@gmail.com> > > The calibrate_v1 function allocates the qfprom_cdata variable > during qfprom_read, but it never gets freed: properly kfree it. This has already been fixed upstream. So this patch isn't required. > Signed-off-by: AngeloGioacchino Del Regno <kholk11@gmail.com> > --- > drivers/thermal/qcom/tsens-v1.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c > index 3c85a698123a..017501f37a41 100644 > --- a/drivers/thermal/qcom/tsens-v1.c > +++ b/drivers/thermal/qcom/tsens-v1.c > @@ -173,8 +173,10 @@ static int calibrate_v1(struct tsens_priv *priv) > int i; > > qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); > - if (IS_ERR(qfprom_cdata)) > + if (IS_ERR(qfprom_cdata)) { > + kfree(qfprom_cdata); > return PTR_ERR(qfprom_cdata); > + } > > mode = (qfprom_cdata[4] & CAL_SEL_MASK) >> CAL_SEL_SHIFT; > dev_dbg(priv->dev, "calibration mode is %d\n", mode); > @@ -225,6 +227,7 @@ static int calibrate_v1(struct tsens_priv *priv) > } > > compute_intercept_slope(priv, p1, p2, mode); > + kfree(qfprom_cdata); > > return 0; > } > -- > 2.21.0 > ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-10-16 18:18 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-10-05 10:41 [PATCH v3 0/3] Add TSENS support for MSM8956/76 kholk11 2019-10-05 10:41 ` [PATCH v3 1/3] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976 kholk11 2019-10-07 5:12 ` Amit Kucheria 2019-10-16 17:20 ` Amit Kucheria 2019-10-16 18:18 ` Daniel Lezcano 2019-10-05 10:41 ` [PATCH v3 2/3] dt: thermal: tsens: Document compatible for MSM8976/56 kholk11 2019-10-07 5:11 ` Amit Kucheria 2019-10-05 10:41 ` [PATCH v3 3/3] thermal: qcom: tsens-v1: Free memory in calibrate_v1 where required kholk11 2019-10-07 5:09 ` Amit Kucheria
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).