clk: clk-wizard: clock-wizard: Driver updates
Subsystems (3)
v3 cover clk: clk-wizard: clock-wizard: Driver updates
From: Shubhrajyoti Datta <[email protected]>
In the thread [1] Greg suggested that we move the driver to the clk from the staging.
Add patches to address the concerns regarding the fractional and set rate support in the TODO.
The patch set does the following
- Trivial fixes for kernel doc.
- Move the driver to the clk folder
- Add capability to set rate.
- Add fractional support.
- Add support for configurable outputs.
- Make the output names unique so that multiple instances do not crib.
Changes in the v3:
Added the cover-letter.
Add patches for rate setting and fractional support Add patches for warning.
Remove the driver from staging as suggested
[1] https://spinics.net/lists/linux-driver-devel/msg117326.html
Shubhrajyoti Datta (10):
dt-bindings: add documentation of xilinx clocking wizard
clk: clock-wizard: Move the clockwizard to clk
clk: clock-wizard: Fix kernel-doc warning
clk: clock-wizard: Add support for dynamic reconfiguration
clk: clock-wizard: Add support for fractional support
clk: clock-wizard: Remove the hardcoding of the clock outputs
clk: clock-wizard: Update the fixed factor divisors
clk: clock-wizard: Make the output names unique
staging: clocking-wizard: Delete the driver from the staging
clk: clock-wizard: Fix the compilation failure
.../bindings/clock/xlnx,clocking-wizard.txt | 32 + drivers/clk/Kconfig | 6 + drivers/clk/Makefile | 1 + drivers/clk/clk-xlnx-clock-wizard.c | 710 +++++++++++++++++++++ drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/clocking-wizard/Kconfig | 10 - drivers/staging/clocking-wizard/Makefile | 2 - drivers/staging/clocking-wizard/TODO | 12 - .../clocking-wizard/clk-xlnx-clock-wizard.c | 335 ---------- drivers/staging/clocking-wizard/dt-binding.txt | 30 - 11 files changed, 749 insertions(+), 392 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt create mode 100644 drivers/clk/clk-xlnx-clock-wizard.c delete mode 100644 drivers/staging/clocking-wizard/Kconfig delete mode 100644 drivers/staging/clocking-wizard/Makefile delete mode 100644 drivers/staging/clocking-wizard/TODO delete mode 100644 drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c delete mode 100644 drivers/staging/clocking-wizard/dt-binding.txt
Signature · 1 line
2.1.1
PATCH v3 1/10 dt-bindings: add documentation of xilinx clocking wizard
From: Shubhrajyoti Datta <[email protected]>
Add the devicetree binding for the xilinx clocking wizard.
--- .../bindings/clock/xlnx,clocking-wizard.txt | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt
Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt new file +32 -0
@@ -0,0 +1,32 @@ +Binding for Xilinx Clocking Wizard IP Core + +This binding uses the common clock binding[1]. Details about the devices can be +found in the product guide[2]. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt +[2] Clocking Wizard Product Guide +http://www.xilinx.com/support/documentation/ip_documentation/clk_wiz/v5_1/pg065-clk-wiz.pdf + +Required properties: + - compatible: Must be 'xlnx,clocking-wizard' + - #clock-cells: Number of cells in a clock specifier. Should be 1 + - reg: Base and size of the cores register space + - clocks: Handle to input clock + - clock-names: Tuple containing 'clk_in1' and 's_axi_aclk' + - clock-output-names: Names for the output clocks + +Optional properties: + - speed-grade: Speed grade of the device (valid values are 1..3) + +Example: + clock-generator@40040000 { + #clock-cells = <1>; + reg = <0x40040000 0x1000>; + compatible = "xlnx,clocking-wizard"; + speed-grade = <1>; + clock-names = "clk_in1", "s_axi_aclk"; + clocks = <&clkc 15>, <&clkc 15>; + clock-output-names = "clk_out0", "clk_out1", "clk_out2", + "clk_out3", "clk_out4", "clk_out5", + "clk_out6", "clk_out7"; + };
Signature · 1 line
2.1.1
Rob Herring
maintainerRe: [PATCH v3 01/10] dt-bindings: add documentation of xilinx clocking wizard
Quoted 9 lines · On Thu, Nov 28, 2019 at 12:06:08PM +0530, [email protected] wrote:
From: Shubhrajyoti Datta <[email protected]>
Add the devicetree binding for the xilinx clocking wizard.
Signed-off-by Shubhrajyoti Datta <[email protected]>--- .../bindings/clock/xlnx,clocking-wizard.txt | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt
New bindings should be in DT schema format.
Quoted 8 lines
Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt new file +1
-0@@ -0,0 +1,32 @@ +Binding for Xilinx Clocking Wizard IP Core
Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt line 11
Quoted 10 lines
Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt new file +10
-0+ +This binding uses the common clock binding[1]. Details about the devices can be +found in the product guide[2]. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt +[2] Clocking Wizard Product Guide +http://www.xilinx.com/support/documentation/ip_documentation/clk_wiz/v5_1/pg065-clk-wiz.pdf + +Required properties: + - compatible: Must be 'xlnx,clocking-wizard'
That's not very specific. Is there only 1 version of this h/w?
Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt line 16
Quoted 5 lines
Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt new file +5
-0+ - #clock-cells: Number of cells in a clock specifier. Should be 1 + - reg: Base and size of the cores register space + - clocks: Handle to input clock + - clock-names: Tuple containing 'clk_in1' and 's_axi_aclk' + - clock-output-names: Names for the output clocks
You have to define the values.
Quoted 5 lines
Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt new file +5
-0+ +Optional properties: + - speed-grade: Speed grade of the device (valid values are 1..3) + +Example:
Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt line 31
Quoted 10 lines
Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.txt new file +10
-0+ clock-generator@40040000 { + #clock-cells = <1>; + reg = <0x40040000 0x1000>; + compatible = "xlnx,clocking-wizard"; + speed-grade = <1>; + clock-names = "clk_in1", "s_axi_aclk"; + clocks = <&clkc 15>, <&clkc 15>; + clock-output-names = "clk_out0", "clk_out1", "clk_out2", + "clk_out3", "clk_out4", "clk_out5", + "clk_out6", "clk_out7";
Don't really need this to be in DT given all the names are the same except for the index.
Rob
PATCH v3 2/10 clk: clock-wizard: Move the clockwizard to clk
In reply to [email protected]From: Shubhrajyoti Datta <[email protected]>
Move the clocking wizard driver from staging to clk.
--- drivers/clk/Kconfig | 6 + drivers/clk/Makefile | 1 + drivers/clk/clk-xlnx-clock-wizard.c | 335 ++++++++++++++++++++++++++++++++++++ 3 files changed, 342 insertions(+) create mode 100644 drivers/clk/clk-xlnx-clock-wizard.c
drivers/clk/Kconfig +6 -0
@@ -305,6 +305,12 @@ config COMMON_CLK_FIXED_MMIO help Support for Memory Mapped IO Fixed clocks +config COMMON_CLK_XLNX_CLKWZRD + tristate "Xilinx Clocking Wizard" + depends on COMMON_CLK && OF + help + Support for the Xilinx Clocking Wizard IP core clock generator. + source "drivers/clk/actions/Kconfig" source "drivers/clk/analogbits/Kconfig" source "drivers/clk/bcm/Kconfig"
drivers/clk/Makefile +1 -0
@@ -65,6 +65,7 @@ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o obj-$(CONFIG_COMMON_CLK_VC5) += clk-versaclock5.o obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o +obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clk-xlnx-clock-wizard.o # please keep this section sorted lexicographically by directory path name obj-y += actions/
drivers/clk/clk-xlnx-clock-wizard.c new file +335 -0
335 lines not on this page · raw message
Signature · 1 line
2.1.1
Rob Herring
maintainerRe: [PATCH v3 02/10] clk: clock-wizard: Move the clockwizard to clk
Quoted 11 lines · On Thu, Nov 28, 2019 at 12:06:09PM +0530, [email protected] wrote:
From: Shubhrajyoti Datta <[email protected]>
Move the clocking wizard driver from staging to clk.
Signed-off-by Shubhrajyoti Datta <[email protected]>--- drivers/clk/Kconfig | 6 + drivers/clk/Makefile | 1 + drivers/clk/clk-xlnx-clock-wizard.c | 335 ++++++++++++++++++++++++++++++++++++ 3 files changed, 342 insertions(+) create mode 100644 drivers/clk/clk-xlnx-clock-wizard.c
I don't see anything moved here.
Rob
PATCH v3 3/10 clk: clock-wizard: Fix kernel-doc warning
In reply to [email protected]From: Shubhrajyoti Datta <[email protected]>
Update description for the clocking wizard structure
--- drivers/clk/clk-xlnx-clock-wizard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/clk-xlnx-clock-wizard.c +2 -1
@@ -38,7 +38,8 @@ enum clk_wzrd_int_clks { };/** -* struct clk_wzrd: +* struct clk_wzrd - Clock wizard private data structure +* * @clk_data: Clock data * @nb: Notifier block * @base: Memory base
Signature · 1 line
2.1.1
Re: [PATCH v3 03/10] clk: clock-wizard: Fix kernel-doc warning
Quoting [email protected] (2019-11-27 22:36:10)
Quoted 6 lines
From: Shubhrajyoti Datta <[email protected]>
Update description for the clocking wizard structure
Signed-off-by Shubhrajyoti Datta <[email protected]>---
PATCH v3 4/10 clk: clock-wizard: Add support for dynamic reconfiguration
In reply to [email protected]From: Shubhrajyoti Datta <[email protected]>
The patch adds support for dynamic reconfiguration of clock output rate. Output clocks are registered as dividers and set rate callback function is used for dynamic reconfiguration.
Based on the initial work from Chirag.
--- drivers/clk/clk-xlnx-clock-wizard.c | 209 +++++++++++++++++++++++++++++++++++- 1 file changed, 204 insertions(+), 5 deletions(-)
drivers/clk/clk-xlnx-clock-wizard.c +204 -5
@@ -29,8 +29,23 @@#define WZRD_DIVCLK_DIVIDE_SHIFT 0#define WZRD_DIVCLK_DIVIDE_MASK (0xff << WZRD_DIVCLK_DIVIDE_SHIFT)#define WZRD_CLKOUT_DIVIDE_SHIFT 0 +#define WZRD_CLKOUT_DIVIDE_WIDTH 8#define WZRD_CLKOUT_DIVIDE_MASK (0xff << WZRD_DIVCLK_DIVIDE_SHIFT) +#define WZRD_DR_MAX_INT_DIV_VALUE 255 +#define WZRD_DR_NUM_RETRIES 10000 +#define WZRD_DR_STATUS_REG_OFFSET 0x04 +#define WZRD_DR_LOCK_BIT_MASK 0x00000001 +#define WZRD_DR_INIT_REG_OFFSET 0x25C +#define WZRD_DR_DIV_TO_PHASE_OFFSET 4 +#define WZRD_DR_BEGIN_DYNA_RECONF 0x03 + +/* Get the mask from width */ +#define div_mask (width) ((1 << (width)) - 1) + +/* Extract divider instance from clock hardware instance */ +#define to_clk_wzrd_divider (_hw) container_of(_hw, struct clk_wzrd_divider, hw) +enum clk_wzrd_int_clks { wzrd_clk_mul, wzrd_clk_mul_div,
@@ -62,6 +77,29 @@ struct clk_wzrd {bool suspended; }; +/** +* struct clk_wzrd_divider - clock divider specific to clk_wzrd +* +* @hw: handle between common and hardware-specific interfaces +* @base: base address of register containing the divider +* @offset: offset address of register containing the divider +* @shift: shift to the divider bit field +* @width: width of the divider bit field +* @flags: clk_wzrd divider flags +* @table: array of value/divider pairs, last entry should have div = 0 +* @lock: register lock +*/ +struct clk_wzrd_divider { +struct clk_hw hw; +void __iomem *base; +u16 offset; +u8 shift; +u8 width; +u8 flags; +const struct clk_div_table *table; +spinlock_t *lock;/* divider lock */ +}; +#define to_clk_wzrd (_nb) container_of(_nb, struct clk_wzrd, nb)/* maximum frequencies for input/output clocks per speed grade */
@@ -71,6 +109,164 @@ static const unsigned long clk_wzrd_max_freq[] = {1066000000UL }; +/* spin lock variable for clk_wzrd */ +static DEFINE_SPINLOCK (clkwzrd_lock); + +static unsigned long clk_wzrd_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct clk_wzrd_divider *divider =to_clk_wzrd_divider (hw); +void __iomem *div_addr = + (void __iomem *)((u64 )divider->base + divider->offset); +unsigned int val; + + val =readl (div_addr) >> divider->shift; + val &=div_mask (divider->width); + +return divider_recalc_rate (hw, parent_rate, val, divider->table, + divider->flags, divider->width); +} + +static int clk_wzrd_dynamic_reconfig (struct clk_hw *hw,unsigned long rate, +unsigned long parent_rate) +{ +int err =0 ; +u16 retries; +u32 value; +unsigned long flags =0 ; +struct clk_wzrd_divider *divider =to_clk_wzrd_divider (hw); +void __iomem *div_addr = + (void __iomem *)((u64 )divider->base + divider->offset); + +if (divider->lock) +spin_lock_irqsave (divider->lock, flags); +else +__acquire (divider->lock); + + value =DIV_ROUND_CLOSEST (parent_rate, rate); + +/* Cap the value to max */ +if (value >WZRD_DR_MAX_INT_DIV_VALUE ) + value =WZRD_DR_MAX_INT_DIV_VALUE ; + +/* Set divisor and clear phase offset */ +writel (value, div_addr); +writel (0x00 , div_addr +WZRD_DR_DIV_TO_PHASE_OFFSET ); + +/* Check status register */ + retries =WZRD_DR_NUM_RETRIES ; +while (retries--) { +if (readl (divider->base +WZRD_DR_STATUS_REG_OFFSET ) & +WZRD_DR_LOCK_BIT_MASK ) +break ; + } + +if (retries ==0 ) { + err = -ETIMEDOUT ; + goto err_reconfig; + } + +/* Initiate reconfiguration */ +writel (WZRD_DR_BEGIN_DYNA_RECONF , + divider->base +WZRD_DR_INIT_REG_OFFSET ); + +/* Check status register */ + retries =WZRD_DR_NUM_RETRIES ; +while (retries--) { +if (readl (divider->base +WZRD_DR_STATUS_REG_OFFSET ) & +WZRD_DR_LOCK_BIT_MASK ) +break ; + } + +if (retries ==0 ) + err = -ETIMEDOUT ; + +err_reconfig: +if (divider->lock) +spin_unlock_irqrestore (divider->lock, flags); +else +__release (divider->lock); + +return err; +} + +static long clk_wzrd_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *prate) +{ +u8 div; + +/* +* since we donot change parent rate we just round rate to closest +* achievable +*/ + div =DIV_ROUND_CLOSEST (*prate, rate); + +return (*prate / div); +} + +static const struct clk_ops clk_wzrd_clk_divider_ops = { + .round_rate = clk_wzrd_round_rate, + .set_rate = clk_wzrd_dynamic_reconfig, + .recalc_rate = clk_wzrd_recalc_rate, +}; + +static struct clk *clk_wzrd_register_divider (struct device *dev, +const char *name, +const char *parent_name, +unsigned long flags, +void __iomem *base,u16 offset, +u8 shift,u8 width, +u8 clk_divider_flags, +const struct clk_div_table *table, +spinlock_t *lock) +{ +struct clk_wzrd_divider *div; +struct clk_hw *hw; +struct clk_init_data init; +int ret; + +if (clk_divider_flags &CLK_DIVIDER_HIWORD_MASK ) { +if (width + shift >16 ) { +pr_warn ("divider value exceeds LOWORD field\n" ); +return ERR_PTR (-EINVAL ); + } + } + +/* allocate the divider */ + div =kzalloc (sizeof (*div),GFP_KERNEL ); +if (!div) +return ERR_PTR (-ENOMEM ); + + init.name = name; +if (clk_divider_flags &CLK_DIVIDER_READ_ONLY ) + init.ops = &clk_divider_ro_ops; +else + init.ops = &clk_wzrd_clk_divider_ops; + init.flags = flags |CLK_IS_BASIC ; + init.parent_names = (parent_name ? &parent_name :NULL ); + init.num_parents = (parent_name ?1 :0 ); + +/* struct clk_divider assignments */ + div->base = base; + div->offset = offset; + div->shift = shift; + div->width = width; + div->flags = clk_divider_flags; + div->lock = lock; + div->hw.init = &init; + div->table = table; + +/* register the clock */ + hw = &div->hw; + ret =clk_hw_register (dev, hw); +if (ret) { +kfree (div); + hw =ERR_PTR (ret); + } + +return hw->clk; +} +static int clk_wzrd_clk_notifier (struct notifier_block *nb,unsigned long event,void *data) {
@@ -241,11 +437,14 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -EINVAL ; goto err_rm_int_clks; } - reg =readl (clk_wzrd->base +WZRD_CLK_CFG_REG (2 ) + i *12 ); - reg &=WZRD_CLKOUT_DIVIDE_MASK ; - reg >>=WZRD_CLKOUT_DIVIDE_SHIFT ; - clk_wzrd->clkout[i] =clk_register_fixed_factor - (&pdev->dev, clkout_name, clk_name,0 ,1 , reg); + clk_wzrd->clkout[i] =clk_wzrd_register_divider (&pdev->dev, + clkout_name, + clk_name,0 , + clk_wzrd->base, (WZRD_CLK_CFG_REG (2 ) + i *12 ), +WZRD_CLKOUT_DIVIDE_SHIFT , +WZRD_CLKOUT_DIVIDE_WIDTH , +CLK_DIVIDER_ONE_BASED |CLK_DIVIDER_ALLOW_ZERO , +NULL , &clkwzrd_lock);if (IS_ERR (clk_wzrd->clkout[i])) {int j;
Signature · 1 line
2.1.1
Stephen Boyd
maintainerRe: [PATCH v3 04/10] clk: clock-wizard: Add support for dynamic reconfiguration
Quoting [email protected] (2019-11-27 22:36:11)
Quoted 11 lines
From: Shubhrajyoti Datta <[email protected]>
The patch adds support for dynamic reconfiguration of clock output rate. Output clocks are registered as dividers and set rate callback function is used for dynamic reconfiguration.
Based on the initial work from Chirag.
Signed-off-by Chirag Parekh <[email protected]>Signed-off-by Shubhrajyoti Datta <[email protected]>Signed-off-by Michal Simek <[email protected]>
Are these more like Co-developed-by: tags?
Quoted 43 lines
drivers/clk/clk-xlnx-clock-wizard.c +26
-0@@ -29,8 +29,23 @@#define WZRD_DIVCLK_DIVIDE_SHIFT 0#define WZRD_DIVCLK_DIVIDE_MASK (0xff << WZRD_DIVCLK_DIVIDE_SHIFT)#define WZRD_CLKOUT_DIVIDE_SHIFT 0 +#define WZRD_CLKOUT_DIVIDE_WIDTH 8#define WZRD_CLKOUT_DIVIDE_MASK (0xff << WZRD_DIVCLK_DIVIDE_SHIFT) +#define WZRD_DR_MAX_INT_DIV_VALUE 255 +#define WZRD_DR_NUM_RETRIES 10000 +#define WZRD_DR_STATUS_REG_OFFSET 0x04 +#define WZRD_DR_LOCK_BIT_MASK 0x00000001 +#define WZRD_DR_INIT_REG_OFFSET 0x25C +#define WZRD_DR_DIV_TO_PHASE_OFFSET 4 +#define WZRD_DR_BEGIN_DYNA_RECONF 0x03 + +/* Get the mask from width */ +#define div_mask (width) ((1 << (width)) - 1) + +/* Extract divider instance from clock hardware instance */ +#define to_clk_wzrd_divider (_hw) container_of(_hw, struct clk_wzrd_divider, hw) +enum clk_wzrd_int_clks { wzrd_clk_mul, wzrd_clk_mul_div,@@ -62,6 +77,29 @@ struct clk_wzrd {bool suspended; }; +/** +* struct clk_wzrd_divider - clock divider specific to clk_wzrd +* +* @hw: handle between common and hardware-specific interfaces +* @base: base address of register containing the divider +* @offset: offset address of register containing the divider +* @shift: shift to the divider bit field +* @width: width of the divider bit field +* @flags: clk_wzrd divider flags +* @table: array of value/divider pairs, last entry should have div = 0 +* @lock: register lock
drivers/clk/clk-xlnx-clock-wizard.c struct clk_wzrd { · line 100
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +10
-0+*/ +struct clk_wzrd_divider { +struct clk_hw hw; +void __iomem *base; +u16 offset; +u8 shift; +u8 width; +u8 flags; +const struct clk_div_table *table; +spinlock_t *lock;/* divider lock */
Is this register lock used by anything? I'm mostly wondering if dividers are in a shared register with some other clk so we need to have this lock. Otherwise it adds more conditional locking code for no gain and should be removed to simplify.
Quoted 8 lines
drivers/clk/clk-xlnx-clock-wizard.c +2
-0+}; +#define to_clk_wzrd (_nb) container_of(_nb, struct clk_wzrd, nb)/* maximum frequencies for input/output clocks per speed grade */ @@ -71,6 +109,164 @@ static const unsigned long clk_wzrd_max_freq[] = { 1066000000UL };
drivers/clk/clk-xlnx-clock-wizard.c static const unsigned long clk_wzrd_max_freq[] = { · line 120
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +9
-0+/* spin lock variable for clk_wzrd */ +static DEFINE_SPINLOCK (clkwzrd_lock); + +static unsigned long clk_wzrd_recalc_rate (struct clk_hw *hw, +unsigned long parent_rate) +{ +struct clk_wzrd_divider *divider =to_clk_wzrd_divider (hw); +void __iomem *div_addr = + (void __iomem *)((u64 )divider->base + divider->offset);
Is this casting necessary?
Quoted 20 lines
drivers/clk/clk-xlnx-clock-wizard.c +20
-0+unsigned int val; + + val =readl (div_addr) >> divider->shift; + val &=div_mask (divider->width); + +return divider_recalc_rate (hw, parent_rate, val, divider->table, + divider->flags, divider->width); +} + +static int clk_wzrd_dynamic_reconfig (struct clk_hw *hw,unsigned long rate, +unsigned long parent_rate) +{ +int err =0 ; +u16 retries; +u32 value; +unsigned long flags =0 ; +struct clk_wzrd_divider *divider =to_clk_wzrd_divider (hw); +void __iomem *div_addr = + (void __iomem *)((u64 )divider->base + divider->offset); +
drivers/clk/clk-xlnx-clock-wizard.c static const unsigned long clk_wzrd_max_freq[] = { · line 150
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +10
-0+if (divider->lock) +spin_lock_irqsave (divider->lock, flags); +else +__acquire (divider->lock); + + value =DIV_ROUND_CLOSEST (parent_rate, rate); + +/* Cap the value to max */ +if (value >WZRD_DR_MAX_INT_DIV_VALUE ) + value =WZRD_DR_MAX_INT_DIV_VALUE ;
Please use min().
drivers/clk/clk-xlnx-clock-wizard.c static const unsigned long clk_wzrd_max_freq[] = { · line 162
Quoted 12 lines
drivers/clk/clk-xlnx-clock-wizard.c +12
-0+ +/* Set divisor and clear phase offset */ +writel (value, div_addr); +writel (0x00 , div_addr +WZRD_DR_DIV_TO_PHASE_OFFSET ); + +/* Check status register */ + retries =WZRD_DR_NUM_RETRIES ; +while (retries--) { +if (readl (divider->base +WZRD_DR_STATUS_REG_OFFSET ) & +WZRD_DR_LOCK_BIT_MASK ) +break ; + }
Is this readl_poll_timeout()?
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +10
-0+ +if (retries ==0 ) { + err = -ETIMEDOUT ; + goto err_reconfig; + } + +/* Initiate reconfiguration */ +writel (WZRD_DR_BEGIN_DYNA_RECONF , + divider->base +WZRD_DR_INIT_REG_OFFSET ); +
drivers/clk/clk-xlnx-clock-wizard.c static const unsigned long clk_wzrd_max_freq[] = { · line 182
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +10
-0+/* Check status register */ + retries =WZRD_DR_NUM_RETRIES ; +while (retries--) { +if (readl (divider->base +WZRD_DR_STATUS_REG_OFFSET ) & +WZRD_DR_LOCK_BIT_MASK ) +break ; + } + +if (retries ==0 ) + err = -ETIMEDOUT ;
readl_poll_timeout()?
Quoted 7 lines
drivers/clk/clk-xlnx-clock-wizard.c +7
-0+ +err_reconfig: +if (divider->lock) +spin_unlock_irqrestore (divider->lock, flags); +else +__release (divider->lock); +
drivers/clk/clk-xlnx-clock-wizard.c static const unsigned long clk_wzrd_max_freq[] = { · line 199
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +10
-0+return err; +} + +static long clk_wzrd_round_rate (struct clk_hw *hw,unsigned long rate, +unsigned long *prate) +{ +u8 div; + +/* +* since we donot change parent rate we just round rate to closest
s/donot/don't/
Quoted 19 lines
drivers/clk/clk-xlnx-clock-wizard.c +19
-0+* achievable +*/ + div =DIV_ROUND_CLOSEST (*prate, rate); + +return (*prate / div); +} + +static const struct clk_ops clk_wzrd_clk_divider_ops = { + .round_rate = clk_wzrd_round_rate, + .set_rate = clk_wzrd_dynamic_reconfig, + .recalc_rate = clk_wzrd_recalc_rate, +}; + +static struct clk *clk_wzrd_register_divider(struct device *dev, + const char *name, + const char *parent_name, + unsigned long flags, + void __iomem *base, u16 offset, + u8 shift, u8 width,
drivers/clk/clk-xlnx-clock-wizard.c static const unsigned long clk_wzrd_max_freq[] = { · line 228
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +10
-0+u8 clk_divider_flags, + const struct clk_div_table *table, + spinlock_t *lock) +{ + struct clk_wzrd_divider *div; +struct clk_hw *hw; +struct clk_init_data init; +int ret; + +if (clk_divider_flags &CLK_DIVIDER_HIWORD_MASK ) {
Do you use HIWORD mask things? I thought that was mostly rockchip specific quirk. If not, please remove this code.
Quoted 7 lines
drivers/clk/clk-xlnx-clock-wizard.c +7
-0+if (width + shift >16 ) { +pr_warn ("divider value exceeds LOWORD field\n" ); +return ERR_PTR (-EINVAL ); + } + } + +/* allocate the divider */
drivers/clk/clk-xlnx-clock-wizard.c static const unsigned long clk_wzrd_max_freq[] = { · line 245
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +10
-0+ div =kzalloc (sizeof (*div),GFP_KERNEL ); +if (!div) +return ERR_PTR (-ENOMEM ); + + init.name = name; +if (clk_divider_flags &CLK_DIVIDER_READ_ONLY ) + init.ops = &clk_divider_ro_ops; +else + init.ops = &clk_wzrd_clk_divider_ops; + init.flags = flags |CLK_IS_BASIC ;
Oh yeah, don't add this flag. This code won't compile so please compile test each patch in a series to make sure we don't have compilation bisection holes.
drivers/clk/clk-xlnx-clock-wizard.c static const unsigned long clk_wzrd_max_freq[] = { · line 247
Quoted 2 lines
drivers/clk/clk-xlnx-clock-wizard.c +2
-0+ init.parent_names = (parent_name ? &parent_name :NULL ); + init.num_parents = (parent_name ?1 :0 );
Is it sometimes the root of the tree? Seems unlikely so probably just assume there is a parent all the time.
drivers/clk/clk-xlnx-clock-wizard.c static const unsigned long clk_wzrd_max_freq[] = { · line 249
Quoted 2 lines
drivers/clk/clk-xlnx-clock-wizard.c +2
-0+ +/* struct clk_divider assignments */
Drop useless comment please.
drivers/clk/clk-xlnx-clock-wizard.c static const unsigned long clk_wzrd_max_freq[] = { · line 259
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +10
-0+ div->base = base; + div->offset = offset; + div->shift = shift; + div->width = width; + div->flags = clk_divider_flags; + div->lock = lock; + div->hw.init = &init; + div->table = table; + +/* register the clock */
Drop useless comment please.
Quoted 16 lines
drivers/clk/clk-xlnx-clock-wizard.c +10
-0+ hw = &div->hw; + ret =clk_hw_register (dev, hw); +if (ret) { +kfree (div); + hw =ERR_PTR (ret); + } + +return hw->clk; +} +static int clk_wzrd_clk_notifier (struct notifier_block *nb,unsigned long event,void *data) {@@ -241,11 +437,14 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -EINVAL ; goto err_rm_int_clks;
drivers/clk/clk-xlnx-clock-wizard.c static int clk_wzrd_probe(struct platform_device *pdev) · line 443
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +4
-5} - reg =readl (clk_wzrd->base +WZRD_CLK_CFG_REG (2 ) + i *12 ); - reg &=WZRD_CLKOUT_DIVIDE_MASK ; - reg >>=WZRD_CLKOUT_DIVIDE_SHIFT ; - clk_wzrd->clkout[i] =clk_register_fixed_factor - (&pdev->dev, clkout_name, clk_name,0 ,1 , reg); + clk_wzrd->clkout[i] = clk_wzrd_register_divider(&pdev->dev, + clkout_name, + clk_name, 0, + clk_wzrd->base, (WZRD_CLK_CFG_REG(2) + i * 12),
Please remove useless parenthesis.
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c +4
-0+WZRD_CLKOUT_DIVIDE_SHIFT , +WZRD_CLKOUT_DIVIDE_WIDTH , +CLK_DIVIDER_ONE_BASED |CLK_DIVIDER_ALLOW_ZERO , + NULL, &clkwzrd_lock);if (IS_ERR (clk_wzrd->clkout[i])) {int j;Signature · 1 line
2.1.1
PATCH v3 5/10 clk: clock-wizard: Add support for fractional support
In reply to [email protected]From: Shubhrajyoti Datta <[email protected]>
Currently the set rate granularity is to integral divisors. Add support for the fractional divisors.
Only the first output0 is fractional in the hardware.
--- drivers/clk/clk-xlnx-clock-wizard.c | 192 +++++++++++++++++++++++++++++++++--- 1 file changed, 179 insertions(+), 13 deletions(-)
drivers/clk/clk-xlnx-clock-wizard.c +179 -13
@@ -26,11 +26,15 @@#define WZRD_CLKFBOUT_MULT_SHIFT 8#define WZRD_CLKFBOUT_MULT_MASK (0xff << WZRD_CLKFBOUT_MULT_SHIFT) +#define WZRD_CLKFBOUT_FRAC_SHIFT 16 +#define WZRD_CLKFBOUT_FRAC_MASK (0x3ff << WZRD_CLKFBOUT_FRAC_SHIFT)#define WZRD_DIVCLK_DIVIDE_SHIFT 0#define WZRD_DIVCLK_DIVIDE_MASK (0xff << WZRD_DIVCLK_DIVIDE_SHIFT)#define WZRD_CLKOUT_DIVIDE_SHIFT 0#define WZRD_CLKOUT_DIVIDE_WIDTH 8#define WZRD_CLKOUT_DIVIDE_MASK (0xff << WZRD_DIVCLK_DIVIDE_SHIFT) +#define WZRD_CLKOUT_FRAC_SHIFT 8 +#define WZRD_CLKOUT_FRAC_MASK 0x3ff#define WZRD_DR_MAX_INT_DIV_VALUE 255#define WZRD_DR_NUM_RETRIES 10000
@@ -49,6 +53,7 @@enum clk_wzrd_int_clks { wzrd_clk_mul, wzrd_clk_mul_div, + wzrd_clk_mul_frac, wzrd_clk_int_max };
@@ -124,7 +129,7 @@ static unsigned long clk_wzrd_recalc_rate(struct clk_hw *hw, val &=div_mask (divider->width);return divider_recalc_rate (hw, parent_rate, val, divider->table, - divider->flags, divider->width); + divider->flags); } static int clk_wzrd_dynamic_reconfig(struct clk_hw *hw, unsigned long rate,
@@ -210,6 +215,161 @@ static const struct clk_ops clk_wzrd_clk_divider_ops = { .recalc_rate = clk_wzrd_recalc_rate, }; +static unsigned long clk_wzrd_recalc_ratef (struct clk_hw *hw, +unsigned long parent_rate) +{ +unsigned int val; +u32 div, frac; +struct clk_wzrd_divider *divider =to_clk_wzrd_divider (hw); +void __iomem *div_addr = + (void __iomem *)((u64 )divider->base + divider->offset); + + val =readl (div_addr); + div = val &div_mask (divider->width); + frac = (val >>WZRD_CLKOUT_FRAC_SHIFT ) &WZRD_CLKOUT_FRAC_MASK ; + +return ((parent_rate *1000 ) / ((div *1000 ) + frac)); +} + +static int clk_wzrd_dynamic_reconfig_f (struct clk_hw *hw,unsigned long rate, +unsigned long parent_rate) +{ +int err =0 ; +u16 retries; +u32 value, pre; +unsigned long flags =0 ; +unsigned long rate_div, f, clockout0_div; +struct clk_wzrd_divider *divider =to_clk_wzrd_divider (hw); +void __iomem *div_addr = + (void __iomem *)((u64 )divider->base + divider->offset); + +if (divider->lock) +spin_lock_irqsave (divider->lock, flags); +else +__acquire (divider->lock); + + rate_div = ((parent_rate *1000 ) / rate); + clockout0_div = rate_div /1000 ; + + pre =DIV_ROUND_CLOSEST ((parent_rate *1000 ), rate); + f = (u32)(pre - (clockout0_div *1000 )); + f = f &WZRD_CLKOUT_FRAC_MASK ; + + value = ((f <<WZRD_CLKOUT_DIVIDE_WIDTH ) | (clockout0_div & +WZRD_CLKOUT_DIVIDE_MASK )); + +/* Set divisor and clear phase offset */ +writel (value, div_addr); +writel (0x0 , div_addr +WZRD_DR_DIV_TO_PHASE_OFFSET ); + +/* Check status register */ + retries =WZRD_DR_NUM_RETRIES ; +while (retries--) { +if (readl (divider->base +WZRD_DR_STATUS_REG_OFFSET ) & +WZRD_DR_LOCK_BIT_MASK ) +break ; + } + +if (!retries) { + err = -ETIMEDOUT ; + goto err_reconfig; + } + +/* Initiate reconfiguration */ +writel (WZRD_DR_BEGIN_DYNA_RECONF , + divider->base +WZRD_DR_INIT_REG_OFFSET ); + +/* Check status register */ + retries =WZRD_DR_NUM_RETRIES ; +while (retries--) { +if (readl (divider->base +WZRD_DR_STATUS_REG_OFFSET ) & +WZRD_DR_LOCK_BIT_MASK ) +break ; + } + +if (!retries) + err = -ETIMEDOUT ; + +err_reconfig: +if (divider->lock) +spin_unlock_irqrestore (divider->lock, flags); +else +__release (divider->lock); + +return err; +} + +static long clk_wzrd_round_rate_f (struct clk_hw *hw,unsigned long rate, +unsigned long *prate) +{ +return rate; +} + +static const struct clk_ops clk_wzrd_clk_divider_ops_f = { + .round_rate = clk_wzrd_round_rate_f, + .set_rate = clk_wzrd_dynamic_reconfig_f, + .recalc_rate = clk_wzrd_recalc_ratef, +}; + +static struct clk *clk_wzrd_register_divf (struct device *dev, +const char *name, +const char *parent_name, +unsigned long flags, +void __iomem *base,u16 offset, +u8 shift,u8 width, +u8 clk_divider_flags, +const struct clk_div_table *table, +spinlock_t *lock) +{ +struct clk_wzrd_divider *div; +struct clk_hw *hw; +struct clk_init_data init; +int ret; + +if (clk_divider_flags &CLK_DIVIDER_HIWORD_MASK ) { +if (width + shift >16 ) { +pr_warn ("divider value exceeds LOWORD field\n" ); +return ERR_PTR (-EINVAL ); + } + } + +/* allocate the divider */ + div =kzalloc (sizeof (*div),GFP_KERNEL ); +if (!div) +return ERR_PTR (-ENOMEM ); + + init.name = name; + +if (clk_divider_flags &CLK_DIVIDER_READ_ONLY ) + init.ops = &clk_divider_ro_ops; +else + init.ops = &clk_wzrd_clk_divider_ops_f; + + init.flags = flags |CLK_IS_BASIC ; + init.parent_names = (parent_name ? &parent_name :NULL ); + init.num_parents = (parent_name ?1 :0 ); + +/* struct clk_divider assignments */ + div->base = base; + div->offset = offset; + div->shift = shift; + div->width = width; + div->flags = clk_divider_flags; + div->lock = lock; + div->hw.init = &init; + div->table = table; + +/* register the clock */ + hw = &div->hw; + ret =clk_hw_register (dev, hw); +if (ret) { +kfree (div); +return ERR_PTR (ret); + } + +return hw->clk; +} + static struct clk *clk_wzrd_register_divider(struct device *dev, const char *name, const char *parent_name,
@@ -328,7 +488,7 @@ static SIMPLE_DEV_PM_OPS(clk_wzrd_dev_pm_ops, clk_wzrd_suspend,static int clk_wzrd_probe (struct platform_device *pdev) {int i, ret; -u32 reg; +u32 reg, reg_f, mult;unsigned long rate;const char *clk_name;struct clk_wzrd *clk_wzrd;
@@ -380,17 +540,13 @@ static int clk_wzrd_probe(struct platform_device *pdev) goto err_disable_clk; } -/* we don't support fractional div/mul yet */ - reg =readl (clk_wzrd->base +WZRD_CLK_CFG_REG (0 )) & -WZRD_CLKFBOUT_FRAC_EN ; - reg |=readl (clk_wzrd->base +WZRD_CLK_CFG_REG (2 )) & -WZRD_CLKOUT0_FRAC_EN ; -if (reg) -dev_warn (&pdev->dev,"fractional div/mul not supported\n" ); -/* register multiplier */ reg = (readl (clk_wzrd->base +WZRD_CLK_CFG_REG (0 )) &WZRD_CLKFBOUT_MULT_MASK ) >>WZRD_CLKFBOUT_MULT_SHIFT ; + reg_f = (readl (clk_wzrd->base +WZRD_CLK_CFG_REG (0 )) & +WZRD_CLKFBOUT_FRAC_MASK ) >>WZRD_CLKFBOUT_FRAC_SHIFT ; + + mult = ((reg *1000 ) + reg_f); clk_name =kasprintf (GFP_KERNEL ,"%s_mul" ,dev_name (&pdev->dev));if (!clk_name) { ret = -ENOMEM ;
@@ -399,7 +555,7 @@ static int clk_wzrd_probe(struct platform_device *pdev) clk_wzrd->clks_internal[wzrd_clk_mul] =clk_register_fixed_factor (&pdev->dev, clk_name,__clk_get_name (clk_wzrd->clk_in1), -0 , reg,1 ); +0 , mult,1000 );kfree (clk_name);if (IS_ERR (clk_wzrd->clks_internal[wzrd_clk_mul])) {dev_err (&pdev->dev,"unable to register fixed-factor clock\n" );
@@ -437,8 +593,18 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -EINVAL ; goto err_rm_int_clks; } - clk_wzrd->clkout[i] = clk_wzrd_register_divider(&pdev->dev, - clkout_name, +if (!i) + clk_wzrd->clkout[i] =clk_wzrd_register_divf + (&pdev->dev, clkout_name, + clk_name,0 , + clk_wzrd->base, (WZRD_CLK_CFG_REG (2 ) + i *12 ), +WZRD_CLKOUT_DIVIDE_SHIFT , +WZRD_CLKOUT_DIVIDE_WIDTH , +CLK_DIVIDER_ONE_BASED |CLK_DIVIDER_ALLOW_ZERO , +NULL , &clkwzrd_lock); +else + clk_wzrd->clkout[i] = clk_wzrd_register_divider + (&pdev->dev, clkout_name, clk_name, 0, clk_wzrd->base, (WZRD_CLK_CFG_REG(2) + i * 12), WZRD_CLKOUT_DIVIDE_SHIFT,
Signature · 1 line
2.1.1
PATCH v3 6/10 clk: clock-wizard: Remove the hardcoding of the clock outputs
In reply to [email protected]From: Shubhrajyoti Datta <[email protected]>
The number of output clocks are configurable in the hardware. Currently the driver registers the maximum number of outputs. Fix the same by registering only the outputs that are there.
--- drivers/clk/clk-xlnx-clock-wizard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/clk-xlnx-clock-wizard.c +3 -2
@@ -493,6 +493,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)const char *clk_name;struct clk_wzrd *clk_wzrd;struct resource *mem; +int outputs;struct device_node *np = pdev->dev.of_node; clk_wzrd =devm_kzalloc (&pdev->dev,sizeof (*clk_wzrd),GFP_KERNEL );
@@ -583,7 +584,7 @@ static int clk_wzrd_probe(struct platform_device *pdev) }/* register div per output */ -for (i =WZRD_NUM_OUTPUTS -1 ; i >=0 ; i--) { +for (i = outputs -1 ; i >=0 ; i--) {const char *clkout_name; if (of_property_read_string_index(np, "clock-output-names", i,
@@ -614,7 +615,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)if (IS_ERR (clk_wzrd->clkout[i])) {int j; -for (j = i +1 ; j <WZRD_NUM_OUTPUTS ; j++) +for (j = i +1 ; j < outputs; j++)clk_unregister (clk_wzrd->clkout[j]);dev_err (&pdev->dev,"unable to register divider clock\n" );
Signature · 1 line
2.1.1
Stephen Boyd
maintainerRe: [PATCH v3 06/10] clk: clock-wizard: Remove the hardcoding of the clock outputs
Quoting [email protected] (2019-11-27 22:36:13)
Quoted 13 lines
drivers/clk/clk-xlnx-clock-wizard.c +1
-0@@ -493,6 +493,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)const char *clk_name;struct clk_wzrd *clk_wzrd;struct resource *mem; +int outputs;struct device_node *np = pdev->dev.of_node; clk_wzrd =devm_kzalloc (&pdev->dev,sizeof (*clk_wzrd),GFP_KERNEL );
drivers/clk/clk-xlnx-clock-wizard.c static int clk_wzrd_probe(struct platform_device *pdev) · line 587
Quoted 5 lines
drivers/clk/clk-xlnx-clock-wizard.c +1
-1@@ -583,7 +584,7 @@ static int clk_wzrd_probe(struct platform_device *pdev) }/* register div per output */ -for (i =WZRD_NUM_OUTPUTS -1 ; i >=0 ; i--) { +for (i = outputs -1 ; i >=0 ; i--) {
Where is 'outputs' assigned in this patch?
Quoted 12 lines
drivers/clk/clk-xlnx-clock-wizard.c +1
-1const char *clkout_name; if (of_property_read_string_index(np, "clock-output-names", i,@@ -614,7 +615,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)if (IS_ERR (clk_wzrd->clkout[i])) {int j; -for (j = i +1 ; j <WZRD_NUM_OUTPUTS ; j++) +for (j = i +1 ; j < outputs; j++)clk_unregister (clk_wzrd->clkout[j]);dev_err (&pdev->dev,"unable to register divider clock\n" );
PATCH v3 7/10 clk: clock-wizard: Update the fixed factor divisors
In reply to [email protected]From: Shubhrajyoti Datta <[email protected]>
Update the fixed factor clock registration to register the divisors.
--- drivers/clk/clk-xlnx-clock-wizard.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/clk/clk-xlnx-clock-wizard.c +11 -6
@@ -491,9 +491,11 @@ static int clk_wzrd_probe(struct platform_device *pdev)u32 reg, reg_f, mult;unsigned long rate;const char *clk_name; +void __iomem *ctrl_reg;struct clk_wzrd *clk_wzrd;struct resource *mem;int outputs; +unsigned long flags =0 ;struct device_node *np = pdev->dev.of_node; clk_wzrd =devm_kzalloc (&pdev->dev,sizeof (*clk_wzrd),GFP_KERNEL );
@@ -564,19 +566,22 @@ static int clk_wzrd_probe(struct platform_device *pdev) goto err_disable_clk; } -/* register div */ - reg = (readl (clk_wzrd->base +WZRD_CLK_CFG_REG (0 )) & -WZRD_DIVCLK_DIVIDE_MASK ) >>WZRD_DIVCLK_DIVIDE_SHIFT ; + outputs =of_property_count_strings (np,"clock-output-names" ); +if (outputs ==1 ) + flags =CLK_SET_RATE_PARENT ; clk_name =kasprintf (GFP_KERNEL ,"%s_mul_div" ,dev_name (&pdev->dev));if (!clk_name) { ret = -ENOMEM ; goto err_rm_int_clk; } - clk_wzrd->clks_internal[wzrd_clk_mul_div] =clk_register_fixed_factor + ctrl_reg = clk_wzrd->base +WZRD_CLK_CFG_REG (0 ); +/* register div */ + clk_wzrd->clks_internal[wzrd_clk_mul_div] =clk_register_divider (&pdev->dev, clk_name,__clk_get_name (clk_wzrd->clks_internal[wzrd_clk_mul]), -0 ,1 , reg); + flags, ctrl_reg,0 ,8 ,CLK_DIVIDER_ONE_BASED | +CLK_DIVIDER_ALLOW_ZERO , &clkwzrd_lock);if (IS_ERR (clk_wzrd->clks_internal[wzrd_clk_mul_div])) {dev_err (&pdev->dev,"unable to register divider clock\n" ); ret =PTR_ERR (clk_wzrd->clks_internal[wzrd_clk_mul_div]);
@@ -597,7 +602,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)if (!i) clk_wzrd->clkout[i] = clk_wzrd_register_divf (&pdev->dev, clkout_name, - clk_name, 0, + clk_name, flags, clk_wzrd->base, (WZRD_CLK_CFG_REG(2) + i * 12), WZRD_CLKOUT_DIVIDE_SHIFT, WZRD_CLKOUT_DIVIDE_WIDTH,
Signature · 1 line
2.1.1
Stephen Boyd
maintainerRe: [PATCH v3 07/10] clk: clock-wizard: Update the fixed factor divisors
Quoting [email protected] (2019-11-27 22:36:14)
Quoted 26 lines
From: Shubhrajyoti Datta <[email protected]>
Update the fixed factor clock registration to register the divisors.
Signed-off-by Shubhrajyoti Datta <[email protected]>--- drivers/clk/clk-xlnx-clock-wizard.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)drivers/clk/clk-xlnx-clock-wizard.c +2
-0@@ -491,9 +491,11 @@ static int clk_wzrd_probe(struct platform_device *pdev)u32 reg, reg_f, mult;unsigned long rate;const char *clk_name; +void __iomem *ctrl_reg;struct clk_wzrd *clk_wzrd;struct resource *mem;int outputs; +unsigned long flags =0 ;struct device_node *np = pdev->dev.of_node; clk_wzrd =devm_kzalloc (&pdev->dev,sizeof (*clk_wzrd),GFP_KERNEL );
drivers/clk/clk-xlnx-clock-wizard.c static int clk_wzrd_probe(struct platform_device *pdev) · line 571
Quoted 9 lines
drivers/clk/clk-xlnx-clock-wizard.c +3
-3@@ -564,19 +566,22 @@ static int clk_wzrd_probe(struct platform_device *pdev) goto err_disable_clk; } -/* register div */ - reg = (readl (clk_wzrd->base +WZRD_CLK_CFG_REG (0 )) & -WZRD_DIVCLK_DIVIDE_MASK ) >>WZRD_DIVCLK_DIVIDE_SHIFT ; + outputs =of_property_count_strings (np,"clock-output-names" ); +if (outputs ==1 ) + flags =CLK_SET_RATE_PARENT ;
What does the number of clk outputs have to do with the ability to change the rate of a parent clk? The commit text doesn't inform me of what this is for either. Please help us understand.
Quoted 6 lines
drivers/clk/clk-xlnx-clock-wizard.c +0
-0clk_name =kasprintf (GFP_KERNEL ,"%s_mul_div" ,dev_name (&pdev->dev));if (!clk_name) { ret = -ENOMEM ; goto err_rm_int_clk; }
Re: [PATCH v3 07/10] clk: clock-wizard: Update the fixed factor divisors
Quoted 31 lines · Stephen Boyd
Quoting [email protected] (2019-11-27 22:36:14)
Quoted 29 lines
From: Shubhrajyoti Datta <[email protected]>
Update the fixed factor clock registration to register the divisors.
Signed-off-by Shubhrajyoti Datta <[email protected]>--- drivers/clk/clk-xlnx-clock-wizard.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)drivers/clk/clk-xlnx-clock-wizard.c +2
-0@@ -491,9 +491,11 @@ static int clk_wzrd_probe(struct platform_device *pdev)u32 reg, reg_f, mult;unsigned long rate;const char *clk_name; +void __iomem *ctrl_reg;struct clk_wzrd *clk_wzrd;struct resource *mem;int outputs; +unsigned long flags =0 ;struct device_node *np = pdev->dev.of_node; clk_wzrd =devm_kzalloc (&pdev->dev,sizeof (*clk_wzrd),GFP_KERNEL );@@ -564,19 +566,22 @@ static int clk_wzrd_probe(struct platform_device *pdev) goto err_disable_clk; }
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c static int clk_wzrd_probe(struct platform_device *pdev) · line 571
Quoted 6 lines
drivers/clk/clk-xlnx-clock-wizard.c +3
-3-/* register div */ - reg = (readl (clk_wzrd->base +WZRD_CLK_CFG_REG (0 )) & -WZRD_DIVCLK_DIVIDE_MASK ) >>WZRD_DIVCLK_DIVIDE_SHIFT ; + outputs =of_property_count_strings (np,"clock-output-names" ); +if (outputs ==1 ) + flags =CLK_SET_RATE_PARENT ;What does the number of clk outputs have to do with the ability to change the rate of a parent clk? The commit text doesn't inform me of what this is for either. Please help us understand.
If there are multiple clocks then changing the rate of the parent changes the rate of all the
outputs so we donot allow changing the rate of the parent if there are multiple clocks.
If there is only one output then that is not an issue.
I will update the description in the next version.
Quoted 7 lines
Quoted 7 lines
drivers/clk/clk-xlnx-clock-wizard.c +0
-0clk_name =kasprintf (GFP_KERNEL ,"%s_mul_div" ,dev_name (&pdev->dev));if (!clk_name) { ret = -ENOMEM ; goto err_rm_int_clk; }
PATCH v3 8/10 clk: clock-wizard: Make the output names unique
In reply to [email protected]From: Shubhrajyoti Datta <[email protected]>
Incase there are more than one instance of the clocking wizard. And if the output name given is the same then the probe fails. Fix the same by appending the device name to the output name to make it unique.
--- drivers/clk/clk-xlnx-clock-wizard.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/clk/clk-xlnx-clock-wizard.c +8 -5
@@ -555,6 +555,9 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -ENOMEM ; goto err_disable_clk; } + outputs =of_property_count_strings (np,"clock-output-names" ); +if (outputs ==1 ) + flags =CLK_SET_RATE_PARENT ; clk_wzrd->clks_internal[wzrd_clk_mul] = clk_register_fixed_factor (&pdev->dev, clk_name, __clk_get_name(clk_wzrd->clk_in1),
@@ -566,9 +569,6 @@ static int clk_wzrd_probe(struct platform_device *pdev) goto err_disable_clk; } - outputs =of_property_count_strings (np,"clock-output-names" ); -if (outputs ==1 ) - flags =CLK_SET_RATE_PARENT ; clk_name =kasprintf (GFP_KERNEL ,"%s_mul_div" ,dev_name (&pdev->dev));if (!clk_name) { ret = -ENOMEM ;
@@ -591,6 +591,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)/* register div per output */ for (i = outputs -1 ; i >=0 ; i--) {const char *clkout_name; +const char *clkout_name_wiz;if (of_property_read_string_index (np,"clock-output-names" , i, &clkout_name)) {
@@ -599,9 +600,11 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -EINVAL ; goto err_rm_int_clks; } + clkout_name_wiz =kasprintf (GFP_KERNEL ,"%s_%s" , +dev_name (&pdev->dev), clkout_name);if (!i) clk_wzrd->clkout[i] = clk_wzrd_register_divf - (&pdev->dev, clkout_name, + (&pdev->dev, clkout_name_wiz, clk_name, flags, clk_wzrd->base, (WZRD_CLK_CFG_REG(2) + i * 12), WZRD_CLKOUT_DIVIDE_SHIFT,
@@ -610,7 +613,7 @@ static int clk_wzrd_probe(struct platform_device *pdev) NULL, &clkwzrd_lock); else clk_wzrd->clkout[i] = clk_wzrd_register_divider - (&pdev->dev, clkout_name, + (&pdev->dev, clkout_name_wiz, clk_name, 0, clk_wzrd->base, (WZRD_CLK_CFG_REG(2) + i * 12), WZRD_CLKOUT_DIVIDE_SHIFT,
Signature · 1 line
2.1.1
Re: [PATCH v3 08/10] clk: clock-wizard: Make the output names unique
Quoted 45 lines · On Thu, Nov 28, 2019 at 12:06:15PM +0530, [email protected] wrote:
From: Shubhrajyoti Datta <[email protected]>
Incase there are more than one instance of the clocking wizard. And if the output name given is the same then the probe fails. Fix the same by appending the device name to the output name to make it unique.
Signed-off-by Shubhrajyoti Datta <[email protected]>--- drivers/clk/clk-xlnx-clock-wizard.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)drivers/clk/clk-xlnx-clock-wizard.c +4
-3@@ -555,6 +555,9 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -ENOMEM ; goto err_disable_clk; } + outputs =of_property_count_strings (np,"clock-output-names" ); +if (outputs ==1 ) + flags =CLK_SET_RATE_PARENT ; clk_wzrd->clks_internal[wzrd_clk_mul] = clk_register_fixed_factor (&pdev->dev, clk_name, __clk_get_name(clk_wzrd->clk_in1),@@ -566,9 +569,6 @@ static int clk_wzrd_probe(struct platform_device *pdev) goto err_disable_clk; } - outputs =of_property_count_strings (np,"clock-output-names" ); -if (outputs ==1 ) - flags =CLK_SET_RATE_PARENT ; clk_name =kasprintf (GFP_KERNEL ,"%s_mul_div" ,dev_name (&pdev->dev));if (!clk_name) { ret = -ENOMEM ;@@ -591,6 +591,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)/* register div per output */ for (i = outputs -1 ; i >=0 ; i--) {const char *clkout_name; +const char *clkout_name_wiz;if (of_property_read_string_index (np,"clock-output-names" , i, &clkout_name)) {
drivers/clk/clk-xlnx-clock-wizard.c static int clk_wzrd_probe(struct platform_device *pdev) · line 604
Quoted 5 lines
drivers/clk/clk-xlnx-clock-wizard.c +2
-0@@ -599,9 +600,11 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -EINVAL ; goto err_rm_int_clks; } + clkout_name_wiz =kasprintf (GFP_KERNEL ,"%s_%s" , +dev_name (&pdev->dev), clkout_name);
If this kasprintf() crashes then clk_wzrd_register_divf() will fail. But that was a headache to review. Just add a check for NULL. We need a kfree() as well.
One alternative would be to just declare a buffer on the stack and use snprintf(). We don't need to keep the name around after the call to clk_wzrd_register_divf().
regards,
dan carpenter
Re: [PATCH v3 08/10] clk: clock-wizard: Make the output names unique
Quoted 57 lines · Dan Carpenter
Quoted 45 lines · On Thu, Nov 28, 2019 at 12:06:15PM +0530, [email protected] wrote:
From: Shubhrajyoti Datta <[email protected]>
Incase there are more than one instance of the clocking wizard. And if the output name given is the same then the probe fails. Fix the same by appending the device name to the output name to make it unique.
Signed-off-by Shubhrajyoti Datta <[email protected]>--- drivers/clk/clk-xlnx-clock-wizard.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)drivers/clk/clk-xlnx-clock-wizard.c +4
-3@@ -555,6 +555,9 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -ENOMEM ; goto err_disable_clk; } + outputs =of_property_count_strings (np,"clock-output-names" ); +if (outputs ==1 ) + flags =CLK_SET_RATE_PARENT ; clk_wzrd->clks_internal[wzrd_clk_mul] = clk_register_fixed_factor (&pdev->dev, clk_name, __clk_get_name(clk_wzrd->clk_in1),@@ -566,9 +569,6 @@ static int clk_wzrd_probe(struct platform_device *pdev) goto err_disable_clk; } - outputs =of_property_count_strings (np,"clock-output-names" ); -if (outputs ==1 ) - flags =CLK_SET_RATE_PARENT ; clk_name =kasprintf (GFP_KERNEL ,"%s_mul_div" ,dev_name (&pdev->dev));if (!clk_name) { ret = -ENOMEM ;@@ -591,6 +591,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)/* register div per output */ for (i = outputs -1 ; i >=0 ; i--) {const char *clkout_name; +const char *clkout_name_wiz;if (of_property_read_string_index (np,"clock-output-names" , i, &clkout_name)) {drivers/clk/clk-xlnx-clock-wizard.c static int clk_wzrd_probe(struct platform_device *pdev) · line 604
Quoted 5 lines
drivers/clk/clk-xlnx-clock-wizard.c +2
-0@@ -599,9 +600,11 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -EINVAL ; goto err_rm_int_clks; } + clkout_name_wiz =kasprintf (GFP_KERNEL ,"%s_%s" , +dev_name (&pdev->dev), clkout_name);If this
kasprintf()crashes thenclk_wzrd_register_divf()will fail. But that was a headache to review. Just add a check for NULL. We need akfree()as well.
Quoted 3 lines
One alternative would be to just declare a buffer on the stack and use
snprintf(). We don't need to keep the name around after the call toclk_wzrd_register_divf().
Will fix in next version.
Quoted 4 lines
regards,
dan carpenter
Re: [PATCH v3 08/10] clk: clock-wizard: Make the output names unique
Quoted 45 lines · Shubhrajyoti Datta
Quoted 44 lines · Dan Carpenter
Quoted 42 lines · On Thu, Nov 28, 2019 at 12:06:15PM +0530, [email protected] wrote:
From: Shubhrajyoti Datta <[email protected]>
Incase there are more than one instance of the clocking wizard. And if the output name given is the same then the probe fails. Fix the same by appending the device name to the output name to make it unique.
Signed-off-by Shubhrajyoti Datta <[email protected]>--- drivers/clk/clk-xlnx-clock-wizard.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)drivers/clk/clk-xlnx-clock-wizard.c +4
-3@@ -555,6 +555,9 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -ENOMEM ; goto err_disable_clk; } + outputs =of_property_count_strings (np,"clock-output-names" ); +if (outputs ==1 ) + flags =CLK_SET_RATE_PARENT ; clk_wzrd->clks_internal[wzrd_clk_mul] = clk_register_fixed_factor (&pdev->dev, clk_name, __clk_get_name(clk_wzrd->clk_in1),@@ -566,9 +569,6 @@ static int clk_wzrd_probe(struct platform_device *pdev) goto err_disable_clk; } - outputs =of_property_count_strings (np,"clock-output-names" ); -if (outputs ==1 ) - flags =CLK_SET_RATE_PARENT ; clk_name =kasprintf (GFP_KERNEL ,"%s_mul_div" ,dev_name (&pdev->dev));if (!clk_name) { ret = -ENOMEM ;@@ -591,6 +591,7 @@ static int clk_wzrd_probe(struct platform_device *pdev)/* register div per output */ for (i = outputs -1 ; i >=0 ; i--) {const char *clkout_name; +const char *clkout_name_wiz;
Quoted 10 lines
Quoted 10 lines
drivers/clk/clk-xlnx-clock-wizard.c static int clk_wzrd_probe(struct platform_device *pdev) · line 604
Quoted 8 lines
drivers/clk/clk-xlnx-clock-wizard.c +2
-0if (of_property_read_string_index (np,"clock-output-names" , i, &clkout_name)) {@@ -599,9 +600,11 @@ static int clk_wzrd_probe(struct platform_device *pdev) ret = -EINVAL ; goto err_rm_int_clks; } + clkout_name_wiz =kasprintf (GFP_KERNEL ,"%s_%s" , +dev_name (&pdev->dev), clkout_name);If this
kasprintf()crashes thenclk_wzrd_register_divf()will fail.
I meant if kasprintf() returns NULL not crashes... :/
Quoted 2 lines
Quoted 2 lines
But that was a headache to review. Just add a check for NULL. We need a
kfree()as well.
regards,
dan carpenter
PATCH v3 9/10 staging: clocking-wizard: Delete the driver from the staging
In reply to [email protected]From: Shubhrajyoti Datta <[email protected]>
Delete the driver from the staging as it is in drivers/clk.
--- drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/clocking-wizard/Kconfig | 10 - drivers/staging/clocking-wizard/Makefile | 2 - drivers/staging/clocking-wizard/TODO | 12 - .../clocking-wizard/clk-xlnx-clock-wizard.c | 335 --------------------- drivers/staging/clocking-wizard/dt-binding.txt | 30 -- 7 files changed, 392 deletions(-) delete mode 100644 drivers/staging/clocking-wizard/Kconfig delete mode 100644 drivers/staging/clocking-wizard/Makefile delete mode 100644 drivers/staging/clocking-wizard/TODO delete mode 100644 drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c delete mode 100644 drivers/staging/clocking-wizard/dt-binding.txt
drivers/staging/Kconfig +0 -2
@@ -78,8 +78,6 @@ source "drivers/staging/gs_fpgaboot/Kconfig" source "drivers/staging/unisys/Kconfig" -source "drivers/staging/clocking-wizard/Kconfig" - source "drivers/staging/fbtft/Kconfig" source "drivers/staging/fsl-dpaa2/Kconfig"
drivers/staging/Makefile +0 -1
@@ -29,7 +29,6 @@ obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/ obj-$(CONFIG_GOLDFISH) += goldfish/ obj-$(CONFIG_GS_FPGABOOT) += gs_fpgaboot/ obj-$(CONFIG_UNISYSSPAR) += unisys/ -obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ obj-$(CONFIG_FB_TFT) += fbtft/ obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/ obj-$(CONFIG_WILC1000) += wilc1000/
drivers/staging/clocking-wizard/Kconfig deleted +0 -10
@@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Xilinx Clocking Wizard Driver -# - -config COMMON_CLK_XLNX_CLKWZRD - tristate "Xilinx Clocking Wizard" - depends on COMMON_CLK && OF - help - Support for the Xilinx Clocking Wizard IP core clock generator.
drivers/staging/clocking-wizard/Makefile deleted +0 -2
@@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clk-xlnx-clock-wizard.o
drivers/staging/clocking-wizard/TODO deleted +0 -12
@@ -1,12 +0,0 @@ -TODO: - - support for fractional multiplier - - support for fractional divider (output 0 only) - - support for set_rate() operations (may benefit from Stephen Boyd's - refactoring of the clk primitives: https://lkml.org/lkml/2014/9/5/766) - - review arithmetic - - overflow after multiplication? - - maximize accuracy before divisions - -Patches to: - Greg Kroah-Hartman <[email protected]> - Sören Brinkmann <[email protected]>
drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c deleted +0 -335
335 lines not on this page · raw message
drivers/staging/clocking-wizard/dt-binding.txt deleted +0 -30
@@ -1,30 +0,0 @@ -Binding for Xilinx Clocking Wizard IP Core - -This binding uses the common clock binding[1]. Details about the devices can be -found in the product guide[2]. - -[1] Documentation/devicetree/bindings/clock/clock-bindings.txt -[2] Clocking Wizard Product Guide -http://www.xilinx.com/support/documentation/ip_documentation/clk_wiz/v5_1/pg065-clk-wiz.pdf - -Required properties: - - compatible: Must be 'xlnx,clocking-wizard' - - reg: Base and size of the cores register space - - clocks: Handle to input clock - - clock-names: Tuple containing 'clk_in1' and 's_axi_aclk' - - clock-output-names: Names for the output clocks - -Optional properties: - - speed-grade: Speed grade of the device (valid values are 1..3) - -Example: - clock-generator@40040000 { - reg = <0x40040000 0x1000>; - compatible = "xlnx,clocking-wizard"; - speed-grade = <1>; - clock-names = "clk_in1", "s_axi_aclk"; - clocks = <&clkc 15>, <&clkc 15>; - clock-output-names = "clk_out0", "clk_out1", "clk_out2", - "clk_out3", "clk_out4", "clk_out5", - "clk_out6", "clk_out7"; - };
Signature · 1 line
2.1.1
Stephen Boyd
maintainerRe: [PATCH v3 09/10] staging: clocking-wizard: Delete the driver from the staging
Quoting [email protected] (2019-11-27 22:36:16)
Quoted 5 lines
From: Shubhrajyoti Datta <[email protected]>
Delete the driver from the staging as it is in
drivers/clk.Signed-off-by Shubhrajyoti Datta <[email protected]>
Can all these patches in this series apply to the staging paths and be picked up by Greg? Then when the driver is ready to be moved out of staging I would like to see one patch that removes the driver from staging and adds it to drivers/clk/ so we can be certain the diff is minimal.
Feel free to add me and linux-clk to the review of the clocking-wizard driver patches. I will review the driver patches that way.
PATCH v3 10/10 clk: clock-wizard: Fix the compilation failure
In reply to [email protected]From: Shubhrajyoti Datta <[email protected]>
After 90b6c5c73 (clk: Remove CLK_IS_BASIC clk flag) The CLK_IS_BASIC is deleted. Adapt the driver for the same.
--- drivers/clk/clk-xlnx-clock-wizard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/clk-xlnx-clock-wizard.c +2 -2
@@ -345,7 +345,7 @@ static struct clk *clk_wzrd_register_divf(struct device *dev,else init.ops = &clk_wzrd_clk_divider_ops_f; - init.flags = flags |CLK_IS_BASIC ; + init.flags = flags; init.parent_names = (parent_name ? &parent_name :NULL ); init.num_parents = (parent_name ?1 :0 );
@@ -402,7 +402,7 @@ static struct clk *clk_wzrd_register_divider(struct device *dev, init.ops = &clk_divider_ro_ops; else init.ops = &clk_wzrd_clk_divider_ops; - init.flags = flags |CLK_IS_BASIC ; + init.flags = flags; init.parent_names = (parent_name ? &parent_name :NULL ); init.num_parents = (parent_name ?1 :0 );
Signature · 1 line
2.1.1
Stephen Boyd
maintainerRe: [PATCH v3 10/10] clk: clock-wizard: Fix the compilation failure
Quoting [email protected] (2019-11-27 22:36:17)
Quoted 4 lines
From: Shubhrajyoti Datta <[email protected]>
After
90b6c5c73(clk: RemoveCLK_IS_BASICclk flag) TheCLK_IS_BASICis deleted. Adapt the driver for the same.
I don't see any CLK_IS_BASIC in the tree right now, so did it get reintroduced by this patch series? Can you squash this into whatever patch introduces CLK_IS_BASIC usage?