Re: [PATCH v4] ALSA: hda/tas2781: Fix the order of TAS2781 calibrated-data

Gergo Koteles
2025-10-02T19:31:19Z

Cc: <stable@vger.kernel.org>

On Mon, 2025-09-08 at 06:27 +0800, Shenghao Ding wrote:
> A bug reported by one of my customers that the order of TAS2781
> calibrated-data is incorrect, the correct way is to move R0_Low
> and insert it between R0 and InvR0.
>
> Fixes: 4fe238513407 ("ALSA: hda/tas2781: Move and unified the calibrated-data getting function for SPI and I2C into the tas2781_hda lib")
> Signed-off-by: Shenghao Ding <shenghao-ding@ti.com>
>
> ---
> v4:
> - Add missing base into cali_cnv().
> v3:
> - Take Tiwai's advice on cali_cnv() to make it more simpler.
> v2:
> - Submit to the sound branch maintained by Tiwai instead of linux-next
> branch
> - Drop other fix
> ---
> sound/hda/codecs/side-codecs/tas2781_hda.c | 25 +++++++++++++++++-----
> 1 file changed, 20 insertions(+), 5 deletions(-)
>
> diff --git a/sound/hda/codecs/side-codecs/tas2781_hda.c b/sound/hda/codecs/side-codecs/tas2781_hda.c
> index f46d2e06c64f..536940c78f00 100644
> --- a/sound/hda/codecs/side-codecs/tas2781_hda.c
> +++ b/sound/hda/codecs/side-codecs/tas2781_hda.c
> @@ -33,6 +33,23 @@ const efi_guid_t tasdev_fct_efi_guid[] = {
> };
> EXPORT_SYMBOL_NS_GPL(tasdev_fct_efi_guid, "SND_HDA_SCODEC_TAS2781");
>
> +/*
> + * The order of calibrated-data writing function is a bit different from the
> + * order in UEFI. Here is the conversion to match the order of calibrated-data
> + * writing function.
> + */
> +static void cali_cnv(unsigned char *data, unsigned int base, int offset)
> +{
> + struct cali_reg reg_data;
> +
> + memcpy(&reg_data, &data[base], sizeof(reg_data));
> + /* the data order has to be swapped between r0_low_reg and inv0_reg */
> + swap(reg_data.r0_low_reg, reg_data.invr0_reg);
> +
> + cpu_to_be32_array((__force __be32 *)(data + offset + 1),
> + (u32 *)&reg_data, TASDEV_CALIB_N);
> +}
> +
> static void tas2781_apply_calib(struct tasdevice_priv *p)
> {
> struct calidata *cali_data = &p->cali_data;
> @@ -103,8 +120,7 @@ static void tas2781_apply_calib(struct tasdevice_priv *p)
>
> data[l] = k;
> oft++;
> - for (i = 0; i < TASDEV_CALIB_N * 4; i++)
> - data[l + i + 1] = data[4 * oft + i];
> + cali_cnv(data, 4 * oft, l);
> k++;
> }
> }
> @@ -130,9 +146,8 @@ static void tas2781_apply_calib(struct tasdevice_priv *p)
>
> for (j = p->ndev - 1; j >= 0; j--) {
> l = j * (cali_data->cali_dat_sz_per_dev + 1);
> - for (i = TASDEV_CALIB_N * 4; i > 0 ; i--)
> - data[l + i] = data[p->index * 5 + i];
> - data[l+i] = j;
> + cali_cnv(data, cali_data->cali_dat_sz_per_dev * j, l);
> + data[l] = j;
> }
> }
>