| Message ID | 20220627131415.2868938-4-stephan.gerhold@kernkonzept.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Daniel Lezcano |
| Headers | show |
| Series | thermal: qcom: tsens: Add data for MSM8909 | expand |
On 27/06/2022 16:14, Stephan Gerhold wrote: > The MSM8909 SoC has 5 thermal sensors in a TSENS v0.1 block similar to > MSM8916, except that the bit offsets in the qfprom were changed. > Also, some fixed correction factors are needed as workaround because the > factory calibration apparently was not reliable enough. > > Add the defines and calibration function for MSM8909 in the existing > tsens-v0_1.c driver to make the thermal sensors work on MSM8909. > The changes are derived from the original msm-3.18 kernel [1] from > Qualcomm but cleaned up and adapted to the driver in mainline. > > [1]: https://git.codelinaro.org/clo/la/kernel/msm-3.18/-/blob/LA.UM.7.7.c26-08600-8x09.0/drivers/thermal/msm-tsens.c > > Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com> > --- > drivers/thermal/qcom/tsens-v0_1.c | 119 +++++++++++++++++++++++++++++- > drivers/thermal/qcom/tsens.c | 3 + > drivers/thermal/qcom/tsens.h | 2 +- > 3 files changed, 122 insertions(+), 2 deletions(-) > > diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c > index f136cb350238..e17c4f9d9aa5 100644 > --- a/drivers/thermal/qcom/tsens-v0_1.c > +++ b/drivers/thermal/qcom/tsens-v0_1.c > @@ -15,6 +15,48 @@ > #define TM_Sn_STATUS_OFF 0x0030 > #define TM_TRDY_OFF 0x005c > > +/* eeprom layout data for 8909 */ > +#define MSM8909_CAL_SEL_MASK 0x00070000 > +#define MSM8909_CAL_SEL_SHIFT 16 > + > +#define MSM8909_BASE0_MASK 0x000000ff > +#define MSM8909_BASE1_MASK 0x0000ff00 > +#define MSM8909_BASE0_SHIFT 0 > +#define MSM8909_BASE1_SHIFT 8 > + > +#define MSM8909_S0_P1_MASK 0x0000003f > +#define MSM8909_S1_P1_MASK 0x0003f000 > +#define MSM8909_S2_P1_MASK 0x3f000000 > +#define MSM8909_S3_P1_MASK 0x000003f0 > +#define MSM8909_S4_P1_MASK 0x003f0000 > + > +#define MSM8909_S0_P2_MASK 0x00000fc0 > +#define MSM8909_S1_P2_MASK 0x00fc0000 > +#define MSM8909_S2_P2_MASK_0_1 0xc0000000 > +#define MSM8909_S2_P2_MASK_2_5 0x0000000f > +#define MSM8909_S3_P2_MASK 0x0000fc00 > +#define MSM8909_S4_P2_MASK 0x0fc00000 > + > +#define MSM8909_S0_P1_SHIFT 0 > +#define MSM8909_S1_P1_SHIFT 12 > +#define MSM8909_S2_P1_SHIFT 24 > +#define MSM8909_S3_P1_SHIFT 4 > +#define MSM8909_S4_P1_SHIFT 16 > + > +#define MSM8909_S0_P2_SHIFT 6 > +#define MSM8909_S1_P2_SHIFT 18 > +#define MSM8909_S2_P2_SHIFT_0_1 30 > +#define MSM8909_S2_P2_SHIFT_2_5 2 > +#define MSM8909_S3_P2_SHIFT 10 > +#define MSM8909_S4_P2_SHIFT 22 > + > +#define MSM8909_D30_WA_S1 10 > +#define MSM8909_D30_WA_S3 9 > +#define MSM8909_D30_WA_S4 8 > +#define MSM8909_D120_WA_S1 6 > +#define MSM8909_D120_WA_S3 9 > +#define MSM8909_D120_WA_S4 10 > + > /* eeprom layout data for 8916 */ > #define MSM8916_BASE0_MASK 0x0000007f > #define MSM8916_BASE1_MASK 0xfe000000 > @@ -223,6 +265,68 @@ > #define MDM9607_CAL_SEL_MASK 0x00700000 > #define MDM9607_CAL_SEL_SHIFT 20 > > +static int calibrate_8909(struct tsens_priv *priv) > +{ > + u32 *qfprom_cdata, *qfprom_csel; > + int base0, base1, mode, i; > + u32 p1[5], p2[5]; > + > + qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); > + if (IS_ERR(qfprom_cdata)) > + return PTR_ERR(qfprom_cdata); > + > + qfprom_csel = (u32 *)qfprom_read(priv->dev, "calib_sel"); > + if (IS_ERR(qfprom_csel)) { > + kfree(qfprom_cdata); > + return PTR_ERR(qfprom_csel); > + } > + > + mode = (qfprom_csel[0] & MSM8909_CAL_SEL_MASK) >> MSM8909_CAL_SEL_SHIFT; > + dev_dbg(priv->dev, "calibration mode is %d\n", mode); > + > + switch (mode) { > + case TWO_PT_CALIB: > + base1 = (qfprom_csel[0] & MSM8909_BASE1_MASK) >> MSM8909_BASE1_SHIFT; > + p2[0] = (qfprom_cdata[0] & MSM8909_S0_P2_MASK) >> MSM8909_S0_P2_SHIFT; > + p2[1] = (qfprom_cdata[0] & MSM8909_S1_P2_MASK) >> MSM8909_S1_P2_SHIFT; > + p2[2] = (qfprom_cdata[0] & MSM8909_S2_P2_MASK_0_1) >> MSM8909_S2_P2_SHIFT_0_1; > + p2[2] |= (qfprom_cdata[1] & MSM8909_S2_P2_MASK_2_5) << MSM8909_S2_P2_SHIFT_2_5; > + p2[3] = (qfprom_cdata[1] & MSM8909_S3_P2_MASK) >> MSM8909_S3_P2_SHIFT; > + p2[4] = (qfprom_cdata[1] & MSM8909_S4_P2_MASK) >> MSM8909_S4_P2_SHIFT; Please use nvmem_cell_read_* to read these values. This would allow you to push all the possible si_pi definitions into the DT and use mode to switch between them. And mode can be read using the nvmem_cell_read_* too. > + for (i = 0; i < priv->num_sensors; i++) > + p2[i] = ((base1 + p2[i]) << 2); > + p2[1] -= MSM8909_D120_WA_S1; > + p2[3] -= MSM8909_D120_WA_S3; > + p2[4] -= MSM8909_D120_WA_S4; > + fallthrough; > + case ONE_PT_CALIB2: > + base0 = (qfprom_csel[0] & MSM8909_BASE0_MASK) >> MSM8909_BASE0_SHIFT; > + p1[0] = (qfprom_cdata[0] & MSM8909_S0_P1_MASK) >> MSM8909_S0_P1_SHIFT; > + p1[1] = (qfprom_cdata[0] & MSM8909_S1_P1_MASK) >> MSM8909_S1_P1_SHIFT; > + p1[2] = (qfprom_cdata[0] & MSM8909_S2_P1_MASK) >> MSM8909_S2_P1_SHIFT; > + p1[3] = (qfprom_cdata[1] & MSM8909_S3_P1_MASK) >> MSM8909_S3_P1_SHIFT; > + p1[4] = (qfprom_cdata[1] & MSM8909_S4_P1_MASK) >> MSM8909_S4_P1_SHIFT; > + for (i = 0; i < priv->num_sensors; i++) > + p1[i] = (((base0) + p1[i]) << 2); > + p1[1] -= MSM8909_D30_WA_S1; > + p1[3] -= MSM8909_D30_WA_S3; > + p1[4] -= MSM8909_D30_WA_S4; > + break; > + default: > + for (i = 0; i < priv->num_sensors; i++) { > + p1[i] = 500; > + p2[i] = 780; > + } > + break; > + } > + > + compute_intercept_slope(priv, p1, p2, mode); > + kfree(qfprom_cdata); > + kfree(qfprom_csel); > + > + return 0; > +} > + > static int calibrate_8916(struct tsens_priv *priv) > { > int base0 = 0, base1 = 0, i; > @@ -534,7 +638,7 @@ static int calibrate_9607(struct tsens_priv *priv) > return 0; > } > > -/* v0.1: 8916, 8939, 8974, 9607 */ > +/* v0.1: 8909, 8916, 8939, 8974, 9607 */ > > static struct tsens_features tsens_v0_1_feat = { > .ver_major = VER_0_1, > @@ -580,6 +684,19 @@ static const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = { > [TRDY] = REG_FIELD(TM_TRDY_OFF, 0, 0), > }; > > +static const struct tsens_ops ops_8909 = { > + .init = init_common, > + .calibrate = calibrate_8909, > + .get_temp = get_temp_common, > +}; > + > +struct tsens_plat_data data_8909 = { > + .num_sensors = 5, > + .ops = &ops_8909, > + .feat = &tsens_v0_1_feat, > + .fields = tsens_v0_1_regfields, > +}; > + > static const struct tsens_ops ops_8916 = { > .init = init_common, > .calibrate = calibrate_8916, > diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c > index 7963ee33bf75..cb7bbaa72d89 100644 > --- a/drivers/thermal/qcom/tsens.c > +++ b/drivers/thermal/qcom/tsens.c > @@ -973,6 +973,9 @@ static const struct of_device_id tsens_table[] = { > }, { > .compatible = "qcom,mdm9607-tsens", > .data = &data_9607, > + }, { > + .compatible = "qcom,msm8909-tsens", > + .data = &data_8909, > }, { > .compatible = "qcom,msm8916-tsens", > .data = &data_8916, > diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h > index 1471a2c00f15..752d4718f26e 100644 > --- a/drivers/thermal/qcom/tsens.h > +++ b/drivers/thermal/qcom/tsens.h > @@ -587,7 +587,7 @@ int get_temp_common(const struct tsens_sensor *s, int *temp); > extern struct tsens_plat_data data_8960; > > /* TSENS v0.1 targets */ > -extern struct tsens_plat_data data_8916, data_8939, data_8974, data_9607; > +extern struct tsens_plat_data data_8909, data_8916, data_8939, data_8974, data_9607; > > /* TSENS v1 targets */ > extern struct tsens_plat_data data_tsens_v1, data_8976;
On Thu, Sep 08, 2022 at 11:57:41PM +0300, Dmitry Baryshkov wrote: > On 27/06/2022 16:14, Stephan Gerhold wrote: > > The MSM8909 SoC has 5 thermal sensors in a TSENS v0.1 block similar to > > MSM8916, except that the bit offsets in the qfprom were changed. > > Also, some fixed correction factors are needed as workaround because the > > factory calibration apparently was not reliable enough. > > > > Add the defines and calibration function for MSM8909 in the existing > > tsens-v0_1.c driver to make the thermal sensors work on MSM8909. > > The changes are derived from the original msm-3.18 kernel [1] from > > Qualcomm but cleaned up and adapted to the driver in mainline. > > > > [1]: https://git.codelinaro.org/clo/la/kernel/msm-3.18/-/blob/LA.UM.7.7.c26-08600-8x09.0/drivers/thermal/msm-tsens.c > > > > Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com> > > --- > > drivers/thermal/qcom/tsens-v0_1.c | 119 +++++++++++++++++++++++++++++- > > drivers/thermal/qcom/tsens.c | 3 + > > drivers/thermal/qcom/tsens.h | 2 +- > > 3 files changed, 122 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c > > index f136cb350238..e17c4f9d9aa5 100644 > > --- a/drivers/thermal/qcom/tsens-v0_1.c > > +++ b/drivers/thermal/qcom/tsens-v0_1.c > > @@ -15,6 +15,48 @@ > > #define TM_Sn_STATUS_OFF 0x0030 > > #define TM_TRDY_OFF 0x005c > > +/* eeprom layout data for 8909 */ > > +#define MSM8909_CAL_SEL_MASK 0x00070000 > > +#define MSM8909_CAL_SEL_SHIFT 16 > > + > > +#define MSM8909_BASE0_MASK 0x000000ff > > +#define MSM8909_BASE1_MASK 0x0000ff00 > > +#define MSM8909_BASE0_SHIFT 0 > > +#define MSM8909_BASE1_SHIFT 8 > > + > > +#define MSM8909_S0_P1_MASK 0x0000003f > > +#define MSM8909_S1_P1_MASK 0x0003f000 > > +#define MSM8909_S2_P1_MASK 0x3f000000 > > +#define MSM8909_S3_P1_MASK 0x000003f0 > > +#define MSM8909_S4_P1_MASK 0x003f0000 > > + > > +#define MSM8909_S0_P2_MASK 0x00000fc0 > > +#define MSM8909_S1_P2_MASK 0x00fc0000 > > +#define MSM8909_S2_P2_MASK_0_1 0xc0000000 > > +#define MSM8909_S2_P2_MASK_2_5 0x0000000f > > +#define MSM8909_S3_P2_MASK 0x0000fc00 > > +#define MSM8909_S4_P2_MASK 0x0fc00000 > > + > > +#define MSM8909_S0_P1_SHIFT 0 > > +#define MSM8909_S1_P1_SHIFT 12 > > +#define MSM8909_S2_P1_SHIFT 24 > > +#define MSM8909_S3_P1_SHIFT 4 > > +#define MSM8909_S4_P1_SHIFT 16 > > + > > +#define MSM8909_S0_P2_SHIFT 6 > > +#define MSM8909_S1_P2_SHIFT 18 > > +#define MSM8909_S2_P2_SHIFT_0_1 30 > > +#define MSM8909_S2_P2_SHIFT_2_5 2 > > +#define MSM8909_S3_P2_SHIFT 10 > > +#define MSM8909_S4_P2_SHIFT 22 > > + > > +#define MSM8909_D30_WA_S1 10 > > +#define MSM8909_D30_WA_S3 9 > > +#define MSM8909_D30_WA_S4 8 > > +#define MSM8909_D120_WA_S1 6 > > +#define MSM8909_D120_WA_S3 9 > > +#define MSM8909_D120_WA_S4 10 > > + > > /* eeprom layout data for 8916 */ > > #define MSM8916_BASE0_MASK 0x0000007f > > #define MSM8916_BASE1_MASK 0xfe000000 > > @@ -223,6 +265,68 @@ > > #define MDM9607_CAL_SEL_MASK 0x00700000 > > #define MDM9607_CAL_SEL_SHIFT 20 > > +static int calibrate_8909(struct tsens_priv *priv) > > +{ > > + u32 *qfprom_cdata, *qfprom_csel; > > + int base0, base1, mode, i; > > + u32 p1[5], p2[5]; > > + > > + qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); > > + if (IS_ERR(qfprom_cdata)) > > + return PTR_ERR(qfprom_cdata); > > + > > + qfprom_csel = (u32 *)qfprom_read(priv->dev, "calib_sel"); > > + if (IS_ERR(qfprom_csel)) { > > + kfree(qfprom_cdata); > > + return PTR_ERR(qfprom_csel); > > + } > > + > > + mode = (qfprom_csel[0] & MSM8909_CAL_SEL_MASK) >> MSM8909_CAL_SEL_SHIFT; > > + dev_dbg(priv->dev, "calibration mode is %d\n", mode); > > + > > + switch (mode) { > > + case TWO_PT_CALIB: > > + base1 = (qfprom_csel[0] & MSM8909_BASE1_MASK) >> MSM8909_BASE1_SHIFT; > > + p2[0] = (qfprom_cdata[0] & MSM8909_S0_P2_MASK) >> MSM8909_S0_P2_SHIFT; > > + p2[1] = (qfprom_cdata[0] & MSM8909_S1_P2_MASK) >> MSM8909_S1_P2_SHIFT; > > + p2[2] = (qfprom_cdata[0] & MSM8909_S2_P2_MASK_0_1) >> MSM8909_S2_P2_SHIFT_0_1; > > + p2[2] |= (qfprom_cdata[1] & MSM8909_S2_P2_MASK_2_5) << MSM8909_S2_P2_SHIFT_2_5; > > + p2[3] = (qfprom_cdata[1] & MSM8909_S3_P2_MASK) >> MSM8909_S3_P2_SHIFT; > > + p2[4] = (qfprom_cdata[1] & MSM8909_S4_P2_MASK) >> MSM8909_S4_P2_SHIFT; > > Please use nvmem_cell_read_* to read these values. This would allow you to > push all the possible si_pi definitions into the DT and use mode to switch > between them. And mode can be read using the nvmem_cell_read_* too. Thanks for the suggestion. I agree that this would have been nicer if this had been implemented that way for all the existing platforms supported by the tsens driver. But now we already have 7+ platforms using exactly the approach I'm using in this patch, with existing bindings and existing device trees that must stay supported. My msm8909.dtsi is actually mostly just a simple overlay on top of msm8916.dtsi, so I would like to keep these platforms consistent wherever possible. We could change all the existing platforms as well but in my opinion this would just make the driver and bindings a lot more complicated because the old approach still must be supported. Also, I think the main benefit of having all the points as separate NVMEM cells would be to allow having a generic qcom,tsens-v0.1 compatible, without SoC-specific code required in the driver. However, subtle differences in the way the calibration points are used (e.g. the fixed correction offsets in this patch) will likely make SoC-specific code necessary anyway. And then it doesn't matter much if the bit masks are in the driver like all existing code or end up being put into the DT. TL;DR: I would prefer to keep this as-is to keep the driver simple and consistent across all the supported platforms. Thanks, Stephan
On 09/09/2022 16:51, Stephan Gerhold wrote: > On Thu, Sep 08, 2022 at 11:57:41PM +0300, Dmitry Baryshkov wrote: >> On 27/06/2022 16:14, Stephan Gerhold wrote: >>> The MSM8909 SoC has 5 thermal sensors in a TSENS v0.1 block similar to >>> MSM8916, except that the bit offsets in the qfprom were changed. >>> Also, some fixed correction factors are needed as workaround because the >>> factory calibration apparently was not reliable enough. >>> >>> Add the defines and calibration function for MSM8909 in the existing >>> tsens-v0_1.c driver to make the thermal sensors work on MSM8909. >>> The changes are derived from the original msm-3.18 kernel [1] from >>> Qualcomm but cleaned up and adapted to the driver in mainline. >>> >>> [1]: https://git.codelinaro.org/clo/la/kernel/msm-3.18/-/blob/LA.UM.7.7.c26-08600-8x09.0/drivers/thermal/msm-tsens.c >>> >>> Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com> >>> --- >>> drivers/thermal/qcom/tsens-v0_1.c | 119 +++++++++++++++++++++++++++++- >>> drivers/thermal/qcom/tsens.c | 3 + >>> drivers/thermal/qcom/tsens.h | 2 +- >>> 3 files changed, 122 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c >>> index f136cb350238..e17c4f9d9aa5 100644 >>> --- a/drivers/thermal/qcom/tsens-v0_1.c >>> +++ b/drivers/thermal/qcom/tsens-v0_1.c >>> @@ -15,6 +15,48 @@ >>> #define TM_Sn_STATUS_OFF 0x0030 >>> #define TM_TRDY_OFF 0x005c >>> +/* eeprom layout data for 8909 */ >>> +#define MSM8909_CAL_SEL_MASK 0x00070000 >>> +#define MSM8909_CAL_SEL_SHIFT 16 >>> + >>> +#define MSM8909_BASE0_MASK 0x000000ff >>> +#define MSM8909_BASE1_MASK 0x0000ff00 >>> +#define MSM8909_BASE0_SHIFT 0 >>> +#define MSM8909_BASE1_SHIFT 8 >>> + >>> +#define MSM8909_S0_P1_MASK 0x0000003f >>> +#define MSM8909_S1_P1_MASK 0x0003f000 >>> +#define MSM8909_S2_P1_MASK 0x3f000000 >>> +#define MSM8909_S3_P1_MASK 0x000003f0 >>> +#define MSM8909_S4_P1_MASK 0x003f0000 >>> + >>> +#define MSM8909_S0_P2_MASK 0x00000fc0 >>> +#define MSM8909_S1_P2_MASK 0x00fc0000 >>> +#define MSM8909_S2_P2_MASK_0_1 0xc0000000 >>> +#define MSM8909_S2_P2_MASK_2_5 0x0000000f >>> +#define MSM8909_S3_P2_MASK 0x0000fc00 >>> +#define MSM8909_S4_P2_MASK 0x0fc00000 >>> + >>> +#define MSM8909_S0_P1_SHIFT 0 >>> +#define MSM8909_S1_P1_SHIFT 12 >>> +#define MSM8909_S2_P1_SHIFT 24 >>> +#define MSM8909_S3_P1_SHIFT 4 >>> +#define MSM8909_S4_P1_SHIFT 16 >>> + >>> +#define MSM8909_S0_P2_SHIFT 6 >>> +#define MSM8909_S1_P2_SHIFT 18 >>> +#define MSM8909_S2_P2_SHIFT_0_1 30 >>> +#define MSM8909_S2_P2_SHIFT_2_5 2 >>> +#define MSM8909_S3_P2_SHIFT 10 >>> +#define MSM8909_S4_P2_SHIFT 22 >>> + >>> +#define MSM8909_D30_WA_S1 10 >>> +#define MSM8909_D30_WA_S3 9 >>> +#define MSM8909_D30_WA_S4 8 >>> +#define MSM8909_D120_WA_S1 6 >>> +#define MSM8909_D120_WA_S3 9 >>> +#define MSM8909_D120_WA_S4 10 >>> + >>> /* eeprom layout data for 8916 */ >>> #define MSM8916_BASE0_MASK 0x0000007f >>> #define MSM8916_BASE1_MASK 0xfe000000 >>> @@ -223,6 +265,68 @@ >>> #define MDM9607_CAL_SEL_MASK 0x00700000 >>> #define MDM9607_CAL_SEL_SHIFT 20 >>> +static int calibrate_8909(struct tsens_priv *priv) >>> +{ >>> + u32 *qfprom_cdata, *qfprom_csel; >>> + int base0, base1, mode, i; >>> + u32 p1[5], p2[5]; >>> + >>> + qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); >>> + if (IS_ERR(qfprom_cdata)) >>> + return PTR_ERR(qfprom_cdata); >>> + >>> + qfprom_csel = (u32 *)qfprom_read(priv->dev, "calib_sel"); >>> + if (IS_ERR(qfprom_csel)) { >>> + kfree(qfprom_cdata); >>> + return PTR_ERR(qfprom_csel); >>> + } >>> + >>> + mode = (qfprom_csel[0] & MSM8909_CAL_SEL_MASK) >> MSM8909_CAL_SEL_SHIFT; >>> + dev_dbg(priv->dev, "calibration mode is %d\n", mode); >>> + >>> + switch (mode) { >>> + case TWO_PT_CALIB: >>> + base1 = (qfprom_csel[0] & MSM8909_BASE1_MASK) >> MSM8909_BASE1_SHIFT; >>> + p2[0] = (qfprom_cdata[0] & MSM8909_S0_P2_MASK) >> MSM8909_S0_P2_SHIFT; >>> + p2[1] = (qfprom_cdata[0] & MSM8909_S1_P2_MASK) >> MSM8909_S1_P2_SHIFT; >>> + p2[2] = (qfprom_cdata[0] & MSM8909_S2_P2_MASK_0_1) >> MSM8909_S2_P2_SHIFT_0_1; >>> + p2[2] |= (qfprom_cdata[1] & MSM8909_S2_P2_MASK_2_5) << MSM8909_S2_P2_SHIFT_2_5; >>> + p2[3] = (qfprom_cdata[1] & MSM8909_S3_P2_MASK) >> MSM8909_S3_P2_SHIFT; >>> + p2[4] = (qfprom_cdata[1] & MSM8909_S4_P2_MASK) >> MSM8909_S4_P2_SHIFT; >> >> Please use nvmem_cell_read_* to read these values. This would allow you to >> push all the possible si_pi definitions into the DT and use mode to switch >> between them. And mode can be read using the nvmem_cell_read_* too. > > Thanks for the suggestion. > > I agree that this would have been nicer if this had been implemented > that way for all the existing platforms supported by the tsens driver. > But now we already have 7+ platforms using exactly the approach I'm > using in this patch, with existing bindings and existing device trees > that must stay supported. > > My msm8909.dtsi is actually mostly just a simple overlay on top of > msm8916.dtsi, so I would like to keep these platforms consistent > wherever possible. We could change all the existing platforms as well > but in my opinion this would just make the driver and bindings a lot > more complicated because the old approach still must be supported. > > Also, I think the main benefit of having all the points as separate > NVMEM cells would be to allow having a generic qcom,tsens-v0.1 > compatible, without SoC-specific code required in the driver. However, > subtle differences in the way the calibration points are used (e.g. the > fixed correction offsets in this patch) will likely make SoC-specific > code necessary anyway. And then it doesn't matter much if the bit masks > are in the driver like all existing code or end up being put into the DT. > > TL;DR: I would prefer to keep this as-is to keep the driver simple and > consistent across all the supported platforms. At least let's change the driver to use FIELD_GET, this will allow us to remove SHIFT defines. I will take a look in the next few days if we can switch to nvmem_cell in a sensible manner.
diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c index f136cb350238..e17c4f9d9aa5 100644 --- a/drivers/thermal/qcom/tsens-v0_1.c +++ b/drivers/thermal/qcom/tsens-v0_1.c @@ -15,6 +15,48 @@ #define TM_Sn_STATUS_OFF 0x0030 #define TM_TRDY_OFF 0x005c +/* eeprom layout data for 8909 */ +#define MSM8909_CAL_SEL_MASK 0x00070000 +#define MSM8909_CAL_SEL_SHIFT 16 + +#define MSM8909_BASE0_MASK 0x000000ff +#define MSM8909_BASE1_MASK 0x0000ff00 +#define MSM8909_BASE0_SHIFT 0 +#define MSM8909_BASE1_SHIFT 8 + +#define MSM8909_S0_P1_MASK 0x0000003f +#define MSM8909_S1_P1_MASK 0x0003f000 +#define MSM8909_S2_P1_MASK 0x3f000000 +#define MSM8909_S3_P1_MASK 0x000003f0 +#define MSM8909_S4_P1_MASK 0x003f0000 + +#define MSM8909_S0_P2_MASK 0x00000fc0 +#define MSM8909_S1_P2_MASK 0x00fc0000 +#define MSM8909_S2_P2_MASK_0_1 0xc0000000 +#define MSM8909_S2_P2_MASK_2_5 0x0000000f +#define MSM8909_S3_P2_MASK 0x0000fc00 +#define MSM8909_S4_P2_MASK 0x0fc00000 + +#define MSM8909_S0_P1_SHIFT 0 +#define MSM8909_S1_P1_SHIFT 12 +#define MSM8909_S2_P1_SHIFT 24 +#define MSM8909_S3_P1_SHIFT 4 +#define MSM8909_S4_P1_SHIFT 16 + +#define MSM8909_S0_P2_SHIFT 6 +#define MSM8909_S1_P2_SHIFT 18 +#define MSM8909_S2_P2_SHIFT_0_1 30 +#define MSM8909_S2_P2_SHIFT_2_5 2 +#define MSM8909_S3_P2_SHIFT 10 +#define MSM8909_S4_P2_SHIFT 22 + +#define MSM8909_D30_WA_S1 10 +#define MSM8909_D30_WA_S3 9 +#define MSM8909_D30_WA_S4 8 +#define MSM8909_D120_WA_S1 6 +#define MSM8909_D120_WA_S3 9 +#define MSM8909_D120_WA_S4 10 + /* eeprom layout data for 8916 */ #define MSM8916_BASE0_MASK 0x0000007f #define MSM8916_BASE1_MASK 0xfe000000 @@ -223,6 +265,68 @@ #define MDM9607_CAL_SEL_MASK 0x00700000 #define MDM9607_CAL_SEL_SHIFT 20 +static int calibrate_8909(struct tsens_priv *priv) +{ + u32 *qfprom_cdata, *qfprom_csel; + int base0, base1, mode, i; + u32 p1[5], p2[5]; + + qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); + if (IS_ERR(qfprom_cdata)) + return PTR_ERR(qfprom_cdata); + + qfprom_csel = (u32 *)qfprom_read(priv->dev, "calib_sel"); + if (IS_ERR(qfprom_csel)) { + kfree(qfprom_cdata); + return PTR_ERR(qfprom_csel); + } + + mode = (qfprom_csel[0] & MSM8909_CAL_SEL_MASK) >> MSM8909_CAL_SEL_SHIFT; + dev_dbg(priv->dev, "calibration mode is %d\n", mode); + + switch (mode) { + case TWO_PT_CALIB: + base1 = (qfprom_csel[0] & MSM8909_BASE1_MASK) >> MSM8909_BASE1_SHIFT; + p2[0] = (qfprom_cdata[0] & MSM8909_S0_P2_MASK) >> MSM8909_S0_P2_SHIFT; + p2[1] = (qfprom_cdata[0] & MSM8909_S1_P2_MASK) >> MSM8909_S1_P2_SHIFT; + p2[2] = (qfprom_cdata[0] & MSM8909_S2_P2_MASK_0_1) >> MSM8909_S2_P2_SHIFT_0_1; + p2[2] |= (qfprom_cdata[1] & MSM8909_S2_P2_MASK_2_5) << MSM8909_S2_P2_SHIFT_2_5; + p2[3] = (qfprom_cdata[1] & MSM8909_S3_P2_MASK) >> MSM8909_S3_P2_SHIFT; + p2[4] = (qfprom_cdata[1] & MSM8909_S4_P2_MASK) >> MSM8909_S4_P2_SHIFT; + for (i = 0; i < priv->num_sensors; i++) + p2[i] = ((base1 + p2[i]) << 2); + p2[1] -= MSM8909_D120_WA_S1; + p2[3] -= MSM8909_D120_WA_S3; + p2[4] -= MSM8909_D120_WA_S4; + fallthrough; + case ONE_PT_CALIB2: + base0 = (qfprom_csel[0] & MSM8909_BASE0_MASK) >> MSM8909_BASE0_SHIFT; + p1[0] = (qfprom_cdata[0] & MSM8909_S0_P1_MASK) >> MSM8909_S0_P1_SHIFT; + p1[1] = (qfprom_cdata[0] & MSM8909_S1_P1_MASK) >> MSM8909_S1_P1_SHIFT; + p1[2] = (qfprom_cdata[0] & MSM8909_S2_P1_MASK) >> MSM8909_S2_P1_SHIFT; + p1[3] = (qfprom_cdata[1] & MSM8909_S3_P1_MASK) >> MSM8909_S3_P1_SHIFT; + p1[4] = (qfprom_cdata[1] & MSM8909_S4_P1_MASK) >> MSM8909_S4_P1_SHIFT; + for (i = 0; i < priv->num_sensors; i++) + p1[i] = (((base0) + p1[i]) << 2); + p1[1] -= MSM8909_D30_WA_S1; + p1[3] -= MSM8909_D30_WA_S3; + p1[4] -= MSM8909_D30_WA_S4; + break; + default: + for (i = 0; i < priv->num_sensors; i++) { + p1[i] = 500; + p2[i] = 780; + } + break; + } + + compute_intercept_slope(priv, p1, p2, mode); + kfree(qfprom_cdata); + kfree(qfprom_csel); + + return 0; +} + static int calibrate_8916(struct tsens_priv *priv) { int base0 = 0, base1 = 0, i; @@ -534,7 +638,7 @@ static int calibrate_9607(struct tsens_priv *priv) return 0; } -/* v0.1: 8916, 8939, 8974, 9607 */ +/* v0.1: 8909, 8916, 8939, 8974, 9607 */ static struct tsens_features tsens_v0_1_feat = { .ver_major = VER_0_1, @@ -580,6 +684,19 @@ static const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = { [TRDY] = REG_FIELD(TM_TRDY_OFF, 0, 0), }; +static const struct tsens_ops ops_8909 = { + .init = init_common, + .calibrate = calibrate_8909, + .get_temp = get_temp_common, +}; + +struct tsens_plat_data data_8909 = { + .num_sensors = 5, + .ops = &ops_8909, + .feat = &tsens_v0_1_feat, + .fields = tsens_v0_1_regfields, +}; + static const struct tsens_ops ops_8916 = { .init = init_common, .calibrate = calibrate_8916, diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 7963ee33bf75..cb7bbaa72d89 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -973,6 +973,9 @@ static const struct of_device_id tsens_table[] = { }, { .compatible = "qcom,mdm9607-tsens", .data = &data_9607, + }, { + .compatible = "qcom,msm8909-tsens", + .data = &data_8909, }, { .compatible = "qcom,msm8916-tsens", .data = &data_8916, diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index 1471a2c00f15..752d4718f26e 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -587,7 +587,7 @@ int get_temp_common(const struct tsens_sensor *s, int *temp); extern struct tsens_plat_data data_8960; /* TSENS v0.1 targets */ -extern struct tsens_plat_data data_8916, data_8939, data_8974, data_9607; +extern struct tsens_plat_data data_8909, data_8916, data_8939, data_8974, data_9607; /* TSENS v1 targets */ extern struct tsens_plat_data data_tsens_v1, data_8976;
The MSM8909 SoC has 5 thermal sensors in a TSENS v0.1 block similar to MSM8916, except that the bit offsets in the qfprom were changed. Also, some fixed correction factors are needed as workaround because the factory calibration apparently was not reliable enough. Add the defines and calibration function for MSM8909 in the existing tsens-v0_1.c driver to make the thermal sensors work on MSM8909. The changes are derived from the original msm-3.18 kernel [1] from Qualcomm but cleaned up and adapted to the driver in mainline. [1]: https://git.codelinaro.org/clo/la/kernel/msm-3.18/-/blob/LA.UM.7.7.c26-08600-8x09.0/drivers/thermal/msm-tsens.c Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com> --- drivers/thermal/qcom/tsens-v0_1.c | 119 +++++++++++++++++++++++++++++- drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 2 +- 3 files changed, 122 insertions(+), 2 deletions(-)