github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 18:21:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: codecs: lpass-macro: Gracefully handle unknown version

Browse Source 
Qualcomm LPASS macro codec driver parses registers in order to
detect version of the codec.  It recognizes codecs v2.0 - v2.8, however
we know that there are earlier versions and 'enum lpass_codec_version'
has also v1.0, v1.1 and v1.2.  If by any chance we run on unrecognized
version, driver will use random value from the stack as the codec
version.

Fix it by mapping such cases to an enum of value 0:
LPASS_CODEC_VERSION_UNKNOWN.

Fixes: 378918d591 ("ASoC: codecs: lpass-macro: add helpers to get codec version")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patch.msgid.link/20240625165736.722106-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2024-06-25 18:57:35 +02:00 committed by Mark Brown
parent 727de4fbc5
commit ebc1a54051
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/lpass-macro-common.h
View File

@ -19,7 +19,8 @@ enum lpass_version {
};
enum lpass_codec_version {
LPASS_CODEC_VERSION_1_0 = 1,
LPASS_CODEC_VERSION_UNKNOWN,
LPASS_CODEC_VERSION_1_0,
LPASS_CODEC_VERSION_1_1,
LPASS_CODEC_VERSION_1_2,
LPASS_CODEC_VERSION_2_0,

3
sound/soc/codecs/lpass-va-macro.c
View File

@ -1463,7 +1463,8 @@ static int va_macro_validate_dmic_sample_rate(u32 dmic_sample_rate,
static void va_macro_set_lpass_codec_version(struct va_macro *va)
{
int core_id_0 = 0, core_id_1 = 0, core_id_2 = 0, version;
int core_id_0 = 0, core_id_1 = 0, core_id_2 = 0;
int version = LPASS_CODEC_VERSION_UNKNOWN;
regmap_read(va->regmap, CDC_VA_TOP_CSR_CORE_ID_0, &core_id_0);
regmap_read(va->regmap, CDC_VA_TOP_CSR_CORE_ID_1, &core_id_1);