Commit f54d2cd3 authored by Tero Kristo's avatar Tero Kristo Committed by Stephen Boyd
Browse files

clk: keystone: sci-clk: Fix sci_clk_get 



Currently a bug in the sci_clk_get implementation causes it to always
return a clock belonging to the last device in the static list of clock
data. This is due to a bug in the init code that causes the array
used by sci_clk_get to only be populated with the clocks for the last
device, as each device overwrites the entire array with its own clocks.

Fix this by calculating the actual number of clocks for the SoC, and
allocating the whole array in one go. Also, we don't need the handle
to the init data array anymore after doing this, instead we can
just compare the dev_id / clk_id against the registered clocks and
use binary search for speed.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Reported-by: default avatarDave Gerlach <d-gerlach@ti.com>
Fixes: b745c079 ("clk: keystone: Add sci-clk driver support")
Cc: Nishanth Menon <nm@ti.com>
Tested-by: default avatarFranklin Cooper <fcooper@ti.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 5c0858f1

drivers/clk/keystone/sci-clk.c

+42 −24
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/soc/ti/ti_sci_protocol.h>

#include <linux/soc/ti/ti_sci_protocol.h>

#include <linux/bsearch.h>





#define SCI_CLK_SSC_ENABLE		BIT(0)

#define SCI_CLK_SSC_ENABLE		BIT(0)

#define SCI_CLK_ALLOW_FREQ_CHANGE	BIT(1)

#define SCI_CLK_ALLOW_FREQ_CHANGE	BIT(1)
@@ -44,6 +45,7 @@ struct sci_clk_data { 
 * @dev: Device pointer for the clock provider

 * @dev: Device pointer for the clock provider

 * @clk_data: Clock data

 * @clk_data: Clock data

 * @clocks: Clocks array for this device

 * @clocks: Clocks array for this device

 * @num_clocks: Total number of clocks for this provider

 */

 */

struct sci_clk_provider {

struct sci_clk_provider {

	const struct ti_sci_handle *sci;

	const struct ti_sci_handle *sci;
@@ -51,6 +53,7 @@ struct sci_clk_provider { 
	struct device *dev;

	struct device *dev;

	const struct sci_clk_data *clk_data;

	const struct sci_clk_data *clk_data;

	struct clk_hw **clocks;

	struct clk_hw **clocks;

	int num_clocks;

};

};





/**

/**
@@ -58,7 +61,6 @@ struct sci_clk_provider { 
 * @hw:		 Hardware clock cookie for common clock framework

 * @hw:		 Hardware clock cookie for common clock framework

 * @dev_id:	 Device index

 * @dev_id:	 Device index

 * @clk_id:	 Clock index

 * @clk_id:	 Clock index

 * @node:	 Clocks list link

 * @provider:	 Master clock provider

 * @provider:	 Master clock provider

 * @flags:	 Flags for the clock

 * @flags:	 Flags for the clock

 */

 */
@@ -66,7 +68,6 @@ struct sci_clk { 
	struct clk_hw hw;

	struct clk_hw hw;

	u16 dev_id;

	u16 dev_id;

	u8 clk_id;

	u8 clk_id;

	struct list_head node;

	struct sci_clk_provider *provider;

	struct sci_clk_provider *provider;

	u8 flags;

	u8 flags;

};

};
@@ -367,6 +368,19 @@ err: 
	return &sci_clk->hw;

	return &sci_clk->hw;

}

}





static int _cmp_sci_clk(const void *a, const void *b)

{

	const struct sci_clk *ca = a;

	const struct sci_clk *cb = *(struct sci_clk **)b;



	if (ca->dev_id == cb->dev_id && ca->clk_id == cb->clk_id)

		return 0;

	if (ca->dev_id > cb->dev_id ||

	    (ca->dev_id == cb->dev_id && ca->clk_id > cb->clk_id))

		return 1;

	return -1;

}



/**

/**

 * sci_clk_get - Xlate function for getting clock handles

 * sci_clk_get - Xlate function for getting clock handles

 * @clkspec: device tree clock specifier

 * @clkspec: device tree clock specifier
@@ -380,29 +394,22 @@ err: 
static struct clk_hw *sci_clk_get(struct of_phandle_args *clkspec, void *data)

static struct clk_hw *sci_clk_get(struct of_phandle_args *clkspec, void *data)

{

{

	struct sci_clk_provider *provider = data;

	struct sci_clk_provider *provider = data;

	u16 dev_id;

	struct sci_clk **clk;

	u8 clk_id;

	struct sci_clk key;

	const struct sci_clk_data *clks = provider->clk_data;

	struct clk_hw **clocks = provider->clocks;





	if (clkspec->args_count != 2)

	if (clkspec->args_count != 2)

		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);





	dev_id = clkspec->args[0];

	key.dev_id = clkspec->args[0];

	clk_id = clkspec->args[1];

	key.clk_id = clkspec->args[1];



	while (clks->num_clks) {

		if (clks->dev == dev_id) {

			if (clk_id >= clks->num_clks)

				return ERR_PTR(-EINVAL);



			return clocks[clk_id];

		}





		clks++;

	clk = bsearch(&key, provider->clocks, provider->num_clocks,

	}

		      sizeof(clk), _cmp_sci_clk);





	if (!clk)

		return ERR_PTR(-ENODEV);

		return ERR_PTR(-ENODEV);



	return &(*clk)->hw;

}

}





static int ti_sci_init_clocks(struct sci_clk_provider *p)

static int ti_sci_init_clocks(struct sci_clk_provider *p)
@@ -410,18 +417,29 @@ static int ti_sci_init_clocks(struct sci_clk_provider *p) 
	const struct sci_clk_data *data = p->clk_data;

	const struct sci_clk_data *data = p->clk_data;

	struct clk_hw *hw;

	struct clk_hw *hw;

	int i;

	int i;

	int num_clks = 0;





	while (data->num_clks) {

	while (data->num_clks) {

		p->clocks = devm_kcalloc(p->dev, data->num_clks,

		num_clks += data->num_clks;

					 sizeof(struct sci_clk),

		data++;

	}



	p->num_clocks = num_clks;



	p->clocks = devm_kcalloc(p->dev, num_clks, sizeof(struct sci_clk),

				 GFP_KERNEL);

				 GFP_KERNEL);

	if (!p->clocks)

	if (!p->clocks)

		return -ENOMEM;

		return -ENOMEM;





	num_clks = 0;



	data = p->clk_data;



	while (data->num_clks) {

		for (i = 0; i < data->num_clks; i++) {

		for (i = 0; i < data->num_clks; i++) {

			hw = _sci_clk_build(p, data->dev, i);

			hw = _sci_clk_build(p, data->dev, i);

			if (!IS_ERR(hw)) {

			if (!IS_ERR(hw)) {

				p->clocks[i] = hw;

				p->clocks[num_clks++] = hw;

				continue;

				continue;

			}

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE