On Mon, 4 Aug 2025 15:32:08 +0530
Varshini Rajendran <varshini.rajendran@microchip.com> wrote:
> Add additional condition for validating the calibration data read from
> the OTP through nvmem device interface. Adjust the calibration indexes
> of sama7g5 according to the buffer received from the OTP memory.
Changing those indexes looks to me like either this was broken previously
or we are supporting something new (possibly at the expense of the older
support)
Or is this 'broken' by patch 2 and you are fixing it up here?
If so we normally try not to do that sort of change in multiple steps
because the patches may go via different trees and potentially only
part of it make it to upstream in a particular cycle.
Messy though it is, if you need to change indexes because something
broke doe it all in one patch.
>
> Signed-off-by: Varshini Rajendran <varshini.rajendran@microchip.com>
> ---
> drivers/iio/adc/at91-sama5d2_adc.c | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
> index c3450246730e..d952109a64a9 100644
> --- a/drivers/iio/adc/at91-sama5d2_adc.c
> +++ b/drivers/iio/adc/at91-sama5d2_adc.c
> @@ -445,6 +445,14 @@ static const struct at91_adc_reg_layout sama7g5_layout = {
> #define at91_adc_writel(st, reg, val) \
> writel_relaxed(val, (st)->base + (st)->soc_info.platform->layout->reg)
>
> +/*
> + * The calibration data has a TAG to recognize the packet
> + * The tag has a constant value "ACST" with the ASCII
> + * equivalent 0x41435354. This is used to validate the
> + * calibration data obtained from the OTP.
> + */
> +#define AT91_TEMP_CALIB_TAG 0x41435354
Could we treat it as a string and do a strcmp? Main advantage
is this comment may become unneeded if the code is clear enough.
> +
> /**
> * struct at91_adc_platform - at91-sama5d2 platform information struct
> * @layout: pointer to the reg layout struct
> @@ -504,10 +512,10 @@ struct at91_adc_temp_sensor_clb {
> * @AT91_ADC_TS_CLB_IDX_MAX: max index for temperature calibration packet in OTP
> */
> enum at91_adc_ts_clb_idx {
> - AT91_ADC_TS_CLB_IDX_P1 = 2,
> - AT91_ADC_TS_CLB_IDX_P4 = 5,
> - AT91_ADC_TS_CLB_IDX_P6 = 7,
> - AT91_ADC_TS_CLB_IDX_MAX = 19,
> + AT91_ADC_TS_CLB_IDX_P1 = 1,
> + AT91_ADC_TS_CLB_IDX_P4 = 4,
> + AT91_ADC_TS_CLB_IDX_P6 = 6,
> + AT91_ADC_TS_CLB_IDX_MAX = 18,
> };
>
> /* Temperature sensor calibration - Vtemp voltage sensitivity to temperature. */
> @@ -2281,7 +2289,7 @@ static int at91_adc_temp_sensor_init(struct at91_adc_state *st,
> dev_err(dev, "Failed to read calibration data!\n");
> return PTR_ERR(buf);
> }
> - if (len < AT91_ADC_TS_CLB_IDX_MAX * 4) {
> + if (len < AT91_ADC_TS_CLB_IDX_MAX * 4 || buf[0] != AT91_TEMP_CALIB_TAG) {
> dev_err(dev, "Invalid calibration data!\n");
> ret = -EINVAL;
> goto free_buf;
Not related to this patch, but this would be excellent place to deploy __free
u32 *buf __free(kfree) = nvmem_cell_read(temp_calib, &len);
then can directly return on error here and drop the kfree(buf) below.