Received: by 10.192.165.156 with SMTP id m28csp1369410imm; Fri, 13 Apr 2018 19:39:01 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/WMBg3Zj9gIhVBjbcpTkd+xzUoXfi+j3KCDYig7FGVUIjM16MyY4rkjsL5nU4E1T6P5IVH X-Received: by 10.98.102.131 with SMTP id s3mr13583857pfj.89.1523673541258; Fri, 13 Apr 2018 19:39:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523673541; cv=none; d=google.com; s=arc-20160816; b=PIJK4fn9dkswxDq1Nx2S/Wsk+FLRjHFK2xrFAPHZZjH+6XkfSUI/3TeIUldBhjSsrG jguFwcqVA1mAmJLOD4hQK31ElL6mci0sWa0UTL0YPS5DXCn7kfNMyKop0OOQTwt33m/g rAOgJWiy0umBkBf+aI0cFrMEM7P/e9z5UemQh5zvtxD6RGfLRjFCc8yRuScvO78CQq1q wnuq2EGQul5+VhqIsaAcm8S5zcuBxxYSXOytas+LPwFWJ9pjtxEB0WXX1r0CxncomBEa U1W+IU2T6qi4DlnwXTeB8REkYwFx+OQ6v9rLp8e9kppY3UMgsm19m/Q+WWaT9C3Ig/ZJ Hklw== 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:dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=nEsbUNv0+IzEx158GgvFR0v6IcgmEwAmrpx2L7txI8o=; b=qZAKSJ9aI1c/3dbiCiAxEEVu+pt04s/e6LyDaE0crut9PUeWVF1P1nW4Atv5oqoT3d rjVcFjDOzyI83Il2umzSabJwUKqG3U4nYTrgYGk61kG02qBUwvopojxboj9g428etLpx G5WsJW8PjwbcGjk6OpbBSGV08q1LfvgnUvLqbMQ0Kakyti/5rCN92nzN2Xap+22gY4O0 lh/kotjMTHt4e+LQhVkoew/wTvmCIRhzdgipnDLksVFl2qUeK7s0xnHCPWF4G8U5O/+D iirFI1XpWTQHtyLBKk1Ap9S8wHpf/I4x0KjZ/fxDIuF/VgqCMP55gYS+9hfK0/DDpAHo iY9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=Ej+UBRAy; dkim=pass header.i=@codeaurora.org header.s=default header.b=H1iXOi8q; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y7-v6si6777165plt.287.2018.04.13.19.38.21; Fri, 13 Apr 2018 19:39:01 -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=@codeaurora.org header.s=default header.b=Ej+UBRAy; dkim=pass header.i=@codeaurora.org header.s=default header.b=H1iXOi8q; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752168AbeDNChN (ORCPT + 99 others); Fri, 13 Apr 2018 22:37:13 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:55164 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751978AbeDNChI (ORCPT ); Fri, 13 Apr 2018 22:37:08 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 1B12660BFA; Sat, 14 Apr 2018 02:37:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1523673428; bh=9cUF8a0SOgrygcYdLlL9uZMB+FtEOPJvSSKnAA/D8Jo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ej+UBRAyFgBfPKMdM6/AdKFT3ikMqgpCSzgeT9vKjR4YKadKVEP6SSEmNArDFdoRN uyp0eHNpp3rmaCJrx1GlIwpHVSNrymVM0awUqIk8EHkLHkA7oPZHH7/6Ig2CLuv17M CBteUKSY0nWUr4q3aZNE0Mf57n0AMYVDEs2lm3NY= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from tdas-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: tdas@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8455560C55; Sat, 14 Apr 2018 02:37:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1523673426; bh=9cUF8a0SOgrygcYdLlL9uZMB+FtEOPJvSSKnAA/D8Jo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H1iXOi8q093NqgbWVtZY1dS50WNcy3F240zAYaBTd2cAk4bhlG4gKzptLhg9S6P3H 3fW8XSkF7X/ZNN/xyVcvY5EmUOIk7yc/5QK3hfUN8ikKIO/ByESE7lFz06miGEIHKY HCPehmuA8DG+JDkHWjXMGeYFBVcpF2yRHVEU8dgg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8455560C55 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=tdas@codeaurora.org From: Taniya Das To: Stephen Boyd , Michael Turquette Cc: Andy Gross , David Brown , Rajendra Nayak , Odelu Kukatla , Amit Nischal , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Taniya Das , David Collins Subject: [PATCH v3 2/2] clk: qcom: clk-rpmh: Add QCOM RPMh clock driver Date: Sat, 14 Apr 2018 08:06:41 +0530 Message-Id: <1523673401-21611-3-git-send-email-tdas@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1523673401-21611-1-git-send-email-tdas@codeaurora.org> References: <1523673401-21611-1-git-send-email-tdas@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the RPMh clock driver to control the RPMh managed clock resources on some of the Qualcomm Technologies, Inc. SoCs. Signed-off-by: David Collins Signed-off-by: Amit Nischal --- drivers/clk/qcom/Kconfig | 9 ++ drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/clk-rpmh.c | 367 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 377 insertions(+) create mode 100644 drivers/clk/qcom/clk-rpmh.c diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig index fbf4532..63c3372 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -112,6 +112,15 @@ config IPQ_GCC_8074 i2c, USB, SD/eMMC, etc. Select this for the root clock of ipq8074. +config QCOM_CLK_RPMH + tristate "RPMh Clock Driver" + depends on COMMON_CLK_QCOM && QCOM_RPMH + help + RPMh manages shared resources on some Qualcomm Technologies, Inc. + SoCs. It accepts requests from other hardware subsystems via RSC. + Say Y if you want to support the clocks exposed by RPMh on + platforms such as sdm845. + config MSM_GCC_8660 tristate "MSM8660 Global Clock Controller" depends on COMMON_CLK_QCOM diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile index 230332c..b2b5babf 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -36,5 +36,6 @@ obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm8996.o obj-$(CONFIG_QCOM_A53PLL) += a53-pll.o obj-$(CONFIG_QCOM_CLK_APCS_MSM8916) += apcs-msm8916.o obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o +obj-$(CONFIG_QCOM_CLK_RPMH) += clk-rpmh.o obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c new file mode 100644 index 0000000..fa61284 --- /dev/null +++ b/drivers/clk/qcom/clk-rpmh.c @@ -0,0 +1,367 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2018, The Linux Foundation. All rights reserved. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define CLK_RPMH_ARC_EN_OFFSET 0 +#define CLK_RPMH_VRM_EN_OFFSET 4 +#define CLK_RPMH_APPS_RSC_AO_STATE_MASK (BIT(RPMH_WAKE_ONLY_STATE) | \ + BIT(RPMH_ACTIVE_ONLY_STATE)) +#define CLK_RPMH_APPS_RSC_STATE_MASK (BIT(RPMH_WAKE_ONLY_STATE) | \ + BIT(RPMH_ACTIVE_ONLY_STATE) | \ + BIT(RPMH_SLEEP_STATE)) +struct clk_rpmh { + struct clk_hw hw; + const char *res_name; + u32 res_addr; + u32 res_en_offset; + u32 res_on_val; + u32 res_off_val; + u32 state; + u32 aggr_state; + u32 last_sent_aggr_state; + u32 valid_state_mask; + struct rpmh_client *rpmh_client; + struct device *dev; + struct clk_rpmh *peer; + unsigned long rate; +}; + +struct rpmh_cc { + struct clk_onecell_data data; + struct clk *clks[]; +}; + +struct clk_rpmh_desc { + struct clk_hw **clks; + size_t num_clks; +}; + +static DEFINE_MUTEX(rpmh_clk_lock); + +#define __DEFINE_CLK_RPMH(_platform, _name, _name_active, _res_name, \ + _res_en_offset, _res_on, _res_off, _rate) \ + static struct clk_rpmh _platform##_##_name_active; \ + static struct clk_rpmh _platform##_##_name = { \ + .res_name = _res_name, \ + .res_en_offset = _res_en_offset, \ + .res_on_val = _res_on, \ + .res_off_val = _res_off, \ + .rate = _rate, \ + .peer = &_platform##_##_name_active, \ + .valid_state_mask = CLK_RPMH_APPS_RSC_STATE_MASK, \ + .hw.init = &(struct clk_init_data){ \ + .ops = &clk_rpmh_ops, \ + .name = #_name, \ + }, \ + }; \ + static struct clk_rpmh _platform##_##_name_active = { \ + .res_name = _res_name, \ + .res_en_offset = _res_en_offset, \ + .res_on_val = _res_on, \ + .res_off_val = _res_off, \ + .rate = _rate, \ + .peer = &_platform##_##_name, \ + .valid_state_mask = CLK_RPMH_APPS_RSC_AO_STATE_MASK, \ + .hw.init = &(struct clk_init_data){ \ + .ops = &clk_rpmh_ops, \ + .name = #_name_active, \ + }, \ + } + +#define DEFINE_CLK_RPMH_ARC(_platform, _name, _name_active, _res_name, \ + _res_on, _res_off, _rate) \ + __DEFINE_CLK_RPMH(_platform, _name, _name_active, _res_name, \ + CLK_RPMH_ARC_EN_OFFSET, _res_on, _res_off, _rate) + +#define DEFINE_CLK_RPMH_VRM(_platform, _name, _name_active, _res_name, \ + _rate) \ + __DEFINE_CLK_RPMH(_platform, _name, _name_active, _res_name, \ + CLK_RPMH_VRM_EN_OFFSET, true, false, _rate) + +static inline struct clk_rpmh *to_clk_rpmh(struct clk_hw *_hw) +{ + return container_of(_hw, struct clk_rpmh, hw); +} + +static inline bool has_state_changed(struct clk_rpmh *c, u32 state) +{ + return ((c->last_sent_aggr_state & BIT(state)) + != (c->aggr_state & BIT(state))); +} + +static int clk_rpmh_send_aggregate_command(struct clk_rpmh *c) +{ + struct tcs_cmd cmd = { 0 }; + u32 cmd_state, on_val; + enum rpmh_state state = RPMH_SLEEP_STATE; + int ret = 0; + + cmd.addr = c->res_addr + c->res_en_offset; + cmd_state = c->aggr_state; + on_val = c->res_on_val; + + for (; state <= RPMH_ACTIVE_ONLY_STATE; state++) { + if (has_state_changed(c, state)) { + cmd.data = (cmd_state & BIT(state)) ? on_val : 0; + ret = rpmh_write_async(c->rpmh_client, state, + &cmd, 1); + if (ret) { + dev_err(c->dev, "set %s state of %s failed: (%d)\n", + (!state) ? "sleep" : + (state == RPMH_WAKE_ONLY_STATE) ? + "wake" : "active", c->res_name, ret); + return ret; + } + } + } + + c->last_sent_aggr_state = c->aggr_state; + c->peer->last_sent_aggr_state = c->last_sent_aggr_state; + + return 0; +} + +static int clk_rpmh_aggregate_state_send_command(struct clk_rpmh *c, + bool enable) +{ + int ret; + + /* Update state and aggregate state values based on enable value. */ + c->state = enable ? c->valid_state_mask : 0; + c->aggr_state = c->state | c->peer->state; + c->peer->aggr_state = c->aggr_state; + + ret = clk_rpmh_send_aggregate_command(c); + if (ret && enable) { + c->state = 0; + } else if (ret) { + c->state = c->valid_state_mask; + WARN(1, "clk: %s failed to disable\n", c->res_name); + } + + return ret; +} + +static int clk_rpmh_prepare(struct clk_hw *hw) +{ + struct clk_rpmh *c = to_clk_rpmh(hw); + int ret = 0; + + mutex_lock(&rpmh_clk_lock); + + if (c->state) + goto out; + + ret = clk_rpmh_aggregate_state_send_command(c, true); +out: + mutex_unlock(&rpmh_clk_lock); + return ret; +}; + +static void clk_rpmh_unprepare(struct clk_hw *hw) +{ + struct clk_rpmh *c = to_clk_rpmh(hw); + + mutex_lock(&rpmh_clk_lock); + + if (!c->state) + goto out; + + clk_rpmh_aggregate_state_send_command(c, false); +out: + mutex_unlock(&rpmh_clk_lock); + return; +}; + +static unsigned long clk_rpmh_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct clk_rpmh *r = to_clk_rpmh(hw); + + /* + * RPMh clocks have a fixed rate. Return static rate set + * at init time. + */ + return r->rate; +} + +static const struct clk_ops clk_rpmh_ops = { + .prepare = clk_rpmh_prepare, + .unprepare = clk_rpmh_unprepare, + .recalc_rate = clk_rpmh_recalc_rate, +}; + +/* Resource name must match resource id present in cmd-db. */ +DEFINE_CLK_RPMH_ARC(sdm845, bi_tcxo, bi_tcxo_ao, "xo.lvl", 0x3, 0x0, 19200000); +DEFINE_CLK_RPMH_VRM(sdm845, ln_bb_clk2, ln_bb_clk2_ao, "lnbclka2", 19200000); +DEFINE_CLK_RPMH_VRM(sdm845, ln_bb_clk3, ln_bb_clk3_ao, "lnbclka3", 19200000); +DEFINE_CLK_RPMH_VRM(sdm845, rf_clk1, rf_clk1_ao, "rfclka1", 38400000); +DEFINE_CLK_RPMH_VRM(sdm845, rf_clk2, rf_clk2_ao, "rfclka2", 38400000); +DEFINE_CLK_RPMH_VRM(sdm845, rf_clk3, rf_clk3_ao, "rfclka3", 38400000); + +static struct clk_hw *sdm845_rpmh_clocks[] = { + [RPMH_CXO_CLK] = &sdm845_bi_tcxo.hw, + [RPMH_CXO_CLK_A] = &sdm845_bi_tcxo_ao.hw, + [RPMH_LN_BB_CLK2] = &sdm845_ln_bb_clk2.hw, + [RPMH_LN_BB_CLK2_A] = &sdm845_ln_bb_clk2_ao.hw, + [RPMH_LN_BB_CLK3] = &sdm845_ln_bb_clk3.hw, + [RPMH_LN_BB_CLK3_A] = &sdm845_ln_bb_clk3_ao.hw, + [RPMH_RF_CLK1] = &sdm845_rf_clk1.hw, + [RPMH_RF_CLK1_A] = &sdm845_rf_clk1_ao.hw, + [RPMH_RF_CLK2] = &sdm845_rf_clk2.hw, + [RPMH_RF_CLK2_A] = &sdm845_rf_clk2_ao.hw, + [RPMH_RF_CLK3] = &sdm845_rf_clk3.hw, + [RPMH_RF_CLK3_A] = &sdm845_rf_clk3_ao.hw, +}; + +static const struct clk_rpmh_desc clk_rpmh_sdm845 = { + .clks = sdm845_rpmh_clocks, + .num_clks = ARRAY_SIZE(sdm845_rpmh_clocks), +}; + +static int clk_rpmh_probe(struct platform_device *pdev) +{ + struct clk **clks; + struct clk *clk; + struct rpmh_cc *rcc; + struct clk_onecell_data *data; + struct clk_hw **hw_clks; + struct clk_rpmh *rpmh_clk; + const struct clk_rpmh_desc *desc; + struct rpmh_client *rpmh_client; + struct device *dev; + size_t num_clks, i; + int ret; + + dev = &pdev->dev; + + ret = cmd_db_ready(); + if (ret) { + if (ret != -EPROBE_DEFER) { + dev_err(dev, "Command DB not available (%d)\n", ret); + goto fail; + } + return ret; + } + + rpmh_client = rpmh_get_client(pdev); + if (IS_ERR(rpmh_client)) { + ret = PTR_ERR(rpmh_client); + dev_err(dev, "Failed to request RPMh client, ret=%d\n", ret); + return ret; + } + + desc = of_device_get_match_data(&pdev->dev); + hw_clks = desc->clks; + num_clks = desc->num_clks; + + rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc) + sizeof(*clks) * num_clks, + GFP_KERNEL); + if (!rcc) { + ret = -ENOMEM; + goto err; + } + + clks = rcc->clks; + data = &rcc->data; + data->clks = clks; + data->clk_num = num_clks; + + for (i = 0; i < num_clks; i++) { + rpmh_clk = to_clk_rpmh(hw_clks[i]); + rpmh_clk->res_addr = cmd_db_read_addr(rpmh_clk->res_name); + if (!rpmh_clk->res_addr) { + dev_err(dev, "missing RPMh resource address for %s\n", + rpmh_clk->res_name); + ret = -ENODEV; + goto err; + } + + rpmh_clk->rpmh_client = rpmh_client; + + clk = devm_clk_register(&pdev->dev, hw_clks[i]); + if (IS_ERR(clk)) { + ret = PTR_ERR(clk); + dev_err(dev, "failed to register %s\n", + hw_clks[i]->init->name); + goto err; + } + + clks[i] = clk; + rpmh_clk->dev = &pdev->dev; + } + + ret = of_clk_add_provider(pdev->dev.of_node, of_clk_src_onecell_get, + data); + if (ret) { + dev_err(dev, "Failed to add clock provider\n"); + goto err; + } + + dev_dbg(dev, "Registered RPMh clocks\n"); + + return 0; +err: + if (rpmh_client) + rpmh_release(rpmh_client); +fail: + dev_err(dev, "Error registering RPMh Clock driver (%d)\n", ret); + return ret; +} + +static int clk_rpmh_remove(struct platform_device *pdev) +{ + const struct clk_rpmh_desc *desc = + of_device_get_match_data(&pdev->dev); + struct clk_hw **hw_clks = desc->clks; + struct clk_rpmh *rpmh_clk = to_clk_rpmh(hw_clks[0]); + + rpmh_release(rpmh_clk->rpmh_client); + of_clk_del_provider(pdev->dev.of_node); + + return 0; +} + +static const struct of_device_id clk_rpmh_match_table[] = { + { .compatible = "qcom,sdm845-rpmh-clk", .data = &clk_rpmh_sdm845}, + { } +}; +MODULE_DEVICE_TABLE(of, clk_rpmh_match_table); + +static struct platform_driver clk_rpmh_driver = { + .probe = clk_rpmh_probe, + .remove = clk_rpmh_remove, + .driver = { + .name = "clk-rpmh", + .of_match_table = clk_rpmh_match_table, + }, +}; + +static int __init clk_rpmh_init(void) +{ + return platform_driver_register(&clk_rpmh_driver); +} +subsys_initcall(clk_rpmh_init); + +static void __exit clk_rpmh_exit(void) +{ + platform_driver_unregister(&clk_rpmh_driver); +} +module_exit(clk_rpmh_exit); + +MODULE_DESCRIPTION("QCOM RPMh Clock Driver"); +MODULE_LICENSE("GPL v2"); -- Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.