Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp5595647ybc; Wed, 27 Nov 2019 06:34:28 -0800 (PST) X-Google-Smtp-Source: APXvYqy/JNjIu1UKTsKbf+UDgpoP35AZ1uyU57lxek21fyLncz5EuauxyXVCh5K1So9tnSW2nkIX X-Received: by 2002:a17:906:2db2:: with SMTP id g18mr30473830eji.163.1574865267730; Wed, 27 Nov 2019 06:34:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574865267; cv=none; d=google.com; s=arc-20160816; b=Aua3Fun6J2DTkXykEhiTfBqCOUmvbtRLnxD/pOmm3GStqnmPwyryiglqiaQGZQZZ+q kllpIjnbs+aGa3BYKawpi2btGw0VVmFVuIsVNBPjuH20KHqXMNOl5I2Utzp3Hlzuzdiw xX8KT8+FvEJlwUo5/exm+4bpZXHNodbKrx7mbBW3RygEv1A4u+KcnBp0KH44KHvpEASb bEMeD2w/0O+vRtYJBUgKz8fN7/LFnEvf7jHAg6HAJE+mdPBSqGru7A6fFjtrLUXTRRbY eDldfjy4kVanE4XF+j5lYt3p6cmmA3tU1vOujSgLNZzYMo8oMhY+vWqAhdCGaeMuGnQ+ 8TkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=D8XLWhB7nAlxz6vN9Je9wtB+lsu/O8Yj1HiVZ7Wrhzk=; b=uHcpoqXlwkqhGdFe3sOECDBtp3/n4Ds39v3I6t90ASjIlVGEuFlA4seBQQOUDZKXEn FIv5k9p915vZqj54HK9ZV8rVs4mKLssRoQAMKac/XAj+UQHJihQxHfDLfz48wLIFsIdk BgOrW2cwhDHIJnULgjJs2vHQxMKyczboxfoBgmlndD+Y9WdW/HgWgEZt/co7vHrQ8Aq4 LXgB+k3JCb4Ez+j4iA+OnRWiOpi5kbe5ioJMRqyjZHSQebj9H+r1SbH2aqZ0Ct3uoSpB rQDRINNdi0fHriWNtS67E0oD3Gx7X5lL8Zy+JQ2hhO9bJ40rcGCHUREbFdAaRLpsiO0K Yj+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="IakcyF/e"; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o19si12009191edz.393.2019.11.27.06.34.02; Wed, 27 Nov 2019 06:34:27 -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=@gmail.com header.s=20161025 header.b="IakcyF/e"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727231AbfK0OcW (ORCPT + 99 others); Wed, 27 Nov 2019 09:32:22 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:39735 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727207AbfK0OcV (ORCPT ); Wed, 27 Nov 2019 09:32:21 -0500 Received: by mail-lj1-f196.google.com with SMTP id e10so15553437ljj.6; Wed, 27 Nov 2019 06:32:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=D8XLWhB7nAlxz6vN9Je9wtB+lsu/O8Yj1HiVZ7Wrhzk=; b=IakcyF/evuCzK6PYTAjKKi5A1O+GSRSlv3RYFi4+j92AcbmMcWkePIcTFxSkJx+tZd UJsCj7QGhT01KGPLlwNwTokj8vBfoBzIJnwL8b+ESSDXDeDng1oxj8V9vI0aD6GCM/6J LEsN8N+Q6RzIXWbVn1glIdo9NusqAynoLnG7I6+fcDUP/tKW3yjFp6WFow85vXJFSddU 3CAxuws0ZPTSCailWyT6YUdHIYBbCAjdAUShOebDSgNf2x8RdrjNj58oeEiudk+XVD/z UmMz5AEEL6OWxLEbOKjrWijpLTK82sRA1RfMSmiEj0Wz96HL+cnlVJk2dyxdgazcKhNb +b7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=D8XLWhB7nAlxz6vN9Je9wtB+lsu/O8Yj1HiVZ7Wrhzk=; b=RQw+guGblf8pKstOrZWQJwX9looazt2gwMRR/M8zs4EEUBFIbiESMjpiWdPSVy+zG6 IHdxERxB4VFjWRjv+1fvpelyL50WoldpyV6lT8BqCq3tloGBNuetGMT45Xd+7bO7jmSf Nu6LoGEp/4SuvfH370eDakGVcVPKig2amTPbKl3fFrb4eXG+XH8wWu8+/BDwZfbyza1J pP366iI5xWNCsnxcqhMO7yKeR1IdD+U+XENtfP0n2TB+HmJQFyU4bB5otu+WZFR5PtEn bLr5D4d1TriMYbWbcer/R4vmFz61HRCnD7FlaFklJ0XTiRM45xyeU+/u2pBdF9jJMDBp FV0Q== X-Gm-Message-State: APjAAAWRCvaKv5wl6R+UIVScI5F8NZ/80XeRfQQpu8NOrIk5b98isUeg ++DZx35pBKLWXmAJlgZT35vb+fB5 X-Received: by 2002:a2e:8855:: with SMTP id z21mr32177249ljj.212.1574865137732; Wed, 27 Nov 2019 06:32:17 -0800 (PST) Received: from [192.168.2.145] (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.googlemail.com with ESMTPSA id k19sm8232823ljg.18.2019.11.27.06.32.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 Nov 2019 06:32:17 -0800 (PST) Subject: Re: [PATCH v2 02/11] soc: tegra: Add Tegra PMC clock registrations into PMC driver To: Sowjanya Komatineni , thierry.reding@gmail.com, jonathanh@nvidia.com, mperttunen@nvidia.com, gregkh@linuxfoundation.org, sboyd@kernel.org, tglx@linutronix.de, robh+dt@kernel.org, mark.rutland@arm.com Cc: allison@lohutok.net, pdeschrijver@nvidia.com, pgaikwad@nvidia.com, mturquette@baylibre.com, horms+renesas@verge.net.au, Jisheng.Zhang@synaptics.com, krzk@kernel.org, arnd@arndb.de, spujar@nvidia.com, josephl@nvidia.com, vidyas@nvidia.com, daniel.lezcano@linaro.org, mmaddireddy@nvidia.com, markz@nvidia.com, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org References: <1574830773-14892-1-git-send-email-skomatineni@nvidia.com> <1574830773-14892-3-git-send-email-skomatineni@nvidia.com> From: Dmitry Osipenko Message-ID: <9c16e4e6-2a23-d35c-e055-a48f96ee861d@gmail.com> Date: Wed, 27 Nov 2019 17:32:16 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <1574830773-14892-3-git-send-email-skomatineni@nvidia.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 27.11.2019 07:59, Sowjanya Komatineni пишет: > Tegra210 and prior Tegra PMC has clk_out_1, clk_out_2, clk_out_3 with > mux and gate for each of these clocks. > > Currently these PMC clocks are registered by Tegra clock driver using > clk_register_mux and clk_register_gate by passing PMC base address > and register offsets and PMC programming for these clocks happens > through direct PMC access by the clock driver. > > With this, when PMC is in secure mode any direct PMC access from the > non-secure world does not go through and these clocks will not be > functional. > > This patch adds these clocks registration with PMC as a clock provider > for these clocks. clk_ops callback implementations for these clocks > uses tegra_pmc_readl and tegra_pmc_writel which supports PMC programming > in secure mode and non-secure mode. > > Signed-off-by: Sowjanya Komatineni > --- > drivers/soc/tegra/pmc.c | 330 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 330 insertions(+) > > diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c > index ea0e11a09c12..a353f6d0a832 100644 > --- a/drivers/soc/tegra/pmc.c > +++ b/drivers/soc/tegra/pmc.c > @@ -13,6 +13,9 @@ > > #include > #include > +#include > +#include > +#include > #include > #include > #include > @@ -48,6 +51,7 @@ > #include > #include > #include > +#include > > #define PMC_CNTRL 0x0 > #define PMC_CNTRL_INTR_POLARITY BIT(17) /* inverts INTR polarity */ > @@ -100,6 +104,7 @@ > #define PMC_WAKE2_STATUS 0x168 > #define PMC_SW_WAKE2_STATUS 0x16c > > +#define PMC_CLK_OUT_CNTRL 0x1a8 > #define PMC_SENSOR_CTRL 0x1b0 > #define PMC_SENSOR_CTRL_SCRATCH_WRITE BIT(2) > #define PMC_SENSOR_CTRL_ENABLE_RST BIT(1) > @@ -155,6 +160,91 @@ > #define TEGRA_SMC_PMC_READ 0xaa > #define TEGRA_SMC_PMC_WRITE 0xbb > > +struct pmc_clk_mux { > + struct clk_hw hw; > + unsigned long offs; > + u32 mask; > + u32 shift; > +}; > + > +#define to_pmc_clk_mux(_hw) container_of(_hw, struct pmc_clk_mux, hw) > + > +struct pmc_clk_gate { > + struct clk_hw hw; > + unsigned long offs; > + u32 shift; > +}; > + > +#define to_pmc_clk_gate(_hw) container_of(_hw, struct pmc_clk_gate, hw) > + > +struct pmc_clk_init_data { > + char *mux_name; > + char *gate_name; > + const char **parents; > + int num_parents; > + int mux_id; > + int gate_id; > + char *dev_name; > + u8 mux_shift; > + u8 gate_shift; > + u8 init_parent_index; > + int init_state; > +}; > + > +static const char *clk_out1_parents[] = { "clk_m", "clk_m_div2", > + "clk_m_div4", "extern1", > +}; > + > +static const char *clk_out2_parents[] = { "clk_m", "clk_m_div2", > + "clk_m_div4", "extern2", > +}; > + > +static const char *clk_out3_parents[] = { "clk_m", "clk_m_div2", > + "clk_m_div4", "extern3", > +}; > + > +static struct pmc_clk_init_data tegra_pmc_clks_data[] = { > + { > + .mux_name = "clk_out_1_mux", > + .gate_name = "clk_out_1", > + .parents = clk_out1_parents, > + .num_parents = ARRAY_SIZE(clk_out1_parents), > + .mux_id = TEGRA_PMC_CLK_OUT_1_MUX, > + .gate_id = TEGRA_PMC_CLK_OUT_1, > + .dev_name = "extern1", > + .mux_shift = 6, > + .gate_shift = 2, > + .init_parent_index = 3, > + .init_state = 1, > + }, > + { > + .mux_name = "clk_out_2_mux", > + .gate_name = "clk_out_2", > + .parents = clk_out2_parents, > + .num_parents = ARRAY_SIZE(clk_out2_parents), > + .mux_id = TEGRA_PMC_CLK_OUT_2_MUX, > + .gate_id = TEGRA_PMC_CLK_OUT_2, > + .dev_name = "extern2", > + .mux_shift = 14, > + .gate_shift = 10, > + .init_parent_index = 0, > + .init_state = 0, > + }, > + { > + .mux_name = "clk_out_3_mux", > + .gate_name = "clk_out_3", > + .parents = clk_out3_parents, > + .num_parents = ARRAY_SIZE(clk_out3_parents), > + .mux_id = TEGRA_PMC_CLK_OUT_3_MUX, > + .gate_id = TEGRA_PMC_CLK_OUT_3, > + .dev_name = "extern3", > + .mux_shift = 22, > + .gate_shift = 18, > + .init_parent_index = 0, > + .init_state = 0, > + }, > +}; > + > struct tegra_powergate { > struct generic_pm_domain genpd; > struct tegra_pmc *pmc; > @@ -254,6 +344,9 @@ struct tegra_pmc_soc { > */ > const struct tegra_wake_event *wake_events; > unsigned int num_wake_events; > + > + struct pmc_clk_init_data *pmc_clks_data; > + unsigned int num_pmc_clks; > }; > > static const char * const tegra186_reset_sources[] = { > @@ -2163,6 +2256,228 @@ static int tegra_pmc_clk_notify_cb(struct notifier_block *nb, > return NOTIFY_OK; > } > > +static void pmc_clk_fence_udelay(u32 offset) > +{ > + tegra_pmc_readl(pmc, offset); > + /* pmc clk propagation delay 2 us */ > + udelay(2); > +} > + > +static u8 pmc_clk_mux_get_parent(struct clk_hw *hw) > +{ > + struct pmc_clk_mux *mux = to_pmc_clk_mux(hw); > + int num_parents = clk_hw_get_num_parents(hw); > + u32 val; > + > + val = tegra_pmc_readl(pmc, mux->offs) >> mux->shift; > + val &= mux->mask; > + > + if (val >= num_parents) > + return -EINVAL; > + > + return val; > +} > + > +static int pmc_clk_mux_set_parent(struct clk_hw *hw, u8 index) > +{ > + struct pmc_clk_mux *mux = to_pmc_clk_mux(hw); > + u32 val; > + > + val = tegra_pmc_readl(pmc, mux->offs); > + val &= ~(mux->mask << mux->shift); > + val |= index << mux->shift; > + tegra_pmc_writel(pmc, val, mux->offs); > + pmc_clk_fence_udelay(mux->offs); > + > + return 0; > +} > + > +static const struct clk_ops pmc_clk_mux_ops = { > + .get_parent = pmc_clk_mux_get_parent, > + .set_parent = pmc_clk_mux_set_parent, > + .determine_rate = __clk_mux_determine_rate, > +}; > + > +static struct clk * > +tegra_pmc_clk_mux_register(const char *name, const char * const *parent_names, > + int num_parents, unsigned long flags, > + unsigned long offset, u32 shift, u32 mask) > +{ > + struct clk_init_data init; > + struct pmc_clk_mux *mux; > + > + mux = kzalloc(sizeof(*mux), GFP_KERNEL); > + if (!mux) > + return ERR_PTR(-ENOMEM); > + > + init.name = name; > + init.ops = &pmc_clk_mux_ops; > + init.parent_names = parent_names; > + init.num_parents = num_parents; > + init.flags = flags; > + > + mux->hw.init = &init; > + mux->offs = offset; > + mux->mask = mask; > + mux->shift = shift; > + > + return clk_register(NULL, &mux->hw); > +} > + > +static int pmc_clk_is_enabled(struct clk_hw *hw) > +{ > + struct pmc_clk_gate *gate = to_pmc_clk_gate(hw); > + > + return tegra_pmc_readl(pmc, gate->offs) & BIT(gate->shift) ? 1 : 0; > +} > + > +static void pmc_clk_set_state(struct clk_hw *hw, int state) > +{ > + struct pmc_clk_gate *gate = to_pmc_clk_gate(hw); > + u32 val; > + > + val = tegra_pmc_readl(pmc, gate->offs); > + val = state ? (val | BIT(gate->shift)) : (val & ~BIT(gate->shift)); > + tegra_pmc_writel(pmc, val, gate->offs); > + pmc_clk_fence_udelay(gate->offs); > +} > + > +static int pmc_clk_enable(struct clk_hw *hw) > +{ > + pmc_clk_set_state(hw, 1); > + > + return 0; > +} > + > +static void pmc_clk_disable(struct clk_hw *hw) > +{ > + pmc_clk_set_state(hw, 0); > +} > + > +static const struct clk_ops pmc_clk_gate_ops = { > + .is_enabled = pmc_clk_is_enabled, > + .enable = pmc_clk_enable, > + .disable = pmc_clk_disable, > +}; > + > +static struct clk * > +tegra_pmc_clk_gate_register(const char *name, const char *parent_name, > + unsigned long flags, unsigned long offset, > + u32 shift) > +{ > + struct clk_init_data init; > + struct pmc_clk_gate *gate; > + > + gate = kzalloc(sizeof(*gate), GFP_KERNEL); > + if (!gate) > + return ERR_PTR(-ENOMEM); > + > + init.name = name; > + init.ops = &pmc_clk_gate_ops; > + init.parent_names = &parent_name; > + init.num_parents = 1; > + init.flags = flags; > + > + gate->hw.init = &init; > + gate->offs = offset; > + gate->shift = shift; > + > + return clk_register(NULL, &gate->hw); > +} > + > +static void tegra_pmc_clock_register(struct tegra_pmc *pmc, > + struct device_node *np) > +{ > + struct clk *clkmux, *clk, *parent; > + struct clk_onecell_data *clk_data; > + unsigned int num_clks; > + int i, ret; > + > + /* each pmc clock output has a mux and a gate */ > + num_clks = pmc->soc->num_pmc_clks * 2; > + > + if (!num_clks) > + return; > + > + clk_data = kmalloc(sizeof(*clk_data), GFP_KERNEL); > + if (!clk_data) > + return; > + > + clk_data->clks = kcalloc(TEGRA_PMC_CLK_MAX, sizeof(*clk_data->clks), > + GFP_KERNEL); > + if (!clk_data->clks) > + goto free_clkdata; > + > + clk_data->clk_num = num_clks; > + > + for (i = 0; i < pmc->soc->num_pmc_clks; i++) { > + struct pmc_clk_init_data *data; > + > + data = pmc->soc->pmc_clks_data + i; > + > + clkmux = tegra_pmc_clk_mux_register(data->mux_name, > + data->parents, > + data->num_parents, > + CLK_SET_RATE_NO_REPARENT | > + CLK_SET_RATE_PARENT, > + PMC_CLK_OUT_CNTRL, > + data->mux_shift, 3); > + if (IS_ERR(clkmux)) > + goto free_clks; > + > + clk_data->clks[data->mux_id] = clkmux; > + > + clk = tegra_pmc_clk_gate_register(data->gate_name, > + data->mux_name, > + CLK_SET_RATE_PARENT, > + PMC_CLK_OUT_CNTRL, > + data->gate_shift); > + if (IS_ERR(clk)) > + goto free_clks; > + > + clk_data->clks[data->gate_id] = clk; > + > + ret = clk_set_parent(clk, clkmux); > + if (ret < 0) { > + pr_err("failed to set parent of %s to %s\n", > + __func__, __clk_get_name(clk), > + __clk_get_name(clkmux)); > + } > + > + clk_register_clkdev(clk, data->dev_name, data->gate_name); > + > + /* configure initial clock parent and state */ > + parent = clk_get_sys(data->gate_name, > + data->parents[data->init_parent_index]); > + if (!IS_ERR(parent)) { > + ret = clk_set_parent(clkmux, parent); > + if (ret < 0) { > + pr_err("failed to set parent of %s to %s\n", > + __func__, __clk_get_name(clkmux), > + __clk_get_name(parent)); > + WARN_ON(1); > + } > + } > + > + if (data->init_state) { > + if (clk_prepare_enable(clk)) { > + pr_err("failed to enable %s\n", __func__, > + __clk_get_name(clk)); > + WARN_ON(1); > + } > + } > + } In file included from ./include/linux/printk.h:7, from ./include/linux/kernel.h:15, from ./include/linux/clk.h:13, from drivers/soc/tegra/pmc.c:15: drivers/soc/tegra/pmc.c: In function ‘tegra_pmc_clock_register’: ./include/linux/kern_levels.h:5:18: warning: too many arguments for format [-Wformat-extra-args] 5 | #define KERN_SOH "\001" /* ASCII Start Of Header */ | ^~~~~~ ./include/linux/kern_levels.h:11:18: note: in expansion of macro ‘KERN_SOH’ 11 | #define KERN_ERR KERN_SOH "3" /* error conditions */ | ^~~~~~~~ ./include/linux/printk.h:304:9: note: in expansion of macro ‘KERN_ERR’ 304 | printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) | ^~~~~~~~ drivers/soc/tegra/pmc.c:2451:4: note: in expansion of macro ‘pr_err’ 2451 | pr_err("failed to set parent of %s to %s\n", | ^~~~~~ ./include/linux/kern_levels.h:5:18: warning: too many arguments for format [-Wformat-extra-args] 5 | #define KERN_SOH "\001" /* ASCII Start Of Header */ | ^~~~~~ ./include/linux/kern_levels.h:11:18: note: in expansion of macro ‘KERN_SOH’ 11 | #define KERN_ERR KERN_SOH "3" /* error conditions */ | ^~~~~~~~ ./include/linux/printk.h:304:9: note: in expansion of macro ‘KERN_ERR’ 304 | printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) | ^~~~~~~~ drivers/soc/tegra/pmc.c:2464:5: note: in expansion of macro ‘pr_err’ 2464 | pr_err("failed to set parent of %s to %s\n", | ^~~~~~ ./include/linux/kern_levels.h:5:18: warning: too many arguments for format [-Wformat-extra-args] 5 | #define KERN_SOH "\001" /* ASCII Start Of Header */ | ^~~~~~ ./include/linux/kern_levels.h:11:18: note: in expansion of macro ‘KERN_SOH’ 11 | #define KERN_ERR KERN_SOH "3" /* error conditions */ | ^~~~~~~~ ./include/linux/printk.h:304:9: note: in expansion of macro ‘KERN_ERR’ 304 | printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) | ^~~~~~~~ drivers/soc/tegra/pmc.c:2473:5: note: in expansion of macro ‘pr_err’ 2473 | pr_err("failed to enable %s\n", __func__, |