| Message ID | 20220910124701.4060321-1-dmitry.baryshkov@linaro.org |
|---|---|
| Headers | show |
| Series | thermal/drivers/tsens: specify nvmem cells in DT rather than parsing them manually | expand |
On 10/09/2022 14:46, Dmitry Baryshkov wrote: > Allow specifing the exact calibration mode and calibration data as nvmem > cells, rather than specifying just a single calibration data blob. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > .../bindings/thermal/qcom-tsens.yaml | 64 ++++++++++++++++--- > 1 file changed, 54 insertions(+), 10 deletions(-) > > diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml > index 038d81338fcf..b813f6f19c1d 100644 > --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml > +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml > @@ -77,18 +77,62 @@ properties: > - const: critical > > nvmem-cells: > - minItems: 1 > - maxItems: 2 > - description: > - Reference to an nvmem node for the calibration data > + oneOf: > + - minItems: 1 > + maxItems: 2 > + description: > + Reference to an nvmem node for the calibration data > + - minItems: 5 > + maxItems: 35 > + description: | > + Reference to an nvmem cells for the calibration mode, two calibration s/an nvmem/nvmem/ Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
Il 10/09/22 14:46, Dmitry Baryshkov ha scritto: > According to msm-3.10, msm8976 uses the same routine for processing > calibration data as other platforms. Drop the msm8976-specific > compute_intercept_slope_8976() and use compute_intercept_slope(). > > Cc: Konrad Dybcio <konrad.dybcio@somainline.org> > Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> As far as I remember, at least some MSM8976 versions don't have the slope fuses populated and/or the values are bad. This is the reason why slopes are hardcoded. This commit would break support for MSM8976. Cc'ing Marijn, as he should be able to re-test this. Cheers, Angelo
Hi, On Mon, 12 Sept 2022 at 11:57, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> wrote: > > Il 10/09/22 14:46, Dmitry Baryshkov ha scritto: > > According to msm-3.10, msm8976 uses the same routine for processing > > calibration data as other platforms. Drop the msm8976-specific > > compute_intercept_slope_8976() and use compute_intercept_slope(). > > > > Cc: Konrad Dybcio <konrad.dybcio@somainline.org> > > Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > As far as I remember, at least some MSM8976 versions don't have the slope > fuses populated and/or the values are bad. This is the reason why slopes > are hardcoded. > > This commit would break support for MSM8976. > Cc'ing Marijn, as he should be able to re-test this. Thanks! I was not sure, granted that the downstream seems to use standard procedure. The details/retesting would be appreciated.
On 12/09/2022 11:57, AngeloGioacchino Del Regno wrote: > Il 10/09/22 14:46, Dmitry Baryshkov ha scritto: >> According to msm-3.10, msm8976 uses the same routine for processing >> calibration data as other platforms. Drop the msm8976-specific >> compute_intercept_slope_8976() and use compute_intercept_slope(). >> >> Cc: Konrad Dybcio <konrad.dybcio@somainline.org> >> Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > As far as I remember, at least some MSM8976 versions don't have the slope > fuses populated and/or the values are bad. This is the reason why slopes > are hardcoded. > > This commit would break support for MSM8976. > Cc'ing Marijn, as he should be able to re-test this. Angelo, Marijn, any update on testing this?
Hi, On 22/09/2022 20:23, Stephan Gerhold wrote: > Hi Dmitry, > > On Sat, Sep 10, 2022 at 03:46:51PM +0300, Dmitry Baryshkov wrote: >> Historically the tsens driver fetches the calibration data as a blob and >> then parses the blob on its own. This results in semi-duplicated code >> spreading over the platform-specific functions. >> >> This patch series changes tsens calibration code to use pre-parsed nvmem >> cells rather than parsing the blob in the driver. For backwards >> compatibility the old code is left in place for msm8916 and qcs404, two >> platforms which have in-tree DT files. For msm8974 the original function >> is left intact, since it differs significantly (and I can not test the >> code on msm8974). For all other affected platforms the old parsing code >> has been dropped as a part of this RFC. >> >> The code was tested on msm8916 and qcs404 only, thus it is being sent as >> an RFC. >> > > Thanks a lot for working on this! > > After thinking about this for a while I wonder if we can go even a step > further: Can we drop SoC-specific code entirely for 8939 and 9607 and > match the generic compatible (qcom,tsens-v0_1)? This would allow most > v0.1 plaforms to use generic code like for qcom,tsens-v2. While this idea looks appealing, I think it's a bit against our custom to put hardware details into the driver rather than putting them into the DT. So, I think, the 8939 will have to stay as is, while for the 9607 and maybe several other devices it should be possible to create a fallback entry. > > AFAICT with your changes only the following remains SoC-specific: > > - hw_ids (actually only needed for 8939 since 9607 has standard IDs) As I wrote, I wouldn't put this into DT. > > While two other things are already handled: > > - num_sensors (the driver supports "#qcom,sensors" in DT already) > - tsens_calibrate_nvmem() shift (AFAICT in downstream msm-tsens.c > everything except 8916 uses shift = 2. 8916 needs special handling > anyway for the backwards compatibility) > > Having the generic compatible would allow me to add MSM8909 without any > code changes at all (just DT schema addition). > > For 8939 we could read the hw_ids from the DT with something like: > > qcom,sensors = <0 1 2 3 5 6 7 8 9 10>; > > And actually there are two revisions of 8939, the older one has one > sensor less (msm-3.10: msm8939-common.dtsi vs msm8939-v3.0.dtsi). > This could also be easily handled from the DT without any code changes: > > qcom,sensors = <0 1 2 3 5 6 7 8 9>; Usually we only care about the latest revision of the chip, earlier revisions typically correspond to engineering samples, never hitting the actual consumer devices. > > The diff could be something like the following (I did not test it yet). > > What do you think? I'd like to sort the calibration data for 8976 first. At this moment I'm waiting for the 8976 data to be tested. Also it would be nice to be able to cleanup the 8976 calibration code.
On Sat, Sep 24, 2022 at 09:58:56PM +0300, Dmitry Baryshkov wrote: > On 22/09/2022 20:23, Stephan Gerhold wrote: > > On Sat, Sep 10, 2022 at 03:46:51PM +0300, Dmitry Baryshkov wrote: > > > Historically the tsens driver fetches the calibration data as a blob and > > > then parses the blob on its own. This results in semi-duplicated code > > > spreading over the platform-specific functions. > > > > > > This patch series changes tsens calibration code to use pre-parsed nvmem > > > cells rather than parsing the blob in the driver. For backwards > > > compatibility the old code is left in place for msm8916 and qcs404, two > > > platforms which have in-tree DT files. For msm8974 the original function > > > is left intact, since it differs significantly (and I can not test the > > > code on msm8974). For all other affected platforms the old parsing code > > > has been dropped as a part of this RFC. > > > > > > The code was tested on msm8916 and qcs404 only, thus it is being sent as > > > an RFC. > > > > > > > Thanks a lot for working on this! > > > > After thinking about this for a while I wonder if we can go even a step > > further: Can we drop SoC-specific code entirely for 8939 and 9607 and > > match the generic compatible (qcom,tsens-v0_1)? This would allow most > > v0.1 plaforms to use generic code like for qcom,tsens-v2. > > While this idea looks appealing, I think it's a bit against our custom to > put hardware details into the driver rather than putting them into the DT. > So, I think, the 8939 will have to stay as is, while for the 9607 and maybe > several other devices it should be possible to create a fallback entry. > IMHO the existing tsens-v2 support is a good example that it's sometimes better to have some minor hardware details in the DT so the driver does not have to be changed for every single platform. Extending from specifying the number of sensors in the DT to the exact set of sensors is not a very big step. Also, aren't you also going against the custom here by moving the fuse hardware details to the DT? :) > [...] > > And actually there are two revisions of 8939, the older one has one > > sensor less (msm-3.10: msm8939-common.dtsi vs msm8939-v3.0.dtsi). > > This could also be easily handled from the DT without any code changes: > > > > qcom,sensors = <0 1 2 3 5 6 7 8 9>; > > Usually we only care about the latest revision of the chip, earlier > revisions typically correspond to engineering samples, never hitting the > actual consumer devices. > I'm afraid we might have to care about both revisions here - I recently checked a couple of MSM8939 devices in postmarketOS and there are definitely two different revisions used in production - they are easily identifiable since they have different CPU revisions in the "lscpu" output (Cortex-A53 r0p1 vs r0p4). Thanks, Stephan
Historically the tsens driver fetches the calibration data as a blob and then parses the blob on its own. This results in semi-duplicated code spreading over the platform-specific functions. This patch series changes tsens calibration code to use pre-parsed nvmem cells rather than parsing the blob in the driver. For backwards compatibility the old code is left in place for msm8916 and qcs404, two platforms which have in-tree DT files. For msm8974 the original function is left intact, since it differs significantly (and I can not test the code on msm8974). For all other affected platforms the old parsing code has been dropped as a part of this RFC. The code was tested on msm8916 and qcs404 only, thus it is being sent as an RFC. Dmitry Baryshkov (10): dt-bindings: thermal: tsens: support per-sensor calibration cells thermal/drivers/tsens: Support using nvmem cells for calibration data thermal/drivers/tsens: drop single-cell code for msm8939 thermal/drivers/tsens: drop single-cell code for mdm9607 thermal/drivers/tsens: drop msm8976-specific defines thermal/drivers/tsens: use generic calibration routine for msm8976 thermal/drivers/tsens: use tsens_calibrate_nvmem for msm8976 calibration thermal/drivers/tsens: drop single-cell code for msm8976 arm64: dts: qcom: msm8916: specify per-sensor calibration cells arm64: dts: qcom: qcs404: specify per-sensor calibration cells .../bindings/thermal/qcom-tsens.yaml | 64 +++++- arch/arm64/boot/dts/qcom/msm8916.dtsi | 70 +++++- arch/arm64/boot/dts/qcom/qcs404.dtsi | 120 +++++++++- drivers/thermal/qcom/tsens-v0_1.c | 208 +----------------- drivers/thermal/qcom/tsens-v1.c | 154 +------------ drivers/thermal/qcom/tsens.c | 62 ++++++ drivers/thermal/qcom/tsens.h | 4 + 7 files changed, 314 insertions(+), 368 deletions(-)