| Message ID | 20200916145252.16024-1-sibis@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] remoteproc: qcom_q6v5: Assign mpss region to Q6 before MBA boot | expand |
Quoting Sibi Sankar (2020-09-16 07:52:52) > On secure devices which support warm reset, the MBA firmware requires > access to the modem region to clear them out. Hence provide Q6 access > to this region before MBA boot. This will be a nop during a modem SSR. > Does it need a Fixes: tag? Probably. > Signed-off-by: Sibi Sankar <sibis@codeaurora.org> > --- > Trivia time! > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > index c401bcc263fa..f989ca81d374 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -931,6 +931,16 @@ static int q6v5_mba_load(struct q6v5 *qproc) > goto assert_reset; > } > > + /* Some versions of the MBA firmware will upon boot wipe the MPSS region as well, so provide Should have /* on a line by itself. > + * the Q6 access to this region. > + */ > + ret = q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm, false, true, > + qproc->mpss_phys, qproc->mpss_size); > + if (ret) { > + dev_err(qproc->dev, "assigning Q6 access to mpss memory failed: %d\n", ret); > + goto disable_active_clks; > + } > + > /* Assign MBA image access in DDR to q6 */ > ret = q6v5_xfer_mem_ownership(qproc, &qproc->mba_perm, false, true, > qproc->mba_phys, qproc->mba_size); > @@ -1137,8 +1147,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc) > > /** Should be /* instead of /**, the latter is for kernel-doc which this is not. > * In case of a modem subsystem restart on secure devices, the modem > - * memory can be reclaimed only after MBA is loaded. For modem cold > - * boot this will be a nop > + * memory can be reclaimed only after MBA is loaded. > */ > q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm, true, false, > qproc->mpss_phys, qproc->mpss_size);
Stephen, Thanks for taking time to review the series. On 2020-09-16 22:47, Stephen Boyd wrote: > Quoting Sibi Sankar (2020-09-16 07:52:52) >> On secure devices which support warm reset, the MBA firmware requires >> access to the modem region to clear them out. Hence provide Q6 access >> to this region before MBA boot. This will be a nop during a modem SSR. >> > > Does it need a Fixes: tag? Probably. it doesn't really fix anything previously committed. When SC7180 support was added, mss driver still lacked secure boot support and when Bjorn added secure boot support, none of the secure devices necessarily supported warm reset. So I'll skip adding fixes tag. > >> Signed-off-by: Sibi Sankar <sibis@codeaurora.org> >> --- >> > > Trivia time! > >> >> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c >> b/drivers/remoteproc/qcom_q6v5_mss.c >> index c401bcc263fa..f989ca81d374 100644 >> --- a/drivers/remoteproc/qcom_q6v5_mss.c >> +++ b/drivers/remoteproc/qcom_q6v5_mss.c >> @@ -931,6 +931,16 @@ static int q6v5_mba_load(struct q6v5 *qproc) >> goto assert_reset; >> } >> >> + /* Some versions of the MBA firmware will upon boot wipe the >> MPSS region as well, so provide > > Should have /* on a line by itself. > >> + * the Q6 access to this region. >> + */ >> + ret = q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm, false, >> true, >> + qproc->mpss_phys, >> qproc->mpss_size); >> + if (ret) { >> + dev_err(qproc->dev, "assigning Q6 access to mpss >> memory failed: %d\n", ret); >> + goto disable_active_clks; >> + } >> + >> /* Assign MBA image access in DDR to q6 */ >> ret = q6v5_xfer_mem_ownership(qproc, &qproc->mba_perm, false, >> true, >> qproc->mba_phys, >> qproc->mba_size); >> @@ -1137,8 +1147,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc) >> >> /** > > Should be /* instead of /**, the latter is for kernel-doc which this is > not. sure I'll get ^^ done in the next re-spin. > >> * In case of a modem subsystem restart on secure devices, the >> modem >> - * memory can be reclaimed only after MBA is loaded. For modem >> cold >> - * boot this will be a nop >> + * memory can be reclaimed only after MBA is loaded. >> */ >> q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm, true, false, >> qproc->mpss_phys, qproc->mpss_size);
diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index c401bcc263fa..f989ca81d374 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -931,6 +931,16 @@ static int q6v5_mba_load(struct q6v5 *qproc) goto assert_reset; } + /* Some versions of the MBA firmware will upon boot wipe the MPSS region as well, so provide + * the Q6 access to this region. + */ + ret = q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm, false, true, + qproc->mpss_phys, qproc->mpss_size); + if (ret) { + dev_err(qproc->dev, "assigning Q6 access to mpss memory failed: %d\n", ret); + goto disable_active_clks; + } + /* Assign MBA image access in DDR to q6 */ ret = q6v5_xfer_mem_ownership(qproc, &qproc->mba_perm, false, true, qproc->mba_phys, qproc->mba_size); @@ -1137,8 +1147,7 @@ static int q6v5_mpss_load(struct q6v5 *qproc) /** * In case of a modem subsystem restart on secure devices, the modem - * memory can be reclaimed only after MBA is loaded. For modem cold - * boot this will be a nop + * memory can be reclaimed only after MBA is loaded. */ q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm, true, false, qproc->mpss_phys, qproc->mpss_size);
On secure devices which support warm reset, the MBA firmware requires access to the modem region to clear them out. Hence provide Q6 access to this region before MBA boot. This will be a nop during a modem SSR. Signed-off-by: Sibi Sankar <sibis@codeaurora.org> --- V2: * Fixup comments as suggested by Bjorn. drivers/remoteproc/qcom_q6v5_mss.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)