From patchwork Tue Sep 15 17:37:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sibi Sankar X-Patchwork-Id: 250251 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78DA1C43461 for ; Tue, 15 Sep 2020 18:39:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 344F221655 for ; Tue, 15 Sep 2020 18:39:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="tBT3/fBF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727951AbgIORim (ORCPT ); Tue, 15 Sep 2020 13:38:42 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:39943 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727946AbgIORhn (ORCPT ); Tue, 15 Sep 2020 13:37:43 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1600191447; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: Cc: To: From: Sender; bh=SfPogHCOVXzD1t3NOZd7E7xh1krkIKc4i6JLC9hjcYw=; b=tBT3/fBFLf3k9KKe/CFXKacX0nkiIq8aHlF87LV5xg1l3gypx4G0l9UuhRPyz8A5Te7E71ru GG6H1zuG/UshmIWE6+w3XWuwa+xekWE1q8fr3JEqVL7/jU/pl9oaEWIFKaw+D4Yq7/fwE9hw Bw2hMyhSACmtVzelHFP1lzKE1a0= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyI1MzIzYiIsICJsaW51eC1hcm0tbXNtQHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n02.prod.us-west-2.postgun.com with SMTP id 5f60fbd5be06707b34317b45 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 15 Sep 2020 17:37:25 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 0DA1DC43382; Tue, 15 Sep 2020 17:37:25 +0000 (UTC) Received: from blr-ubuntu-253.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.18.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sibis) by smtp.codeaurora.org (Postfix) with ESMTPSA id A6A5BC433CA; Tue, 15 Sep 2020 17:37:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A6A5BC433CA Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=sibis@codeaurora.org From: Sibi Sankar To: bjorn.andersson@linaro.org Cc: agross@kernel.org, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, ohad@wizery.com, evgreen@chromium.org, swboyd@chromium.org, Sibi Sankar Subject: [PATCH] remoteproc: qcom_q6v5: Assign mpss region to Q6 before MBA cold boot Date: Tue, 15 Sep 2020 23:07:13 +0530 Message-Id: <20200915173713.28098-1-sibis@codeaurora.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On secure devices which support warm reset, the modem subsystem requires access to the mpss region to clear them out. Hence assign the mpss region to Q6 before MBA cold boot. This will be a nop during a modem SSR. Signed-off-by: Sibi Sankar --- I didn't want to add any new flags for warm reset support because calling xfer for mpss to q6 shouldn't have any side effects on platforms that don't support warm resets. drivers/remoteproc/qcom_q6v5_mss.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index c401bcc263fa5..cc5b7edc02c73 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -931,6 +931,18 @@ static int q6v5_mba_load(struct q6v5 *qproc) goto assert_reset; } + /** + * On secure devices which support warm reboot, the modem subsystem's cold boot is similar + * to an SSR sequence i.e the mba requires access to the modem memory to clear it out during + * Q6 cold boot. For modem SSR it will be a nop. + */ + 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);