linux-clk.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sowjanya Komatineni <skomatineni@nvidia.com>
To: Dmitry Osipenko <digetx@gmail.com>, <thierry.reding@gmail.com>,
	<jonathanh@nvidia.com>, <mperttunen@nvidia.com>,
	<gregkh@linuxfoundation.org>, <sboyd@kernel.org>,
	<robh+dt@kernel.org>, <mark.rutland@arm.com>
Cc: <pdeschrijver@nvidia.com>, <pgaikwad@nvidia.com>,
	<spujar@nvidia.com>, <josephl@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>
Subject: Re: [PATCH v4 06/19] soc: tegra: Add Tegra PMC clock registrations into PMC driver
Date: Wed, 18 Dec 2019 16:41:04 -0800	[thread overview]
Message-ID: <c5bb3c25-1fae-3ca9-6bf3-c3d66be20e19@nvidia.com> (raw)
In-Reply-To: <e11d2ea9-20f1-6920-7efc-ba8a50312f75@gmail.com>


On 12/18/19 1:44 PM, Dmitry Osipenko wrote:
> 18.12.2019 11:35, Dmitry Osipenko пишет:
>> 18.12.2019 11:30, Dmitry Osipenko пишет:
>>> 17.12.2019 23:03, Sowjanya Komatineni пишет:
>>>> Tegra PMC has clk_out_1, clk_out_2, and clk_out_3 clocks and currently
>>>> these PMC clocks are registered by Tegra clock driver with each clock as
>>>> separate mux and gate clocks 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 PMC clocks registration to pmc driver with PMC as
>>>> a clock provider and registers each clock as single clock.
>>>>
>>>> clk_ops callback implementations for these clocks uses tegra_pmc_readl and
>>>> tegra_pmc_writel which supports PMC programming in both secure mode and
>>>> non-secure mode.
>>>>
>>>> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
>>>> ---
>>>>   drivers/soc/tegra/pmc.c | 248 ++++++++++++++++++++++++++++++++++++++++++++++++
>>>>   1 file changed, 248 insertions(+)
>>>>
>>>> diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c
>>>> index ea0e11a09c12..6d65194a6e71 100644
>>>> --- a/drivers/soc/tegra/pmc.c
>>>> +++ b/drivers/soc/tegra/pmc.c
>>>> @@ -13,6 +13,9 @@
>>>>   
>>>>   #include <linux/arm-smccc.h>
>>>>   #include <linux/clk.h>
>>>> +#include <linux/clk-provider.h>
>>>> +#include <linux/clkdev.h>
>>>> +#include <linux/clk/clk-conf.h>
>>>>   #include <linux/clk/tegra.h>
>>>>   #include <linux/debugfs.h>
>>>>   #include <linux/delay.h>
>>>> @@ -48,6 +51,7 @@
>>>>   #include <dt-bindings/pinctrl/pinctrl-tegra-io-pad.h>
>>>>   #include <dt-bindings/gpio/tegra186-gpio.h>
>>>>   #include <dt-bindings/gpio/tegra194-gpio.h>
>>>> +#include <dt-bindings/soc/tegra-pmc.h>
>>>>   
>>>>   #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,64 @@
>>>>   #define  TEGRA_SMC_PMC_READ	0xaa
>>>>   #define  TEGRA_SMC_PMC_WRITE	0xbb
>>>>   
>>>> +struct pmc_clk {
>>>> +	struct clk_hw	hw;
>>>> +	unsigned long	offs;
>>>> +	u32		mux_mask;
>>>> +	u32		mux_shift;
>>>> +	u32		gate_shift;
>>>> +};
>>>> +
>>>> +#define to_pmc_clk(_hw) container_of(_hw, struct pmc_clk, hw)
>>>> +
>>>> +struct pmc_clk_init_data {
>>>> +	char *name;
>>>> +	const char *const *parents;
>>>> +	int num_parents;
>>>> +	int clk_id;
>>>> +	u8 mux_shift;
>>>> +	u8 gate_shift;
>>>> +};
>>>> +
>>>> +static const char * const clk_out1_parents[] = { "osc", "osc_div2",
>>>> +	"osc_div4", "extern1",
>>>> +};
>>>> +
>>>> +static const char * const clk_out2_parents[] = { "osc", "osc_div2",
>>>> +	"osc_div4", "extern2",
>>>> +};
>>>> +
>>>> +static const char * const clk_out3_parents[] = { "osc", "osc_div2",
>>>> +	"osc_div4", "extern3",
>>>> +};
>>>> +
>>>> +static const struct pmc_clk_init_data tegra_pmc_clks_data[] = {
>>>> +	{
>>>> +		.name = "clk_out_1",
>>>> +		.parents = clk_out1_parents,
>>>> +		.num_parents = ARRAY_SIZE(clk_out1_parents),
>>>> +		.clk_id = TEGRA_PMC_CLK_OUT_1,
>>>> +		.mux_shift = 6,
>>>> +		.gate_shift = 2,
>>> I'd replace these with a single .shift, given that mux_shift =
>>> gate_shift + 4 for all clocks.
>>>
>>>> +	},
>>>> +	{
>>>> +		.name = "clk_out_2",
>>>> +		.parents = clk_out2_parents,
>>>> +		.num_parents = ARRAY_SIZE(clk_out2_parents),
>>>> +		.clk_id = TEGRA_PMC_CLK_OUT_2,
>>>> +		.mux_shift = 14,
>>>> +		.gate_shift = 10,
>>>> +	},
>>>> +	{
>>>> +		.name = "clk_out_3",
>>>> +		.parents = clk_out3_parents,
>>>> +		.num_parents = ARRAY_SIZE(clk_out3_parents),
>>>> +		.clk_id = TEGRA_PMC_CLK_OUT_3,
>>>> +		.mux_shift = 22,
>>>> +		.gate_shift = 18,
>>>> +	},
>>>> +};
>>>> +
>>>>   struct tegra_powergate {
>>>>   	struct generic_pm_domain genpd;
>>>>   	struct tegra_pmc *pmc;
>>>> @@ -254,6 +317,9 @@ struct tegra_pmc_soc {
>>>>   	 */
>>>>   	const struct tegra_wake_event *wake_events;
>>>>   	unsigned int num_wake_events;
>>>> +
>>>> +	const struct pmc_clk_init_data *pmc_clks_data;
>>>> +	unsigned int num_pmc_clks;
>>>>   };
>>>>   
>>>>   static const char * const tegra186_reset_sources[] = {
>>>> @@ -2163,6 +2229,173 @@ 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 *clk = to_pmc_clk(hw);
>>>> +	u32 val;
>>>> +
>>>> +	val = tegra_pmc_readl(pmc, clk->offs) >> clk->mux_shift;
>>>> +	val &= clk->mux_mask;
>>>> +
>>>> +	return val;
>>>> +}
>>>> +
>>>> +static int pmc_clk_mux_set_parent(struct clk_hw *hw, u8 index)
>>>> +{
>>>> +	struct pmc_clk *clk = to_pmc_clk(hw);
>>>> +	u32 val;
>>>> +
>>>> +	val = tegra_pmc_readl(pmc, clk->offs);
>>>> +	val &= ~(clk->mux_mask << clk->mux_shift);
>>>> +	val |= index << clk->mux_shift;
>>>> +	tegra_pmc_writel(pmc, val, clk->offs);
>>>> +	pmc_clk_fence_udelay(clk->offs);
>>>> +
>>>> +	return 0;
>>>> +}
>>>> +
>>>> +static int pmc_clk_is_enabled(struct clk_hw *hw)
>>>> +{
>>>> +	struct pmc_clk *clk = to_pmc_clk(hw);
>>>> +
>>>> +	return tegra_pmc_readl(pmc, clk->offs) & BIT(clk->gate_shift) ? 1 : 0;
>>>> +}
>>>> +
>>>> +static void pmc_clk_set_state(unsigned long offs, u32 shift, int state)
>>>> +{
>>>> +	u32 val;
>>>> +
>>>> +	val = tegra_pmc_readl(pmc, offs);
>>>> +	val = state ? (val | BIT(shift)) : (val & ~BIT(shift));
>>>> +	tegra_pmc_writel(pmc, val, offs);
>>>> +	pmc_clk_fence_udelay(offs);
>>>> +}
>>>> +
>>>> +static int pmc_clk_enable(struct clk_hw *hw)
>>>> +{
>>>> +	struct pmc_clk *clk = to_pmc_clk(hw);
>>>> +
>>>> +	pmc_clk_set_state(clk->offs, clk->gate_shift, 1);
>>>> +
>>>> +	return 0;
>>>> +}
>>>> +
>>>> +static void pmc_clk_disable(struct clk_hw *hw)
>>>> +{
>>>> +	struct pmc_clk *clk = to_pmc_clk(hw);
>>>> +
>>>> +	pmc_clk_set_state(clk->offs, clk->gate_shift, 0);
>>>> +}
>>>> +
>>>> +static const struct clk_ops pmc_clk_ops = {
>>>> +	.get_parent = pmc_clk_mux_get_parent,
>>>> +	.set_parent = pmc_clk_mux_set_parent,
>>>> +	.determine_rate = __clk_mux_determine_rate,
>>>> +	.is_enabled = pmc_clk_is_enabled,
>>>> +	.enable = pmc_clk_enable,
>>>> +	.disable = pmc_clk_disable,
>>>> +};
>>>> +
>>>> +static struct clk *
>>>> +tegra_pmc_clk_out_register(const struct pmc_clk_init_data *data,
>>>> +			   unsigned long offset)
>>>> +{
>>>> +	struct clk_init_data init;
>>>> +	struct pmc_clk *pmc_clk;
>>>> +
>>>> +	pmc_clk = kzalloc(sizeof(*pmc_clk), GFP_KERNEL);
>>>> +	if (!pmc_clk)
>>>> +		return ERR_PTR(-ENOMEM);
>>>> +
>>>> +	init.name = data->name;
>>>> +	init.ops = &pmc_clk_ops;
>>>> +	init.parent_names = data->parents;
>>>> +	init.num_parents = data->num_parents;
>>>> +	init.flags = CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT |
>>>> +		     CLK_SET_PARENT_GATE;
>>>> +
>>>> +	pmc_clk->hw.init = &init;
>>>> +	pmc_clk->offs = offset;
>>>> +	pmc_clk->mux_mask = 3;
>>> If mux_mask is a constant value, perhaps will be better to replace the
>>> variable with a literal?
>>>
>>> #define PMC_CLK_OUT_MUX_MASK	GENMASK(1, 0)
>> Maybe even:
>>
>> #define PMC_CLK_OUT_MUX_MASK(c)	GENMASK(c->shift + 1, c->shift)

MUX Mask is used only here for PMC clock out and is same for all clk_out 
mux so will use

#define PMC_CLK_OUT_MUX_MASK	GENMASK(1, 0)

> I want to point out that may be a separated gate/mux shifts is a fine
> variant, you should try and see whether another variants produce more
> concise result.
>
> [snip]

  reply	other threads:[~2019-12-19  0:41 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-17 20:03 [PATCH v4 00/19] Move PMC clocks into Tegra PMC driver Sowjanya Komatineni
2019-12-17 20:03 ` [PATCH v4 01/19] dt-bindings: clock: tegra: Change CLK_M_DIV to OSC_DIV clocks Sowjanya Komatineni
2019-12-18 21:19   ` Rob Herring
2019-12-17 20:03 ` [PATCH v4 02/19] clk: tegra: Change CLK_M_DIV clocks " Sowjanya Komatineni
2019-12-17 20:03 ` [PATCH v4 03/19] clk: tegra: Fix Tegra PMC clock out parents Sowjanya Komatineni
2019-12-17 20:03 ` [PATCH v4 04/19] dt-bindings: tegra: Convert Tegra PMC bindings to YAML Sowjanya Komatineni
2019-12-18 21:29   ` Rob Herring
2019-12-18 22:31     ` Sowjanya Komatineni
2019-12-17 20:03 ` [PATCH v4 05/19] dt-bindings: soc: tegra-pmc: Add Tegra PMC clock bindings Sowjanya Komatineni
2019-12-18  7:56   ` Dmitry Osipenko
2019-12-17 20:03 ` [PATCH v4 06/19] soc: tegra: Add Tegra PMC clock registrations into PMC driver Sowjanya Komatineni
2019-12-18  8:30   ` Dmitry Osipenko
2019-12-18  8:35     ` Dmitry Osipenko
2019-12-18 15:46       ` Sowjanya Komatineni
2019-12-18 15:50         ` Sowjanya Komatineni
2019-12-18 16:52           ` Dmitry Osipenko
2019-12-18 17:00             ` Sowjanya Komatineni
2019-12-18 16:48         ` Dmitry Osipenko
2019-12-18 21:44       ` Dmitry Osipenko
2019-12-19  0:41         ` Sowjanya Komatineni [this message]
2019-12-20  1:21           ` Sowjanya Komatineni
2019-12-20  1:39             ` Dmitry Osipenko
2019-12-20  4:13               ` Sowjanya Komatineni
2019-12-20  4:34                 ` Dmitry Osipenko
2019-12-20 19:06                   ` Sowjanya Komatineni
2019-12-17 20:03 ` [PATCH v4 07/19] dt-bindings: soc: tegra-pmc: Add id for Tegra PMC 32KHz blink clock Sowjanya Komatineni
2019-12-18 21:30   ` Rob Herring
2019-12-17 20:03 ` [PATCH v4 08/19] soc: tegra: Add support for " Sowjanya Komatineni
2019-12-18  5:08   ` Dmitry Osipenko
2019-12-17 20:03 ` [PATCH v4 09/19] clk: tegra: Remove tegra_pmc_clk_init along with clk ids Sowjanya Komatineni
2019-12-17 20:03 ` [PATCH v4 10/19] dt-bindings: clock: tegra: Remove pmc clock ids from clock dt-bindings Sowjanya Komatineni
2019-12-18 21:32   ` Rob Herring
2019-12-17 20:03 ` [PATCH v4 11/19] ASoC: tegra: Use device managed resource APIs to get the clock Sowjanya Komatineni
2019-12-17 20:03 ` [PATCH v4 12/19] ASoC: tegra: Add initial parent configuration for audio mclk Sowjanya Komatineni
2019-12-17 20:04 ` [PATCH v4 13/19] ASoC: tegra: Add fallback implementation " Sowjanya Komatineni
2019-12-18  6:59   ` Dmitry Osipenko
2019-12-18  7:01     ` Dmitry Osipenko
2019-12-18  7:14       ` Sowjanya Komatineni
2019-12-18  7:22         ` Dmitry Osipenko
2019-12-18  7:31           ` Dmitry Osipenko
2019-12-18 15:43             ` Sowjanya Komatineni
2019-12-18 16:29               ` Dmitry Osipenko
2019-12-18 16:32                 ` Sowjanya Komatineni
2019-12-18 16:34                   ` Dmitry Osipenko
2019-12-17 20:04 ` [PATCH v4 14/19] clk: tegra: Remove audio related clock enables from clocks init_table Sowjanya Komatineni
2019-12-17 20:04 ` [PATCH v4 15/19] ARM: dts: tegra: Add clock-cells property to pmc Sowjanya Komatineni
2019-12-18 21:36   ` Dmitry Osipenko
2019-12-17 20:04 ` [PATCH v4 16/19] arm64: tegra: Add clock-cells property to Tegra PMC node Sowjanya Komatineni
2019-12-17 20:04 ` [PATCH v4 17/19] ARM: tegra: Update sound node clocks in device tree Sowjanya Komatineni
2019-12-18  6:39   ` Dmitry Osipenko
2019-12-18  7:47   ` Dmitry Osipenko
2019-12-17 20:04 ` [PATCH v4 18/19] arm64: tegra: smaug: Change clk_out_2 provider to pmc Sowjanya Komatineni
2019-12-17 20:04 ` [PATCH v4 19/19] ASoC: nau8825: change Tegra clk_out_2 provider from tegra_car " Sowjanya Komatineni
2019-12-18 21:32   ` Rob Herring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c5bb3c25-1fae-3ca9-6bf3-c3d66be20e19@nvidia.com \
    --to=skomatineni@nvidia.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=digetx@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jonathanh@nvidia.com \
    --cc=josephl@nvidia.com \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=markz@nvidia.com \
    --cc=mmaddireddy@nvidia.com \
    --cc=mperttunen@nvidia.com \
    --cc=pdeschrijver@nvidia.com \
    --cc=pgaikwad@nvidia.com \
    --cc=robh+dt@kernel.org \
    --cc=sboyd@kernel.org \
    --cc=spujar@nvidia.com \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).