]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ALSA: hda/tas2781: fix wrong calibrated data order
authorBaojun Xu <baojun.xu@ti.com>
Tue, 13 Aug 2024 04:37:48 +0000 (12:37 +0800)
committerTakashi Iwai <tiwai@suse.de>
Tue, 13 Aug 2024 06:58:42 +0000 (08:58 +0200)
Wrong calibration data order cause sound too low in some device.
Fix wrong calibrated data order, add calibration data converssion
by get_unaligned_be32() after reading from UEFI.

Fixes: 5be27f1e3ec9 ("ALSA: hda/tas2781: Add tas2781 HDA driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: Baojun Xu <baojun.xu@ti.com>
Link: https://patch.msgid.link/20240813043749.108-1-shenghao-ding@ti.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/tas2781_hda_i2c.c

index 49bd7097d8928aa11ffa53ee22748bd1a304d893..7dbfc92d9d55c454b4caa586b71a8042bc4bdbf4 100644 (file)
@@ -2,10 +2,12 @@
 //
 // TAS2781 HDA I2C driver
 //
-// Copyright 2023 Texas Instruments, Inc.
+// Copyright 2023 - 2024 Texas Instruments, Inc.
 //
 // Author: Shenghao Ding <shenghao-ding@ti.com>
+// Current maintainer: Baojun Xu <baojun.xu@ti.com>
 
+#include <asm/unaligned.h>
 #include <linux/acpi.h>
 #include <linux/crc8.h>
 #include <linux/crc32.h>
@@ -519,20 +521,22 @@ static void tas2781_apply_calib(struct tasdevice_priv *tas_priv)
        static const unsigned char rgno_array[CALIB_MAX] = {
                0x74, 0x0c, 0x14, 0x70, 0x7c,
        };
-       unsigned char *data;
+       int offset = 0;
        int i, j, rc;
+       __be32 data;
 
        for (i = 0; i < tas_priv->ndev; i++) {
-               data = tas_priv->cali_data.data +
-                       i * TASDEVICE_SPEAKER_CALIBRATION_SIZE;
                for (j = 0; j < CALIB_MAX; j++) {
+                       data = get_unaligned_be32(
+                               &tas_priv->cali_data.data[offset]);
                        rc = tasdevice_dev_bulk_write(tas_priv, i,
                                TASDEVICE_REG(0, page_array[j], rgno_array[j]),
-                               &(data[4 * j]), 4);
+                               (unsigned char *)&data, 4);
                        if (rc < 0)
                                dev_err(tas_priv->dev,
                                        "chn %d calib %d bulk_wr err = %d\n",
                                        i, j, rc);
+                       offset += 4;
                }
        }
 }