From patchwork Sun Jan 6 08:09:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 154827 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2339633ljp; Sun, 6 Jan 2019 00:10:26 -0800 (PST) X-Google-Smtp-Source: ALg8bN5yvCoT16lcyhbj3JDJWh2gxm8PQX6dTSAR0fkZ0ZYJzEumuws2ZMUb3CX4dYgbrUZA6PSx X-Received: by 2002:aa7:84d3:: with SMTP id x19mr58357592pfn.220.1546762225997; Sun, 06 Jan 2019 00:10:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546762225; cv=none; d=google.com; s=arc-20160816; b=nD+Yi+NuYwTDrSKY/3ZztLY6zpG35TR9MWTjNCShlanu/+J3KGR5ZHgYCVQ4kTJ3RJ wPdn8z4fiGrJJFekg+yzs6ymyikCh2tkNzMGllZCidZclPI1YGGUEGl0XCYe/6L27xnQ PX9z4Qyx05BOchl0m3JfYtHC5mfuvdLcftTfLqG3rsP/mHmLmVe3l5rC4sQ49HbaBzns BvjXd9B7I+YyX1yZQ7RpfQjTzPwSkNcKqOyMFnWLMl3kb55VZG/NcijdZqlK+ubd1oWW jBBohCW2JM4rOWHtXBGptUUFXbqANkW2zhaUQAdRE+UZhra8PRGlFeAeOCMRDchLLihy RmwA== 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=8nMYeQKIt4Dh3nFqXbC/17ExZVSNvJ/SwmQaru91kF4=; b=XUEacJbYT9bgr94ML+Q9IFEn20QCVQUBBI2eDSF4vjeAvBCv7qo3l17l6A/tv6wj8T 3VzUMIqesiABrJYw9UxvHAHYh8iZW/tfIm0JSyTFQAMUNUJ3qWT8IGc9hIGnGGSdhk8P SNqW18e/ghcgMAjJU1DJfs0taFFiaykH1/qJRxBHdZRKVYzLBJT6M0x66esOVh9bstkC qNzaUPSA2GEGp5tPSRZGfluJARpqQBkxqMY2s1ldMsq5RGv1USLnqnUuN6cbcmtZ8NC0 a3ivSUR7xiItzk0XyWzLMsfPjWsBd7npsijAurMiTGEy5xNDLXes2lTAFyh8ikDE2d6H NtVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Nx1Q3727; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 n3si17132972plk.328.2019.01.06.00.10.25; Sun, 06 Jan 2019 00:10:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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=Nx1Q3727; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-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 S1726495AbfAFIKX (ORCPT + 15 others); Sun, 6 Jan 2019 03:10:23 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:39550 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726484AbfAFIKX (ORCPT ); Sun, 6 Jan 2019 03:10:23 -0500 Received: by mail-pl1-f193.google.com with SMTP id 101so19394888pld.6 for ; Sun, 06 Jan 2019 00:10:22 -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=8nMYeQKIt4Dh3nFqXbC/17ExZVSNvJ/SwmQaru91kF4=; b=Nx1Q3727XfLnhlPBImy+XV/d6pA+sDqBG+veFVjCXOVI2iQZFgmyIOIS0o8kxXitxU fNss2ThOjnKmEQm2GYoqpvTe7N689pbTvAmRDnnM+1Ptye0hMqfbfg6wk1+p2Mbpt6rp FcqjJA5G8mF15WGHU8hoTgybFsAq2THSaoLNw= 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=8nMYeQKIt4Dh3nFqXbC/17ExZVSNvJ/SwmQaru91kF4=; b=AHPYHzulPBGpoB58xz+ZghJPap2BdO5Vq1v1yHSmF0T2rE3axA4ob7RJEc+CAs/pNC oceIHcl7lKQ7O0iEQjw8Qk0+2d9Y9KIRmKGVXP6uIJmaJkdQn1NRLl8bhmwrxhTVXF1E ljYXb4l+ZPcoTAdeVH+x6rrpZwYDJ4N5Xmc9tbGzp+WmKN6HpJ4thuAvRA5gcMe2/4xI 06l0j3msQLTEIrTALnIdEz7SwVLrLEaz09B3dPrOZzViIgHIb2oK+ZpBx0/3q4n4Mku3 f4IE0S+BDWMUh07Dn5OCfkOwbAW7uQiELHDgnJjF4Evy6T/rIDC3VguPPqo0rXzJFpCo RTPA== X-Gm-Message-State: AJcUukf5tbcZtvJ77/LvpItED6ElUzbobsNLAisKgZwhIv8hKlGpW0zK nyA+vwT2bP/QDuheS1V1FwGrDQ== X-Received: by 2002:a17:902:24a2:: with SMTP id w31mr56153855pla.216.1546762221656; Sun, 06 Jan 2019 00:10:21 -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 v190sm90763364pfv.26.2019.01.06.00.10.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Jan 2019 00:10:21 -0800 (PST) From: Bjorn Andersson To: Andy Gross , David Brown , Rob Herring , Mark Rutland Cc: Russell King , Ulf Hansson , Arun Kumar Neelakantam , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/7] remoteproc: q6v5-mss: Vote for rpmh power domains Date: Sun, 6 Jan 2019 00:09:12 -0800 Message-Id: <20190106080915.4493-5-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190106080915.4493-1-bjorn.andersson@linaro.org> References: <20190106080915.4493-1-bjorn.andersson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Rajendra Nayak With rpmh ARC resources being modelled as power domains with performance state, we need to proxy vote on these for SDM845. Add support to vote on multiple of them, now that genpd supports associating mutliple power domains to a device. Signed-off-by: Rajendra Nayak [bjorn: Drop device link, improve error handling, name things "proxy"] Signed-off-by: Bjorn Andersson --- This is v3 of this patch, but updated to cover "loadstate". v2 can be found here: https://lore.kernel.org/lkml/20180904071046.8152-1-rnayak@codeaurora.org/ Changes since v2: - Drop device links, as we can do active and proxy votes using device links - Improved error handling, by unrolling some votes on failure - Rename things proxy, to follow naming of "proxy" and "active" drivers/remoteproc/qcom_q6v5_mss.c | 115 ++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 4 deletions(-) -- 2.18.0 diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 01be7314e176..62cf16ddb7af 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include #include @@ -131,6 +133,7 @@ struct rproc_hexagon_res { char **proxy_clk_names; char **reset_clk_names; char **active_clk_names; + char **proxy_pd_names; int version; bool need_mem_protection; bool has_alt_reset; @@ -156,9 +159,11 @@ struct q6v5 { struct clk *active_clks[8]; struct clk *reset_clks[4]; struct clk *proxy_clks[4]; + struct device *proxy_pds[3]; int active_clk_count; int reset_clk_count; int proxy_clk_count; + int proxy_pd_count; struct reg_info active_regs[1]; struct reg_info proxy_regs[3]; @@ -321,6 +326,41 @@ static void q6v5_clk_disable(struct device *dev, clk_disable_unprepare(clks[i]); } +static int q6v5_pds_enable(struct q6v5 *qproc, struct device **pds, + size_t pd_count) +{ + int ret; + int i; + + for (i = 0; i < pd_count; i++) { + dev_pm_genpd_set_performance_state(pds[i], INT_MAX); + ret = pm_runtime_get_sync(pds[i]); + if (ret < 0) + goto unroll_pd_votes; + } + + return 0; + +unroll_pd_votes: + for (i--; i >= 0; i--) { + dev_pm_genpd_set_performance_state(pds[i], 0); + pm_runtime_put(pds[i]); + } + + return ret; +}; + +static void q6v5_pds_disable(struct q6v5 *qproc, struct device **pds, + size_t pd_count) +{ + int i; + + for (i = 0; i < pd_count; i++) { + dev_pm_genpd_set_performance_state(pds[i], 0); + pm_runtime_put(pds[i]); + } +} + static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, int *current_perm, bool remote_owner, phys_addr_t addr, size_t size) @@ -690,11 +730,17 @@ static int q6v5_mba_load(struct q6v5 *qproc) qcom_q6v5_prepare(&qproc->q6v5); + 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; + } + ret = q6v5_regulator_enable(qproc, qproc->proxy_regs, qproc->proxy_reg_count); if (ret) { dev_err(qproc->dev, "failed to enable proxy supplies\n"); - goto disable_irqs; + goto disable_proxy_pds; } ret = q6v5_clk_enable(qproc->dev, qproc->proxy_clks, @@ -791,6 +837,8 @@ static int q6v5_mba_load(struct q6v5 *qproc) disable_proxy_reg: q6v5_regulator_disable(qproc, qproc->proxy_regs, qproc->proxy_reg_count); +disable_proxy_pds: + q6v5_pds_disable(qproc, qproc->proxy_pds, qproc->proxy_pd_count); disable_irqs: qcom_q6v5_unprepare(&qproc->q6v5); @@ -1121,6 +1169,7 @@ static void qcom_msa_handover(struct qcom_q6v5 *q6v5) qproc->proxy_clk_count); q6v5_regulator_disable(qproc, qproc->proxy_regs, qproc->proxy_reg_count); + q6v5_pds_disable(qproc, qproc->proxy_pds, qproc->proxy_pd_count); } static int q6v5_init_mem(struct q6v5 *qproc, struct platform_device *pdev) @@ -1181,6 +1230,45 @@ static int q6v5_init_clocks(struct device *dev, struct clk **clks, return i; } +static int q6v5_pds_attach(struct device *dev, struct device **devs, + char **pd_names) +{ + size_t num_pds = 0; + int ret; + int i; + + if (!pd_names) + return 0; + + while (pd_names[num_pds]) + num_pds++; + + for (i = 0; i < num_pds; i++) { + devs[i] = dev_pm_domain_attach_by_name(dev, pd_names[i]); + if (IS_ERR(devs[i])) { + ret = PTR_ERR(devs[i]); + goto unroll_attach; + } + } + + return num_pds; + +unroll_attach: + for (i--; i >= 0; i--) + dev_pm_domain_detach(devs[i], false); + + return ret; +}; + +static void q6v5_pds_detach(struct q6v5 *qproc, struct device **pds, + size_t pd_count) +{ + int i; + + for (i = 0; i < pd_count; i++) + dev_pm_domain_detach(pds[i], false); +} + static int q6v5_init_reset(struct q6v5 *qproc) { qproc->mss_restart = devm_reset_control_get_exclusive(qproc->dev, @@ -1322,10 +1410,18 @@ static int q6v5_probe(struct platform_device *pdev) } qproc->active_reg_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; + } + qproc->proxy_pd_count = ret; + qproc->has_alt_reset = desc->has_alt_reset; ret = q6v5_init_reset(qproc); if (ret) - goto free_rproc; + goto detach_proxy_pds; qproc->version = desc->version; qproc->need_mem_protection = desc->need_mem_protection; @@ -1333,7 +1429,7 @@ static int q6v5_probe(struct platform_device *pdev) ret = qcom_q6v5_init(&qproc->q6v5, pdev, rproc, MPSS_CRASH_REASON_SMEM, qcom_msa_handover); if (ret) - goto free_rproc; + goto detach_proxy_pds; qproc->mpss_perm = BIT(QCOM_SCM_VMID_HLOS); qproc->mba_perm = BIT(QCOM_SCM_VMID_HLOS); @@ -1344,10 +1440,12 @@ static int q6v5_probe(struct platform_device *pdev) ret = rproc_add(rproc); if (ret) - goto free_rproc; + goto detach_proxy_pds; return 0; +detach_proxy_pds: + q6v5_pds_detach(qproc, qproc->proxy_pds, qproc->proxy_pd_count); free_rproc: rproc_free(rproc); @@ -1364,6 +1462,9 @@ static int q6v5_remove(struct platform_device *pdev) qcom_remove_glink_subdev(qproc->rproc, &qproc->glink_subdev); qcom_remove_smd_subdev(qproc->rproc, &qproc->smd_subdev); qcom_remove_ssr_subdev(qproc->rproc, &qproc->ssr_subdev); + + q6v5_pds_detach(qproc, qproc->proxy_pds, qproc->proxy_pd_count); + rproc_free(qproc->rproc); return 0; @@ -1388,6 +1489,12 @@ static const struct rproc_hexagon_res sdm845_mss = { "mnoc_axi", NULL }, + .proxy_pd_names = (char*[]){ + "cx", + "mx", + "mss", + NULL + }, .need_mem_protection = true, .has_alt_reset = true, .version = MSS_SDM845,