From: Konrad Dybcio <konrad.dybcio@linaro.org>
To: Luca Weiss <luca@z3ntu.xyz>,
~postmarketos/upstreaming@lists.sr.ht,
phone-devel@vger.kernel.org, Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Loic Poulain <loic.poulain@linaro.org>
Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] soc: qcom: rmtfs: handle optional qcom,vmid correctly
Date: Mon, 6 Mar 2023 11:19:04 +0100 [thread overview]
Message-ID: <069ef490-6d50-2e1a-ea01-3c40f829b7fe@linaro.org> (raw)
In-Reply-To: <20230305-rmtfs-vmid-fix-v1-2-6a7206081602@z3ntu.xyz>
On 5.03.2023 11:32, Luca Weiss wrote:
> Older platforms don't have qcom,vmid set
Ugh, "evolution" :P
, handle -EINVAL return value
> correctly. And since num_vmids is passed to of_property_read_u32_array
> later we should make sure it has a sane value before continuing.
>
> Fixes: e656cd0bcf3d ("soc: qcom: rmtfs: Optionally map RMTFS to more VMs")
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
This needs to be sanctioned by bindings, (i.e. if !oldplatform
require qcom,vmid), as without this property new ones will simply
lock up..
But this change is correct on its own
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> drivers/soc/qcom/rmtfs_mem.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soc/qcom/rmtfs_mem.c b/drivers/soc/qcom/rmtfs_mem.c
> index 218397ab0c36f..fb6e4def8c78b 100644
> --- a/drivers/soc/qcom/rmtfs_mem.c
> +++ b/drivers/soc/qcom/rmtfs_mem.c
> @@ -229,7 +229,10 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
> }
>
> num_vmids = of_property_count_u32_elems(node, "qcom,vmid");
> - if (num_vmids < 0) {
> + if (num_vmids == -EINVAL) {
> + /* qcom,vmid is optional */
> + num_vmids = 0;
> + } else if (num_vmids < 0) {
> dev_err(&pdev->dev, "failed to count qcom,vmid elements: %d\n", num_vmids);
> goto remove_cdev;
> } else if (num_vmids > NUM_MAX_VMIDS) {
>
next prev parent reply other threads:[~2023-03-06 10:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-05 10:32 [PATCH 0/2] Fix qcom,vmid handling in rmtfs_mem Luca Weiss
2023-03-05 10:32 ` [PATCH 1/2] soc: qcom: rmtfs: fix error handling reading qcom,vmid Luca Weiss
2023-03-06 10:16 ` Konrad Dybcio
2023-03-05 10:32 ` [PATCH 2/2] soc: qcom: rmtfs: handle optional qcom,vmid correctly Luca Weiss
2023-03-06 10:19 ` Konrad Dybcio [this message]
2023-03-07 4:20 ` (subset) [PATCH 0/2] Fix qcom,vmid handling in rmtfs_mem Bjorn Andersson
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=069ef490-6d50-2e1a-ea01-3c40f829b7fe@linaro.org \
--to=konrad.dybcio@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.poulain@linaro.org \
--cc=luca@z3ntu.xyz \
--cc=phone-devel@vger.kernel.org \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/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;
as well as URLs for NNTP newsgroup(s).