From: Mukesh Ojha <quic_mojha@quicinc.com>
To: Neil Armstrong <neil.armstrong@linaro.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Manivannan Sadhasivam <mani@kernel.org>
Cc: <linux-arm-msm@vger.kernel.org>,
<linux-remoteproc@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 2/3] remoteproc: qcom: pas: make region assign more generic
Date: Mon, 6 Nov 2023 20:06:45 +0530 [thread overview]
Message-ID: <1b1a81fa-5293-3de0-70c5-eacf7f368311@quicinc.com> (raw)
In-Reply-To: <20231106-topic-sm8650-upstream-remoteproc-v3-2-dbd4cabaeb47@linaro.org>
On 11/6/2023 1:58 PM, Neil Armstrong wrote:
> The current memory region assign only supports a single
> memory region.
>
> But new platforms introduces more regions to make the
> memory requirements more flexible for various use cases.
> Those new platforms also shares the memory region between the
> DSP and HLOS.
>
> To handle this, make the region assign more generic in order
> to support more than a single memory region and also permit
> setting the regions permissions as shared.
>
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
> ---
> drivers/remoteproc/qcom_q6v5_pas.c | 101 ++++++++++++++++++++++++-------------
> 1 file changed, 66 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
> index 913a5d2068e8..2ea364a04d4c 100644
> --- a/drivers/remoteproc/qcom_q6v5_pas.c
> +++ b/drivers/remoteproc/qcom_q6v5_pas.c
> @@ -33,6 +33,8 @@
>
> #define ADSP_DECRYPT_SHUTDOWN_DELAY_MS 100
>
> +#define MAX_ASSIGN_COUNT 2
> +
> struct adsp_data {
> int crash_reason_smem;
> const char *firmware_name;
> @@ -51,6 +53,9 @@ struct adsp_data {
> int ssctl_id;
>
> int region_assign_idx;
> + int region_assign_count;
> + bool region_assign_shared;
> + int region_assign_vmid;
> };
>
> struct qcom_adsp {
> @@ -87,15 +92,18 @@ struct qcom_adsp {
> phys_addr_t dtb_mem_phys;
> phys_addr_t mem_reloc;
> phys_addr_t dtb_mem_reloc;
> - phys_addr_t region_assign_phys;
> + phys_addr_t region_assign_phys[MAX_ASSIGN_COUNT];
> void *mem_region;
> void *dtb_mem_region;
> size_t mem_size;
> size_t dtb_mem_size;
> - size_t region_assign_size;
> + size_t region_assign_size[MAX_ASSIGN_COUNT];
>
> int region_assign_idx;
> - u64 region_assign_perms;
> + int region_assign_count;
> + bool region_assign_shared;
> + int region_assign_vmid;
> + u64 region_assign_perms[MAX_ASSIGN_COUNT];
>
> struct qcom_rproc_glink glink_subdev;
> struct qcom_rproc_subdev smd_subdev;
> @@ -590,37 +598,53 @@ static int adsp_alloc_memory_region(struct qcom_adsp *adsp)
>
> static int adsp_assign_memory_region(struct qcom_adsp *adsp)
> {
> - struct reserved_mem *rmem = NULL;
> - struct qcom_scm_vmperm perm;
> + struct qcom_scm_vmperm perm[MAX_ASSIGN_COUNT];
> struct device_node *node;
> + unsigned int perm_size;
> + int offset;
> int ret;
>
> if (!adsp->region_assign_idx)
> return 0;
>
> - node = of_parse_phandle(adsp->dev->of_node, "memory-region", adsp->region_assign_idx);
> - if (node)
> - rmem = of_reserved_mem_lookup(node);
> - of_node_put(node);
> - if (!rmem) {
> - dev_err(adsp->dev, "unable to resolve shareable memory-region\n");
> - return -EINVAL;
> - }
> + for (offset = 0; offset < adsp->region_assign_count; ++offset) {
> + struct reserved_mem *rmem = NULL;
> +
> + node = of_parse_phandle(adsp->dev->of_node, "memory-region",
> + adsp->region_assign_idx + offset);
> + if (node)
> + rmem = of_reserved_mem_lookup(node);
> + of_node_put(node);
> + if (!rmem) {
> + dev_err(adsp->dev, "unable to resolve shareable memory-region index %d\n",
> + offset);
> + return -EINVAL;
> + }
>
> - perm.vmid = QCOM_SCM_VMID_MSS_MSA;
> - perm.perm = QCOM_SCM_PERM_RW;
> + if (adsp->region_assign_shared) {
> + perm[0].vmid = QCOM_SCM_VMID_HLOS;
> + perm[0].perm = QCOM_SCM_PERM_RW;
> + perm[1].vmid = adsp->region_assign_vmid;
> + perm[1].perm = QCOM_SCM_PERM_RW;
> + perm_size = 2;
> + } else {
> + perm[0].vmid = adsp->region_assign_vmid;
> + perm[0].perm = QCOM_SCM_PERM_RW;
> + perm_size = 1;
> + }
>
> - adsp->region_assign_phys = rmem->base;
> - adsp->region_assign_size = rmem->size;
> - adsp->region_assign_perms = BIT(QCOM_SCM_VMID_HLOS);
> + adsp->region_assign_phys[offset] = rmem->base;
> + adsp->region_assign_size[offset] = rmem->size;
> + adsp->region_assign_perms[offset] = BIT(QCOM_SCM_VMID_HLOS);
>
> - ret = qcom_scm_assign_mem(adsp->region_assign_phys,
> - adsp->region_assign_size,
> - &adsp->region_assign_perms,
> - &perm, 1);
> - if (ret < 0) {
> - dev_err(adsp->dev, "assign memory failed\n");
> - return ret;
> + ret = qcom_scm_assign_mem(adsp->region_assign_phys[offset],
> + adsp->region_assign_size[offset],
> + &adsp->region_assign_perms[offset],
> + perm, perm_size);
> + if (ret < 0) {
> + dev_err(adsp->dev, "assign memory %d failed\n", offset);
> + return ret;
> + }
> }
>
> return 0;
> @@ -629,20 +653,22 @@ static int adsp_assign_memory_region(struct qcom_adsp *adsp)
> static void adsp_unassign_memory_region(struct qcom_adsp *adsp)
> {
> struct qcom_scm_vmperm perm;
> - int ret;
> + int offset, ret;
one variable per line..
>
> - if (!adsp->region_assign_idx)
> + if (!adsp->region_assign_idx || adsp->region_assign_shared)
> return;
>
> - perm.vmid = QCOM_SCM_VMID_HLOS;
> - perm.perm = QCOM_SCM_PERM_RW;
> + for (offset = 0; offset < adsp->region_assign_count; ++offset) {
> + perm.vmid = QCOM_SCM_VMID_HLOS;
> + perm.perm = QCOM_SCM_PERM_RW;
>
> - ret = qcom_scm_assign_mem(adsp->region_assign_phys,
> - adsp->region_assign_size,
> - &adsp->region_assign_perms,
> - &perm, 1);
> - if (ret < 0)
> - dev_err(adsp->dev, "unassign memory failed\n");
> + ret = qcom_scm_assign_mem(adsp->region_assign_phys[offset],
> + adsp->region_assign_size[offset],
> + &adsp->region_assign_perms[offset],
> + &perm, 1);
> + if (ret < 0)
> + dev_err(adsp->dev, "unassign memory failed\n");
In case you are going to send another version,
you can print offset similar to the assign call failure.,
Otherwise, LGTM.
Feel free to add.
Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
-Mukesh
> + }
> }
>
> static int adsp_probe(struct platform_device *pdev)
> @@ -696,6 +722,9 @@ static int adsp_probe(struct platform_device *pdev)
> adsp->info_name = desc->sysmon_name;
> adsp->decrypt_shutdown = desc->decrypt_shutdown;
> adsp->region_assign_idx = desc->region_assign_idx;
> + adsp->region_assign_count = min_t(int, MAX_ASSIGN_COUNT, desc->region_assign_count);
> + adsp->region_assign_vmid = desc->region_assign_vmid;
> + adsp->region_assign_shared = desc->region_assign_shared;
> if (dtb_fw_name) {
> adsp->dtb_firmware_name = dtb_fw_name;
> adsp->dtb_pas_id = desc->dtb_pas_id;
> @@ -1163,6 +1192,8 @@ static const struct adsp_data sm8550_mpss_resource = {
> .sysmon_name = "modem",
> .ssctl_id = 0x12,
> .region_assign_idx = 2,
> + .region_assign_count = 1,
> + .region_assign_vmid = QCOM_SCM_VMID_MSS_MSA,
> };
>
> static const struct of_device_id adsp_of_match[] = {
>
next prev parent reply other threads:[~2023-11-06 14:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 8:28 [PATCH v3 0/3] remoteproc: qcom: Introduce DSP support for SM8650 Neil Armstrong
2023-11-06 8:28 ` [PATCH v3 1/3] dt-bindings: remoteproc: qcom,sm8550-pas: document the SM8650 PAS Neil Armstrong
2023-11-06 8:28 ` [PATCH v3 2/3] remoteproc: qcom: pas: make region assign more generic Neil Armstrong
2023-11-06 14:36 ` Mukesh Ojha [this message]
2023-11-06 8:28 ` [PATCH v3 3/3] remoteproc: qcom: pas: Add SM8650 remoteproc support Neil Armstrong
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=1b1a81fa-5293-3de0-70c5-eacf7f368311@quicinc.com \
--to=quic_mojha@quicinc.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mani@kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=neil.armstrong@linaro.org \
--cc=robh+dt@kernel.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).