The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From bbcda30271752bb7490f2e2aef5411dbcae69116 Mon Sep 17 00:00:00 2001

From: Brian Norris briannorris@chromium.org Date: Mon, 8 Oct 2018 19:08:05 -0700 Subject: [PATCH] remoteproc: qcom: q6v5-mss: add SCM probe dependency

The memory ownership transfer request is performed using SCM, ensure that SCM is available before we probe the driver if memory protection is needed by the subsystem.

Fixes: 6c5a9dc2481b ("remoteproc: qcom: Make secure world call for mem ownership switch") Cc: stable@vger.kernel.org Signed-off-by: Brian Norris briannorris@chromium.org [bjorn: Added condition for need_mem_protection, updated commit message] Signed-off-by: Bjorn Andersson bjorn.andersson@linaro.org

diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 3448f1df2e87..4c47f5e0a87c 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -1152,6 +1152,9 @@ static int q6v5_probe(struct platform_device *pdev) if (!desc) return -EINVAL;

+ if (desc->need_mem_protection && !qcom_scm_is_available()) + return -EPROBE_DEFER; + rproc = rproc_alloc(&pdev->dev, pdev->name, &q6v5_ops, desc->hexagon_mba_image, sizeof(*qproc)); if (!rproc) {