Skip to content

Commit 5552ccc

Browse files
committed
ASoC: codecs: warn on unknown codec version
Merge series from Dmitry Baryshkov <[email protected]>: 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)
2 parents 7277677 + a9a7a2d commit 5552ccc

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

sound/soc/codecs/lpass-macro-common.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ static inline void lpass_macro_pds_exit_action(void *pds)
4949
static inline const char *lpass_macro_get_codec_version_string(int version)
5050
{
5151
switch (version) {
52+
case LPASS_CODEC_VERSION_1_0:
53+
return "v1.0";
54+
case LPASS_CODEC_VERSION_1_1:
55+
return "v1.1";
56+
case LPASS_CODEC_VERSION_1_2:
57+
return "v1.2";
5258
case LPASS_CODEC_VERSION_2_0:
5359
return "v2.0";
5460
case LPASS_CODEC_VERSION_2_1:

sound/soc/codecs/lpass-va-macro.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,6 +1485,10 @@ static void va_macro_set_lpass_codec_version(struct va_macro *va)
14851485
if ((core_id_0 == 0x02) && (core_id_1 == 0x0F) && (core_id_2 == 0x80 || core_id_2 == 0x81))
14861486
version = LPASS_CODEC_VERSION_2_8;
14871487

1488+
if (version == LPASS_CODEC_VERSION_UNKNOWN)
1489+
dev_warn(va->dev, "Unknown Codec version, ID: %02x / %02x / %02x\n",
1490+
core_id_0, core_id_1, core_id_2);
1491+
14881492
lpass_macro_set_codec_version(version);
14891493

14901494
dev_dbg(va->dev, "LPASS Codec Version %s\n", lpass_macro_get_codec_version_string(version));

0 commit comments

Comments
 (0)