From: Varadarajan Narayanan <quic_varada@quicinc.com>
To: <robh@kernel.org>, <krzk+dt@kernel.org>, <conor+dt@kernel.org>,
<angelogioacchino.delregno@collabora.com>, <andersson@kernel.org>,
<konrad.dybcio@linaro.org>, <mturquette@baylibre.com>,
<sboyd@kernel.org>, <ilia.lin@kernel.org>, <rafael@kernel.org>,
<viresh.kumar@linaro.org>, <ulf.hansson@linaro.org>,
<quic_sibis@quicinc.com>, <otto.pflueger@abscue.de>,
<neil.armstrong@linaro.org>, <luca@z3ntu.xyz>,
<abel.vesa@linaro.org>, <danila@jiaxyga.com>,
<quic_varada@quicinc.com>, <quic_ipkumar@quicinc.com>,
<linux-arm-msm@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-clk@vger.kernel.org>,
<linux-pm@vger.kernel.org>
Subject: [PATCH v3 1/9] soc: qcom: cpr3: Fix 'acc_desc' usage
Date: Wed, 26 Jun 2024 16:09:54 +0530 [thread overview]
Message-ID: <20240626104002.420535-2-quic_varada@quicinc.com> (raw)
In-Reply-To: <20240626104002.420535-1-quic_varada@quicinc.com>
cpr3 code assumes that 'acc_desc' is available for SoCs
implementing CPR version 4 or less. However, IPQ9574 SoC
implements CPRv4 without ACC. This causes NULL pointer accesses
resulting in crashes. Hence, check is 'acc_desc' is populated
before using it.
Signed-off-by: Varadarajan Narayanan <quic_varada@quicinc.com>
---
drivers/pmdomain/qcom/cpr3.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/pmdomain/qcom/cpr3.c b/drivers/pmdomain/qcom/cpr3.c
index c7790a71e74f..c28028be50d8 100644
--- a/drivers/pmdomain/qcom/cpr3.c
+++ b/drivers/pmdomain/qcom/cpr3.c
@@ -2399,12 +2399,12 @@ static int cpr_pd_attach_dev(struct generic_pm_domain *domain,
if (ret)
goto exit;
- if (acc_desc->config)
+ if (acc_desc && acc_desc->config)
regmap_multi_reg_write(drv->tcsr, acc_desc->config,
acc_desc->num_regs_per_fuse);
/* Enable ACC if required */
- if (acc_desc->enable_mask)
+ if (acc_desc && acc_desc->enable_mask)
regmap_update_bits(drv->tcsr, acc_desc->enable_reg,
acc_desc->enable_mask,
acc_desc->enable_mask);
@@ -2676,7 +2676,7 @@ static int cpr_probe(struct platform_device *pdev)
desc = data->cpr_desc;
/* CPRh disallows MEM-ACC access from the HLOS */
- if (!data->acc_desc && desc->cpr_type < CTRL_TYPE_CPRH)
+ if (!data->acc_desc && desc->cpr_type < CTRL_TYPE_CPR4)
return -EINVAL;
drv = devm_kzalloc(dev, sizeof(*drv), GFP_KERNEL);
@@ -2703,7 +2703,7 @@ static int cpr_probe(struct platform_device *pdev)
mutex_init(&drv->lock);
- if (desc->cpr_type < CTRL_TYPE_CPRH) {
+ if (desc->cpr_type < CTRL_TYPE_CPR4) {
np = of_parse_phandle(dev->of_node, "qcom,acc", 0);
if (!np)
return -ENODEV;
--
2.34.1
next prev parent reply other threads:[~2024-06-26 10:40 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-26 10:39 [PATCH v3 0/9] Enable CPR for IPQ9574 Varadarajan Narayanan
2024-06-26 10:39 ` Varadarajan Narayanan [this message]
2024-06-26 18:21 ` [PATCH v3 1/9] soc: qcom: cpr3: Fix 'acc_desc' usage Dmitry Baryshkov
2024-06-26 10:39 ` [PATCH v3 2/9] cpufreq: qcom-nvmem: Add genpd names to match_data_kryo Varadarajan Narayanan
2024-06-26 18:23 ` Dmitry Baryshkov
2024-06-28 6:32 ` Varadarajan Narayanan
2024-06-28 7:40 ` Dmitry Baryshkov
2024-07-03 7:16 ` Varadarajan Narayanan
2024-06-26 10:39 ` [PATCH v3 3/9] dt-bindings: power: rpmpd: Add IPQ9574 power domains Varadarajan Narayanan
2024-06-26 10:39 ` [PATCH v3 4/9] dt-bindings: soc: qcom: cpr3: Add bindings for IPQ9574 Varadarajan Narayanan
2024-06-27 7:32 ` Krzysztof Kozlowski
2024-06-26 10:39 ` [PATCH v3 5/9] pmdomain: qcom: rpmpd: Add IPQ9574 power domains Varadarajan Narayanan
2024-06-26 18:26 ` Dmitry Baryshkov
2024-06-26 10:39 ` [PATCH v3 6/9] dt-bindings: clock: Add CPR clock defines for IPQ9574 Varadarajan Narayanan
2024-06-26 10:40 ` [PATCH v3 7/9] clk: qcom: gcc-ipq9574: Add CPR clock definition Varadarajan Narayanan
2024-06-26 10:40 ` [PATCH v3 8/9] soc: qcom: cpr3: Add IPQ9574 definitions Varadarajan Narayanan
2024-06-26 18:27 ` Dmitry Baryshkov
2024-06-27 7:23 ` Varadarajan Narayanan
2024-06-27 13:46 ` Dmitry Baryshkov
2024-06-28 11:53 ` Varadarajan Narayanan
2024-06-26 10:40 ` [PATCH v3 9/9] dts: arm64: qcom: ipq9574: Enable CPR Varadarajan Narayanan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240626104002.420535-2-quic_varada@quicinc.com \
--to=quic_varada@quicinc.com \
--cc=abel.vesa@linaro.org \
--cc=andersson@kernel.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=conor+dt@kernel.org \
--cc=danila@jiaxyga.com \
--cc=devicetree@vger.kernel.org \
--cc=ilia.lin@kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=luca@z3ntu.xyz \
--cc=mturquette@baylibre.com \
--cc=neil.armstrong@linaro.org \
--cc=otto.pflueger@abscue.de \
--cc=quic_ipkumar@quicinc.com \
--cc=quic_sibis@quicinc.com \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®