From: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Ohad Ben-Cohen <ohad@wizery.com>,
Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>,
MSM <linux-arm-msm@vger.kernel.org>,
linux-remoteproc@vger.kernel.org,
lkml <linux-kernel@vger.kernel.org>,
Sibi Sankar <sibis@codeaurora.org>,
stable@vger.kernel.org
Subject: Re: [PATCH v2 1/2] remoteproc: qcom_q6v5_mss: Don't reassign mpss region on shutdown
Date: Tue, 12 Nov 2019 10:01:38 -0700 [thread overview]
Message-ID: <CAOCk7NrkpwyuZnq7C3CgLDBHoCXM=SMxvt_iv+nQzS9atT3B9A@mail.gmail.com> (raw)
In-Reply-To: <20191109004033.1496871-2-bjorn.andersson@linaro.org>
On Fri, Nov 8, 2019 at 5:40 PM Bjorn Andersson
<bjorn.andersson@linaro.org> wrote:
>
> Trying to reclaim mpss memory while the mba is not running causes the
> system to crash on devices with security fuses blown, so leave it
> assigned to the remote on shutdown and recover it on a subsequent boot.
>
> Fixes: 6c5a9dc2481b ("remoteproc: qcom: Make secure world call for mem ownership switch")
> Cc: stable@vger.kernel.org
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Stuff still works on the laptop, and I don't hit the access violation
with the crash dump scenario on the mtp.
Reviewed-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
Tested-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
> ---
>
> Changes since v1:
> - Assign memory back to Linux in coredump case
>
> drivers/remoteproc/qcom_q6v5_mss.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
> index de919f2e8b94..efab574b2e12 100644
> --- a/drivers/remoteproc/qcom_q6v5_mss.c
> +++ b/drivers/remoteproc/qcom_q6v5_mss.c
> @@ -875,11 +875,6 @@ static void q6v5_mba_reclaim(struct q6v5 *qproc)
> writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
> }
>
> - ret = q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm,
> - false, qproc->mpss_phys,
> - qproc->mpss_size);
> - WARN_ON(ret);
> -
> q6v5_reset_assert(qproc);
>
> q6v5_clk_disable(qproc->dev, qproc->reset_clks,
> @@ -969,6 +964,10 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
> max_addr = ALIGN(phdr->p_paddr + phdr->p_memsz, SZ_4K);
> }
>
> + /* Try to reset ownership back to Linux */
> + q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm, false,
> + qproc->mpss_phys, qproc->mpss_size);
> +
> mpss_reloc = relocate ? min_addr : qproc->mpss_phys;
> qproc->mpss_reloc = mpss_reloc;
> /* Load firmware segments */
> @@ -1058,9 +1057,14 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc,
> void *ptr = rproc_da_to_va(rproc, segment->da, segment->size);
>
> /* Unlock mba before copying segments */
> - if (!qproc->dump_mba_loaded)
> + if (!qproc->dump_mba_loaded) {
> ret = q6v5_mba_load(qproc);
>
> + /* Try to reset ownership back to Linux */
> + q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm, false,
> + qproc->mpss_phys, qproc->mpss_size);
> + }
> +
> if (!ptr || ret)
> memset(dest, 0xff, segment->size);
> else
> @@ -1111,10 +1115,6 @@ static int q6v5_start(struct rproc *rproc)
> return 0;
>
> reclaim_mpss:
> - xfermemop_ret = q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm,
> - false, qproc->mpss_phys,
> - qproc->mpss_size);
> - WARN_ON(xfermemop_ret);
> q6v5_mba_reclaim(qproc);
>
> return ret;
> --
> 2.23.0
>
next prev parent reply other threads:[~2019-11-12 17:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-09 0:40 [PATCH v2 0/2] remoteproc: mss: Improve mem_assign and firmware load Bjorn Andersson
2019-11-09 0:40 ` [PATCH v2 1/2] remoteproc: qcom_q6v5_mss: Don't reassign mpss region on shutdown Bjorn Andersson
2019-11-12 17:01 ` Jeffrey Hugo [this message]
2019-11-13 18:02 ` Jeffrey Hugo
2019-11-09 0:40 ` [PATCH v2 2/2] remoteproc: qcom_q6v5_mss: Validate each segment during loading Bjorn Andersson
2019-11-10 14:05 ` Luca Weiss
2019-11-11 6:45 ` 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='CAOCk7NrkpwyuZnq7C3CgLDBHoCXM=SMxvt_iv+nQzS9atT3B9A@mail.gmail.com' \
--to=jeffrey.l.hugo@gmail.com \
--cc=akdwived@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
--cc=sibis@codeaurora.org \
--cc=stable@vger.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 NNTP newsgroup(s).