This patch series adds support for custom type flags passed from
firmware. It also update fraction clock check from custom type
flags since new firmware pass CLK_FRAC flag as a part of custom flags
instead of clkflags as CLK_FRAC is not common clock framework flag.
This patch series maintains backward compatibility with older version
of firmware.
v2:
-PATCH[2/2] Correct BIT index of CLK_FRAC in custom_type_flag
Rajan Vaja (1):
drivers: clk: zynqmp: Add support for custom type flags
Tejas Patel (1):
drivers: clk: zynqmp: Update fraction clock check from custom type
flags
drivers/clk/zynqmp/clk-zynqmp.h | 1 +
drivers/clk/zynqmp/clkc.c | 4 ++++
drivers/clk/zynqmp/divider.c | 6 ++++--
3 files changed, 9 insertions(+), 2 deletions(-)
--
2.7.4
From: Tejas Patel <[email protected]>
Older firmware version sets BIT(13) in clkflag to mark a
divider as fractional divider. Updated firmware version sets BIT(4)
in type flags to mark a divider as fractional divider since
BIT(13) is defined as CLK_DUTY_CYCLE_PARENT in the common clk
framework flags.
To support both old and new firmware version, consider BIT(13) from
clkflag and BIT(4) from type_flag to check if divider is fractional
or not.
To maintain compatibility BIT(13) of clkflag in firmware will not be
used in future for any purpose and will be marked as unused.
Signed-off-by: Tejas Patel <[email protected]>
Signed-off-by: Rajan Vaja <[email protected]>
Signed-off-by: Jolly Shah <[email protected]>
---
drivers/clk/zynqmp/divider.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/zynqmp/divider.c b/drivers/clk/zynqmp/divider.c
index 8eed715..efe2ed6 100644
--- a/drivers/clk/zynqmp/divider.c
+++ b/drivers/clk/zynqmp/divider.c
@@ -25,7 +25,8 @@
#define to_zynqmp_clk_divider(_hw) \
container_of(_hw, struct zynqmp_clk_divider, hw)
-#define CLK_FRAC BIT(13) /* has a fractional parent */
+#define CLK_FRAC BIT(13) /* has a fractional parent */
+#define CUSTOM_FLAG_CLK_FRAC BIT(0) /* has a fractional parent in custom type flag */
/**
* struct zynqmp_clk_divider - adjustable divider clock
@@ -307,7 +308,8 @@ struct clk_hw *zynqmp_clk_register_divider(const char *name,
init.num_parents = 1;
/* struct clk_divider assignments */
- div->is_frac = !!(nodes->flag & CLK_FRAC);
+ div->is_frac = !!((nodes->flag & CLK_FRAC) |
+ (nodes->custom_type_flag & CUSTOM_FLAG_CLK_FRAC));
div->flags = nodes->type_flag;
div->hw.init = &init;
div->clk_id = clk_id;
--
2.7.4
From: Rajan Vaja <[email protected]>
Store extra custom type flags received from firmware.
Signed-off-by: Rajan Vaja <[email protected]>
Signed-off-by: Tejas Patel <[email protected]>
Signed-off-by: Jolly Shah <[email protected]>
---
drivers/clk/zynqmp/clk-zynqmp.h | 1 +
drivers/clk/zynqmp/clkc.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/clk/zynqmp/clk-zynqmp.h b/drivers/clk/zynqmp/clk-zynqmp.h
index fec9a15..5beeb41 100644
--- a/drivers/clk/zynqmp/clk-zynqmp.h
+++ b/drivers/clk/zynqmp/clk-zynqmp.h
@@ -30,6 +30,7 @@ struct clock_topology {
u32 type;
u32 flag;
u32 type_flag;
+ u8 custom_type_flag;
};
struct clk_hw *zynqmp_clk_register_pll(const char *name, u32 clk_id,
diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index 5eed5ce..e12d01c 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -84,6 +84,7 @@ struct name_resp {
struct topology_resp {
#define CLK_TOPOLOGY_TYPE GENMASK(3, 0)
+#define CLK_TOPOLOGY_CUSTOM_TYPE_FLAGS GENMASK(7, 4)
#define CLK_TOPOLOGY_FLAGS GENMASK(23, 8)
#define CLK_TOPOLOGY_TYPE_FLAGS GENMASK(31, 24)
u32 topology[CLK_GET_TOPOLOGY_RESP_WORDS];
@@ -395,6 +396,9 @@ static int __zynqmp_clock_get_topology(struct clock_topology *topology,
topology[*nnodes].type_flag =
FIELD_GET(CLK_TOPOLOGY_TYPE_FLAGS,
response->topology[i]);
+ topology[*nnodes].custom_type_flag =
+ FIELD_GET(CLK_TOPOLOGY_CUSTOM_TYPE_FLAGS,
+ response->topology[i]);
(*nnodes)++;
}
--
2.7.4
A gentle reminder for review.
Thanks,
Jolly Shah
On 3/12/20, 2:32 PM, "Jolly Shah" <[email protected]> wrote:
This patch series adds support for custom type flags passed from
firmware. It also update fraction clock check from custom type
flags since new firmware pass CLK_FRAC flag as a part of custom flags
instead of clkflags as CLK_FRAC is not common clock framework flag.
This patch series maintains backward compatibility with older version
of firmware.
v2:
-PATCH[2/2] Correct BIT index of CLK_FRAC in custom_type_flag
Rajan Vaja (1):
drivers: clk: zynqmp: Add support for custom type flags
Tejas Patel (1):
drivers: clk: zynqmp: Update fraction clock check from custom type
flags
drivers/clk/zynqmp/clk-zynqmp.h | 1 +
drivers/clk/zynqmp/clkc.c | 4 ++++
drivers/clk/zynqmp/divider.c | 6 ++++--
3 files changed, 9 insertions(+), 2 deletions(-)
--
2.7.4
Hi Stephan,
Ping. Please review.
Thanks,
Jolly Shah
> ------Original Message------
> From: Jolly Shah <[email protected]>
> Sent: Thursday, March 12, 2020 2:31PM
> To: Olof <[email protected]>, Mturquette <[email protected]>,
Sboyd <[email protected]>, Michal Simek <[email protected]>, Arm
<[email protected]>, Linux-clk <[email protected]>
> Cc: Rajan Vaja <[email protected]>,
[email protected]
<[email protected]>, [email protected]
<[email protected]>, Jolly Shah <[email protected]>
> Subject: [PATCH v2 0/2] drivers: clk: zynqmp: Update fraction clock
check from custom type flags
>
> This patch series adds support for custom type flags passed from
> firmware. It also update fraction clock check from custom type
> flags since new firmware pass CLK_FRAC flag as a part of custom flags
> instead of clkflags as CLK_FRAC is not common clock framework flag.
>
> This patch series maintains backward compatibility with older version
> of firmware.
> v2:
> -PATCH[2/2] Correct BIT index of CLK_FRAC in custom_type_flag
>
> Rajan Vaja (1):
> drivers: clk: zynqmp: Add support for custom type flags
>
> Tejas Patel (1):
> drivers: clk: zynqmp: Update fraction clock check from custom type
> flags
>
> drivers/clk/zynqmp/clk-zynqmp.h | 1 +
> drivers/clk/zynqmp/clkc.c | 4 ++++
> drivers/clk/zynqmp/divider.c | 6 ++++--
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
Quoting Jolly Shah (2020-03-12 14:31:39)
> From: Tejas Patel <[email protected]>
>
> Older firmware version sets BIT(13) in clkflag to mark a
> divider as fractional divider. Updated firmware version sets BIT(4)
> in type flags to mark a divider as fractional divider since
> BIT(13) is defined as CLK_DUTY_CYCLE_PARENT in the common clk
> framework flags.
>
> To support both old and new firmware version, consider BIT(13) from
> clkflag and BIT(4) from type_flag to check if divider is fractional
> or not.
>
> To maintain compatibility BIT(13) of clkflag in firmware will not be
> used in future for any purpose and will be marked as unused.
Why are we mixing the firmware flags with the ccf flags? They shouldn't
be the same. The firmware should have its own 'flag numberspace' that is
distinct from the common clk framework's 'flag numberspace'. Please fix
the code.
Quoting Jolly Shah (2020-03-12 14:31:38)
> From: Rajan Vaja <[email protected]>
>
> Store extra custom type flags received from firmware.
>
> Signed-off-by: Rajan Vaja <[email protected]>
> Signed-off-by: Tejas Patel <[email protected]>
> Signed-off-by: Jolly Shah <[email protected]>
> ---
Applied to clk-next
Quoting Jolly Shah (2020-03-12 14:31:39)
> From: Tejas Patel <[email protected]>
>
> Older firmware version sets BIT(13) in clkflag to mark a
> divider as fractional divider. Updated firmware version sets BIT(4)
> in type flags to mark a divider as fractional divider since
> BIT(13) is defined as CLK_DUTY_CYCLE_PARENT in the common clk
> framework flags.
>
> To support both old and new firmware version, consider BIT(13) from
> clkflag and BIT(4) from type_flag to check if divider is fractional
> or not.
>
> To maintain compatibility BIT(13) of clkflag in firmware will not be
> used in future for any purpose and will be marked as unused.
>
> Signed-off-by: Tejas Patel <[email protected]>
> Signed-off-by: Rajan Vaja <[email protected]>
> Signed-off-by: Jolly Shah <[email protected]>
> ---
Applied to clk-next
Hi Stephan,
Thanks for the review.
> ------Original Message------
> From: Stephen Boyd <[email protected]>
> Sent: Tuesday, May 26, 2020 6:08PM
> To: Jolly Shah <[email protected]>, Arm <[email protected]>,
Linux-clk <[email protected]>, Michal Simek
<[email protected]>, Mturquette <[email protected]>, Olof
<[email protected]>
> Cc: Rajan Vaja <[email protected]>,
[email protected]
<[email protected]>, [email protected]
<[email protected]>, Tejas Patel <[email protected]>,
Rajan Vaja <[email protected]>, Jolly Shah <[email protected]>
> Subject: Re: [PATCH v2 2/2] drivers: clk: zynqmp: Update fraction
clock check from custom type flags
>
> Quoting Jolly Shah (2020-03-12 14:31:39)
>> From: Tejas Patel <[email protected]>
>>
>> Older firmware version sets BIT(13) in clkflag to mark a
>> divider as fractional divider. Updated firmware version sets BIT(4)
>> in type flags to mark a divider as fractional divider since
>> BIT(13) is defined as CLK_DUTY_CYCLE_PARENT in the common clk
>> framework flags.
>>
>> To support both old and new firmware version, consider BIT(13) from
>> clkflag and BIT(4) from type_flag to check if divider is fractional
>> or not.
>>
>> To maintain compatibility BIT(13) of clkflag in firmware will not be
>> used in future for any purpose and will be marked as unused.
>
> Why are we mixing the firmware flags with the ccf flags? They shouldn't
> be the same. The firmware should have its own 'flag numberspace' that is
> distinct from the common clk framework's 'flag numberspace'. Please fix
> the code.
>
Yes firmware flags are using separate numberspace now. Firmware
maintains CCF and firmware specific flags separately but earlier
CLK_FRAC was mistakenly defined in ccf flagspace and hence handled here
for backward compatibility. Driver takes care of not registering same
with CCF. Let me know if I misunderstood.
Thanks,
Jolly Shah
Quoting Jolly Shah (2020-05-28 10:44:01)
> Hi Stephan,
>
> Thanks for the review.
>
> > ------Original Message------
> > From: Stephen Boyd <[email protected]>
> > Sent: Tuesday, May 26, 2020 6:08PM
> > To: Jolly Shah <[email protected]>, Arm <[email protected]>,
> Linux-clk <[email protected]>, Michal Simek
> <[email protected]>, Mturquette <[email protected]>, Olof
> <[email protected]>
> > Cc: Rajan Vaja <[email protected]>,
> [email protected]
> <[email protected]>, [email protected]
> <[email protected]>, Tejas Patel <[email protected]>,
> Rajan Vaja <[email protected]>, Jolly Shah <[email protected]>
> > Subject: Re: [PATCH v2 2/2] drivers: clk: zynqmp: Update fraction
> clock check from custom type flags
> >
> > Quoting Jolly Shah (2020-03-12 14:31:39)
> >> From: Tejas Patel <[email protected]>
> >>
> >> Older firmware version sets BIT(13) in clkflag to mark a
> >> divider as fractional divider. Updated firmware version sets BIT(4)
> >> in type flags to mark a divider as fractional divider since
> >> BIT(13) is defined as CLK_DUTY_CYCLE_PARENT in the common clk
> >> framework flags.
> >>
> >> To support both old and new firmware version, consider BIT(13) from
> >> clkflag and BIT(4) from type_flag to check if divider is fractional
> >> or not.
> >>
> >> To maintain compatibility BIT(13) of clkflag in firmware will not be
> >> used in future for any purpose and will be marked as unused.
> >
> > Why are we mixing the firmware flags with the ccf flags? They shouldn't
> > be the same. The firmware should have its own 'flag numberspace' that is
> > distinct from the common clk framework's 'flag numberspace'. Please fix
> > the code.
> >
>
> Yes firmware flags are using separate numberspace now. Firmware
> maintains CCF and firmware specific flags separately but earlier
> CLK_FRAC was mistakenly defined in ccf flagspace and hence handled here
> for backward compatibility. Driver takes care of not registering same
> with CCF. Let me know if I misunderstood.
Why is the firmware maintaining CCF specific flags? The firmware
shouldn't know about the CCF flag numbering at all. We can change the
numbers that the CCF flags are assigned to randomly and that shouldn't
mean that the firmware needs to change. Maybe I should apply this patch?
---8<----
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index bd1ee9039558..c1f36bca85b0 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -16,22 +16,22 @@
*
* Please update clk_flags[] in drivers/clk/clk.c when making changes here!
*/
-#define CLK_SET_RATE_GATE BIT(0) /* must be gated across rate change */
-#define CLK_SET_PARENT_GATE BIT(1) /* must be gated across re-parent */
-#define CLK_SET_RATE_PARENT BIT(2) /* propagate rate change up one level */
-#define CLK_IGNORE_UNUSED BIT(3) /* do not gate even if unused */
+#define CLK_SET_RATE_GATE BIT(13) /* must be gated across rate change */
+#define CLK_SET_PARENT_GATE BIT(2) /* must be gated across re-parent */
+#define CLK_SET_RATE_PARENT BIT(3) /* propagate rate change up one level */
+#define CLK_IGNORE_UNUSED BIT(4) /* do not gate even if unused */
/* unused */
/* unused */
-#define CLK_GET_RATE_NOCACHE BIT(6) /* do not use the cached clk rate */
-#define CLK_SET_RATE_NO_REPARENT BIT(7) /* don't re-parent on rate change */
-#define CLK_GET_ACCURACY_NOCACHE BIT(8) /* do not use the cached clk accuracy */
-#define CLK_RECALC_NEW_RATES BIT(9) /* recalc rates after notifications */
-#define CLK_SET_RATE_UNGATE BIT(10) /* clock needs to run to set rate */
-#define CLK_IS_CRITICAL BIT(11) /* do not gate, ever */
+#define CLK_GET_RATE_NOCACHE BIT(5) /* do not use the cached clk rate */
+#define CLK_SET_RATE_NO_REPARENT BIT(6) /* don't re-parent on rate change */
+#define CLK_GET_ACCURACY_NOCACHE BIT(7) /* do not use the cached clk accuracy */
+#define CLK_RECALC_NEW_RATES BIT(8) /* recalc rates after notifications */
+#define CLK_SET_RATE_UNGATE BIT(9) /* clock needs to run to set rate */
+#define CLK_IS_CRITICAL BIT(10) /* do not gate, ever */
/* parents need enable during gate/ungate, set rate and re-parent */
-#define CLK_OPS_PARENT_ENABLE BIT(12)
+#define CLK_OPS_PARENT_ENABLE BIT(11)
/* duty cycle call may be forwarded to the parent clock */
-#define CLK_DUTY_CYCLE_PARENT BIT(13)
+#define CLK_DUTY_CYCLE_PARENT BIT(12)
struct clk;
struct clk_hw;
Hi Stephan,
> ------Original Message------
> From: Stephen Boyd <[email protected]>
> Sent: Thursday, May 28, 2020 4:12PM
> To: Jolly Shah <[email protected]>, Arm <[email protected]>,
Linux-clk <[email protected]>, Michal Simek
<[email protected]>, Mturquette <[email protected]>, Olof
<[email protected]>
> Cc: Rajan Vaja <[email protected]>,
[email protected]
<[email protected]>, [email protected]
<[email protected]>, Tejas Patel <[email protected]>,
Rajan Vaja <[email protected]>
> Subject: Re: [PATCH v2 2/2] drivers: clk: zynqmp: Update fraction
clock check from custom type flags
>
> Quoting Jolly Shah (2020-05-28 10:44:01)
>> Hi Stephan,
>>
>> Thanks for the review.
>>
>> > ------Original Message------
>> > From: Stephen Boyd <[email protected]>
>> > Sent: Tuesday, May 26, 2020 6:08PM
>> > To: Jolly Shah <[email protected]>, Arm <[email protected]>,
>> Linux-clk <[email protected]>, Michal Simek
>> <[email protected]>, Mturquette <[email protected]>, Olof
>> <[email protected]>
>> > Cc: Rajan Vaja <[email protected]>,
>> [email protected]
>> <[email protected]>, [email protected]
>> <[email protected]>, Tejas Patel <[email protected]>,
>> Rajan Vaja <[email protected]>, Jolly Shah <[email protected]>
>> > Subject: Re: [PATCH v2 2/2] drivers: clk: zynqmp: Update fraction
>> clock check from custom type flags
>> >
>>> Quoting Jolly Shah (2020-03-12 14:31:39)
>>>> From: Tejas Patel <[email protected]>
>>>>
>>>> Older firmware version sets BIT(13) in clkflag to mark a
>>>> divider as fractional divider. Updated firmware version sets BIT(4)
>>>> in type flags to mark a divider as fractional divider since
>>>> BIT(13) is defined as CLK_DUTY_CYCLE_PARENT in the common clk
>>>> framework flags.
>>>>
>>>> To support both old and new firmware version, consider BIT(13) from
>>>> clkflag and BIT(4) from type_flag to check if divider is fractional
>>>> or not.
>>>>
>>>> To maintain compatibility BIT(13) of clkflag in firmware will not be
>>>> used in future for any purpose and will be marked as unused.
>>>
>>> Why are we mixing the firmware flags with the ccf flags? They shouldn't
>>> be the same. The firmware should have its own 'flag numberspace' that is
>>> distinct from the common clk framework's 'flag numberspace'. Please fix
>>> the code.
>>>
>>
>> Yes firmware flags are using separate numberspace now. Firmware
>> maintains CCF and firmware specific flags separately but earlier
>> CLK_FRAC was mistakenly defined in ccf flagspace and hence handled here
>> for backward compatibility. Driver takes care of not registering same
>> with CCF. Let me know if I misunderstood.
>
> Why is the firmware maintaining CCF specific flags? The firmware
> shouldn't know about the CCF flag numbering at all. We can change the
> numbers that the CCF flags are assigned to randomly and that shouldn't
> mean that the firmware needs to change. Maybe I should apply this patch?
Got it. Will fix it.
Thanks,
Jolly Shah
>
> ---8<----
> diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
> index bd1ee9039558..c1f36bca85b0 100644
> --- a/include/linux/clk-provider.h
> +++ b/include/linux/clk-provider.h
> @@ -16,22 +16,22 @@
> *
> * Please update clk_flags[] in drivers/clk/clk.c when making changes here!
> */
> -#define CLK_SET_RATE_GATE BIT(0) /* must be gated across rate change */
> -#define CLK_SET_PARENT_GATE BIT(1) /* must be gated across re-parent */
> -#define CLK_SET_RATE_PARENT BIT(2) /* propagate rate change up one level */
> -#define CLK_IGNORE_UNUSED BIT(3) /* do not gate even if unused */
> +#define CLK_SET_RATE_GATE BIT(13) /* must be gated across rate change */
> +#define CLK_SET_PARENT_GATE BIT(2) /* must be gated across re-parent */
> +#define CLK_SET_RATE_PARENT BIT(3) /* propagate rate change up one level */
> +#define CLK_IGNORE_UNUSED BIT(4) /* do not gate even if unused */
> /* unused */
> /* unused */
> -#define CLK_GET_RATE_NOCACHE BIT(6) /* do not use the cached clk rate */
> -#define CLK_SET_RATE_NO_REPARENT BIT(7) /* don't re-parent on rate change */
> -#define CLK_GET_ACCURACY_NOCACHE BIT(8) /* do not use the cached clk accuracy */
> -#define CLK_RECALC_NEW_RATES BIT(9) /* recalc rates after notifications */
> -#define CLK_SET_RATE_UNGATE BIT(10) /* clock needs to run to set rate */
> -#define CLK_IS_CRITICAL BIT(11) /* do not gate, ever */
> +#define CLK_GET_RATE_NOCACHE BIT(5) /* do not use the cached clk rate */
> +#define CLK_SET_RATE_NO_REPARENT BIT(6) /* don't re-parent on rate change */
> +#define CLK_GET_ACCURACY_NOCACHE BIT(7) /* do not use the cached clk accuracy */
> +#define CLK_RECALC_NEW_RATES BIT(8) /* recalc rates after notifications */
> +#define CLK_SET_RATE_UNGATE BIT(9) /* clock needs to run to set rate */
> +#define CLK_IS_CRITICAL BIT(10) /* do not gate, ever */
> /* parents need enable during gate/ungate, set rate and re-parent */
> -#define CLK_OPS_PARENT_ENABLE BIT(12)
> +#define CLK_OPS_PARENT_ENABLE BIT(11)
> /* duty cycle call may be forwarded to the parent clock */
> -#define CLK_DUTY_CYCLE_PARENT BIT(13)
> +#define CLK_DUTY_CYCLE_PARENT BIT(12)
>
> struct clk;
> struct clk_hw;
>