Skip to content

Commit 816c9ca

Browse files
rfvirgilbroonie
authored andcommitted
ASoC: cs35l56: Log a message if firmware is missing
If the amp is still reporting FIRMWARE_MISSING after cs35l56_patch() has completed it is helpful to log a warning. After a complete firmware download the FIRMWARE_MISSING flag will be clear. If this isn't the case, the driver should log a message to report this. The amp can produce basic audio output without firmware, as a fallback, so this wasn't originally logged as a warning condition because the amp is still in an operational state - just not with full functionality. However, it was not at all obvious to an end user that anything is unusual. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Link: https://patch.msgid.link/20251128112520.40067-1-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent feab287 commit 816c9ca

3 files changed

Lines changed: 21 additions & 0 deletions

File tree

include/sound/cs35l56.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ int cs35l56_cal_set_status_get(struct cs35l56_base *cs35l56_base,
409409
struct snd_ctl_elem_value *uvalue);
410410
int cs35l56_read_prot_status(struct cs35l56_base *cs35l56_base,
411411
bool *fw_missing, unsigned int *fw_version);
412+
void cs35l56_warn_if_firmware_missing(struct cs35l56_base *cs35l56_base);
412413
void cs35l56_log_tuning(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp);
413414
int cs35l56_hw_init(struct cs35l56_base *cs35l56_base);
414415
int cs35l56_get_speaker_id(struct cs35l56_base *cs35l56_base);

sound/soc/codecs/cs35l56-shared.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,6 +1337,23 @@ int cs35l56_read_prot_status(struct cs35l56_base *cs35l56_base,
13371337
}
13381338
EXPORT_SYMBOL_NS_GPL(cs35l56_read_prot_status, "SND_SOC_CS35L56_SHARED");
13391339

1340+
void cs35l56_warn_if_firmware_missing(struct cs35l56_base *cs35l56_base)
1341+
{
1342+
unsigned int firmware_version;
1343+
bool firmware_missing;
1344+
int ret;
1345+
1346+
ret = cs35l56_read_prot_status(cs35l56_base, &firmware_missing, &firmware_version);
1347+
if (ret)
1348+
return;
1349+
1350+
if (!firmware_missing)
1351+
return;
1352+
1353+
dev_warn(cs35l56_base->dev, "FIRMWARE_MISSING\n");
1354+
}
1355+
EXPORT_SYMBOL_NS_GPL(cs35l56_warn_if_firmware_missing, "SND_SOC_CS35L56_SHARED");
1356+
13401357
void cs35l56_log_tuning(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp)
13411358
{
13421359
__be32 pid, sid, tid;

sound/soc/codecs/cs35l56.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -823,6 +823,9 @@ static void cs35l56_patch(struct cs35l56_private *cs35l56, bool firmware_missing
823823
goto err_unlock;
824824
}
825825

826+
/* Check if the firmware is still reported missing */
827+
cs35l56_warn_if_firmware_missing(&cs35l56->base);
828+
826829
regmap_clear_bits(cs35l56->base.regmap,
827830
cs35l56->base.fw_reg->prot_sts,
828831
CS35L56_FIRMWARE_MISSING);

0 commit comments

Comments
 (0)