ASoC: rt722-sdca: Add a control to support CAE firmware update
Subsystems (3)
PATCH v2 1/1 ASoC: rt722-sdca: Add a control to support CAE firmware update
From: Jack Yu <[email protected]>
Realtek CAE requires specific tuning parameters based on the system vendor and SKU.
This patch adds a kcontrol to trigger the firmware loading process.
---
Changes in v2:
- Fix the build error caught by kernel test robot. Replace the non-existent snd_soc_component_get_bias_level() with snd_soc_dapm_get_bias_level().
--- sound/soc/codecs/rt722-sdca-sdw.c | 39 ++++- sound/soc/codecs/rt722-sdca.c | 273 +++++++++++++++++++++++++++++- sound/soc/codecs/rt722-sdca.h | 23 +++ 3 files changed, 327 insertions(+), 8 deletions(-)
sound/soc/codecs/rt722-sdca-sdw.c +37 -2
@@ -19,7 +19,9 @@static int rt722_sdca_mbq_size (struct device *dev,unsigned int reg) {switch (reg) { - case 0x2f01 ... 0x2f0a: + case 0x22f0 ... 0x22f1: + case 0x2f01 ... 0x2f0c: + case 0x2f21 ... 0x2f24: case 0x2f35 ... 0x2f36: case 0x2f50 ... 0x2f52:case 0x2f54 :
@@ -84,6 +86,21 @@ static int rt722_sdca_mbq_size(struct device *dev, unsigned int reg)case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_CS31 ,RT722_SDCA_CTL_SAMPLE_FREQ_INDEX ,0 ): case RT722_BUF_ADDR_HID1 ... RT722_BUF_ADDR_HID2: + case 0x44011000 ... 0x440115ff: +case 0x44012000 : +case 0x44012021 : +case 0x44012022 : +case 0x44012025 : + case 0x44021000 ... 0x440211ff: +case 0x44022000 : +case 0x44022019 : +case 0x4402201a : +case 0x4402201d : + case 0x44041000 ... 0x440415ff: +case 0x44042000 : +case 0x44042019 : +case 0x4404201a : +case 0x4404201d :return 1 ; case 0x2000000 ... 0x2000024: case 0x2000029 ... 0x200004a:
@@ -95,8 +112,10 @@ static int rt722_sdca_mbq_size(struct device *dev, unsigned int reg)case 0x200007f : case 0x2000082 ... 0x200008e: case 0x2000090 ... 0x2000094: +case 0x20000b1 : +case 0x20000b4 :case 0x3110000 : - case 0x5300000 ... 0x5300002: + case 0x5300000 ... 0x5300300:case 0x5400002 : case 0x5600000 ... 0x5600007: case 0x5700000 ... 0x5700004:
@@ -175,6 +194,7 @@ static bool rt722_sdca_volatile_register(struct device *dev, unsigned int reg)case SDW_SDCA_CTL (FUNC_NUM_AMP ,RT722_SDCA_ENT_PDE23 ,RT722_SDCA_CTL_ACTUAL_POWER_STATE ,0 ): case RT722_BUF_ADDR_HID1 ... RT722_BUF_ADDR_HID2:case 0x2000000 : +case 0x2000007 :case 0x200000d :case 0x2000019 :case 0x2000020 :
@@ -186,6 +206,21 @@ static bool rt722_sdca_volatile_register(struct device *dev, unsigned int reg)case 0x3110000 :case 0x5800003 :case 0x5810000 : + case 0x44011000 ... 0x440115ff: +case 0x44012000 : +case 0x44012021 : +case 0x44012022 : +case 0x44012025 : + case 0x44021000 ... 0x440211ff: +case 0x44022000 : +case 0x44022019 : +case 0x4402201a : +case 0x4402201d : + case 0x44041000 ... 0x440415ff: +case 0x44042000 : +case 0x44042019 : +case 0x4404201a : +case 0x4404201d :return true;default :return false;
sound/soc/codecs/rt722-sdca.c +267 -6
304 lines not on this page · raw message
sound/soc/codecs/rt722-sdca.h +23 -0
@@ -44,6 +44,7 @@ struct rt722_sdca_priv {bool fu1e_dapm_mute;bool fu1e_mixer_mute[4 ];int hw_vid; +int cae_update_done; };struct rt722_sdca_dmic_kctrl_priv {
@@ -55,6 +56,7 @@ struct rt722_sdca_dmic_kctrl_priv {/* NID */ #define RT722_VENDOR_REG 0x20 +#define RT722_VENDOR_EQ_CAE 0x53#define RT722_VENDOR_CALI 0x58#define RT722_VENDOR_SPK_EFUSE 0x5c#define RT722_VENDOR_IMS_DRE 0x5b
@@ -64,6 +66,7 @@ struct rt722_sdca_dmic_kctrl_priv {/* Index (NID:20h) */ #define RT722_JD_PRODUCT_NUM 0x00#define RT722_ANALOG_BIAS_CTL3 0x04 +#define RT722_MISC_CTRL1 0x07#define RT722_JD_CTRL1 0x09#define RT722_LDO2_3_CTL1 0x0e#define RT722_LDO1_CTL 0x1a
@@ -79,6 +82,12 @@ struct rt722_sdca_dmic_kctrl_priv {#define RT722_SW_CONFIG1 0x8a#define RT722_SW_CONFIG2 0x8b +/* Index (NID:53h) */ +#define RT722_EQ_CTRL_SPK 0x00 +#define RT722_EQ_CTRL_HP 0x100 +#define RT722_EQ_CTRL_DMIC 0x200 +#define RT722_EQ_CTRL_AMIC 0x300 +/* Index (NID:58h) */ #define RT722_DAC_DC_CALI_CTL0 0x00#define RT722_DAC_DC_CALI_CTL1 0x01
@@ -156,6 +165,20 @@ struct rt722_sdca_dmic_kctrl_priv {#define RT722_BUF_ADDR_HID1 0x44030000#define RT722_BUF_ADDR_HID2 0x44030020 +/* RT722 CAE parameter settings */ +#define RT722_SPK_CAE_PARAM1 0x44012000 +#define RT722_SPK_CAE_PARAM34 0x44012021 +#define RT722_SPK_CAE_PARAM35 0x44012022 +#define RT722_SPK_CAE_PARAM38 0x44012025 +#define RT722_HP_CAE_PARAM39 0x44022000 +#define RT722_HP_CAE_PARAM64 0x44022019 +#define RT722_HP_CAE_PARAM65 0x4402201a +#define RT722_HP_CAE_PARAM68 0x4402201d +#define RT722_MIC_CAE_PARAM39 0x44042000 +#define RT722_MIC_CAE_PARAM95 0x44042019 +#define RT722_MIC_CAE_PARAM96 0x4404201a +#define RT722_MIC_CAE_PARAM99 0x4404201d +/* RT722 SDCA Control - function number */ #define FUNC_NUM_JACK_CODEC 0x01#define FUNC_NUM_MIC_ARRAY 0x02
Signature · 1 line
2.54.0
Mark Brown
maintainerQuoted 9 lines · On Mon, May 18, 2026 at 10:55:24AM +0800, [email protected] wrote:
Realtek CAE requires specific tuning parameters based on the system vendor and SKU.
This patch adds a kcontrol to trigger the firmware loading process.Reported-by kernel test robot <[email protected]>- Fix the build error caught by kernel test robot. Replace the non-existent
snd_soc_component_get_bias_level()withsnd_soc_dapm_get_bias_level().
The tags for the report only make sense to include if sending an incremental patch, they don't make sense when sending a whole new version since it looks like the bot asked for the new control which it obviously didn't.
Review
Quoted 5 lines
(quoted diff) +4
-0+static int rt722_cae_load(struct rt722_sdca_priv *rt722) +{ + rt722_sdca_index_update_bits(rt722, RT722_VENDOR_REG, + RT722_MISC_CTRL1, 0x8000, 0x8000);
Should the error paths disable this? We disable it when we finish loading but not in the error paths.
sound/soc/codecs/rt722-sdca.c static int rt722_sdca_set_jack_detect(struct snd_soc_component *component, · line 468
Quoted 6 lines
sound/soc/codecs/rt722-sdca.c +6
-0+regcache_cache_bypass (rt722->regmap, true); +for (fw_offset =0 ; fw_offset < cae_fw->size;) { + + fw_data = (unsigned char *)&cae_fw->data[fw_offset]; +memcpy (tag, fw_data,4 ); + tag[4 ] ='\0' ;
We only validate that our current pointer is inside the firmware, we don't validate that the record we're trying to parse fits inside the firmware.
sound/soc/codecs/rt722-sdca.c static int rt722_sdca_set_jack_detect(struct snd_soc_component *component, · line 473
Quoted 4 lines
sound/soc/codecs/rt722-sdca.c +4
-0+if (strcmp (tag, xu_tag) ==0 ) { +dev_dbg (dev,"%s: This is a XU tag" , __func__); +memcpy (&addr, (fw_data +4 ),4 ); +memcpy (&size, (fw_data +8 ),4 );
We don't validate the size AFAICT?
sound/soc/codecs/rt722-sdca.c static int rt722_sdca_set_jack_detect(struct snd_soc_component *component, · line 575
Quoted 10 lines
sound/soc/codecs/rt722-sdca.c +9
-0+static int rt722_cae_update_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ + +if (ucontrol->value.integer.value[0 ]) { +if (snd_soc_dapm_get_bias_level (dapm) ==SND_SOC_BIAS_OFF ) { + ret =rt722_cae_load (rt722); +if (ret) +dev_err (component->dev,"CAE load failed: %d\n" , ret);
I think it'd make sense to return the error to userspace rather than silently just reporting it as no change.