From: Varadarajan Narayanan <quic_varada@quicinc.com>
To: <andersson@kernel.org>, <konradybcio@kernel.org>,
<robh@kernel.org>, <krzk+dt@kernel.org>, <conor+dt@kernel.org>,
<mturquette@baylibre.com>, <sboyd@kernel.org>,
<ilia.lin@kernel.org>, <rafael@kernel.org>,
<viresh.kumar@linaro.org>, <ulf.hansson@linaro.org>,
<linux-pm@vger.kernel.org>, <linux-arm-msm@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-clk@vger.kernel.org>
Cc: Varadarajan Narayanan <quic_varada@quicinc.com>
Subject: [PATCH v7 1/7] soc: qcom: cpr3: Fix 'acc_desc' usage
Date: Tue, 20 Aug 2024 11:26:59 +0530 [thread overview]
Message-ID: <20240820055705.3922754-2-quic_varada@quicinc.com> (raw)
In-Reply-To: <20240820055705.3922754-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 if 'acc_desc' is populated
before using it.
Signed-off-by: Varadarajan Narayanan <quic_varada@quicinc.com>
---
v6: Changes done in the previous version of this patch got squashed
into Konrad's V15
- https://lore.kernel.org/lkml/20240708-topic-cpr3h-v15-9-5bc8b8936489@linaro.org/
In v14, cpr_set_acc() was invoked from cpr_pre_voltage() or
cpr_post_voltage(). Both of those functions invoked cpr_set_acc()
only if drv->tcsr was not NULL (and that implied acc_desc != NULL).
In v15, cpr_pre_voltage() & cpr_post_voltage() have been
removed and cpr_set_acc() is called even though acc_desc
is NULL resulting in NULL pointer access.
Hence allow cpr_set_acc() to proceed only if acc_desc is set.
v5: Add acc_desc check in a different way without breaking other SoC
v4: Undo the acc_desc validation in probe function as that could
affect other SoC.
---
drivers/pmdomain/qcom/cpr3.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/pmdomain/qcom/cpr3.c b/drivers/pmdomain/qcom/cpr3.c
index de24973978b7..d594bc79be1c 100644
--- a/drivers/pmdomain/qcom/cpr3.c
+++ b/drivers/pmdomain/qcom/cpr3.c
@@ -536,12 +536,15 @@ static void cpr_corner_restore(struct cpr_thread *thread,
static void cpr_set_acc(struct cpr_drv *drv, int f)
{
const struct acc_desc *desc = drv->acc_desc;
- struct reg_sequence *s = desc->settings;
- int n = desc->num_regs_per_fuse;
+ struct reg_sequence *s;
+ int n;
- if (!drv->tcsr)
+ if (!desc || !drv->tcsr)
return;
+ s = desc->settings;
+ n = desc->num_regs_per_fuse;
+
if (!s || f == drv->fuse_level_set)
return;
--
2.34.1
next prev parent reply other threads:[~2024-08-20 5:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-20 5:56 [PATCH v7 0/7] Enable CPR for IPQ9574 Varadarajan Narayanan
2024-08-20 5:56 ` Varadarajan Narayanan [this message]
2024-08-20 5:57 ` [PATCH v7 2/7] cpufreq: qcom-nvmem: Add support " Varadarajan Narayanan
2024-08-20 5:57 ` [PATCH v7 3/7] dt-bindings: soc: qcom: cpr3: Add bindings " Varadarajan Narayanan
2024-08-28 20:59 ` Dmitry Baryshkov
2024-08-20 5:57 ` [PATCH v7 4/7] dt-bindings: clock: Add CPR clock defines " Varadarajan Narayanan
2024-08-20 5:57 ` [PATCH v7 5/7] clk: qcom: gcc-ipq9574: Add CPR clock definition Varadarajan Narayanan
2024-08-28 20:26 ` Stephen Boyd
2024-08-20 5:57 ` [PATCH v7 6/7] soc: qcom: cpr3: Add IPQ9574 definitions Varadarajan Narayanan
2024-08-28 21:01 ` Dmitry Baryshkov
2024-08-20 5:57 ` [PATCH v7 7/7] arm64: dts: 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=20240820055705.3922754-2-quic_varada@quicinc.com \
--to=quic_varada@quicinc.com \
--cc=andersson@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=ilia.lin@kernel.org \
--cc=konradybcio@kernel.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=mturquette@baylibre.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®