From patchwork Tue Jun 25 16:57:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13711658 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BE93176241 for ; Tue, 25 Jun 2024 16:57:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719334664; cv=none; b=aVynUU9pM+jjzeAuiim6B+WVsQn1uyJBwGjL+falL2ap2pIrfCtnXHRkiDPixbulhZNvp9Z/9MBZNbckRqp7OCcLjJrpr5oaqh2gv+S5tuORFmdHPkSm2bzYt6updE6eSUhEeTvC3dpVOGquZn67u9tbwA+0ovb12HdqsXbRy7k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719334664; c=relaxed/simple; bh=LPxzSDIC0bWWiTuwSNjSkbPq6ilg698BH/kDijwxfsY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Zorc5Q28KFO/JbUUeNAR9YAIskWjjPEjcWwgrHqJ9ATeJpFb9XlIo19KQ+2OkXAKkkW4VX11VH8ya140bI2zrHd3UyTUCLI3Gxi2iECg/hdiMCsdbrau2Xe1rxJpMy3EhEhg7E9zRNWe9W5Y0OzPy5iT4DhcnzFgIIhWdOUF/fY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=m9Uh+AZo; arc=none smtp.client-ip=209.85.167.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="m9Uh+AZo" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-52ce655ff5bso2279839e87.3 for ; Tue, 25 Jun 2024 09:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719334661; x=1719939461; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=j1XpUiv8RRrKO5F/X4U0smbjR19Jj8NAdavi9RRkoig=; b=m9Uh+AZoEdKJWRjAx+4MpBDYGAueiw2gAx9wDXgS5/dfbm6npOgaIZgZVD4be+wspD sr/uxY99mbwX+/oiDQs/WBocrY1U/OOfTx1pk9u6FmX2nzsX3xHUlmdDpwVqqH01bV3V EtCaO2j5ZW3sKOedFS2W4lC95j98lzpUUiHWR0yOttVLpNHEMF/92p4o+X4wQfxUlYpm iLjKlqOktIhWYM50/QgAsTW9baoZuXaRWgCnLay2vy7rQCVfdVXZPUzKtZYOY38b9P2g fvjqRKoyYNAXFTUpqmjTttrmB69IDZicPOrcJMiE7uOYxOSXYfbS37t9elj5a4EoeZx5 v95A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719334661; x=1719939461; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=j1XpUiv8RRrKO5F/X4U0smbjR19Jj8NAdavi9RRkoig=; b=TUDNgboTHwcKv8W9wotcdKWfnXigwf/7q03VZ6f/VP+IFr8Y2IBm4aOFvZ6GYZ7ZIt iPLOkJQ4CPldkVjKKb4CfvVSbU+SFz0ZeDUM9zGtBDvFUOvz+DU7eVbCc1805fzN7O9l r3LnUNiPt2UuCoWdINH6TPixtDBN92IZByBaY1eKxDftSrBNoGo88t1KongS16atZqBb LnsuuXnFREOoat3hQT1De4nEQ1+/880Pkri8VznL1e4Puay1B9c2NE2TY8Yvo3xDPUNr 1ClKTH0nylVB+vYJTFYD5O/yLgTKcVfRvyjqyA1WQbZTilSQ3bvq+aTNAiP+q/nW9Kxx mt4w== X-Forwarded-Encrypted: i=1; AJvYcCVA+qwuoWdZcrFdeOajd1TjCbdwFsASzG5KJdpEKZuRlq/EP6KxKJmM7wWggFSL62/G56/5E4UonNCSxQGA0m2NmkYfn2XKP/GjaAY= X-Gm-Message-State: AOJu0YxT2a75Y/qT9pcrri+ffl9MkWUxPdu8m6vxum4m0v/6oaFSpKy1 6NhT0XQRKZipfKwwKuvHFrqQByAGNoqbnQVreOoC+nEhFNggU7J9ZeR8NyH99A8= X-Google-Smtp-Source: AGHT+IF+dVYgyh8tXVU2XlGCKPydiP8H7EHqIFJAhnmGeg7Yj/64VIHLGroClHUHimYmWRgI8KJmSQ== X-Received: by 2002:a05:6512:70c:b0:52c:e054:4149 with SMTP id 2adb3069b0e04-52ce0619798mr5410849e87.15.1719334660778; Tue, 25 Jun 2024 09:57:40 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3663a8cb6d2sm13360519f8f.111.2024.06.25.09.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 09:57:40 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Srinivas Kandagatla , Banajit Goswami , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/2] ASoC: codecs: lpass-macro: Gracefully handle unknown version Date: Tue, 25 Jun 2024 18:57:35 +0200 Message-ID: <20240625165736.722106-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 378918d59181 ("ASoC: codecs: lpass-macro: add helpers to get codec version") Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- sound/soc/codecs/lpass-macro-common.h | 3 ++- sound/soc/codecs/lpass-va-macro.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/lpass-macro-common.h b/sound/soc/codecs/lpass-macro-common.h index f6f1bfe8eb77..94697d0ba8c9 100644 --- a/sound/soc/codecs/lpass-macro-common.h +++ b/sound/soc/codecs/lpass-macro-common.h @@ -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, diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c index ae80865cd459..f9262d7d2c26 100644 --- a/sound/soc/codecs/lpass-va-macro.c +++ b/sound/soc/codecs/lpass-va-macro.c @@ -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); From patchwork Tue Jun 25 16:57:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13711659 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03E5F176245 for ; Tue, 25 Jun 2024 16:57:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719334665; cv=none; b=scDESJ+utlU1gg9sEySd16u2yfpC4+Mw05e7HmsLcbfkAh6kmrd3u/sIPkapfLIY8IYfOUeZ72ki8ZS5H/FslI9XfrUaMZjR5eIowOBuQmSRW0SqXxAhdlvkM8v+BVo97QS33aepr0Mh8Holmw6QXX/A8jzhknxhZYbOoLuUud8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719334665; c=relaxed/simple; bh=IgGwHrHuFpbFHTEvgUPbclMeTRgHKAPJp73FYsZVpTQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W/4gda3JnNt8YihXQYwFJfr2XubKj2dGFOG4JJcUI3mwFVv953nCcDIzrHMo9Yy1qxsYgOKkJFyNRzoWQuHaTVvVVPdsTXfYe8fNwe5jZXEF5ECG0W6j8XafxIJRiLJQ+Ecq75hTVeeWhAECv+7X1AQxIok1AIWcFAnB/bwEfY4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=hZXrZg/p; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="hZXrZg/p" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-421a1b834acso46792175e9.3 for ; Tue, 25 Jun 2024 09:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719334662; x=1719939462; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LRIDFf691thT58ox/N/VuEZHKFWQnoUZUCRyx39jn5s=; b=hZXrZg/pdIKKxoEUltbP7CANhXKQRlx4s1Kj5LgrIHRQLyhtvnP8iO+3viyePNWUP7 wPPf5CrFqEyONBLpBjPGyLFn1C3JpeFKEfCzykPXqd5WC7Tn62Lj/GgGcncjGtv8uOQd migK/HetNmmRWUA0Ch3diSs7fdqoFxE3qCdtkf2DFr18adJaFLB5WjfigomIYremaF7r yjeMVK/XSm5P0STK0YGpSYCNV1l4LXDd6bgoZwRViyDtmFHFz9iPaB3VHCYvvrMY1NhE 0NDGugDEAZVHaFTLr0hf63jgVPnx+LWijrACa+i/olK+6vsmwAdRkrvfKsxgD0aPb3GO buog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719334662; x=1719939462; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LRIDFf691thT58ox/N/VuEZHKFWQnoUZUCRyx39jn5s=; b=n53+iU9TlOS1EeM9Xo0y5TOUvzobdQk9WRugXi1mhPG04cCkemZ2dzr5qouroTr4op 4i89f2LxCiRfbRm0WzWtc+qsGH7Rc/WOanQOl0roYkspHEznD2XByBVOanxntyKqwNru 9WOQ0xi0xfIdIUHiSVgK4bElv6lqWHhNVmgOoRKDbo0gnM7P/bX98yqvMNACEbbjGPu1 URbzbB48TqJBE974FIUmRnH1MCXWaaAgXMpK7VC/xnYFIC+5v8D/UIrZKVk85pU+/cEU MuauJPaMh68LB+HLOdRcH91AHg5UBMnGNIBGUeKfAsatWrAyeES+V8TI4F/36MCifDIa ZoAw== X-Forwarded-Encrypted: i=1; AJvYcCWIchRkIJ0AU2bTL42oIzo81ccgH9qiPumKR+HNxO0KMXdSLRSgpN5rXa+WzXrSp9OnKBn+D1Og0rbDpf03Du2PP5sp4RkeyWWxpzg= X-Gm-Message-State: AOJu0Yy8GVIaTf09Y/ZBNHZ9D1HTxIcTao2SCDpvO9BjeQEaGMWtw/Ja 5yxErCAs/2FVXivY2hGLThUqzmHpPAqtvRLFcw9culGQPgiPNDZk7NpUiSFA3MVWmy1IT89eGTZ L X-Google-Smtp-Source: AGHT+IE/O1fv/lIki0Fwzrt9YYS/r8AY/7+8D+IqPaAgKoFLSWyy9JqVUr3ddgb2fUcIuTZSME2ZbA== X-Received: by 2002:a5d:46c2:0:b0:360:9cf4:58ce with SMTP id ffacd0b85a97d-366e96b22damr4696741f8f.46.1719334662267; Tue, 25 Jun 2024 09:57:42 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3663a8cb6d2sm13360519f8f.111.2024.06.25.09.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 09:57:41 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Srinivas Kandagatla , Banajit Goswami , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/2] ASoC: codecs: lpass-macro: Use enum for handling codec version Date: Tue, 25 Jun 2024 18:57:36 +0200 Message-ID: <20240625165736.722106-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240625165736.722106-1-krzysztof.kozlowski@linaro.org> References: <20240625165736.722106-1-krzysztof.kozlowski@linaro.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Replace 'int' with proper 'enum lpass_codec_version' in every place which handles the parsed codec version (not raw register values!) to be explicit about contents of the variable. This makes code easier to read and compilers could check missing switch cases. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- sound/soc/codecs/lpass-macro-common.c | 8 ++++---- sound/soc/codecs/lpass-macro-common.h | 4 ++-- sound/soc/codecs/lpass-rx-macro.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/lpass-macro-common.c b/sound/soc/codecs/lpass-macro-common.c index 8b038a99a8f9..6e3b8d0897dd 100644 --- a/sound/soc/codecs/lpass-macro-common.c +++ b/sound/soc/codecs/lpass-macro-common.c @@ -12,7 +12,7 @@ #include "lpass-macro-common.h" static DEFINE_MUTEX(lpass_codec_mutex); -static int lpass_codec_version; +static enum lpass_codec_version lpass_codec_version; struct lpass_macro *lpass_macro_pds_init(struct device *dev) { @@ -69,7 +69,7 @@ void lpass_macro_pds_exit(struct lpass_macro *pds) } EXPORT_SYMBOL_GPL(lpass_macro_pds_exit); -void lpass_macro_set_codec_version(int version) +void lpass_macro_set_codec_version(enum lpass_codec_version version) { mutex_lock(&lpass_codec_mutex); lpass_codec_version = version; @@ -77,9 +77,9 @@ void lpass_macro_set_codec_version(int version) } EXPORT_SYMBOL_GPL(lpass_macro_set_codec_version); -int lpass_macro_get_codec_version(void) +enum lpass_codec_version lpass_macro_get_codec_version(void) { - int ver; + enum lpass_codec_version ver; mutex_lock(&lpass_codec_mutex); ver = lpass_codec_version; diff --git a/sound/soc/codecs/lpass-macro-common.h b/sound/soc/codecs/lpass-macro-common.h index 94697d0ba8c9..3aa9737f2737 100644 --- a/sound/soc/codecs/lpass-macro-common.h +++ b/sound/soc/codecs/lpass-macro-common.h @@ -38,8 +38,8 @@ struct lpass_macro { struct lpass_macro *lpass_macro_pds_init(struct device *dev); void lpass_macro_pds_exit(struct lpass_macro *pds); -void lpass_macro_set_codec_version(int version); -int lpass_macro_get_codec_version(void); +void lpass_macro_set_codec_version(enum lpass_codec_version version); +enum lpass_codec_version lpass_macro_get_codec_version(void); static inline const char *lpass_macro_get_codec_version_string(int version) { diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 1c3429f004ed..320e3261c151 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -642,7 +642,7 @@ struct rx_macro { int rx_mclk_users; int clsh_users; int rx_mclk_cnt; - int codec_version; + enum lpass_codec_version codec_version; int rxn_reg_stride; bool is_ear_mode_on; bool hph_pwr_mode;