From patchwork Wed Jun 21 07:10:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 106051 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp1786215qgd; Wed, 21 Jun 2017 00:11:36 -0700 (PDT) X-Received: by 10.99.185.28 with SMTP id z28mr25294146pge.123.1498029096066; Wed, 21 Jun 2017 00:11:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498029096; cv=none; d=google.com; s=arc-20160816; b=MX9n5XxNGJzCusvOr3zX6r3G6g1Phc2F92726ieILACgsZHeFuO/jPaI21XrMAZsAN FrcJatRPmscdookN2dtvjTQswmxw4PV4eYVZax//68+GeOtj9Am4JllklK13u9bf3RpX 3bommemvuklB+YwaarDV5E5/onVQWxzk9hIOYDfDSoNBUpFAtSO1IcsezxLOEgcXy2aA 0rZ4RNg6aAO/XpfYJCrwA5mToSvY7aGVJpquN4CIa4SfScGs0vsqP/o2Zf8kwencKmBx AYBXJ1MYpjhoh+WybaJVBaJ60jNmpz0zy7IBCxlMG8dXCxXMoVYSjGz7jqI+ByPb2YgD yZTQ== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=5dPXUkCU6keoNlN2wcycWhovbeBXa8Zqf6Rw7KvqOvQ=; b=x76uYtpB1AZ2pZsgLHSGjm/zQNle1vaPLH2gUep1gitkX6Ia5eD9jz+ze+NwWMNhWM TKd5fyt6VToT2U/eTeiaXyhm8FpVw7W+iZ698nULgm0gq5xhLJGGOdtUFaAxEwGrc3v3 AoTYL0mqpqw4lkC48bpo8OmxHg4wAs5JhBDHSRxpppQpnFuu+fX0WZ/gAeZ3w0teHonJ BQpZBYWruBU8GE1EEIdtAaUQd7+RvtRLlsn5DfnTrqkxwSZnuksgLwCPYiWryKMRCypc DABaFzy1/bBXxRxAXh/FOqZKjtUIZOvTVOG9++Rkt45sHzwvflFGS3lMsTMPmn/B0kG6 Clxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=IIH4Pl35; 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 h66si12330513pfa.285.2017.06.21.00.11.35; Wed, 21 Jun 2017 00:11:36 -0700 (PDT) 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.b=IIH4Pl35; 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 S1752554AbdFUHLS (ORCPT + 25 others); Wed, 21 Jun 2017 03:11:18 -0400 Received: from mail-pg0-f46.google.com ([74.125.83.46]:32866 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751969AbdFUHLQ (ORCPT ); Wed, 21 Jun 2017 03:11:16 -0400 Received: by mail-pg0-f46.google.com with SMTP id f185so73495711pgc.0 for ; Wed, 21 Jun 2017 00:11:16 -0700 (PDT) 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 :in-reply-to:references; bh=5dPXUkCU6keoNlN2wcycWhovbeBXa8Zqf6Rw7KvqOvQ=; b=IIH4Pl355fueY/3ad7OGahBwF+/+e3SsuL+SJaony0oZqNI2zKNRR8ILxkqqc7sXKm B4duBl8Mn4fMNLRlLJOF614Lf7/yhc1rUpiaVNJGYiR8qyOTM6fLego3SH/06iZgrJ+b QqVWY+MJePz1lBvUGfS5rtLgTPtJjt9pBfx6g= 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:in-reply-to:references; bh=5dPXUkCU6keoNlN2wcycWhovbeBXa8Zqf6Rw7KvqOvQ=; b=KlesILxhK6D5pOUipxgYQjBlAWH1N+eOHueL07O+rJ28w7rl+Osmf0mAiThfjltMYM /su8i0zbZsz8OCb0e19LHiFQfU9Z0CZ5okEzojVkFqvMCP5bA2Vswi26x4aF1+Ur4Ei+ I+pA6Ni+9eAublnXz89AMHbhN9HUDcRs5O1wv2nwav3YuZM5muxshvvK35TYxUd84b99 BrBD+5StWSENZq6xkoHhoHhixD/wtyjqwxKaBfndTlhOr4MiU+JYoWImUvso38cKd+9w qMMCEFGYLWsddPtWznIl+SiBRrkGKfX8LyXZI+cRoYuRziX0UpsKX6W2o5Sa3smVDKeq hHkQ== X-Gm-Message-State: AKS2vOxVV7Oo4hR62FhFD20A4sTqVYHimmHj/R70t/0BoOx9iw5peVNh z7e9mmV1ZdDnIKdS X-Received: by 10.101.76.136 with SMTP id m8mr34994836pgt.159.1498029070926; Wed, 21 Jun 2017 00:11:10 -0700 (PDT) Received: from localhost ([122.172.59.234]) by smtp.gmail.com with ESMTPSA id r81sm9575350pfi.61.2017.06.21.00.11.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Jun 2017 00:11:10 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , ulf.hansson@linaro.org, Kevin Hilman Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Stephen Boyd , Nishanth Menon , robh+dt@kernel.org, lina.iyer@linaro.org, rnayak@codeaurora.org, sudeep.holla@arm.com, linux-kernel@vger.kernel.org, Len Brown , Pavel Machek , Andy Gross , David Brown Subject: [NOT-FOR-MERGE V8 4/6] soc: qcom: rpmpd: Add support for get/set performance state Date: Wed, 21 Jun 2017 12:40:51 +0530 Message-Id: X-Mailer: git-send-email 2.13.0.71.gd7076ec9c9cb In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rajendra Nayak THIS IS TEST CODE, SHOULDN'T BE MERGED. With genpd now expecting powerdomain drivers supporting performance state to support get/set performance state callbacks, add support for it in the rpmpd driver. NOT-signed-off-by: Rajendra Nayak NOT-signed-off-by: Viresh Kumar --- drivers/soc/qcom/rpmpd.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) -- 2.13.0.71.gd7076ec9c9cb diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index d34d9c363815..7ef81429c5c5 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -101,6 +101,20 @@ struct rpmpd_desc { size_t num_pds; }; +enum rpmpd_levels { + NONE, + LOWER, /* SVS2 */ + LOW, /* SVS */ + NOMINAL, /* NOMINAL */ + HIGH, /* Turbo */ + MAX_LEVEL, +}; + +struct rpmpd_freq_map { + struct rpmpd *pd; + unsigned long freq[MAX_LEVEL]; +}; + static DEFINE_MUTEX(rpmpd_lock); /* msm8996 RPM powerdomains */ @@ -126,6 +140,47 @@ static const struct rpmpd_desc msm8996_desc = { .num_pds = ARRAY_SIZE(msm8996_rpmpds), }; +enum msm8996_devices { + SDHCI, + UFS, + PCIE, + USB3, +}; + +static struct rpmpd_freq_map msm8996_rpmpd_freq_map[] = { + [SDHCI] = { + .pd = &msm8996_vddcx, + .freq[LOWER] = 19200000, + .freq[LOW] = 200000000, + .freq[NOMINAL] = 400000000, + }, + [UFS] = { + .pd = &msm8996_vddcx, + .freq[LOWER] = 19200000, + .freq[LOW] = 100000000, + .freq[NOMINAL] = 200000000, + .freq[HIGH] = 240000000, + }, + [PCIE] = { + .pd = &msm8996_vddcx, + .freq[LOWER] = 1011000, + }, + [USB3] = { + .pd = &msm8996_vddcx, + .freq[LOWER] = 60000000, + .freq[LOW] = 120000000, + .freq[NOMINAL] = 150000000, + }, +}; + +static const struct of_device_id rpmpd_performance_table[] = { + { .compatible = "qcom,sdhci-msm-v4", .data = (void *)SDHCI }, + { .compatible = "qcom,ufshc", .data = (void *)UFS }, + { .compatible = "qcom,pcie-msm8996", .data = (void *)PCIE }, + { .compatible = "qcom,dwc3", .data = (void *)USB3 }, + { } +}; + static const struct of_device_id rpmpd_match_table[] = { { .compatible = "qcom,rpmpd-msm8996", .data = &msm8996_desc }, { } @@ -230,6 +285,49 @@ static int rpmpd_power_off(struct generic_pm_domain *domain) return ret; } +static int rpmpd_set_performance(struct generic_pm_domain *domain, + unsigned int state) +{ + int ret = 0; + struct rpmpd *pd = domain_to_rpmpd(domain); + + mutex_lock(&rpmpd_lock); + + pd->corner = state; + + if (!pd->enabled && (pd->key != KEY_FLOOR_CORNER)) + goto out; + + ret = rpmpd_aggregate_corner(pd); + +out: + mutex_unlock(&rpmpd_lock); + + return ret; +} + + +static int rpmpd_get_performance(struct device *dev, unsigned long rate) +{ + int i; + unsigned long index; + const struct of_device_id *id; + + if (!rate) + return 0; + + id = of_match_device(rpmpd_performance_table, dev); + if (!id) + return -EINVAL; + + index = (unsigned long)id->data; + for (i = 0; i < MAX_LEVEL; i++) + if (msm8996_rpmpd_freq_map[index].freq[i] >= rate) + return i; + + return MAX_LEVEL; +} + static int rpmpd_probe(struct platform_device *pdev) { int i; @@ -267,6 +365,8 @@ static int rpmpd_probe(struct platform_device *pdev) rpmpds[i]->rpm = rpm; rpmpds[i]->pd.power_off = rpmpd_power_off; rpmpds[i]->pd.power_on = rpmpd_power_on; + rpmpds[i]->pd.set_performance_state = rpmpd_set_performance; + rpmpds[i]->pd.get_performance_state = rpmpd_get_performance; pm_genpd_init(&rpmpds[i]->pd, NULL, true); data->domains[i] = &rpmpds[i]->pd;