| Message ID | 1467296018-25086-3-git-send-email-t-kristo@ti.com |
|---|---|
| State | New |
| Headers | show |
On 12/07/16 13:22, Russell King - ARM Linux wrote: > On Thu, Jun 30, 2016 at 05:13:33PM +0300, Tero Kristo wrote: >> /** >> + * ti_clk_get - lookup a TI clock handle >> + * @dev_id: device to lookup clock for >> + * @con_id: connection ID to find >> + * >> + * Searches for a TI clock handle based on the DT node name. >> + * Returns the pointer to the clock handle, or ERR_PTR in failure. >> + */ >> +static struct clk *ti_clk_get(const char *dev_id, const char *con_id) >> +{ >> + struct of_phandle_args clkspec; >> + struct device_node *node; >> + struct clk *clk; >> + >> + /* Only check for cases of type clk_get_sys(NULL, "xyz") */ >> + if (dev_id || !con_id) >> + return ERR_PTR(-ENOENT); >> + >> + if (of_have_populated_dt()) { >> + node = of_find_node_by_name(NULL, con_id); >> + clkspec.np = node; >> + clk = of_clk_get_from_provider(&clkspec); >> + >> + if (!IS_ERR(clk)) >> + return clk; >> + } >> + >> + return ERR_PTR(-ENOENT); >> +} > > I _really_ don't like this. This takes us back to the totally broken > idea, that's already been proven to be greatly harmful in OMAP land, > that the "con_id" is not a _DEVICE SPECIFIC CONNECTION NAME_ but is a > CLOCK NAME. The connection ID is supposed to be a static string in > the requestor of the clock, not some random string picked out from > DT. What is the harm in that actually? I have most likely missed some discussion but please educate me. The problem is, we are already using this convention all over the place in the kernel (not only OMAPs), and trying to clean up the kernel requires some intermediate steps being taken, otherwise we end up doing all the clean-ups in a single massive patch I fear (change all the hwmod data + clock data + any implementations related to these at the same time.) This specific implementation should be possible to deprecate later once the hwmod database is gone btw, and is mostly required for hwmod data only (+ OMAP timer implementation, maybe some others.) The biggest abuser of clk_get interface atm is omap-hwmod. > > This series started out with the assertion that the new clkdev hook > was to avoid registering lots of clock aliases, but it seems with > this patch we're going to end up with lots of specifically named > nodes in DT instead. It's just moving the problem to somewhere else. That is true, it will end up adding new DT nodes. However, as OMAP already is doing this extensively, I wonder what would be the alternative. Maybe move all the clock data back to kernel space to increase the size of multi-v7 builds? -Tero -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/07/16 18:34, Russell King - ARM Linux wrote: > On Tue, Jul 12, 2016 at 06:18:01PM +0300, Tero Kristo wrote: >> On 12/07/16 13:22, Russell King - ARM Linux wrote: >>> On Thu, Jun 30, 2016 at 05:13:33PM +0300, Tero Kristo wrote: >>>> /** >>>> + * ti_clk_get - lookup a TI clock handle >>>> + * @dev_id: device to lookup clock for >>>> + * @con_id: connection ID to find >>>> + * >>>> + * Searches for a TI clock handle based on the DT node name. >>>> + * Returns the pointer to the clock handle, or ERR_PTR in failure. >>>> + */ >>>> +static struct clk *ti_clk_get(const char *dev_id, const char *con_id) >>>> +{ >>>> + struct of_phandle_args clkspec; >>>> + struct device_node *node; >>>> + struct clk *clk; >>>> + >>>> + /* Only check for cases of type clk_get_sys(NULL, "xyz") */ >>>> + if (dev_id || !con_id) >>>> + return ERR_PTR(-ENOENT); >>>> + >>>> + if (of_have_populated_dt()) { >>>> + node = of_find_node_by_name(NULL, con_id); >>>> + clkspec.np = node; >>>> + clk = of_clk_get_from_provider(&clkspec); >>>> + >>>> + if (!IS_ERR(clk)) >>>> + return clk; >>>> + } >>>> + >>>> + return ERR_PTR(-ENOENT); >>>> +} >>> >>> I _really_ don't like this. This takes us back to the totally broken >>> idea, that's already been proven to be greatly harmful in OMAP land, >>> that the "con_id" is not a _DEVICE SPECIFIC CONNECTION NAME_ but is a >>> CLOCK NAME. The connection ID is supposed to be a static string in >>> the requestor of the clock, not some random string picked out from >>> DT. >> >> What is the harm in that actually? I have most likely missed some discussion >> but please educate me. > > The problem is that we end up with drivers that we end up needing platform > information to know what clocks they should get, and what "connection names" > to use to get their clocks. > > We've been there before with OMAP, pre-DT times, and I fixed it up by > creating clkdev and converting much of OMAP over to clkdev, doing > everything the right way. Now, we're heading around the same mistake > that I already solved several years ago. > > It's _well_ documented that the _connection id_ is a connection id and > not a clock name. It's been documented that way ever since the clk API > was first published, and I'm on record for having brought up this point > _many_ times. Yeah I know this is documented this way, the problem is we have plenty of code around which doesn't really use it this way. >.< > > So, when I see something reintroducing ways to persist with this crap, > I'm just not going to allow it. This is 2016 after all, it's a full > _ten_ years after this API was created. Ok fair enough, lets try to figure out something else. I was pretty much worried before posting this patch/approach that you will shoot it down, thus was requesting your feedback specifically. :P > >> The problem is, we are already using this convention >> all over the place in the kernel (not only OMAPs), and trying to clean up >> the kernel requires some intermediate steps being taken, otherwise we end up >> doing all the clean-ups in a single massive patch I fear (change all the >> hwmod data + clock data + any implementations related to these at the same >> time.) > > This isn't an intermediate step if you're having to put stuff into DT > in order to support it. Anything you throw into DT needs to be supported > for years by the kernel, since we have the requirement that newer kernels > are bootable with older DT files without regression. That effectively > means we'll never be able to remove this, and we'll end up fighting other > people abusing the hook. > >> That is true, it will end up adding new DT nodes. However, as OMAP already >> is doing this extensively, I wonder what would be the alternative. Maybe >> move all the clock data back to kernel space to increase the size of >> multi-v7 builds? > > Why can't you use: > > clocks = <&clk_provider fck_index>, <&clk_provider ick_index>, ...; > clock-names = "fck", "ick", ...; > > when describing the hardware? If you don't have a struct device, but > only a struct device_node, you can use of_clk_get(), which allows you > to omit the connection ID and look up by index in the clocks property. That can be done. However, this means the individual clock provider must implement all the clocks in the kernel, adding loads of static data. And the data is different for every TI SoC we have out there in the wild..... aaand, we can't load the clock data as modules either due to early boot time dependencies. This is a royal mess we have here in our hands I am trying to clean-up somehow. I think I have posted several different series along the years trying to get rid of the hwmod static boot time dependency, but it always seems to get shot down. See this approach from last year for example: http://comments.gmane.org/gmane.linux.ports.arm.omap/125555 -Tero -- To unsubscribe from this list: send the line "unsubscribe linux-omap" 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/ti/clk.c b/drivers/clk/ti/clk.c index 5fcf247..17554c3 100644 --- a/drivers/clk/ti/clk.c +++ b/drivers/clk/ti/clk.c @@ -68,6 +68,36 @@ static u32 clk_memmap_readl(void __iomem *reg) } /** + * ti_clk_get - lookup a TI clock handle + * @dev_id: device to lookup clock for + * @con_id: connection ID to find + * + * Searches for a TI clock handle based on the DT node name. + * Returns the pointer to the clock handle, or ERR_PTR in failure. + */ +static struct clk *ti_clk_get(const char *dev_id, const char *con_id) +{ + struct of_phandle_args clkspec; + struct device_node *node; + struct clk *clk; + + /* Only check for cases of type clk_get_sys(NULL, "xyz") */ + if (dev_id || !con_id) + return ERR_PTR(-ENOENT); + + if (of_have_populated_dt()) { + node = of_find_node_by_name(NULL, con_id); + clkspec.np = node; + clk = of_clk_get_from_provider(&clkspec); + + if (!IS_ERR(clk)) + return clk; + } + + return ERR_PTR(-ENOENT); +} + +/** * ti_clk_setup_ll_ops - setup low level clock operations * @ops: low level clock ops descriptor * @@ -87,6 +117,8 @@ int ti_clk_setup_ll_ops(struct ti_clk_ll_ops *ops) ops->clk_readl = clk_memmap_readl; ops->clk_writel = clk_memmap_writel; + clkdev_helper_register(ti_clk_get); + return 0; } @@ -102,14 +134,10 @@ int ti_clk_setup_ll_ops(struct ti_clk_ll_ops *ops) void __init ti_dt_clocks_register(struct ti_dt_clk oclks[]) { struct ti_dt_clk *c; - struct device_node *node; struct clk *clk; - struct of_phandle_args clkspec; for (c = oclks; c->node_name != NULL; c++) { - node = of_find_node_by_name(NULL, c->node_name); - clkspec.np = node; - clk = of_clk_get_from_provider(&clkspec); + clk = ti_clk_get(NULL, c->node_name); if (!IS_ERR(clk)) { c->lk.clk = clk;
TI clocks can be found based on a simple query against the clock name, thus add a clkdev helper functionality for this. Using this new helper implementation allows getting rid of most of the DT_CLK() entries under drivers/clk/ti. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- drivers/clk/ti/clk.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html