From patchwork Tue Jan 22 05:51:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 156274 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp7183084jaa; Mon, 21 Jan 2019 21:52:14 -0800 (PST) X-Google-Smtp-Source: ALg8bN49Dh3EKco0HFy3fHI07+juHAIy6diRJbiM0Q8JWKJJQ2KuQioHc6/uTAHdkukHuKIimHx+ X-Received: by 2002:a17:902:5a0b:: with SMTP id q11mr33237246pli.186.1548136334156; Mon, 21 Jan 2019 21:52:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548136334; cv=none; d=google.com; s=arc-20160816; b=dmkrvlOqwjKDee4/GjNDuLhQ6Tyue3WNxZqMqMaR571E+gBlRxxOg/IN2umIRj8mcH hRb63l7+hqo661dYGrqHpUOy+FJUphiJdNdJAmV4luJpkSKOwAPZzw2iloK0rr+cDO2p JMCori3bgZzPQ4hi+GwIRsmJ3dVf73jqZa8M39Iom3MeWdf7ArJSfF3lFa7dPVoOGq0m rQz/xiZCLi5Ew6di3Om6N2+4nGkIhRMrMx7ItpM5hzlgymt8AUvLO3pjLR3rqDp612R4 WZXj0aysO2606il5B54IPUpHXC2jv8R4tQnpIaas17Euogle6snmMD69EFq7pRMW8JLx m08g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=GjBCWU0YLJV4xz8elAnATcaOk73UwOaJ2hgycUvAavI=; b=rPLCAhQUVLy5RDB7m7xYgAscRpyfYL14aprbjm+B6cUjTDVOh4Qs3cUIi1CmiMG5p5 UHrw8ezDRQtZffa2IinQwZaW+FPd2n79rU5sSRYZ6bs/mqrFxnsa4hGV5JUAf4UfEv+b 9tZvwIoP8ArDFVM4XGAgGzormMwInddCf873rNc797y7hgW6TzxC0WbQpDashMW5wpm9 Yog9uV0Nlj5KqrzJRUMVUYCN93Os/kbzAB80AoVWE3+y2Zn+6MI+BzAYFuogtctxZJAF Kcu465tyV89iHS74j/nJlI7Z3rS8G0Z01MAJ0DmSaGMgTDAK4rJRGyZBGJDcgdvxAFNL m+Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RKDtvGQL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k33si15567032pld.374.2019.01.21.21.52.13; Mon, 21 Jan 2019 21:52:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RKDtvGQL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727162AbfAVFwL (ORCPT + 27 others); Tue, 22 Jan 2019 00:52:11 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:40030 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727075AbfAVFv4 (ORCPT ); Tue, 22 Jan 2019 00:51:56 -0500 Received: by mail-pg1-f196.google.com with SMTP id z10so10524177pgp.7 for ; Mon, 21 Jan 2019 21:51:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GjBCWU0YLJV4xz8elAnATcaOk73UwOaJ2hgycUvAavI=; b=RKDtvGQLZvWYSkFUOZ8HT8YIQWO2AlYj8zviFc8rxVKGtD1nbPNHIk1uHarwkoX4Dd AZXwzycWiJ9U47HKZt8jUXU+GV5QyMNQPtybhuG5oSkCl22OUO7YaC3TaLjhdII2FtrU vc/0X8Yre38cghWml7wwgqMCzW+F/YsyevA34= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GjBCWU0YLJV4xz8elAnATcaOk73UwOaJ2hgycUvAavI=; b=mrOjGOXLnruLPTIqcp7TSj/LB0iM8NJi9Szbjv9EqXks7GJ+oKRCb9zfCoQ7YuqZAW nBqV4xcDgq+3+yfduQORR2lx3+534cH1pSqOdcXm4qy3BjOvwp+KYvra5IjlwbaZfhdH Y83HDhayZVa+d5NJkAsE8KCKb0KriMowlH9qekSZTJaLi1s+lASxNG4khpo7QqtTwPow 5agfaddYhTtnVg9Hzx+S1ubN04XoZ9zJM17/QJgBjIO7PdPLtIYGOSFUlfvAIZYdxmcI pu/9MbLH1isogy0D2tx0sD7CC/XaLwqnTi1h9SJK0J2+cHgH/tEjx653n2jrhgWJLIle CaLg== X-Gm-Message-State: AJcUukfi2dCuSe0lkmbRIZOy0LpgXG1DrqTg2bEsTEKEDhfxmhXe+el9 /ZPi0YOLSk/nCVFERJFqMSAPZw== X-Received: by 2002:a63:6150:: with SMTP id v77mr30087868pgb.266.1548136315105; Mon, 21 Jan 2019 21:51:55 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id z62sm23771572pfl.33.2019.01.21.21.51.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 21:51:54 -0800 (PST) From: Bjorn Andersson To: Andy Gross , David Brown , Sibi Sankar Cc: Rob Herring , Mark Rutland , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 08/10] remoteproc: q6v5-mss: Active powerdomain for SDM845 Date: Mon, 21 Jan 2019 21:51:10 -0800 Message-Id: <20190122055112.30943-9-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190122055112.30943-1-bjorn.andersson@linaro.org> References: <20190122055112.30943-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The SDM845 MSS needs the load_state powerdomain voted for during the duration of the MSS being powered on, to let the AOSS know that it may not perform certain power save measures. So vote for this. Tested-by: Sibi Sankar Reviewed-by: Sibi Sankar Signed-off-by: Bjorn Andersson --- Changes since v2: - None drivers/remoteproc/qcom_q6v5_mss.c | 31 ++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) -- 2.18.0 diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 003186ce56c7..3e25016954d9 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -133,6 +133,7 @@ struct rproc_hexagon_res { char **proxy_clk_names; char **reset_clk_names; char **active_clk_names; + char **active_pd_names; char **proxy_pd_names; int version; bool need_mem_protection; @@ -159,10 +160,12 @@ struct q6v5 { struct clk *active_clks[8]; struct clk *reset_clks[4]; struct clk *proxy_clks[4]; + struct device *active_pds[1]; struct device *proxy_pds[3]; int active_clk_count; int reset_clk_count; int proxy_clk_count; + int active_pd_count; int proxy_pd_count; struct reg_info active_regs[1]; @@ -730,10 +733,16 @@ static int q6v5_mba_load(struct q6v5 *qproc) qcom_q6v5_prepare(&qproc->q6v5); + ret = q6v5_pds_enable(qproc, qproc->active_pds, qproc->active_pd_count); + if (ret < 0) { + dev_err(qproc->dev, "failed to enable active power domains\n"); + goto disable_irqs; + } + ret = q6v5_pds_enable(qproc, qproc->proxy_pds, qproc->proxy_pd_count); if (ret < 0) { dev_err(qproc->dev, "failed to enable proxy power domains\n"); - goto disable_irqs; + goto disable_active_pds; } ret = q6v5_regulator_enable(qproc, qproc->proxy_regs, @@ -839,6 +848,8 @@ static int q6v5_mba_load(struct q6v5 *qproc) qproc->proxy_reg_count); disable_proxy_pds: q6v5_pds_disable(qproc, qproc->proxy_pds, qproc->proxy_pd_count); +disable_active_pds: + q6v5_pds_disable(qproc, qproc->active_pds, qproc->active_pd_count); disable_irqs: qcom_q6v5_unprepare(&qproc->q6v5); @@ -878,6 +889,7 @@ static void q6v5_mba_reclaim(struct q6v5 *qproc) qproc->active_clk_count); q6v5_regulator_disable(qproc, qproc->active_regs, qproc->active_reg_count); + q6v5_pds_disable(qproc, qproc->active_pds, qproc->active_pd_count); /* In case of failure or coredump scenario where reclaiming MBA memory * could not happen reclaim it here. @@ -1412,11 +1424,19 @@ static int q6v5_probe(struct platform_device *pdev) } qproc->active_reg_count = ret; + ret = q6v5_pds_attach(&pdev->dev, qproc->active_pds, + desc->active_pd_names); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to attach active power domains\n"); + goto free_rproc; + } + qproc->active_pd_count = ret; + ret = q6v5_pds_attach(&pdev->dev, qproc->proxy_pds, desc->proxy_pd_names); if (ret < 0) { dev_err(&pdev->dev, "Failed to init power domains\n"); - goto free_rproc; + goto detach_active_pds; } qproc->proxy_pd_count = ret; @@ -1448,6 +1468,8 @@ static int q6v5_probe(struct platform_device *pdev) detach_proxy_pds: q6v5_pds_detach(qproc, qproc->proxy_pds, qproc->proxy_pd_count); +detach_active_pds: + q6v5_pds_detach(qproc, qproc->active_pds, qproc->active_pd_count); free_rproc: rproc_free(rproc); @@ -1465,6 +1487,7 @@ static int q6v5_remove(struct platform_device *pdev) qcom_remove_smd_subdev(qproc->rproc, &qproc->smd_subdev); qcom_remove_ssr_subdev(qproc->rproc, &qproc->ssr_subdev); + q6v5_pds_detach(qproc, qproc->active_pds, qproc->active_pd_count); q6v5_pds_detach(qproc, qproc->proxy_pds, qproc->proxy_pd_count); rproc_free(qproc->rproc); @@ -1491,6 +1514,10 @@ static const struct rproc_hexagon_res sdm845_mss = { "mnoc_axi", NULL }, + .active_pd_names = (char*[]){ + "load_state", + NULL + }, .proxy_pd_names = (char*[]){ "cx", "mx",