* [PATCH v3 1/2] dt-bindings: thermal: tsens: Add msm8992/4 compatibles
@ 2022-05-01 20:20 Konrad Dybcio
2022-05-01 20:20 ` [PATCH v3 2/2] thermal: qcom: tsens-v1: Add support for MSM8992/4 TSENS Konrad Dybcio
0 siblings, 1 reply; 7+ messages in thread
From: Konrad Dybcio @ 2022-05-01 20:20 UTC (permalink / raw)
To: ~postmarketos/upstreaming
Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
jamipkettunen, Konrad Dybcio, Rob Herring, Andy Gross,
Bjorn Andersson, Amit Kucheria, Thara Gopinath,
Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, Rob Herring,
Krzysztof Kozlowski, linux-arm-msm, linux-pm, devicetree,
linux-kernel
Add the compatibles for msm8992/4 TSENS hardware.
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
(no changes)
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 b6406bcc683f..08e6764152ec 100644
--- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
+++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml
@@ -37,6 +37,8 @@ properties:
items:
- enum:
- qcom,msm8976-tsens
+ - qcom,msm8992-tsens
+ - qcom,msm8994-tsens
- qcom,qcs404-tsens
- const: qcom,tsens-v1
--
2.36.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] thermal: qcom: tsens-v1: Add support for MSM8992/4 TSENS
2022-05-01 20:20 [PATCH v3 1/2] dt-bindings: thermal: tsens: Add msm8992/4 compatibles Konrad Dybcio
@ 2022-05-01 20:20 ` Konrad Dybcio
2022-06-27 14:55 ` Konrad Dybcio
2022-06-27 15:15 ` Dmitry Baryshkov
0 siblings, 2 replies; 7+ messages in thread
From: Konrad Dybcio @ 2022-05-01 20:20 UTC (permalink / raw)
To: ~postmarketos/upstreaming
Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
jamipkettunen, Konrad Dybcio, Amit Kucheria, Thara Gopinath,
Andy Gross, Bjorn Andersson, Rafael J. Wysocki, Daniel Lezcano,
Zhang Rui, linux-pm, linux-arm-msm, linux-kernel
MSM8994, despite being heavily based on MSM8974, uses the
1.2 version of TSENS. Also, 8994 being 8994, it has a custom
way of calculating the slope.
MSM8992 in turn is a cut-down version of MSM8994 and uses
the same TSENS hardware, albeit with a different set of sensors.
Also tested on 8976 (by a person who didn't want to be named)
to make sure the 11->16 max_sensors changes didn't break anything.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
Changes since v2:
- don't use slope before it's initialized (whoops!)
- don't re-assign the same value to p[0..15]
- free calib_rsel
- use the same ops for 8992 and 8994
drivers/thermal/qcom/tsens-v1.c | 293 ++++++++++++++++++++++++++++++--
drivers/thermal/qcom/tsens.c | 6 +
drivers/thermal/qcom/tsens.h | 2 +-
3 files changed, 288 insertions(+), 13 deletions(-)
diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
index 573e261ccca7..58864962f370 100644
--- a/drivers/thermal/qcom/tsens-v1.c
+++ b/drivers/thermal/qcom/tsens-v1.c
@@ -142,6 +142,99 @@
#define CAL_SEL_MASK 7
#define CAL_SEL_SHIFT 0
+/* eeprom layout data for 8994 */
+#define MSM8994_BASE0_MASK 0x3ff
+#define MSM8994_BASE1_MASK 0xffc00
+#define MSM8994_BASE0_SHIFT 0
+#define MSM8994_BASE1_SHIFT 10
+
+#define MSM8994_S0_MASK 0xf00000
+#define MSM8994_S1_MASK 0xf000000
+#define MSM8994_S2_MASK 0xf0000000
+#define MSM8994_S3_MASK 0xf
+#define MSM8994_S4_MASK 0xf0
+#define MSM8994_S5_MASK 0xf00
+#define MSM8994_S6_MASK 0xf000
+#define MSM8994_S7_MASK 0xf0000
+#define MSM8994_S8_MASK 0xf00000
+#define MSM8994_S9_MASK 0xf000000
+#define MSM8994_S10_MASK 0xf0000000
+#define MSM8994_S11_MASK 0xf
+#define MSM8994_S12_MASK 0xf0
+#define MSM8994_S13_MASK 0xf00
+#define MSM8994_S14_MASK 0xf000
+#define MSM8994_S15_MASK 0xf0000
+
+#define MSM8994_S0_SHIFT 20
+#define MSM8994_S1_SHIFT 24
+#define MSM8994_S2_SHIFT 28
+#define MSM8994_S3_SHIFT 0
+#define MSM8994_S4_SHIFT 4
+#define MSM8994_S5_SHIFT 8
+#define MSM8994_S6_SHIFT 12
+#define MSM8994_S7_SHIFT 16
+#define MSM8994_S8_SHIFT 20
+#define MSM8994_S9_SHIFT 24
+#define MSM8994_S10_SHIFT 28
+#define MSM8994_S11_SHIFT 0
+#define MSM8994_S12_SHIFT 4
+#define MSM8994_S13_SHIFT 8
+#define MSM8994_S14_SHIFT 12
+#define MSM8994_S15_SHIFT 16
+
+#define MSM8994_CAL_SEL_MASK 0x700000
+#define MSM8994_CAL_SEL_SHIFT 20
+
+#define MSM8994_BASE0_REDUN_MASK 0x7fe00000
+#define MSM8994_BASE1_BIT0_REDUN_MASK 0x80000000
+#define MSM8994_BASE1_BIT1_9_REDUN_MASK 0x1ff
+#define MSM8994_BASE0_REDUN_SHIFT 21
+#define MSM8994_BASE1_BIT0_REDUN_SHIFT_COMPUTE 31
+
+#define MSM8994_S0_REDUN_MASK 0x1e00
+#define MSM8994_S1_REDUN_MASK 0x1e000
+#define MSM8994_S2_REDUN_MASK 0x1e0000
+#define MSM8994_S3_REDUN_MASK 0x1e00000
+#define MSM8994_S4_REDUN_MASK 0x1e000000
+#define MSM8994_S5_REDUN_MASK_BIT0_2 0xe0000000
+#define MSM8994_S5_REDUN_MASK_BIT3 0x800000
+#define MSM8994_S6_REDUN_MASK 0xf000000
+#define MSM8994_S7_REDUN_MASK 0xf0000000
+#define MSM8994_S8_REDUN_MASK 0xf
+#define MSM8994_S9_REDUN_MASK 0xf0
+#define MSM8994_S10_REDUN_MASK 0xf00
+#define MSM8994_S11_REDUN_MASK 0xf000
+#define MSM8994_S12_REDUN_MASK 0xf0000
+#define MSM8994_S13_REDUN_MASK 0xf00000
+#define MSM8994_S14_REDUN_MASK 0xf000000
+#define MSM8994_S15_REDUN_MASK 0xf0000000
+
+#define MSM8994_S0_REDUN_SHIFT 9
+#define MSM8994_S1_REDUN_SHIFT 13
+#define MSM8994_S2_REDUN_SHIFT 17
+#define MSM8994_S3_REDUN_SHIFT 21
+#define MSM8994_S4_REDUN_SHIFT 25
+#define MSM8994_S5_REDUN_SHIFT_BIT0_2 29
+#define MSM8994_S5_REDUN_SHIFT_BIT3 23
+#define MSM8994_S6_REDUN_SHIFT 24
+#define MSM8994_S7_REDUN_SHIFT 28
+#define MSM8994_S8_REDUN_SHIFT 0
+#define MSM8994_S9_REDUN_SHIFT 4
+#define MSM8994_S10_REDUN_SHIFT 8
+#define MSM8994_S11_REDUN_SHIFT 12
+#define MSM8994_S12_REDUN_SHIFT 16
+#define MSM8994_S13_REDUN_SHIFT 20
+#define MSM8994_S14_REDUN_SHIFT 24
+#define MSM8994_S15_REDUN_SHIFT 28
+
+#define MSM8994_REDUN_SEL_MASK 0x7
+#define MSM8994_CAL_SEL_REDUN_MASK 0xe0000000
+#define MSM8994_CAL_SEL_REDUN_SHIFT 29
+
+#define BKP_SEL 0x3
+#define BKP_REDUN_SEL 0xe0000000
+#define BKP_REDUN_SHIFT 29
+
static void compute_intercept_slope_8976(struct tsens_priv *priv,
u32 *p1, u32 *p2, u32 mode)
{
@@ -166,6 +259,29 @@ static void compute_intercept_slope_8976(struct tsens_priv *priv,
}
}
+/* HW-specific calculations forwardported from msm-3.10 kernel */
+static void compute_intercept_slope_8994(struct tsens_priv *priv,
+ u32 base0, u32 base1, u32 *p, u32 mode)
+{
+ int adc_code_of_tempx, i, num, den, slope;
+
+ /* slope (m, dy/dx) = SLOPE_FACTOR * (adc_code2 - adc_code1)/(temp_120_degc - temp_30_degc) */
+ num = (base1 - base0) * SLOPE_FACTOR;
+ den = CAL_DEGC_PT2 - CAL_DEGC_PT1;
+ slope = num / den;
+
+ for (i = 0; i < priv->num_sensors; i++) {
+ adc_code_of_tempx = base0 + p[i];
+ priv->sensor[i].slope = (mode == TWO_PT_CALIB) ? slope : SLOPE_DEFAULT;
+
+ priv->sensor[i].offset = (adc_code_of_tempx * SLOPE_FACTOR) -
+ (CAL_DEGC_PT1 * priv->sensor[i].slope);
+
+ dev_dbg(priv->dev, "%s: offset:%d, slope:%d\n", __func__,
+ priv->sensor[i].offset, priv->sensor[i].slope);
+ }
+}
+
static int calibrate_v1(struct tsens_priv *priv)
{
u32 base0 = 0, base1 = 0;
@@ -297,14 +413,145 @@ static int calibrate_8976(struct tsens_priv *priv)
return 0;
}
-/* v1.x: msm8956,8976,qcs404,405 */
+static int calibrate_8994(struct tsens_priv *priv)
+{
+ int base0 = 0, base1 = 0;
+ u32 p[16] = { [0 ... 15] = 532 }; /* HW-specific, undocumented magic value */
+ int mode = 0;
+ u32 *calib0, *calib1, *calib2, *calib_mode, *calib_rsel;
+ u32 calib_redun_sel;
+
+ /* 0x40d0-0x40dc */
+ calib0 = (u32 *)qfprom_read(priv->dev, "calib");
+ if (IS_ERR(calib0))
+ return PTR_ERR(calib0);
+
+ dev_dbg(priv->dev, "%s: calib0: [0] = %u, [1] = %u, [2] = %u\n",
+ __func__, calib0[0], calib0[1], calib0[2]);
+
+ /* 0x41c0-0x41c8 */
+ calib1 = (u32 *)qfprom_read(priv->dev, "calib_redun1_2");
+ if (IS_ERR(calib1))
+ return PTR_ERR(calib1);
+
+ dev_dbg(priv->dev, "%s: calib1: [0] = %u, [1] = %u\n",
+ __func__, calib1[0], calib1[1]);
+
+ /* 0x41cc-0x41d0 */
+ calib2 = (u32 *)qfprom_read(priv->dev, "calib_redun3");
+ if (IS_ERR(calib2))
+ return PTR_ERR(calib2);
+
+ dev_dbg(priv->dev, "%s: calib2: [0] = %u\n", __func__, calib2[0]);
+
+ /* 0x4440-0x4448 */
+ calib_mode = (u32 *)qfprom_read(priv->dev, "calib_redun4_5");
+ if (IS_ERR(calib_mode))
+ return PTR_ERR(calib_mode);
+
+ dev_dbg(priv->dev, "%s: calib_mode: [0] = %u, [1] = %u\n",
+ __func__, calib1[0], calib1[1]);
+
+ /* 0x4464-0x4468 */
+ calib_rsel = (u32 *)qfprom_read(priv->dev, "calib_rsel");
+ if (IS_ERR(calib_mode))
+ return PTR_ERR(calib_mode);
+
+ dev_dbg(priv->dev, "%s: calib_rsel: [0] = %u\n", __func__, calib_rsel[0]);
+
+ calib_redun_sel = calib_rsel[0] & MSM8994_CAL_SEL_REDUN_MASK;
+ calib_redun_sel >>= MSM8994_CAL_SEL_REDUN_SHIFT;
+
+ if (calib_redun_sel == BKP_SEL) {
+ dev_dbg(priv->dev, "%s: Calibrating in REDUN mode, calib_redun_sel = %u",
+ __func__, calib_redun_sel);
+ mode = calib_mode[1] & MSM8994_REDUN_SEL_MASK;
+
+ if (mode == TWO_PT_CALIB) {
+ dev_dbg(priv->dev, "%s: REDUN TWO_PT mode, mode = %u", __func__, mode);
+ base0 = (calib1[0] & MSM8994_BASE0_REDUN_MASK) >> MSM8994_BASE0_REDUN_SHIFT;
+ base1 = (calib1[0] & MSM8994_BASE1_BIT0_REDUN_MASK) >> MSM8994_BASE1_BIT0_REDUN_SHIFT_COMPUTE;
+ base1 |= calib1[1] & MSM8994_BASE1_BIT1_9_REDUN_MASK;
+ p[0] = (calib1[1] & MSM8994_S0_REDUN_MASK) >> MSM8994_S0_REDUN_SHIFT;
+ p[1] = (calib1[1] & MSM8994_S1_REDUN_MASK) >> MSM8994_S1_REDUN_SHIFT;
+ p[2] = (calib1[1] & MSM8994_S2_REDUN_MASK) >> MSM8994_S2_REDUN_SHIFT;
+ p[3] = (calib1[1] & MSM8994_S3_REDUN_MASK) >> MSM8994_S3_REDUN_SHIFT;
+ p[4] = (calib1[1] & MSM8994_S4_REDUN_MASK) >> MSM8994_S4_REDUN_SHIFT;
+ p[5] = (calib1[1] & MSM8994_S5_REDUN_MASK_BIT0_2) >> MSM8994_S5_REDUN_SHIFT_BIT0_2;
+ p[5] |= (calib2[0] & MSM8994_S5_REDUN_MASK_BIT3) >> MSM8994_S5_REDUN_SHIFT_BIT3;
+ p[6] = (calib2[0] & MSM8994_S6_REDUN_MASK) >> MSM8994_S6_REDUN_SHIFT;
+ p[7] = (calib2[0] & MSM8994_S7_REDUN_MASK) >> MSM8994_S7_REDUN_SHIFT;
+ p[8] = (calib2[0] & MSM8994_S8_REDUN_MASK) >> MSM8994_S8_REDUN_SHIFT;
+ p[9] = (calib2[0] & MSM8994_S9_REDUN_MASK) >> MSM8994_S9_REDUN_SHIFT;
+ p[10] = (calib2[0] & MSM8994_S10_REDUN_MASK) >> MSM8994_S10_REDUN_SHIFT;
+ p[11] = (calib2[0] & MSM8994_S11_REDUN_MASK) >> MSM8994_S11_REDUN_SHIFT;
+ p[12] = (calib2[0] & MSM8994_S12_REDUN_MASK) >> MSM8994_S12_REDUN_SHIFT;
+ p[13] = (calib2[0] & MSM8994_S13_REDUN_MASK) >> MSM8994_S13_REDUN_SHIFT;
+ p[14] = (calib2[0] & MSM8994_S14_REDUN_MASK) >> MSM8994_S14_REDUN_SHIFT;
+ p[15] = (calib2[0] & MSM8994_S15_REDUN_MASK) >> MSM8994_S15_REDUN_SHIFT;
+ } else {
+ dev_dbg(priv->dev, "%s: REDUN NON-TWO_PT mode, mode = %u", __func__, mode);
+ }
+ } else {
+ dev_dbg(priv->dev, "%s: Calibrating in NOT-REDUN mode, calib_redun_sel = %u",
+ __func__, calib_redun_sel);
+ mode = (calib0[2] & MSM8994_CAL_SEL_MASK) >> MSM8994_CAL_SEL_SHIFT;
+
+ if (mode == TWO_PT_CALIB) {
+ dev_dbg(priv->dev, "%s: NOT-REDUN TWO_PT mode, mode = %u", __func__, mode);
+ base0 = (calib0[0] & MSM8994_BASE0_MASK) >> MSM8994_BASE0_SHIFT;
+ base1 = (calib0[0] & MSM8994_BASE1_MASK) >> MSM8994_BASE1_SHIFT;
+ p[0] = (calib0[0] & MSM8994_S0_MASK) >> MSM8994_S0_SHIFT;
+ p[1] = (calib0[0] & MSM8994_S1_MASK) >> MSM8994_S1_SHIFT;
+ p[2] = (calib0[1] & MSM8994_S2_MASK) >> MSM8994_S2_SHIFT;
+ p[3] = (calib0[1] & MSM8994_S3_MASK) >> MSM8994_S3_SHIFT;
+ p[4] = (calib0[1] & MSM8994_S4_MASK) >> MSM8994_S4_SHIFT;
+ p[5] = (calib0[1] & MSM8994_S5_MASK) >> MSM8994_S5_SHIFT;
+ p[6] = (calib0[1] & MSM8994_S6_MASK) >> MSM8994_S6_SHIFT;
+ p[7] = (calib0[1] & MSM8994_S7_MASK) >> MSM8994_S7_SHIFT;
+ p[8] = (calib0[1] & MSM8994_S8_MASK) >> MSM8994_S8_SHIFT;
+ p[9] = (calib0[1] & MSM8994_S9_MASK) >> MSM8994_S9_SHIFT;
+ p[10] = (calib0[1] & MSM8994_S10_MASK) >> MSM8994_S10_SHIFT;
+ p[11] = (calib0[2] & MSM8994_S11_MASK) >> MSM8994_S11_SHIFT;
+ p[12] = (calib0[2] & MSM8994_S12_MASK) >> MSM8994_S12_SHIFT;
+ p[13] = (calib0[2] & MSM8994_S13_MASK) >> MSM8994_S13_SHIFT;
+ p[14] = (calib0[2] & MSM8994_S14_MASK) >> MSM8994_S14_SHIFT;
+ p[15] = (calib0[2] & MSM8994_S15_MASK) >> MSM8994_S15_SHIFT;
+ } else {
+ dev_dbg(priv->dev, "%s: NOT-REDUN NON-TWO_PT mode, mode = %u", __func__, mode);
+ /* Keep the init-time 532 value */
+ }
+ }
+
+ /* 8992 features less sensors and remaps some */
+ if (priv->num_sensors == 13) {
+ p[6] = p[7];
+ p[7] = p[9];
+ p[8] = p[10];
+ p[9] = p[11];
+ p[10] = p[12];
+ p[11] = p[13];
+ p[12] = p[14];
+ }
+
+ compute_intercept_slope_8994(priv, base0, base1, p, mode);
+ kfree(calib0);
+ kfree(calib1);
+ kfree(calib2);
+ kfree(calib_mode);
+ kfree(calib_rsel);
+
+ return 0;
+}
+
+/* v1.x: msm8956/8976, msm8994 (v1.2), qcs404/qcs405 */
static struct tsens_features tsens_v1_feat = {
.ver_major = VER_1_X,
.crit_int = 0,
.adc = 1,
.srot_split = 1,
- .max_sensors = 11,
+ .max_sensors = 16,
};
static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {
@@ -323,12 +570,12 @@ static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {
[INT_EN] = REG_FIELD(TM_INT_EN_OFF, 0, 0),
/* UPPER/LOWER TEMPERATURE THRESHOLDS */
- REG_FIELD_FOR_EACH_SENSOR11(LOW_THRESH, TM_Sn_UPPER_LOWER_STATUS_CTRL_OFF, 0, 9),
- REG_FIELD_FOR_EACH_SENSOR11(UP_THRESH, TM_Sn_UPPER_LOWER_STATUS_CTRL_OFF, 10, 19),
+ REG_FIELD_FOR_EACH_SENSOR16(LOW_THRESH, TM_Sn_UPPER_LOWER_STATUS_CTRL_OFF, 0, 9),
+ REG_FIELD_FOR_EACH_SENSOR16(UP_THRESH, TM_Sn_UPPER_LOWER_STATUS_CTRL_OFF, 10, 19),
/* UPPER/LOWER INTERRUPTS [CLEAR/STATUS] */
- REG_FIELD_FOR_EACH_SENSOR11(LOW_INT_CLEAR, TM_Sn_UPPER_LOWER_STATUS_CTRL_OFF, 20, 20),
- REG_FIELD_FOR_EACH_SENSOR11(UP_INT_CLEAR, TM_Sn_UPPER_LOWER_STATUS_CTRL_OFF, 21, 21),
+ REG_FIELD_FOR_EACH_SENSOR16(LOW_INT_CLEAR, TM_Sn_UPPER_LOWER_STATUS_CTRL_OFF, 20, 20),
+ REG_FIELD_FOR_EACH_SENSOR16(UP_INT_CLEAR, TM_Sn_UPPER_LOWER_STATUS_CTRL_OFF, 21, 21),
[LOW_INT_STATUS_0] = REG_FIELD(TM_HIGH_LOW_INT_STATUS_OFF, 0, 0),
[LOW_INT_STATUS_1] = REG_FIELD(TM_HIGH_LOW_INT_STATUS_OFF, 1, 1),
[LOW_INT_STATUS_2] = REG_FIELD(TM_HIGH_LOW_INT_STATUS_OFF, 2, 2),
@@ -349,14 +596,14 @@ static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {
/* NO CRITICAL INTERRUPT SUPPORT on v1 */
/* Sn_STATUS */
- REG_FIELD_FOR_EACH_SENSOR11(LAST_TEMP, TM_Sn_STATUS_OFF, 0, 9),
- REG_FIELD_FOR_EACH_SENSOR11(VALID, TM_Sn_STATUS_OFF, 14, 14),
+ REG_FIELD_FOR_EACH_SENSOR16(LAST_TEMP, TM_Sn_STATUS_OFF, 0, 9),
+ REG_FIELD_FOR_EACH_SENSOR16(VALID, TM_Sn_STATUS_OFF, 14, 14),
/* xxx_STATUS bits: 1 == threshold violated */
- REG_FIELD_FOR_EACH_SENSOR11(MIN_STATUS, TM_Sn_STATUS_OFF, 10, 10),
- REG_FIELD_FOR_EACH_SENSOR11(LOWER_STATUS, TM_Sn_STATUS_OFF, 11, 11),
- REG_FIELD_FOR_EACH_SENSOR11(UPPER_STATUS, TM_Sn_STATUS_OFF, 12, 12),
+ REG_FIELD_FOR_EACH_SENSOR16(MIN_STATUS, TM_Sn_STATUS_OFF, 10, 10),
+ REG_FIELD_FOR_EACH_SENSOR16(LOWER_STATUS, TM_Sn_STATUS_OFF, 11, 11),
+ REG_FIELD_FOR_EACH_SENSOR16(UPPER_STATUS, TM_Sn_STATUS_OFF, 12, 12),
/* No CRITICAL field on v1.x */
- REG_FIELD_FOR_EACH_SENSOR11(MAX_STATUS, TM_Sn_STATUS_OFF, 13, 13),
+ REG_FIELD_FOR_EACH_SENSOR16(MAX_STATUS, TM_Sn_STATUS_OFF, 13, 13),
/* TRDY: 1=ready, 0=in progress */
[TRDY] = REG_FIELD(TM_TRDY_OFF, 0, 0),
@@ -388,3 +635,25 @@ struct tsens_plat_data data_8976 = {
.feat = &tsens_v1_feat,
.fields = tsens_v1_regfields,
};
+
+static const struct tsens_ops ops_8992_8994 = {
+ .init = init_common,
+ .calibrate = calibrate_8994,
+ .get_temp = get_temp_tsens_valid,
+};
+
+struct tsens_plat_data data_8992 = {
+ .num_sensors = 13,
+ .ops = &ops_8992_8994,
+ .hw_ids = (unsigned int []){ 0, 1, 2, 3, 4, 5, 7, 9, 10, 11, 12, 13, 14 },
+ .feat = &tsens_v1_feat,
+ .fields = tsens_v1_regfields,
+};
+
+struct tsens_plat_data data_8994 = {
+ .num_sensors = 16,
+ .ops = &ops_8992_8994,
+ .hw_ids = (unsigned int []){ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+ .feat = &tsens_v1_feat,
+ .fields = tsens_v1_regfields,
+};
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 154d3cb19c88..514a23370acb 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -982,6 +982,12 @@ static const struct of_device_id tsens_table[] = {
}, {
.compatible = "qcom,msm8974-tsens",
.data = &data_8974,
+ }, {
+ .compatible = "qcom,msm8992-tsens",
+ .data = &data_8992,
+ }, {
+ .compatible = "qcom,msm8994-tsens",
+ .data = &data_8994,
}, {
.compatible = "qcom,msm8976-tsens",
.data = &data_8976,
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index 1471a2c00f15..ca2b0ac914c1 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -590,7 +590,7 @@ extern struct tsens_plat_data data_8960;
extern struct tsens_plat_data data_8916, data_8939, data_8974, data_9607;
/* TSENS v1 targets */
-extern struct tsens_plat_data data_tsens_v1, data_8976;
+extern struct tsens_plat_data data_tsens_v1, data_8976, data_8992, data_8994;
/* TSENS v2 targets */
extern struct tsens_plat_data data_8996, data_tsens_v2;
--
2.36.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] thermal: qcom: tsens-v1: Add support for MSM8992/4 TSENS
2022-05-01 20:20 ` [PATCH v3 2/2] thermal: qcom: tsens-v1: Add support for MSM8992/4 TSENS Konrad Dybcio
@ 2022-06-27 14:55 ` Konrad Dybcio
2022-06-27 15:15 ` Dmitry Baryshkov
1 sibling, 0 replies; 7+ messages in thread
From: Konrad Dybcio @ 2022-06-27 14:55 UTC (permalink / raw)
To: ~postmarketos/upstreaming
Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
jamipkettunen, Amit Kucheria, Thara Gopinath, Andy Gross,
Bjorn Andersson, Rafael J. Wysocki, Daniel Lezcano, Zhang Rui,
linux-pm, linux-arm-msm, linux-kernel
On 1.05.2022 22:20, Konrad Dybcio wrote:
> MSM8994, despite being heavily based on MSM8974, uses the
> 1.2 version of TSENS. Also, 8994 being 8994, it has a custom
> way of calculating the slope.
>
> MSM8992 in turn is a cut-down version of MSM8994 and uses
> the same TSENS hardware, albeit with a different set of sensors.
>
> Also tested on 8976 (by a person who didn't want to be named)
> to make sure the 11->16 max_sensors changes didn't break anything.
>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> ---
Bumping this, as it's seemingly went unseen.
Konrad
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] thermal: qcom: tsens-v1: Add support for MSM8992/4 TSENS
2022-05-01 20:20 ` [PATCH v3 2/2] thermal: qcom: tsens-v1: Add support for MSM8992/4 TSENS Konrad Dybcio
2022-06-27 14:55 ` Konrad Dybcio
@ 2022-06-27 15:15 ` Dmitry Baryshkov
2022-06-28 13:19 ` Konrad Dybcio
1 sibling, 1 reply; 7+ messages in thread
From: Dmitry Baryshkov @ 2022-06-27 15:15 UTC (permalink / raw)
To: Konrad Dybcio
Cc: ~postmarketos/upstreaming, martin.botka,
angelogioacchino.delregno, marijn.suijten, jamipkettunen,
Amit Kucheria, Thara Gopinath, Andy Gross, Bjorn Andersson,
Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, linux-pm,
linux-arm-msm, linux-kernel
On Sun, 1 May 2022 at 23:21, Konrad Dybcio <konrad.dybcio@somainline.org> wrote:
>
> MSM8994, despite being heavily based on MSM8974, uses the
> 1.2 version of TSENS. Also, 8994 being 8994, it has a custom
> way of calculating the slope.
>
> MSM8992 in turn is a cut-down version of MSM8994 and uses
> the same TSENS hardware, albeit with a different set of sensors.
>
> Also tested on 8976 (by a person who didn't want to be named)
> to make sure the 11->16 max_sensors changes didn't break anything.
>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> ---
> Changes since v2:
>
> - don't use slope before it's initialized (whoops!)
> - don't re-assign the same value to p[0..15]
> - free calib_rsel
> - use the same ops for 8992 and 8994
>
> drivers/thermal/qcom/tsens-v1.c | 293 ++++++++++++++++++++++++++++++--
> drivers/thermal/qcom/tsens.c | 6 +
> drivers/thermal/qcom/tsens.h | 2 +-
> 3 files changed, 288 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
> index 573e261ccca7..58864962f370 100644
> --- a/drivers/thermal/qcom/tsens-v1.c
> +++ b/drivers/thermal/qcom/tsens-v1.c
> @@ -142,6 +142,99 @@
> #define CAL_SEL_MASK 7
> #define CAL_SEL_SHIFT 0
>
> +/* eeprom layout data for 8994 */
> +#define MSM8994_BASE0_MASK 0x3ff
> +#define MSM8994_BASE1_MASK 0xffc00
> +#define MSM8994_BASE0_SHIFT 0
> +#define MSM8994_BASE1_SHIFT 10
Generally I feel that all the _MASK values can be better generated
using the GENMASK and newly defined _SHIFT value.
> +
> +#define MSM8994_S0_MASK 0xf00000
> +#define MSM8994_S1_MASK 0xf000000
> +#define MSM8994_S2_MASK 0xf0000000
> +#define MSM8994_S3_MASK 0xf
> +#define MSM8994_S4_MASK 0xf0
> +#define MSM8994_S5_MASK 0xf00
> +#define MSM8994_S6_MASK 0xf000
> +#define MSM8994_S7_MASK 0xf0000
> +#define MSM8994_S8_MASK 0xf00000
> +#define MSM8994_S9_MASK 0xf000000
> +#define MSM8994_S10_MASK 0xf0000000
> +#define MSM8994_S11_MASK 0xf
> +#define MSM8994_S12_MASK 0xf0
> +#define MSM8994_S13_MASK 0xf00
> +#define MSM8994_S14_MASK 0xf000
> +#define MSM8994_S15_MASK 0xf0000
> +
> +#define MSM8994_S0_SHIFT 20
> +#define MSM8994_S1_SHIFT 24
> +#define MSM8994_S2_SHIFT 28
> +#define MSM8994_S3_SHIFT 0
> +#define MSM8994_S4_SHIFT 4
> +#define MSM8994_S5_SHIFT 8
> +#define MSM8994_S6_SHIFT 12
> +#define MSM8994_S7_SHIFT 16
> +#define MSM8994_S8_SHIFT 20
> +#define MSM8994_S9_SHIFT 24
> +#define MSM8994_S10_SHIFT 28
> +#define MSM8994_S11_SHIFT 0
> +#define MSM8994_S12_SHIFT 4
> +#define MSM8994_S13_SHIFT 8
> +#define MSM8994_S14_SHIFT 12
> +#define MSM8994_S15_SHIFT 16
[skipped the rest]
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] thermal: qcom: tsens-v1: Add support for MSM8992/4 TSENS
2022-06-27 15:15 ` Dmitry Baryshkov
@ 2022-06-28 13:19 ` Konrad Dybcio
2022-06-28 13:27 ` Dmitry Baryshkov
0 siblings, 1 reply; 7+ messages in thread
From: Konrad Dybcio @ 2022-06-28 13:19 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: ~postmarketos/upstreaming, martin.botka,
angelogioacchino.delregno, marijn.suijten, jamipkettunen,
Amit Kucheria, Thara Gopinath, Andy Gross, Bjorn Andersson,
Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, linux-pm,
linux-arm-msm, linux-kernel
On 27.06.2022 17:15, Dmitry Baryshkov wrote:
> On Sun, 1 May 2022 at 23:21, Konrad Dybcio <konrad.dybcio@somainline.org> wrote:
>>
>> MSM8994, despite being heavily based on MSM8974, uses the
>> 1.2 version of TSENS. Also, 8994 being 8994, it has a custom
>> way of calculating the slope.
>>
>> MSM8992 in turn is a cut-down version of MSM8994 and uses
>> the same TSENS hardware, albeit with a different set of sensors.
>>
>> Also tested on 8976 (by a person who didn't want to be named)
>> to make sure the 11->16 max_sensors changes didn't break anything.
>>
>> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
>> ---
>> Changes since v2:
>>
>> - don't use slope before it's initialized (whoops!)
>> - don't re-assign the same value to p[0..15]
>> - free calib_rsel
>> - use the same ops for 8992 and 8994
>>
>> drivers/thermal/qcom/tsens-v1.c | 293 ++++++++++++++++++++++++++++++--
>> drivers/thermal/qcom/tsens.c | 6 +
>> drivers/thermal/qcom/tsens.h | 2 +-
>> 3 files changed, 288 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
>> index 573e261ccca7..58864962f370 100644
>> --- a/drivers/thermal/qcom/tsens-v1.c
>> +++ b/drivers/thermal/qcom/tsens-v1.c
>> @@ -142,6 +142,99 @@
>> #define CAL_SEL_MASK 7
>> #define CAL_SEL_SHIFT 0
>>
>> +/* eeprom layout data for 8994 */
>> +#define MSM8994_BASE0_MASK 0x3ff
>> +#define MSM8994_BASE1_MASK 0xffc00
>> +#define MSM8994_BASE0_SHIFT 0
>> +#define MSM8994_BASE1_SHIFT 10
>
> Generally I feel that all the _MASK values can be better generated
> using the GENMASK and newly defined _SHIFT value.
Yes, I agree, however I think it'd be better to do it for
all the defines in this file at once in a separate commit.
Konrad
>
>> +
>> +#define MSM8994_S0_MASK 0xf00000
>> +#define MSM8994_S1_MASK 0xf000000
>> +#define MSM8994_S2_MASK 0xf0000000
>> +#define MSM8994_S3_MASK 0xf
>> +#define MSM8994_S4_MASK 0xf0
>> +#define MSM8994_S5_MASK 0xf00
>> +#define MSM8994_S6_MASK 0xf000
>> +#define MSM8994_S7_MASK 0xf0000
>> +#define MSM8994_S8_MASK 0xf00000
>> +#define MSM8994_S9_MASK 0xf000000
>> +#define MSM8994_S10_MASK 0xf0000000
>> +#define MSM8994_S11_MASK 0xf
>> +#define MSM8994_S12_MASK 0xf0
>> +#define MSM8994_S13_MASK 0xf00
>> +#define MSM8994_S14_MASK 0xf000
>> +#define MSM8994_S15_MASK 0xf0000
>> +
>> +#define MSM8994_S0_SHIFT 20
>> +#define MSM8994_S1_SHIFT 24
>> +#define MSM8994_S2_SHIFT 28
>> +#define MSM8994_S3_SHIFT 0
>> +#define MSM8994_S4_SHIFT 4
>> +#define MSM8994_S5_SHIFT 8
>> +#define MSM8994_S6_SHIFT 12
>> +#define MSM8994_S7_SHIFT 16
>> +#define MSM8994_S8_SHIFT 20
>> +#define MSM8994_S9_SHIFT 24
>> +#define MSM8994_S10_SHIFT 28
>> +#define MSM8994_S11_SHIFT 0
>> +#define MSM8994_S12_SHIFT 4
>> +#define MSM8994_S13_SHIFT 8
>> +#define MSM8994_S14_SHIFT 12
>> +#define MSM8994_S15_SHIFT 16
>
> [skipped the rest]
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] thermal: qcom: tsens-v1: Add support for MSM8992/4 TSENS
2022-06-28 13:19 ` Konrad Dybcio
@ 2022-06-28 13:27 ` Dmitry Baryshkov
0 siblings, 0 replies; 7+ messages in thread
From: Dmitry Baryshkov @ 2022-06-28 13:27 UTC (permalink / raw)
To: Konrad Dybcio
Cc: ~postmarketos/upstreaming, martin.botka,
angelogioacchino.delregno, marijn.suijten, jamipkettunen,
Amit Kucheria, Thara Gopinath, Andy Gross, Bjorn Andersson,
Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, linux-pm,
linux-arm-msm, linux-kernel
On Tue, 28 Jun 2022 at 16:19, Konrad Dybcio
<konrad.dybcio@somainline.org> wrote:
>
>
>
> On 27.06.2022 17:15, Dmitry Baryshkov wrote:
> > On Sun, 1 May 2022 at 23:21, Konrad Dybcio <konrad.dybcio@somainline.org> wrote:
> >>
> >> MSM8994, despite being heavily based on MSM8974, uses the
> >> 1.2 version of TSENS. Also, 8994 being 8994, it has a custom
> >> way of calculating the slope.
> >>
> >> MSM8992 in turn is a cut-down version of MSM8994 and uses
> >> the same TSENS hardware, albeit with a different set of sensors.
> >>
> >> Also tested on 8976 (by a person who didn't want to be named)
> >> to make sure the 11->16 max_sensors changes didn't break anything.
> >>
> >> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> >> ---
> >> Changes since v2:
> >>
> >> - don't use slope before it's initialized (whoops!)
> >> - don't re-assign the same value to p[0..15]
> >> - free calib_rsel
> >> - use the same ops for 8992 and 8994
> >>
> >> drivers/thermal/qcom/tsens-v1.c | 293 ++++++++++++++++++++++++++++++--
> >> drivers/thermal/qcom/tsens.c | 6 +
> >> drivers/thermal/qcom/tsens.h | 2 +-
> >> 3 files changed, 288 insertions(+), 13 deletions(-)
> >>
> >> diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
> >> index 573e261ccca7..58864962f370 100644
> >> --- a/drivers/thermal/qcom/tsens-v1.c
> >> +++ b/drivers/thermal/qcom/tsens-v1.c
> >> @@ -142,6 +142,99 @@
> >> #define CAL_SEL_MASK 7
> >> #define CAL_SEL_SHIFT 0
> >>
> >> +/* eeprom layout data for 8994 */
> >> +#define MSM8994_BASE0_MASK 0x3ff
> >> +#define MSM8994_BASE1_MASK 0xffc00
> >> +#define MSM8994_BASE0_SHIFT 0
> >> +#define MSM8994_BASE1_SHIFT 10
> >
> > Generally I feel that all the _MASK values can be better generated
> > using the GENMASK and newly defined _SHIFT value.
> Yes, I agree, however I think it'd be better to do it for
> all the defines in this file at once in a separate commit.
Then I'd suggest fixing the file first and adding 8992/4 on top of that.
>
> Konrad
> >
> >> +
> >> +#define MSM8994_S0_MASK 0xf00000
> >> +#define MSM8994_S1_MASK 0xf000000
> >> +#define MSM8994_S2_MASK 0xf0000000
> >> +#define MSM8994_S3_MASK 0xf
> >> +#define MSM8994_S4_MASK 0xf0
> >> +#define MSM8994_S5_MASK 0xf00
> >> +#define MSM8994_S6_MASK 0xf000
> >> +#define MSM8994_S7_MASK 0xf0000
> >> +#define MSM8994_S8_MASK 0xf00000
> >> +#define MSM8994_S9_MASK 0xf000000
> >> +#define MSM8994_S10_MASK 0xf0000000
> >> +#define MSM8994_S11_MASK 0xf
> >> +#define MSM8994_S12_MASK 0xf0
> >> +#define MSM8994_S13_MASK 0xf00
> >> +#define MSM8994_S14_MASK 0xf000
> >> +#define MSM8994_S15_MASK 0xf0000
> >> +
> >> +#define MSM8994_S0_SHIFT 20
> >> +#define MSM8994_S1_SHIFT 24
> >> +#define MSM8994_S2_SHIFT 28
> >> +#define MSM8994_S3_SHIFT 0
> >> +#define MSM8994_S4_SHIFT 4
> >> +#define MSM8994_S5_SHIFT 8
> >> +#define MSM8994_S6_SHIFT 12
> >> +#define MSM8994_S7_SHIFT 16
> >> +#define MSM8994_S8_SHIFT 20
> >> +#define MSM8994_S9_SHIFT 24
> >> +#define MSM8994_S10_SHIFT 28
> >> +#define MSM8994_S11_SHIFT 0
> >> +#define MSM8994_S12_SHIFT 4
> >> +#define MSM8994_S13_SHIFT 8
> >> +#define MSM8994_S14_SHIFT 12
> >> +#define MSM8994_S15_SHIFT 16
> >
> > [skipped the rest]
> >
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] thermal: qcom: tsens-v1: Add support for MSM8992/4 TSENS
@ 2022-05-01 23:10 kernel test robot
0 siblings, 0 replies; 7+ messages in thread
From: kernel test robot @ 2022-05-01 23:10 UTC (permalink / raw)
To: kbuild
[-- Attachment #1: Type: text/plain, Size: 16362 bytes --]
CC: kbuild-all(a)lists.01.org
BCC: lkp(a)intel.com
In-Reply-To: <20220501202025.211567-2-konrad.dybcio@somainline.org>
References: <20220501202025.211567-2-konrad.dybcio@somainline.org>
TO: Konrad Dybcio <konrad.dybcio@somainline.org>
TO: ~postmarketos/upstreaming(a)lists.sr.ht
CC: martin.botka(a)somainline.org
CC: angelogioacchino.delregno(a)somainline.org
CC: marijn.suijten(a)somainline.org
CC: jamipkettunen(a)somainline.org
CC: Konrad Dybcio <konrad.dybcio@somainline.org>
CC: Amit Kucheria <amitk@kernel.org>
CC: Thara Gopinath <thara.gopinath@linaro.org>
CC: Andy Gross <agross@kernel.org>
CC: Bjorn Andersson <bjorn.andersson@linaro.org>
CC: "Rafael J. Wysocki" <rafael@kernel.org>
CC: Daniel Lezcano <daniel.lezcano@linaro.org>
CC: Zhang Rui <rui.zhang@intel.com>
CC: linux-pm(a)vger.kernel.org
CC: linux-arm-msm(a)vger.kernel.org
CC: linux-kernel(a)vger.kernel.org
Hi Konrad,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on rafael-pm/thermal]
[also build test WARNING on robh/for-next v5.18-rc5 next-20220429]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Konrad-Dybcio/dt-bindings-thermal-tsens-Add-msm8992-4-compatibles/20220502-042413
base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal
:::::: branch date: 3 hours ago
:::::: commit date: 3 hours ago
compiler: arm-linux-gnueabi-gcc (GCC) 11.3.0
reproduce (cppcheck warning):
# apt-get install cppcheck
git checkout db030f5538c8beb36e6cde82bead3c57131c58b5
cppcheck --quiet --enable=style,performance,portability --template=gcc FILE
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
cppcheck possible warnings: (new ones prefixed by >>, may not real problems)
>> drivers/thermal/qcom/tsens-v1.c:465:5: warning: Mismatching assignment and comparison, comparison 'calib_redun_sel==0x3' is always false. [assignIfError]
if (calib_redun_sel == BKP_SEL) {
^
drivers/thermal/qcom/tsens-v1.c:462:18: note: Mismatching assignment and comparison, comparison 'calib_redun_sel==0x3' is always false.
calib_redun_sel = calib_rsel[0] & MSM8994_CAL_SEL_REDUN_MASK;
^
drivers/thermal/qcom/tsens-v1.c:465:5: note: Mismatching assignment and comparison, comparison 'calib_redun_sel==0x3' is always false.
if (calib_redun_sel == BKP_SEL) {
^
drivers/thermal/qcom/tsens-v1.c:239:15: warning: Parameter 'p1' can be declared with const [constParameter]
u32 *p1, u32 *p2, u32 mode)
^
>> drivers/thermal/qcom/tsens-v1.c:264:37: warning: Parameter 'p' can be declared with const [constParameter]
u32 base0, u32 base1, u32 *p, u32 mode)
^
vim +465 drivers/thermal/qcom/tsens-v1.c
0e580290170dfb AngeloGioacchino Del Regno 2019-10-05 415
db030f5538c8be Konrad Dybcio 2022-05-01 416 static int calibrate_8994(struct tsens_priv *priv)
db030f5538c8be Konrad Dybcio 2022-05-01 417 {
db030f5538c8be Konrad Dybcio 2022-05-01 418 int base0 = 0, base1 = 0;
db030f5538c8be Konrad Dybcio 2022-05-01 419 u32 p[16] = { [0 ... 15] = 532 }; /* HW-specific, undocumented magic value */
db030f5538c8be Konrad Dybcio 2022-05-01 420 int mode = 0;
db030f5538c8be Konrad Dybcio 2022-05-01 421 u32 *calib0, *calib1, *calib2, *calib_mode, *calib_rsel;
db030f5538c8be Konrad Dybcio 2022-05-01 422 u32 calib_redun_sel;
db030f5538c8be Konrad Dybcio 2022-05-01 423
db030f5538c8be Konrad Dybcio 2022-05-01 424 /* 0x40d0-0x40dc */
db030f5538c8be Konrad Dybcio 2022-05-01 425 calib0 = (u32 *)qfprom_read(priv->dev, "calib");
db030f5538c8be Konrad Dybcio 2022-05-01 426 if (IS_ERR(calib0))
db030f5538c8be Konrad Dybcio 2022-05-01 427 return PTR_ERR(calib0);
db030f5538c8be Konrad Dybcio 2022-05-01 428
db030f5538c8be Konrad Dybcio 2022-05-01 429 dev_dbg(priv->dev, "%s: calib0: [0] = %u, [1] = %u, [2] = %u\n",
db030f5538c8be Konrad Dybcio 2022-05-01 430 __func__, calib0[0], calib0[1], calib0[2]);
db030f5538c8be Konrad Dybcio 2022-05-01 431
db030f5538c8be Konrad Dybcio 2022-05-01 432 /* 0x41c0-0x41c8 */
db030f5538c8be Konrad Dybcio 2022-05-01 433 calib1 = (u32 *)qfprom_read(priv->dev, "calib_redun1_2");
db030f5538c8be Konrad Dybcio 2022-05-01 434 if (IS_ERR(calib1))
db030f5538c8be Konrad Dybcio 2022-05-01 435 return PTR_ERR(calib1);
db030f5538c8be Konrad Dybcio 2022-05-01 436
db030f5538c8be Konrad Dybcio 2022-05-01 437 dev_dbg(priv->dev, "%s: calib1: [0] = %u, [1] = %u\n",
db030f5538c8be Konrad Dybcio 2022-05-01 438 __func__, calib1[0], calib1[1]);
db030f5538c8be Konrad Dybcio 2022-05-01 439
db030f5538c8be Konrad Dybcio 2022-05-01 440 /* 0x41cc-0x41d0 */
db030f5538c8be Konrad Dybcio 2022-05-01 441 calib2 = (u32 *)qfprom_read(priv->dev, "calib_redun3");
db030f5538c8be Konrad Dybcio 2022-05-01 442 if (IS_ERR(calib2))
db030f5538c8be Konrad Dybcio 2022-05-01 443 return PTR_ERR(calib2);
db030f5538c8be Konrad Dybcio 2022-05-01 444
db030f5538c8be Konrad Dybcio 2022-05-01 445 dev_dbg(priv->dev, "%s: calib2: [0] = %u\n", __func__, calib2[0]);
db030f5538c8be Konrad Dybcio 2022-05-01 446
db030f5538c8be Konrad Dybcio 2022-05-01 447 /* 0x4440-0x4448 */
db030f5538c8be Konrad Dybcio 2022-05-01 448 calib_mode = (u32 *)qfprom_read(priv->dev, "calib_redun4_5");
db030f5538c8be Konrad Dybcio 2022-05-01 449 if (IS_ERR(calib_mode))
db030f5538c8be Konrad Dybcio 2022-05-01 450 return PTR_ERR(calib_mode);
db030f5538c8be Konrad Dybcio 2022-05-01 451
db030f5538c8be Konrad Dybcio 2022-05-01 452 dev_dbg(priv->dev, "%s: calib_mode: [0] = %u, [1] = %u\n",
db030f5538c8be Konrad Dybcio 2022-05-01 453 __func__, calib1[0], calib1[1]);
db030f5538c8be Konrad Dybcio 2022-05-01 454
db030f5538c8be Konrad Dybcio 2022-05-01 455 /* 0x4464-0x4468 */
db030f5538c8be Konrad Dybcio 2022-05-01 456 calib_rsel = (u32 *)qfprom_read(priv->dev, "calib_rsel");
db030f5538c8be Konrad Dybcio 2022-05-01 457 if (IS_ERR(calib_mode))
db030f5538c8be Konrad Dybcio 2022-05-01 458 return PTR_ERR(calib_mode);
db030f5538c8be Konrad Dybcio 2022-05-01 459
db030f5538c8be Konrad Dybcio 2022-05-01 460 dev_dbg(priv->dev, "%s: calib_rsel: [0] = %u\n", __func__, calib_rsel[0]);
db030f5538c8be Konrad Dybcio 2022-05-01 461
db030f5538c8be Konrad Dybcio 2022-05-01 462 calib_redun_sel = calib_rsel[0] & MSM8994_CAL_SEL_REDUN_MASK;
db030f5538c8be Konrad Dybcio 2022-05-01 463 calib_redun_sel >>= MSM8994_CAL_SEL_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 464
db030f5538c8be Konrad Dybcio 2022-05-01 @465 if (calib_redun_sel == BKP_SEL) {
db030f5538c8be Konrad Dybcio 2022-05-01 466 dev_dbg(priv->dev, "%s: Calibrating in REDUN mode, calib_redun_sel = %u",
db030f5538c8be Konrad Dybcio 2022-05-01 467 __func__, calib_redun_sel);
db030f5538c8be Konrad Dybcio 2022-05-01 468 mode = calib_mode[1] & MSM8994_REDUN_SEL_MASK;
db030f5538c8be Konrad Dybcio 2022-05-01 469
db030f5538c8be Konrad Dybcio 2022-05-01 470 if (mode == TWO_PT_CALIB) {
db030f5538c8be Konrad Dybcio 2022-05-01 471 dev_dbg(priv->dev, "%s: REDUN TWO_PT mode, mode = %u", __func__, mode);
db030f5538c8be Konrad Dybcio 2022-05-01 472 base0 = (calib1[0] & MSM8994_BASE0_REDUN_MASK) >> MSM8994_BASE0_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 473 base1 = (calib1[0] & MSM8994_BASE1_BIT0_REDUN_MASK) >> MSM8994_BASE1_BIT0_REDUN_SHIFT_COMPUTE;
db030f5538c8be Konrad Dybcio 2022-05-01 474 base1 |= calib1[1] & MSM8994_BASE1_BIT1_9_REDUN_MASK;
db030f5538c8be Konrad Dybcio 2022-05-01 475 p[0] = (calib1[1] & MSM8994_S0_REDUN_MASK) >> MSM8994_S0_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 476 p[1] = (calib1[1] & MSM8994_S1_REDUN_MASK) >> MSM8994_S1_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 477 p[2] = (calib1[1] & MSM8994_S2_REDUN_MASK) >> MSM8994_S2_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 478 p[3] = (calib1[1] & MSM8994_S3_REDUN_MASK) >> MSM8994_S3_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 479 p[4] = (calib1[1] & MSM8994_S4_REDUN_MASK) >> MSM8994_S4_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 480 p[5] = (calib1[1] & MSM8994_S5_REDUN_MASK_BIT0_2) >> MSM8994_S5_REDUN_SHIFT_BIT0_2;
db030f5538c8be Konrad Dybcio 2022-05-01 481 p[5] |= (calib2[0] & MSM8994_S5_REDUN_MASK_BIT3) >> MSM8994_S5_REDUN_SHIFT_BIT3;
db030f5538c8be Konrad Dybcio 2022-05-01 482 p[6] = (calib2[0] & MSM8994_S6_REDUN_MASK) >> MSM8994_S6_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 483 p[7] = (calib2[0] & MSM8994_S7_REDUN_MASK) >> MSM8994_S7_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 484 p[8] = (calib2[0] & MSM8994_S8_REDUN_MASK) >> MSM8994_S8_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 485 p[9] = (calib2[0] & MSM8994_S9_REDUN_MASK) >> MSM8994_S9_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 486 p[10] = (calib2[0] & MSM8994_S10_REDUN_MASK) >> MSM8994_S10_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 487 p[11] = (calib2[0] & MSM8994_S11_REDUN_MASK) >> MSM8994_S11_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 488 p[12] = (calib2[0] & MSM8994_S12_REDUN_MASK) >> MSM8994_S12_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 489 p[13] = (calib2[0] & MSM8994_S13_REDUN_MASK) >> MSM8994_S13_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 490 p[14] = (calib2[0] & MSM8994_S14_REDUN_MASK) >> MSM8994_S14_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 491 p[15] = (calib2[0] & MSM8994_S15_REDUN_MASK) >> MSM8994_S15_REDUN_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 492 } else {
db030f5538c8be Konrad Dybcio 2022-05-01 493 dev_dbg(priv->dev, "%s: REDUN NON-TWO_PT mode, mode = %u", __func__, mode);
db030f5538c8be Konrad Dybcio 2022-05-01 494 }
db030f5538c8be Konrad Dybcio 2022-05-01 495 } else {
db030f5538c8be Konrad Dybcio 2022-05-01 496 dev_dbg(priv->dev, "%s: Calibrating in NOT-REDUN mode, calib_redun_sel = %u",
db030f5538c8be Konrad Dybcio 2022-05-01 497 __func__, calib_redun_sel);
db030f5538c8be Konrad Dybcio 2022-05-01 498 mode = (calib0[2] & MSM8994_CAL_SEL_MASK) >> MSM8994_CAL_SEL_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 499
db030f5538c8be Konrad Dybcio 2022-05-01 500 if (mode == TWO_PT_CALIB) {
db030f5538c8be Konrad Dybcio 2022-05-01 501 dev_dbg(priv->dev, "%s: NOT-REDUN TWO_PT mode, mode = %u", __func__, mode);
db030f5538c8be Konrad Dybcio 2022-05-01 502 base0 = (calib0[0] & MSM8994_BASE0_MASK) >> MSM8994_BASE0_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 503 base1 = (calib0[0] & MSM8994_BASE1_MASK) >> MSM8994_BASE1_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 504 p[0] = (calib0[0] & MSM8994_S0_MASK) >> MSM8994_S0_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 505 p[1] = (calib0[0] & MSM8994_S1_MASK) >> MSM8994_S1_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 506 p[2] = (calib0[1] & MSM8994_S2_MASK) >> MSM8994_S2_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 507 p[3] = (calib0[1] & MSM8994_S3_MASK) >> MSM8994_S3_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 508 p[4] = (calib0[1] & MSM8994_S4_MASK) >> MSM8994_S4_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 509 p[5] = (calib0[1] & MSM8994_S5_MASK) >> MSM8994_S5_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 510 p[6] = (calib0[1] & MSM8994_S6_MASK) >> MSM8994_S6_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 511 p[7] = (calib0[1] & MSM8994_S7_MASK) >> MSM8994_S7_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 512 p[8] = (calib0[1] & MSM8994_S8_MASK) >> MSM8994_S8_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 513 p[9] = (calib0[1] & MSM8994_S9_MASK) >> MSM8994_S9_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 514 p[10] = (calib0[1] & MSM8994_S10_MASK) >> MSM8994_S10_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 515 p[11] = (calib0[2] & MSM8994_S11_MASK) >> MSM8994_S11_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 516 p[12] = (calib0[2] & MSM8994_S12_MASK) >> MSM8994_S12_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 517 p[13] = (calib0[2] & MSM8994_S13_MASK) >> MSM8994_S13_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 518 p[14] = (calib0[2] & MSM8994_S14_MASK) >> MSM8994_S14_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 519 p[15] = (calib0[2] & MSM8994_S15_MASK) >> MSM8994_S15_SHIFT;
db030f5538c8be Konrad Dybcio 2022-05-01 520 } else {
db030f5538c8be Konrad Dybcio 2022-05-01 521 dev_dbg(priv->dev, "%s: NOT-REDUN NON-TWO_PT mode, mode = %u", __func__, mode);
db030f5538c8be Konrad Dybcio 2022-05-01 522 /* Keep the init-time 532 value */
db030f5538c8be Konrad Dybcio 2022-05-01 523 }
db030f5538c8be Konrad Dybcio 2022-05-01 524 }
db030f5538c8be Konrad Dybcio 2022-05-01 525
db030f5538c8be Konrad Dybcio 2022-05-01 526 /* 8992 features less sensors and remaps some */
db030f5538c8be Konrad Dybcio 2022-05-01 527 if (priv->num_sensors == 13) {
db030f5538c8be Konrad Dybcio 2022-05-01 528 p[6] = p[7];
db030f5538c8be Konrad Dybcio 2022-05-01 529 p[7] = p[9];
db030f5538c8be Konrad Dybcio 2022-05-01 530 p[8] = p[10];
db030f5538c8be Konrad Dybcio 2022-05-01 531 p[9] = p[11];
db030f5538c8be Konrad Dybcio 2022-05-01 532 p[10] = p[12];
db030f5538c8be Konrad Dybcio 2022-05-01 533 p[11] = p[13];
db030f5538c8be Konrad Dybcio 2022-05-01 534 p[12] = p[14];
db030f5538c8be Konrad Dybcio 2022-05-01 535 }
db030f5538c8be Konrad Dybcio 2022-05-01 536
db030f5538c8be Konrad Dybcio 2022-05-01 537 compute_intercept_slope_8994(priv, base0, base1, p, mode);
db030f5538c8be Konrad Dybcio 2022-05-01 538 kfree(calib0);
db030f5538c8be Konrad Dybcio 2022-05-01 539 kfree(calib1);
db030f5538c8be Konrad Dybcio 2022-05-01 540 kfree(calib2);
db030f5538c8be Konrad Dybcio 2022-05-01 541 kfree(calib_mode);
db030f5538c8be Konrad Dybcio 2022-05-01 542 kfree(calib_rsel);
db030f5538c8be Konrad Dybcio 2022-05-01 543
db030f5538c8be Konrad Dybcio 2022-05-01 544 return 0;
db030f5538c8be Konrad Dybcio 2022-05-01 545 }
db030f5538c8be Konrad Dybcio 2022-05-01 546
--
0-DAY CI Kernel Test Service
https://01.org/lkp
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-06-28 13:29 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-01 20:20 [PATCH v3 1/2] dt-bindings: thermal: tsens: Add msm8992/4 compatibles Konrad Dybcio
2022-05-01 20:20 ` [PATCH v3 2/2] thermal: qcom: tsens-v1: Add support for MSM8992/4 TSENS Konrad Dybcio
2022-06-27 14:55 ` Konrad Dybcio
2022-06-27 15:15 ` Dmitry Baryshkov
2022-06-28 13:19 ` Konrad Dybcio
2022-06-28 13:27 ` Dmitry Baryshkov
2022-05-01 23:10 kernel test robot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.