diff options
| author | Mark Brown <broonie@kernel.org> | 2024-08-08 22:47:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-08-08 22:47:19 +0100 |
| commit | 5552cccb0b73020f6506fd5d8f81975b1f59080c (patch) | |
| tree | 3781116f146d09929533ba6833363da63b146233 /sound/soc | |
| parent | 72776774b55bb59b7b1b09117e915a5030110304 (diff) | |
| parent | a9a7a2d80790d06cd32c535e2e7b10f72ce592e7 (diff) | |
| download | lwn-5552cccb0b73020f6506fd5d8f81975b1f59080c.tar.gz lwn-5552cccb0b73020f6506fd5d8f81975b1f59080c.zip | |
ASoC: codecs: warn on unknown codec version
Merge series from Dmitry Baryshkov <dmitry.baryshkov@linaro.org>:
While debugging broken audio issues on some of Qualcomm platforms I
stumbled upon the kernel not providing the actual error information.
It prints an error from the wsa_macro driver, but the actual issue is in
the VA macro driver. Add error message to point to the actual error
location.
va_macro 3370000.codec: Unknown VA Codec version, ID: 00 / 0f / 00
wsa_macro 3240000.codec: Unsupported Codec version (0)
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/lpass-macro-common.h | 6 | ||||
| -rw-r--r-- | sound/soc/codecs/lpass-va-macro.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/codecs/lpass-macro-common.h b/sound/soc/codecs/lpass-macro-common.h index 21cb30ab706d..fb4b96cb2b23 100644 --- a/sound/soc/codecs/lpass-macro-common.h +++ b/sound/soc/codecs/lpass-macro-common.h @@ -49,6 +49,12 @@ static inline void lpass_macro_pds_exit_action(void *pds) static inline const char *lpass_macro_get_codec_version_string(int version) { switch (version) { + case LPASS_CODEC_VERSION_1_0: + return "v1.0"; + case LPASS_CODEC_VERSION_1_1: + return "v1.1"; + case LPASS_CODEC_VERSION_1_2: + return "v1.2"; case LPASS_CODEC_VERSION_2_0: return "v2.0"; case LPASS_CODEC_VERSION_2_1: diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index a62ccd09bacd..8454193ed22a 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -1485,6 +1485,10 @@ static void va_macro_set_lpass_codec_version(struct va_macro *va) if ((core_id_0 == 0x02) && (core_id_1 == 0x0F) && (core_id_2 == 0x80 || core_id_2 == 0x81)) version = LPASS_CODEC_VERSION_2_8; + if (version == LPASS_CODEC_VERSION_UNKNOWN) + dev_warn(va->dev, "Unknown Codec version, ID: %02x / %02x / %02x\n", + core_id_0, core_id_1, core_id_2); + lpass_macro_set_codec_version(version); dev_dbg(va->dev, "LPASS Codec Version %s\n", lpass_macro_get_codec_version_string(version)); |