| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <74422acd-258c-415e-8dad-751437e114bf@opensource.cirrus.com>
Date: Mon, 28 Apr 2025 18:38:40 +0100
From: Richard Fitzgerald <rf@...nsource.cirrus.com>
To: Stefan Binding <sbinding@...nsource.cirrus.com>,
Mark Brown <broonie@...nel.org>
Cc: linux-sound@...r.kernel.org, linux-kernel@...r.kernel.org,
patches@...nsource.cirrus.com
Subject: Re: [PATCH v1 4/5] ASoC: cs35l56: Add initial support for CS35L63 for
I2C and SoundWire
On 7/4/25 16:16, Stefan Binding wrote:
> CS35L63 uses a similar control interface to CS35L56 so support for
> it can be added into the CS35L56 driver.
> New regmap configs have been added to support CS35L63.
> CS35L63 only has SoundWire and I2C control interfaces.
>
> Signed-off-by: Stefan Binding <sbinding@...nsource.cirrus.com>
> ---
> include/sound/cs35l56.h | 12 +++
> sound/soc/codecs/cs35l56-i2c.c | 6 ++
> sound/soc/codecs/cs35l56-sdw.c | 74 ++++++++++++++++++
> sound/soc/codecs/cs35l56-shared.c | 123 +++++++++++++++++++++++++++++-
> sound/soc/codecs/cs35l56.c | 23 ++++++
> sound/soc/codecs/cs35l56.h | 1 +
> 6 files changed, 237 insertions(+), 2 deletions(-)
>
> diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
> index 3abe4fbd2085..e16e1a94c8a1 100644
> --- a/include/sound/cs35l56.h
> +++ b/include/sound/cs35l56.h
> @@ -104,6 +104,15 @@
> #define CS35L56_DSP1_PMEM_0 0x3800000
> #define CS35L56_DSP1_PMEM_5114 0x3804FE8
>
> +#define CS35L63_DSP1_FW_VER CS35L56_DSP1_FW_VER
> +#define CS35L63_DSP1_HALO_STATE 0x280396C
> +#define CS35L63_DSP1_PM_CUR_STATE 0x28042C8
> +#define CS35L63_PROTECTION_STATUS 0x340009C
> +#define CS35L63_TRANSDUCER_ACTUAL_PS 0x34000F4
> +#define CS35L63_MAIN_RENDER_USER_MUTE 0x3400020
> +#define CS35L63_MAIN_RENDER_USER_VOLUME 0x3400028
> +#define CS35L63_MAIN_POSTURE_NUMBER 0x3400068
> +
> /* DEVID */
> #define CS35L56_DEVID_MASK 0x00FFFFFF
>
> @@ -322,8 +331,11 @@ static inline bool cs35l56_is_spi(struct cs35l56_base *cs35l56)
> extern const struct regmap_config cs35l56_regmap_i2c;
> extern const struct regmap_config cs35l56_regmap_spi;
> extern const struct regmap_config cs35l56_regmap_sdw;
> +extern const struct regmap_config cs35l63_regmap_i2c;
> +extern const struct regmap_config cs35l63_regmap_sdw;
>
> extern const struct cs35l56_fw_reg cs35l56_fw_reg;
> +extern const struct cs35l56_fw_reg cs35l63_fw_reg;
>
> extern const struct cirrus_amp_cal_controls cs35l56_calibration_controls;
>
> diff --git a/sound/soc/codecs/cs35l56-i2c.c b/sound/soc/codecs/cs35l56-i2c.c
> index 38c391d11c78..073f1796ae29 100644
> --- a/sound/soc/codecs/cs35l56-i2c.c
> +++ b/sound/soc/codecs/cs35l56-i2c.c
> @@ -37,6 +37,10 @@ static int cs35l56_i2c_probe(struct i2c_client *client)
> regmap_config = &cs35l56_regmap_i2c;
> cs35l56->base.fw_reg = &cs35l56_fw_reg;
> break;
> + case 0x3563:
> + regmap_config = &cs35l63_regmap_i2c;
> + cs35l56->base.fw_reg = &cs35l63_fw_reg;
> + break;
> default:
> return -ENODEV;
> }
> @@ -69,6 +73,7 @@ static void cs35l56_i2c_remove(struct i2c_client *client)
>
> static const struct i2c_device_id cs35l56_id_i2c[] = {
> { "cs35l56", 0x3556 },
> + { "cs35l63", 0x3563 },
> {}
> };
> MODULE_DEVICE_TABLE(i2c, cs35l56_id_i2c);
> @@ -76,6 +81,7 @@ MODULE_DEVICE_TABLE(i2c, cs35l56_id_i2c);
> #ifdef CONFIG_ACPI
> static const struct acpi_device_id cs35l56_asoc_acpi_match[] = {
> { "CSC355C", 0x3556 },
> + { "CSC356C", 0x3563 },
> {},
> };
> MODULE_DEVICE_TABLE(acpi, cs35l56_asoc_acpi_match);
> diff --git a/sound/soc/codecs/cs35l56-sdw.c b/sound/soc/codecs/cs35l56-sdw.c
> index 2e0422b41385..13f602f51bf3 100644
> --- a/sound/soc/codecs/cs35l56-sdw.c
> +++ b/sound/soc/codecs/cs35l56-sdw.c
> @@ -393,6 +393,74 @@ static int cs35l56_sdw_update_status(struct sdw_slave *peripheral,
> return 0;
> }
>
> +static int cs35l63_sdw_kick_divider(struct cs35l56_private *cs35l56,
> + struct sdw_slave *peripheral)
> +{
> + unsigned int curr_scale_reg, next_scale_reg;
> + int curr_scale, next_scale, ret;
> +
> + if (!cs35l56->base.init_done)
> + return 0;
> +
> + if (peripheral->bus->params.curr_bank) {
> + curr_scale_reg = SDW_SCP_BUSCLOCK_SCALE_B1;
> + next_scale_reg = SDW_SCP_BUSCLOCK_SCALE_B0;
> + } else {
> + curr_scale_reg = SDW_SCP_BUSCLOCK_SCALE_B0;
> + next_scale_reg = SDW_SCP_BUSCLOCK_SCALE_B1;
> + }
> +
> + /*
> + * Current clock scale value must be different to new value.
> + * Modify current to guarantee this. If next still has the dummy
> + * value we wrote when it was current, the core code has not set
> + * a new scale so restore its original good value
> + */
> + curr_scale = sdw_read_no_pm(peripheral, curr_scale_reg);
> + if (curr_scale < 0) {
> + dev_err(cs35l56->base.dev, "Failed to read current clock scale: %d\n", curr_scale);
> + return curr_scale;
> + }
> +
> + next_scale = sdw_read_no_pm(peripheral, next_scale_reg);
> + if (next_scale < 0) {
> + dev_err(cs35l56->base.dev, "Failed to read next clock scale: %d\n", next_scale);
> + return next_scale;
> + }
> +
> + if (next_scale == CS35L56_SDW_INVALID_BUS_SCALE) {
> + next_scale = cs35l56->old_sdw_clock_scale;
> + ret = sdw_write_no_pm(peripheral, next_scale_reg, next_scale);
> + if (ret < 0) {
> + dev_err(cs35l56->base.dev, "Failed to modify current clock scale: %d\n",
> + ret);
> + return ret;
> + }
> + }
> +
> + cs35l56->old_sdw_clock_scale = curr_scale;
> + ret = sdw_write_no_pm(peripheral, curr_scale_reg, CS35L56_SDW_INVALID_BUS_SCALE);
> + if (ret < 0) {
> + dev_err(cs35l56->base.dev, "Failed to modify current clock scale: %d\n", ret);
> + return ret;
> + }
> +
> + dev_dbg(cs35l56->base.dev, "Next bus scale: %#x\n", next_scale);
> +
> + return 0;
> +}
> +
> +static int cs35l56_sdw_bus_config(struct sdw_slave *peripheral,
> + struct sdw_bus_params *params)
> +{
> + struct cs35l56_private *cs35l56 = dev_get_drvdata(&peripheral->dev);
> +
> + if ((cs35l56->base.type == 0x63) && (cs35l56->base.rev < 0xa1))
> + return cs35l63_sdw_kick_divider(cs35l56, peripheral);
> +
> + return 0;
> +}
> +
> static int __maybe_unused cs35l56_sdw_clk_stop(struct sdw_slave *peripheral,
> enum sdw_clk_stop_mode mode,
> enum sdw_clk_stop_type type)
> @@ -408,6 +476,7 @@ static const struct sdw_slave_ops cs35l56_sdw_ops = {
> .read_prop = cs35l56_sdw_read_prop,
> .interrupt_callback = cs35l56_sdw_interrupt,
> .update_status = cs35l56_sdw_update_status,
> + .bus_config = cs35l56_sdw_bus_config,
> #ifdef DEBUG
> .clk_stop = cs35l56_sdw_clk_stop,
> #endif
> @@ -528,6 +597,10 @@ static int cs35l56_sdw_probe(struct sdw_slave *peripheral, const struct sdw_devi
> regmap_config = &cs35l56_regmap_sdw;
> cs35l56->base.fw_reg = &cs35l56_fw_reg;
> break;
> + case 0x3563:
> + regmap_config = &cs35l63_regmap_sdw;
> + cs35l56->base.fw_reg = &cs35l63_fw_reg;
> + break;
> default:
> return -ENODEV;
> }
> @@ -575,6 +648,7 @@ static const struct dev_pm_ops cs35l56_sdw_pm = {
> static const struct sdw_device_id cs35l56_sdw_id[] = {
> SDW_SLAVE_ENTRY(0x01FA, 0x3556, 0x3556),
> SDW_SLAVE_ENTRY(0x01FA, 0x3557, 0x3557),
> + SDW_SLAVE_ENTRY(0x01FA, 0x3563, 0x3563),
> {},
> };
> MODULE_DEVICE_TABLE(sdw, cs35l56_sdw_id);
> diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c
> index da982774bb4d..76ddb1cf6889 100644
> --- a/sound/soc/codecs/cs35l56-shared.c
> +++ b/sound/soc/codecs/cs35l56-shared.c
> @@ -47,6 +47,13 @@ static const struct reg_sequence cs35l56_patch_fw[] = {
> { CS35L56_MAIN_POSTURE_NUMBER, 0x00000000 },
> };
>
> +static const struct reg_sequence cs35l63_patch_fw[] = {
> + /* These are not reset by a soft-reset, so patch to defaults. */
> + { CS35L63_MAIN_RENDER_USER_MUTE, 0x00000000 },
> + { CS35L63_MAIN_RENDER_USER_VOLUME, 0x00000000 },
> + { CS35L63_MAIN_POSTURE_NUMBER, 0x00000000 },
> +};
> +
> int cs35l56_set_patch(struct cs35l56_base *cs35l56_base)
> {
> int ret;
> @@ -64,6 +71,10 @@ int cs35l56_set_patch(struct cs35l56_base *cs35l56_base)
> ret = regmap_register_patch(cs35l56_base->regmap, cs35l56_patch_fw,
> ARRAY_SIZE(cs35l56_patch_fw));
> break;
> + case 0x63:
> + ret = regmap_register_patch(cs35l56_base->regmap, cs35l63_patch_fw,
> + ARRAY_SIZE(cs35l63_patch_fw));
> + break;
> default:
> break;
> }
> @@ -102,6 +113,36 @@ static const struct reg_default cs35l56_reg_defaults[] = {
> { CS35L56_MAIN_POSTURE_NUMBER, 0x00000000 },
> };
>
> +static const struct reg_default cs35l63_reg_defaults[] = {
> + /* no defaults for OTP_MEM - first read populates cache */
> +
> + { CS35L56_ASP1_ENABLES1, 0x00000000 },
> + { CS35L56_ASP1_CONTROL1, 0x00000028 },
> + { CS35L56_ASP1_CONTROL2, 0x18180200 },
> + { CS35L56_ASP1_CONTROL3, 0x00000002 },
> + { CS35L56_ASP1_FRAME_CONTROL1, 0x03020100 },
> + { CS35L56_ASP1_FRAME_CONTROL5, 0x00020100 },
> + { CS35L56_ASP1_DATA_CONTROL1, 0x00000018 },
> + { CS35L56_ASP1_DATA_CONTROL5, 0x00000018 },
> + { CS35L56_ASP1TX1_INPUT, 0x00000000 },
> + { CS35L56_ASP1TX2_INPUT, 0x00000000 },
> + { CS35L56_ASP1TX3_INPUT, 0x00000000 },
> + { CS35L56_ASP1TX4_INPUT, 0x00000000 },
> + { CS35L56_SWIRE_DP3_CH1_INPUT, 0x00000018 },
> + { CS35L56_SWIRE_DP3_CH2_INPUT, 0x00000019 },
> + { CS35L56_SWIRE_DP3_CH3_INPUT, 0x00000029 },
> + { CS35L56_SWIRE_DP3_CH4_INPUT, 0x00000028 },
> + { CS35L56_IRQ1_MASK_1, 0x8003ffff },
> + { CS35L56_IRQ1_MASK_2, 0xffff7fff },
> + { CS35L56_IRQ1_MASK_4, 0xe0ffffff },
> + { CS35L56_IRQ1_MASK_8, 0x8c000fff },
> + { CS35L56_IRQ1_MASK_18, 0x0760f000 },
> + { CS35L56_IRQ1_MASK_20, 0x15c00000 },
> + { CS35L63_MAIN_RENDER_USER_MUTE, 0x00000000 },
> + { CS35L63_MAIN_RENDER_USER_VOLUME, 0x00000000 },
> + { CS35L63_MAIN_POSTURE_NUMBER, 0x00000000 },
> +};
> +
> static bool cs35l56_is_dsp_memory(unsigned int reg)
> {
> switch (reg) {
> @@ -199,7 +240,7 @@ static bool cs35l56_precious_reg(struct device *dev, unsigned int reg)
> }
> }
>
> -static bool cs35l56_volatile_reg(struct device *dev, unsigned int reg)
> +static bool cs35l56_common_volatile_reg(unsigned int reg)
> {
> switch (reg) {
> case CS35L56_DEVID:
> @@ -237,12 +278,32 @@ static bool cs35l56_volatile_reg(struct device *dev, unsigned int reg)
> case CS35L56_DSP1_SCRATCH3:
> case CS35L56_DSP1_SCRATCH4:
> return true;
> + default:
> + return cs35l56_is_dsp_memory(reg);
> + }
> +}
> +
> +static bool cs35l56_volatile_reg(struct device *dev, unsigned int reg)
> +{
> + switch (reg) {
> case CS35L56_MAIN_RENDER_USER_MUTE:
> case CS35L56_MAIN_RENDER_USER_VOLUME:
> case CS35L56_MAIN_POSTURE_NUMBER:
> return false;
> default:
> - return cs35l56_is_dsp_memory(reg);
> + return cs35l56_common_volatile_reg(reg);
> + }
> +}
> +
> +static bool cs35l63_volatile_reg(struct device *dev, unsigned int reg)
> +{
> + switch (reg) {
> + case CS35L63_MAIN_RENDER_USER_MUTE:
> + case CS35L63_MAIN_RENDER_USER_VOLUME:
> + case CS35L63_MAIN_POSTURE_NUMBER:
> + return false;
> + default:
> + return cs35l56_common_volatile_reg(reg);
> }
> }
>
> @@ -405,6 +466,11 @@ static const struct reg_sequence cs35l56_system_reset_seq[] = {
> REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_SYSTEM_RESET),
> };
>
> +static const struct reg_sequence cs35l63_system_reset_seq[] = {
> + REG_SEQ0(CS35L63_DSP1_HALO_STATE, 0),
> + REG_SEQ0(CS35L56_DSP_VIRTUAL1_MBOX_1, CS35L56_MBOX_CMD_SYSTEM_RESET),
> +};
> +
> void cs35l56_system_reset(struct cs35l56_base *cs35l56_base, bool is_soundwire)
> {
> /*
> @@ -426,6 +492,11 @@ void cs35l56_system_reset(struct cs35l56_base *cs35l56_base, bool is_soundwire)
> cs35l56_system_reset_seq,
> ARRAY_SIZE(cs35l56_system_reset_seq));
> break;
> + case 0x63:
> + regmap_multi_reg_write_bypassed(cs35l56_base->regmap,
> + cs35l63_system_reset_seq,
> + ARRAY_SIZE(cs35l63_system_reset_seq));
> + break;
> default:
> break;
> }
> @@ -844,6 +915,9 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base)
> case 0x35A56:
> case 0x35A57:
> break;
> + case 0x35A630:
> + devid = devid >> 4;
> + break;
> default:
> dev_err(cs35l56_base->dev, "Unknown device %x\n", devid);
> return ret;
> @@ -1080,6 +1154,39 @@ const struct regmap_config cs35l56_regmap_sdw = {
> };
> EXPORT_SYMBOL_NS_GPL(cs35l56_regmap_sdw, "SND_SOC_CS35L56_SHARED");
>
> +const struct regmap_config cs35l63_regmap_i2c = {
> + .reg_bits = 32,
> + .val_bits = 32,
> + .reg_stride = 4,
> + .reg_base = 0x8000,
> + .reg_format_endian = REGMAP_ENDIAN_BIG,
> + .val_format_endian = REGMAP_ENDIAN_BIG,
> + .max_register = CS35L56_DSP1_PMEM_5114,
> + .reg_defaults = cs35l63_reg_defaults,
> + .num_reg_defaults = ARRAY_SIZE(cs35l63_reg_defaults),
> + .volatile_reg = cs35l63_volatile_reg,
> + .readable_reg = cs35l56_readable_reg,
> + .precious_reg = cs35l56_precious_reg,
> + .cache_type = REGCACHE_MAPLE,
> +};
> +EXPORT_SYMBOL_NS_GPL(cs35l63_regmap_i2c, "SND_SOC_CS35L56_SHARED");
> +
> +const struct regmap_config cs35l63_regmap_sdw = {
> + .reg_bits = 32,
> + .val_bits = 32,
> + .reg_stride = 4,
> + .reg_format_endian = REGMAP_ENDIAN_LITTLE,
> + .val_format_endian = REGMAP_ENDIAN_BIG,
> + .max_register = CS35L56_DSP1_PMEM_5114,
> + .reg_defaults = cs35l63_reg_defaults,
> + .num_reg_defaults = ARRAY_SIZE(cs35l63_reg_defaults),
> + .volatile_reg = cs35l63_volatile_reg,
> + .readable_reg = cs35l56_readable_reg,
> + .precious_reg = cs35l56_precious_reg,
> + .cache_type = REGCACHE_MAPLE,
> +};
> +EXPORT_SYMBOL_NS_GPL(cs35l63_regmap_sdw, "SND_SOC_CS35L56_SHARED");
> +
> const struct cs35l56_fw_reg cs35l56_fw_reg = {
> .fw_ver = CS35L56_DSP1_FW_VER,
> .halo_state = CS35L56_DSP1_HALO_STATE,
> @@ -1092,6 +1199,18 @@ const struct cs35l56_fw_reg cs35l56_fw_reg = {
> };
> EXPORT_SYMBOL_NS_GPL(cs35l56_fw_reg, "SND_SOC_CS35L56_SHARED");
>
> +const struct cs35l56_fw_reg cs35l63_fw_reg = {
> + .fw_ver = CS35L63_DSP1_FW_VER,
> + .halo_state = CS35L63_DSP1_HALO_STATE,
> + .pm_cur_stat = CS35L63_DSP1_PM_CUR_STATE,
> + .prot_sts = CS35L63_PROTECTION_STATUS,
> + .transducer_actual_ps = CS35L63_TRANSDUCER_ACTUAL_PS,
> + .user_mute = CS35L63_MAIN_RENDER_USER_MUTE,
> + .user_volume = CS35L63_MAIN_RENDER_USER_VOLUME,
> + .posture_number = CS35L63_MAIN_POSTURE_NUMBER,
> +};
> +EXPORT_SYMBOL_NS_GPL(cs35l63_fw_reg, "SND_SOC_CS35L56_SHARED");
> +
> MODULE_DESCRIPTION("ASoC CS35L56 Shared");
> MODULE_AUTHOR("Richard Fitzgerald <rf@...nsource.cirrus.com>");
> MODULE_AUTHOR("Simon Trimmer <simont@...nsource.cirrus.com>");
> diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
> index a4a1d09097fc..cdb283ed938c 100644
> --- a/sound/soc/codecs/cs35l56.c
> +++ b/sound/soc/codecs/cs35l56.c
> @@ -84,6 +84,25 @@ static const struct snd_kcontrol_new cs35l56_controls[] = {
> cs35l56_dspwait_get_volsw, cs35l56_dspwait_put_volsw),
> };
>
> +static const struct snd_kcontrol_new cs35l63_controls[] = {
> + SOC_SINGLE_EXT("Speaker Switch",
> + CS35L63_MAIN_RENDER_USER_MUTE, 0, 1, 1,
> + cs35l56_dspwait_get_volsw, cs35l56_dspwait_put_volsw),
> + SOC_SINGLE_S_EXT_TLV("Speaker Volume",
> + CS35L63_MAIN_RENDER_USER_VOLUME,
> + CS35L56_MAIN_RENDER_USER_VOLUME_SHIFT,
> + CS35L56_MAIN_RENDER_USER_VOLUME_MIN,
> + CS35L56_MAIN_RENDER_USER_VOLUME_MAX,
> + CS35L56_MAIN_RENDER_USER_VOLUME_SIGNBIT,
> + 0,
> + cs35l56_dspwait_get_volsw,
> + cs35l56_dspwait_put_volsw,
> + vol_tlv),
> + SOC_SINGLE_EXT("Posture Number", CS35L63_MAIN_POSTURE_NUMBER,
> + 0, 255, 0,
> + cs35l56_dspwait_get_volsw, cs35l56_dspwait_put_volsw),
> +};
> +
> static SOC_VALUE_ENUM_SINGLE_DECL(cs35l56_asp1tx1_enum,
> CS35L56_ASP1TX1_INPUT,
> 0, CS35L56_ASP_TXn_SRC_MASK,
> @@ -886,6 +905,10 @@ static int cs35l56_component_probe(struct snd_soc_component *component)
> ret = snd_soc_add_component_controls(component, cs35l56_controls,
> ARRAY_SIZE(cs35l56_controls));
> break;
> + case 0x63:
> + ret = snd_soc_add_component_controls(component, cs35l63_controls,
> + ARRAY_SIZE(cs35l63_controls));
> + break;
> default:
> ret = -ENODEV;
> break;
> diff --git a/sound/soc/codecs/cs35l56.h b/sound/soc/codecs/cs35l56.h
> index 8a987ec01507..200f695efca3 100644
> --- a/sound/soc/codecs/cs35l56.h
> +++ b/sound/soc/codecs/cs35l56.h
> @@ -51,6 +51,7 @@ struct cs35l56_private {
> u8 asp_slot_count;
> bool tdm_mode;
> bool sysclk_set;
> + u8 old_sdw_clock_scale;
> };
>
> extern const struct dev_pm_ops cs35l56_pm_ops_i2c_spi;
Reviewed-by: Richard Fitzgerald <rf@...nsource.cirrus.com>
Powered by blists - more mailing lists