From patchwork Thu Jul 9 12:18:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 50952 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C064F213FD for ; Thu, 9 Jul 2015 12:19:42 +0000 (UTC) Received: by laar3 with SMTP id r3sf74640283laa.1 for ; Thu, 09 Jul 2015 05:19:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=7iA7RzlByhNBy67OEFJOvm7QyW0ESXD9Th8eHT+PDPI=; b=eVlqR2YjDwrmT+v1su2Q2pX6utqu8HInL2fsjhK/b521BN5UpaNfvA5UBn4/1mDGXc 7YSxxxvSSL5rwcvqVQQwZ0c27SQmgt67yjcVNKvQhgkOifZa+qDUl5M3EC5ciqkQ70UD WTVOO0v76rzmXFpdO2ice7zPI550eyiEPzDCr4rs/OGydE3uvAdel5dwTMtxI5d09fKp 5tOSPtV3SCl2ogUV9XpQoouC9PoItrwGkTBRswUvmTQgFvrnmjApQx42e7nPNO1PqXS+ Iax9IohK4HB9Jk4zez123GmGnkgO84+hg9QNs96xOv2JRi/h8TQpkylP/0GKjYFUEKdt aMAw== X-Gm-Message-State: ALoCoQkIUtRxywFtTt+ckFm1PfE77MwHs3vyTVQsVUtCniEs9TTOIcyNZmddmxGL6+vvJSoF3Kyu X-Received: by 10.112.253.135 with SMTP id aa7mr7851939lbd.11.1436444381685; Thu, 09 Jul 2015 05:19:41 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.115.204 with SMTP id jq12ls1088609lab.4.gmail; Thu, 09 Jul 2015 05:19:41 -0700 (PDT) X-Received: by 10.152.120.135 with SMTP id lc7mr14181385lab.107.1436444381497; Thu, 09 Jul 2015 05:19:41 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id a4si4319146lak.156.2015.07.09.05.19.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jul 2015 05:19:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lagc2 with SMTP id c2so242136947lag.3 for ; Thu, 09 Jul 2015 05:19:41 -0700 (PDT) X-Received: by 10.112.128.169 with SMTP id np9mr14515533lbb.73.1436444381362; Thu, 09 Jul 2015 05:19:41 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp629130lbb; Thu, 9 Jul 2015 05:19:40 -0700 (PDT) X-Received: by 10.68.65.8 with SMTP id t8mr30831848pbs.133.1436444379301; Thu, 09 Jul 2015 05:19:39 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 12si9078032pdc.25.2015.07.09.05.19.38; Thu, 09 Jul 2015 05:19:39 -0700 (PDT) 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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753049AbbGIMTd (ORCPT + 6 others); Thu, 9 Jul 2015 08:19:33 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:33234 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752262AbbGIMTV (ORCPT ); Thu, 9 Jul 2015 08:19:21 -0400 Received: by wiwl6 with SMTP id l6so16966923wiw.0 for ; Thu, 09 Jul 2015 05:19:20 -0700 (PDT) X-Received: by 10.194.172.130 with SMTP id bc2mr32212868wjc.85.1436444359801; Thu, 09 Jul 2015 05:19:19 -0700 (PDT) Received: from mms.wifi.mm-sol.com ([37.157.136.206]) by smtp.googlemail.com with ESMTPSA id x5sm7990868wif.21.2015.07.09.05.19.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jul 2015 05:19:19 -0700 (PDT) From: Georgi Djakov To: sboyd@codeaurora.org Cc: mturquette@baylibre.com, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 1/2] clk: qcom: Add support for RPM Clocks Date: Thu, 9 Jul 2015 15:18:29 +0300 Message-Id: <1436444310-15108-2-git-send-email-georgi.djakov@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1436444310-15108-1-git-send-email-georgi.djakov@linaro.org> References: <1436444310-15108-1-git-send-email-georgi.djakov@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: georgi.djakov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch adds initial support for clocks controlled by the RPM (Resource Power Manager) processor found on some Qualcomm SoCs. The RPM is a dedicated hardware engine for managing the shared SoC resources in order to keep the lowest power profile. It communicates with other hardware subsystems via shared memory and accepts clock requests, aggregates the requests and turns the clocks on/off or scales them on demand. This work is based on the codeaurora.org driver: https://www.codeaurora.org/cgit/quic/la/kernel/msm-3.10/tree/drivers/clk/qcom/clock-rpm.c Signed-off-by: Georgi Djakov --- drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/clk-rpm.c | 164 ++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/qcom/clk-rpm.h | 137 ++++++++++++++++++++++++++++++++++++ 3 files changed, 302 insertions(+) create mode 100644 drivers/clk/qcom/clk-rpm.c create mode 100644 drivers/clk/qcom/clk-rpm.h -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile index 50b337a24a87..4d14a73ee4ed 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -8,6 +8,7 @@ clk-qcom-y += clk-rcg2.o clk-qcom-y += clk-branch.o clk-qcom-y += clk-regmap-divider.o clk-qcom-y += clk-regmap-mux.o +clk-qcom-y += clk-rpm.o clk-qcom-y += reset.o obj-$(CONFIG_APQ_GCC_8084) += gcc-apq8084.o diff --git a/drivers/clk/qcom/clk-rpm.c b/drivers/clk/qcom/clk-rpm.c new file mode 100644 index 000000000000..58d858f760ea --- /dev/null +++ b/drivers/clk/qcom/clk-rpm.c @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2014, The Linux Foundation. All rights reserved. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include + +#include "clk-rpm.h" + +static int clk_rpm_set_rate_active(struct clk_rpm *r, unsigned long value) +{ + struct rpm_clk_req req = { + .key = QCOM_RPM_SMD_KEY_RATE, + .nbytes = sizeof(u32), + .value = DIV_ROUND_UP(value, 1000), /* RPM expects KHz */ + }; + + return qcom_rpm_smd_write(r->rpm, QCOM_SMD_RPM_ACTIVE_STATE, + r->rpm_res_type, r->rpm_clk_id, &req, + sizeof(req)); +} + +static int clk_rpm_prepare(struct clk_hw *hw) +{ + struct clk_rpm *r = to_clk_rpm(hw); + struct clk_rpm *peer = r->peer; + u32 value; + int ret = 0; + + /* Don't send requests to the RPM if the rate has not been set. */ + if (!r->rate) + goto out; + + /* Take peer clock's rate into account only if it's enabled. */ + if (peer->enabled) + value = max(r->rate, peer->rate); + else + value = r->rate; + + if (r->branch) + value = !!value; + + ret = clk_rpm_set_rate_active(r, value); + if (ret) + goto out; + +out: + if (!ret) + r->enabled = true; + + return ret; +} + +static void clk_rpm_unprepare(struct clk_hw *hw) +{ + struct clk_rpm *r = to_clk_rpm(hw); + + if (r->rate) { + struct clk_rpm *peer = r->peer; + unsigned long peer_rate; + u32 value; + int ret; + + /* Take peer clock's rate into account only if it's enabled. */ + peer_rate = peer->enabled ? peer->rate : 0; + value = r->branch ? !!peer_rate : peer_rate; + ret = clk_rpm_set_rate_active(r, value); + if (ret) + return; + } + r->enabled = false; +} + +static int clk_rpm_set_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct clk_rpm *r = to_clk_rpm(hw); + int ret = 0; + + if (r->enabled) { + u32 value; + struct clk_rpm *peer = r->peer; + + /* Take peer clock's rate into account only if it's enabled. */ + if (peer->enabled) + value = max(rate, peer->rate); + else + value = rate; + + ret = clk_rpm_set_rate_active(r, value); + if (ret) + goto out; + } + r->rate = rate; +out: + return ret; +} + +static long clk_rpm_round_rate(struct clk_hw *hw, unsigned long rate, + unsigned long *parent_rate) +{ + return rate; +} + +static unsigned long clk_rpm_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct clk_rpm *r = to_clk_rpm(hw); + + return r->rate; +} + +int clk_rpm_enable_scaling(struct qcom_smd_rpm *rpm) +{ + int ret; + struct rpm_clk_req req = { + .key = QCOM_RPM_SMD_KEY_ENABLE, + .nbytes = sizeof(u32), + .value = 1, + }; + + ret = qcom_rpm_smd_write(rpm, QCOM_SMD_RPM_ACTIVE_STATE, + QCOM_SMD_RPM_MISC_CLK, + QCOM_RPM_SCALING_ENABLE_ID, &req, sizeof(req)); + if (ret < 0) { + if (ret != -EPROBE_DEFER) + pr_err("RPM clock scaling (active set) not enabled!\n"); + return ret; + } + + pr_debug("%s: RPM clock scaling is enabled\n", __func__); + return 0; +} + +const struct clk_ops clk_rpm_ops = { + .prepare = clk_rpm_prepare, + .unprepare = clk_rpm_unprepare, + .set_rate = clk_rpm_set_rate, + .round_rate = clk_rpm_round_rate, + .recalc_rate = clk_rpm_recalc_rate, +}; +EXPORT_SYMBOL_GPL(clk_rpm_ops); + +const struct clk_ops clk_rpm_branch_ops = { + .prepare = clk_rpm_prepare, + .unprepare = clk_rpm_unprepare, + .round_rate = clk_rpm_round_rate, + .recalc_rate = clk_rpm_recalc_rate, +}; +EXPORT_SYMBOL_GPL(clk_rpm_branch_ops); diff --git a/drivers/clk/qcom/clk-rpm.h b/drivers/clk/qcom/clk-rpm.h new file mode 100644 index 000000000000..51bedf787775 --- /dev/null +++ b/drivers/clk/qcom/clk-rpm.h @@ -0,0 +1,137 @@ +/* + * Copyright (c) 2015, Linaro Limited + * Copyright (c) 2014, The Linux Foundation. All rights reserved. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __QCOM_CLK_RPM_H__ +#define __QCOM_CLK_RPM_H__ + +#include +#include + +#define QCOM_RPM_KEY_SOFTWARE_ENABLE 0x6e657773 +#define QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY 0x62636370 +#define QCOM_RPM_SMD_KEY_RATE 0x007a484b +#define QCOM_RPM_SMD_KEY_ENABLE 0x62616e45 +#define QCOM_RPM_SMD_KEY_STATE 0x54415453 +#define QCOM_RPM_SCALING_ENABLE_ID 0x2 + +struct clk_rpm { + const int rpm_res_type; + const int rpm_key; + const int rpm_clk_id; + const int rpm_status_id; + const bool active_only; + bool enabled; + bool branch; + struct clk_rpm *peer; + struct clk_hw hw; + unsigned long rate; + struct qcom_smd_rpm *rpm; +}; + +struct rpm_clk_req { + u32 key; + u32 nbytes; + u32 value; +}; + +extern const struct clk_ops clk_rpm_ops; +extern const struct clk_ops clk_rpm_branch_ops; +int clk_rpm_enable_scaling(struct qcom_smd_rpm *rpm); + +#define to_clk_rpm(_hw) container_of(_hw, struct clk_rpm, hw) + +#define __DEFINE_CLK_RPM(_name, active, type, r_id, stat_id, dep, key) \ + static struct clk_rpm active; \ + static struct clk_rpm _name = { \ + .rpm_res_type = (type), \ + .rpm_clk_id = (r_id), \ + .rpm_status_id = (stat_id), \ + .rpm_key = (key), \ + .peer = &active, \ + .rate = INT_MAX, \ + .hw.init = &(struct clk_init_data){ \ + .ops = &clk_rpm_ops, \ + .name = #_name, \ + .flags = CLK_IS_ROOT, \ + }, \ + }; \ + static struct clk_rpm active = { \ + .rpm_res_type = (type), \ + .rpm_clk_id = (r_id), \ + .rpm_status_id = (stat_id), \ + .rpm_key = (key), \ + .peer = &_name, \ + .active_only = true, \ + .rate = INT_MAX, \ + .hw.init = &(struct clk_init_data){ \ + .ops = &clk_rpm_ops, \ + .name = #active, \ + .flags = CLK_IS_ROOT, \ + }, \ + }; + +#define __DEFINE_CLK_RPM_BRANCH(_name, active, type, r_id, stat_id, r, \ + key) \ + static struct clk_rpm active; \ + static struct clk_rpm _name = { \ + .rpm_res_type = (type), \ + .rpm_clk_id = (r_id), \ + .rpm_status_id = (stat_id), \ + .rpm_key = (key), \ + .peer = &active, \ + .branch = true, \ + .rate = (r), \ + .hw.init = &(struct clk_init_data){ \ + .ops = &clk_rpm_branch_ops, \ + .name = #_name, \ + .flags = CLK_IS_ROOT, \ + }, \ + }; \ + static struct clk_rpm active = { \ + .rpm_res_type = (type), \ + .rpm_clk_id = (r_id), \ + .rpm_status_id = (stat_id), \ + .rpm_key = (key), \ + .peer = &_name, \ + .active_only = true, \ + .branch = true, \ + .rate = (r), \ + .hw.init = &(struct clk_init_data){ \ + .ops = &clk_rpm_branch_ops, \ + .name = #active, \ + .flags = CLK_IS_ROOT, \ + }, \ + }; + +#define DEFINE_CLK_RPM_SMD(_name, active, type, r_id, dep) \ + __DEFINE_CLK_RPM(_name, active, type, r_id, 0, dep, \ + QCOM_RPM_SMD_KEY_RATE) + +#define DEFINE_CLK_RPM_SMD_BRANCH(_name, active, type, r_id, r) \ + __DEFINE_CLK_RPM_BRANCH(_name, active, type, r_id, 0, r, \ + QCOM_RPM_SMD_KEY_ENABLE) + +#define DEFINE_CLK_RPM_SMD_QDSS(_name, active, type, r_id) \ + __DEFINE_CLK_RPM(_name, active, type, r_id, \ + 0, 0, QCOM_RPM_SMD_KEY_STATE) + +#define DEFINE_CLK_RPM_SMD_XO_BUFFER(_name, active, r_id) \ + __DEFINE_CLK_RPM_BRANCH(_name, active, QCOM_SMD_RPM_CLK_BUF_A, \ + r_id, 0, 1000, QCOM_RPM_KEY_SOFTWARE_ENABLE) + +#define DEFINE_CLK_RPM_SMD_XO_BUFFER_PINCTRL(_name, active, r_id) \ + __DEFINE_CLK_RPM_BRANCH(_name, active, QCOM_SMD_RPM_CLK_BUF_A, \ + r_id, 0, 1000, QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY) + +#endif