From patchwork Wed Apr 25 14:50:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sibi Sankar X-Patchwork-Id: 10363397 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1D3286032C for ; Wed, 25 Apr 2018 14:51:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0912F27B13 for ; Wed, 25 Apr 2018 14:51:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0789B290A7; Wed, 25 Apr 2018 14:51:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 680FD27B13 for ; Wed, 25 Apr 2018 14:50:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754777AbeDYOuj (ORCPT ); Wed, 25 Apr 2018 10:50:39 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:42360 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754300AbeDYOuh (ORCPT ); Wed, 25 Apr 2018 10:50:37 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id EDD1C60F5F; Wed, 25 Apr 2018 14:50:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1524667836; bh=9x+ezQvEH4mi7lTeYVuwcwTH8+VBRTd+JUAYXCO6WN0=; h=From:To:Cc:Subject:Date:From; b=fIW8oZb25P2AdXRqXXri6J6U/mTAdSCBCiaOa8eAAryy6i0Nbkeox0FvZ4t+lK8YF VI5912/zszHhKGRC80akB6qH45G8hv5ujOfcUh7dHsq33Pzykg6Dkj1tzOFJjOp0zR ytwbbneGm9wgpP7QdDsqRHAYtNYeF65HCHPwHGlM= Received: from blr-ubuntu-87.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@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id C900C60C64; Wed, 25 Apr 2018 14:50:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1524667835; bh=9x+ezQvEH4mi7lTeYVuwcwTH8+VBRTd+JUAYXCO6WN0=; h=From:To:Cc:Subject:Date:From; b=H18CnCgbFHLLBhobDU6jUnxGZzBHOedZF4nUT4EHoVF6w7heQjrWPTSAUgM3lQQcE hJ2QjGFcQBnRPu5Yb6qe2bZJ35bmjTG+XTNH5BJ51ICnZ3JwAt2MMiLiKFU5twhQCP 7NC+hBcjIIJY3XejtdsiuI/Tw/gKVimLAmtHPnb4= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C900C60C64 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sibis@codeaurora.org From: Sibi Sankar To: ohad@wizery.com, bjorn.andersson@linaro.org Cc: clew@codeaurora.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Sibi Sankar Subject: [PATCH] remoteproc: Proxy unvote clk/regs in handover context Date: Wed, 25 Apr 2018 20:20:25 +0530 Message-Id: <20180425145025.21654-1-sibis@codeaurora.org> X-Mailer: git-send-email 2.17.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Introduce interrupt handler for smp2p ready interrupt and handle start completion. Remove the proxy votes for clocks and regulators in the handover interrupt context. Disable wdog and fatal interrupts on remoteproc device stop and re-enable them on remoteproc device start. Signed-off-by: Sibi Sankar --- drivers/remoteproc/qcom_q6v5_pil.c | 71 +++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 11 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c index 296eb3f8b551..7e2d04d4f2f0 100644 --- a/drivers/remoteproc/qcom_q6v5_pil.c +++ b/drivers/remoteproc/qcom_q6v5_pil.c @@ -143,6 +143,10 @@ struct q6v5 { struct qcom_smem_state *state; unsigned stop_bit; + unsigned int handover_interrupt; + unsigned int wdog_interrupt; + unsigned int fatal_interrupt; + struct clk *active_clks[8]; struct clk *proxy_clks[4]; int active_clk_count; @@ -170,6 +174,7 @@ struct q6v5 { struct qcom_rproc_ssr ssr_subdev; struct qcom_sysmon *sysmon; bool need_mem_protection; + bool unvoted_flag; int mpss_perm; int mba_perm; int version; @@ -727,6 +732,7 @@ static int q6v5_start(struct rproc *rproc) int xfermemop_ret; int ret; + qproc->unvoted_flag = false; ret = q6v5_regulator_enable(qproc, qproc->proxy_regs, qproc->proxy_reg_count); if (ret) { @@ -793,9 +799,16 @@ static int q6v5_start(struct rproc *rproc) if (ret) goto reclaim_mpss; + enable_irq(qproc->handover_interrupt); + enable_irq(qproc->wdog_interrupt); + enable_irq(qproc->fatal_interrupt); + ret = wait_for_completion_timeout(&qproc->start_done, msecs_to_jiffies(5000)); if (ret == 0) { + disable_irq(qproc->handover_interrupt); + disable_irq(qproc->wdog_interrupt); + disable_irq(qproc->fatal_interrupt); dev_err(qproc->dev, "start timed out\n"); ret = -ETIMEDOUT; goto reclaim_mpss; @@ -809,11 +822,6 @@ static int q6v5_start(struct rproc *rproc) "Failed to reclaim mba buffer system may become unstable\n"); qproc->running = true; - q6v5_clk_disable(qproc->dev, qproc->proxy_clks, - qproc->proxy_clk_count); - q6v5_regulator_disable(qproc, qproc->proxy_regs, - qproc->proxy_reg_count); - return 0; reclaim_mpss: @@ -892,6 +900,16 @@ static int q6v5_stop(struct rproc *rproc) WARN_ON(ret); reset_control_assert(qproc->mss_restart); + disable_irq(qproc->handover_interrupt); + if (!qproc->unvoted_flag) { + q6v5_clk_disable(qproc->dev, qproc->proxy_clks, + qproc->proxy_clk_count); + q6v5_regulator_disable(qproc, qproc->proxy_regs, + qproc->proxy_reg_count); + } + disable_irq(qproc->wdog_interrupt); + disable_irq(qproc->fatal_interrupt); + q6v5_clk_disable(qproc->dev, qproc->active_clks, qproc->active_clk_count); q6v5_regulator_disable(qproc, qproc->active_regs, @@ -959,7 +977,7 @@ static irqreturn_t q6v5_fatal_interrupt(int irq, void *dev) return IRQ_HANDLED; } -static irqreturn_t q6v5_handover_interrupt(int irq, void *dev) +static irqreturn_t q6v5_ready_interrupt(int irq, void *dev) { struct q6v5 *qproc = dev; @@ -967,6 +985,21 @@ static irqreturn_t q6v5_handover_interrupt(int irq, void *dev) return IRQ_HANDLED; } +static irqreturn_t q6v5_handover_interrupt(int irq, void *dev) +{ + struct q6v5 *qproc = dev; + + if (!qproc->unvoted_flag) { + qproc->unvoted_flag = true; + q6v5_clk_disable(qproc->dev, qproc->proxy_clks, + qproc->proxy_clk_count); + q6v5_regulator_disable(qproc, qproc->proxy_regs, + qproc->proxy_reg_count); + } + + return IRQ_HANDLED; +} + static irqreturn_t q6v5_stop_ack_interrupt(int irq, void *dev) { struct q6v5 *qproc = dev; @@ -1048,7 +1081,8 @@ static int q6v5_init_reset(struct q6v5 *qproc) static int q6v5_request_irq(struct q6v5 *qproc, struct platform_device *pdev, const char *name, - irq_handler_t thread_fn) + irq_handler_t thread_fn, + unsigned int *irq_num) { int ret; @@ -1058,6 +1092,9 @@ static int q6v5_request_irq(struct q6v5 *qproc, return ret; } + if (irq_num) + *irq_num = ret; + ret = devm_request_threaded_irq(&pdev->dev, ret, NULL, thread_fn, IRQF_TRIGGER_RISING | IRQF_ONESHOT, @@ -1184,19 +1221,31 @@ static int q6v5_probe(struct platform_device *pdev) qproc->version = desc->version; qproc->need_mem_protection = desc->need_mem_protection; - ret = q6v5_request_irq(qproc, pdev, "wdog", q6v5_wdog_interrupt); + ret = q6v5_request_irq(qproc, pdev, "wdog", q6v5_wdog_interrupt, + &qproc->wdog_interrupt); + if (ret < 0) + goto free_rproc; + disable_irq(qproc->wdog_interrupt); + + ret = q6v5_request_irq(qproc, pdev, "fatal", q6v5_fatal_interrupt, + &qproc->fatal_interrupt); if (ret < 0) goto free_rproc; + disable_irq(qproc->fatal_interrupt); - ret = q6v5_request_irq(qproc, pdev, "fatal", q6v5_fatal_interrupt); + ret = q6v5_request_irq(qproc, pdev, "ready", q6v5_ready_interrupt, + NULL); if (ret < 0) goto free_rproc; - ret = q6v5_request_irq(qproc, pdev, "handover", q6v5_handover_interrupt); + ret = q6v5_request_irq(qproc, pdev, "handover", q6v5_handover_interrupt, + &qproc->handover_interrupt); if (ret < 0) goto free_rproc; + disable_irq(qproc->handover_interrupt); - ret = q6v5_request_irq(qproc, pdev, "stop-ack", q6v5_stop_ack_interrupt); + ret = q6v5_request_irq(qproc, pdev, "stop-ack", q6v5_stop_ack_interrupt, + NULL); if (ret < 0) goto free_rproc;