* [PATCH v2 0/6] clk: clk-axi-clkgen: improvements and some fixes
@ 2025-03-13 15:14 Nuno Sá via B4 Relay
2025-03-13 15:14 ` [PATCH v2 1/6] clk: clk-axi-clkgen: fix fpfd_max frequency for zynq Nuno Sá via B4 Relay
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Nuno Sá via B4 Relay @ 2025-03-13 15:14 UTC (permalink / raw)
To: linux-clk, linux-fpga
Cc: Stephen Boyd, Michael Turquette, Moritz Fischer, Wu Hao, Xu Yilun,
Tom Rix
This series starts with a small fix and then a bunch of small
improvements. The main change though is to allow detecting of
struct axi_clkgen_limits during probe().
---
Changes in v2:
- Patch 3
* Rename adi_axi_fgpa_technology -> adi_axi_fpga_technology.
- Link to v1: https://lore.kernel.org/r/20250219-dev-axi-clkgen-limits-v1-0-26f7ef14cd9c@analog.com
---
Nuno Sá (6):
clk: clk-axi-clkgen: fix fpfd_max frequency for zynq
clk: clk-axi-clkgen: make sure to include mod_devicetable.h
include: fpga: adi-axi-common: add new helper macros
clk: clk-axi-clkgen: detect axi_clkgen_limits at runtime
clk: clk-axi-clkgen move to min/max()
clk: clk-axi-clkgen: fix coding style issues
drivers/clk/clk-axi-clkgen.c | 149 +++++++++++++++++++++++++-----------
include/linux/fpga/adi-axi-common.h | 35 +++++++++
2 files changed, 141 insertions(+), 43 deletions(-)
---
base-commit: 82f69876ef45ad66c0b114b786c7c6ac0f6a4580
change-id: 20250218-dev-axi-clkgen-limits-63fb0c5ec38b
--
Thanks!
- Nuno Sá
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v2 1/6] clk: clk-axi-clkgen: fix fpfd_max frequency for zynq 2025-03-13 15:14 [PATCH v2 0/6] clk: clk-axi-clkgen: improvements and some fixes Nuno Sá via B4 Relay @ 2025-03-13 15:14 ` Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 2/6] clk: clk-axi-clkgen: make sure to include mod_devicetable.h Nuno Sá via B4 Relay ` (4 subsequent siblings) 5 siblings, 0 replies; 10+ messages in thread From: Nuno Sá via B4 Relay @ 2025-03-13 15:14 UTC (permalink / raw) To: linux-clk, linux-fpga Cc: Stephen Boyd, Michael Turquette, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix From: Nuno Sá <nuno.sa@analog.com> The fpfd_max frequency should be set to 450 MHz instead of 300 MHz. Well, it actually depends on the platform speed grade but we are being conservative for ultrascale so let's be consistent. In a following change we will set these limits at runtime. Fixes: 0e646c52cf0e ("clk: Add axi-clkgen driver") Signed-off-by: Nuno Sá <nuno.sa@analog.com> --- drivers/clk/clk-axi-clkgen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/clk-axi-clkgen.c b/drivers/clk/clk-axi-clkgen.c index 934e53a96dddac8ed61dd109cfc188f3a2a0539a..00bf799964c61a3efc042b0f3a9ec3bc8625c9da 100644 --- a/drivers/clk/clk-axi-clkgen.c +++ b/drivers/clk/clk-axi-clkgen.c @@ -118,7 +118,7 @@ static const struct axi_clkgen_limits axi_clkgen_zynqmp_default_limits = { static const struct axi_clkgen_limits axi_clkgen_zynq_default_limits = { .fpfd_min = 10000, - .fpfd_max = 300000, + .fpfd_max = 450000, .fvco_min = 600000, .fvco_max = 1200000, }; -- 2.48.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/6] clk: clk-axi-clkgen: make sure to include mod_devicetable.h 2025-03-13 15:14 [PATCH v2 0/6] clk: clk-axi-clkgen: improvements and some fixes Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 1/6] clk: clk-axi-clkgen: fix fpfd_max frequency for zynq Nuno Sá via B4 Relay @ 2025-03-13 15:14 ` Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 3/6] include: fpga: adi-axi-common: add new helper macros Nuno Sá via B4 Relay ` (3 subsequent siblings) 5 siblings, 0 replies; 10+ messages in thread From: Nuno Sá via B4 Relay @ 2025-03-13 15:14 UTC (permalink / raw) To: linux-clk, linux-fpga Cc: Stephen Boyd, Michael Turquette, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix From: Nuno Sá <nuno.sa@analog.com> The mod_devicetable header is the one to be used for struct of_device_id. Signed-off-by: Nuno Sá <nuno.sa@analog.com> --- drivers/clk/clk-axi-clkgen.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/clk-axi-clkgen.c b/drivers/clk/clk-axi-clkgen.c index 00bf799964c61a3efc042b0f3a9ec3bc8625c9da..2a95f9b220234a1245024a821c50e1eb9c104ac9 100644 --- a/drivers/clk/clk-axi-clkgen.c +++ b/drivers/clk/clk-axi-clkgen.c @@ -13,6 +13,7 @@ #include <linux/io.h> #include <linux/of.h> #include <linux/module.h> +#include <linux/mod_devicetable.h> #include <linux/err.h> #define AXI_CLKGEN_V2_REG_RESET 0x40 -- 2.48.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 3/6] include: fpga: adi-axi-common: add new helper macros 2025-03-13 15:14 [PATCH v2 0/6] clk: clk-axi-clkgen: improvements and some fixes Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 1/6] clk: clk-axi-clkgen: fix fpfd_max frequency for zynq Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 2/6] clk: clk-axi-clkgen: make sure to include mod_devicetable.h Nuno Sá via B4 Relay @ 2025-03-13 15:14 ` Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 4/6] clk: clk-axi-clkgen: detect axi_clkgen_limits at runtime Nuno Sá via B4 Relay ` (2 subsequent siblings) 5 siblings, 0 replies; 10+ messages in thread From: Nuno Sá via B4 Relay @ 2025-03-13 15:14 UTC (permalink / raw) To: linux-clk, linux-fpga Cc: Stephen Boyd, Michael Turquette, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix From: Nuno Sá <nuno.sa@analog.com> Add new helper macros and enums to help identifying the platform and some characteristics of it at runtime. Signed-off-by: Nuno Sá <nuno.sa@analog.com> --- include/linux/fpga/adi-axi-common.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/include/linux/fpga/adi-axi-common.h b/include/linux/fpga/adi-axi-common.h index 141ac3f251e6f256526812b9d55cd440a2a46e76..a832ef9b37473ca339a2a2ff8a4a5716d428fd29 100644 --- a/include/linux/fpga/adi-axi-common.h +++ b/include/linux/fpga/adi-axi-common.h @@ -12,6 +12,8 @@ #define ADI_AXI_COMMON_H_ #define ADI_AXI_REG_VERSION 0x0000 +#define ADI_AXI_REG_FPGA_INFO 0x001C +#define ADI_AXI_REG_FPGA_VOLTAGE 0x0140 #define ADI_AXI_PCORE_VER(major, minor, patch) \ (((major) << 16) | ((minor) << 8) | (patch)) @@ -20,4 +22,37 @@ #define ADI_AXI_PCORE_VER_MINOR(version) (((version) >> 8) & 0xff) #define ADI_AXI_PCORE_VER_PATCH(version) ((version) & 0xff) +#define ADI_AXI_INFO_FPGA_TECH(info) (((info) >> 24) & 0xff) +#define ADI_AXI_INFO_FPGA_FAMILY(info) (((info) >> 16) & 0xff) +#define ADI_AXI_INFO_FPGA_SPEED_GRADE(info) (((info) >> 8) & 0xff) +#define ADI_AXI_INFO_FPGA_VOLTAGE(val) ((val) & 0xffff) + +enum adi_axi_fpga_technology { + ADI_AXI_FPGA_TECH_UNKNOWN = 0, + ADI_AXI_FPGA_TECH_SERIES7, + ADI_AXI_FPGA_TECH_ULTRASCALE, + ADI_AXI_FPGA_TECH_ULTRASCALE_PLUS, +}; + +enum adi_axi_fpga_family { + ADI_AXI_FPGA_FAMILY_UNKNOWN = 0, + ADI_AXI_FPGA_FAMILY_ARTIX, + ADI_AXI_FPGA_FAMILY_KINTEX, + ADI_AXI_FPGA_FAMILY_VIRTEX, + ADI_AXI_FPGA_FAMILY_ZYNQ, +}; + +enum adi_axi_fpga_speed_grade { + ADI_AXI_FPGA_SPEED_UNKNOWN = 0, + ADI_AXI_FPGA_SPEED_1 = 10, + ADI_AXI_FPGA_SPEED_1L = 11, + ADI_AXI_FPGA_SPEED_1H = 12, + ADI_AXI_FPGA_SPEED_1HV = 13, + ADI_AXI_FPGA_SPEED_1LV = 14, + ADI_AXI_FPGA_SPEED_2 = 20, + ADI_AXI_FPGA_SPEED_2L = 21, + ADI_AXI_FPGA_SPEED_2LV = 22, + ADI_AXI_FPGA_SPEED_3 = 30, +}; + #endif /* ADI_AXI_COMMON_H_ */ -- 2.48.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 4/6] clk: clk-axi-clkgen: detect axi_clkgen_limits at runtime 2025-03-13 15:14 [PATCH v2 0/6] clk: clk-axi-clkgen: improvements and some fixes Nuno Sá via B4 Relay ` (2 preceding siblings ...) 2025-03-13 15:14 ` [PATCH v2 3/6] include: fpga: adi-axi-common: add new helper macros Nuno Sá via B4 Relay @ 2025-03-13 15:14 ` Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 5/6] clk: clk-axi-clkgen move to min/max() Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 6/6] clk: clk-axi-clkgen: fix coding style issues Nuno Sá via B4 Relay 5 siblings, 0 replies; 10+ messages in thread From: Nuno Sá via B4 Relay @ 2025-03-13 15:14 UTC (permalink / raw) To: linux-clk, linux-fpga Cc: Stephen Boyd, Michael Turquette, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix From: Nuno Sá <nuno.sa@analog.com> This patch adds support for setting the limits in struct axi_clkgen_limits in accordance with fpga speed grade, voltage, technology and family. This new information is extracted from two new registers implemented in the ip core that are only available for core versions higher or equal to 4. Signed-off-by: Nuno Sá <nuno.sa@analog.com> --- drivers/clk/clk-axi-clkgen.c | 62 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk-axi-clkgen.c b/drivers/clk/clk-axi-clkgen.c index 2a95f9b220234a1245024a821c50e1eb9c104ac9..8c270ba7626bc24c4385615b7aa08ee95e198881 100644 --- a/drivers/clk/clk-axi-clkgen.c +++ b/drivers/clk/clk-axi-clkgen.c @@ -16,6 +16,8 @@ #include <linux/mod_devicetable.h> #include <linux/err.h> +#include <linux/fpga/adi-axi-common.h> + #define AXI_CLKGEN_V2_REG_RESET 0x40 #define AXI_CLKGEN_V2_REG_CLKSEL 0x44 #define AXI_CLKGEN_V2_REG_DRP_CNTRL 0x70 @@ -497,6 +499,54 @@ static u8 axi_clkgen_get_parent(struct clk_hw *clk_hw) return parent; } +static int axi_clkgen_setup_limits(struct axi_clkgen *axi_clkgen, + struct device *dev) +{ + unsigned int tech, family, speed_grade, reg_value; + + axi_clkgen_read(axi_clkgen, ADI_AXI_REG_FPGA_INFO, ®_value); + tech = ADI_AXI_INFO_FPGA_TECH(reg_value); + family = ADI_AXI_INFO_FPGA_FAMILY(reg_value); + speed_grade = ADI_AXI_INFO_FPGA_SPEED_GRADE(reg_value); + + axi_clkgen->limits.fpfd_min = 10000; + axi_clkgen->limits.fvco_min = 600000; + + switch (speed_grade) { + case ADI_AXI_FPGA_SPEED_1 ... ADI_AXI_FPGA_SPEED_1LV: + axi_clkgen->limits.fvco_max = 1200000; + axi_clkgen->limits.fpfd_max = 450000; + break; + case ADI_AXI_FPGA_SPEED_2 ... ADI_AXI_FPGA_SPEED_2LV: + axi_clkgen->limits.fvco_max = 1440000; + axi_clkgen->limits.fpfd_max = 500000; + if (family == ADI_AXI_FPGA_FAMILY_KINTEX || family == ADI_AXI_FPGA_FAMILY_ARTIX) { + axi_clkgen_read(axi_clkgen, ADI_AXI_REG_FPGA_VOLTAGE, + ®_value); + if (ADI_AXI_INFO_FPGA_VOLTAGE(reg_value) < 950) { + axi_clkgen->limits.fvco_max = 1200000; + axi_clkgen->limits.fpfd_max = 450000; + } + } + break; + case ADI_AXI_FPGA_SPEED_3: + axi_clkgen->limits.fvco_max = 1600000; + axi_clkgen->limits.fpfd_max = 550000; + break; + default: + return dev_err_probe(dev, -ENODEV, "Unknown speed grade %d\n", + speed_grade); + }; + + /* Overwrite vco limits for ultrascale+ */ + if (tech == ADI_AXI_FPGA_TECH_ULTRASCALE_PLUS) { + axi_clkgen->limits.fvco_max = 1600000; + axi_clkgen->limits.fvco_min = 800000; + } + + return 0; +} + static const struct clk_ops axi_clkgen_ops = { .recalc_rate = axi_clkgen_recalc_rate, .determine_rate = axi_clkgen_determine_rate, @@ -511,6 +561,7 @@ static int axi_clkgen_probe(struct platform_device *pdev) { const struct axi_clkgen_limits *dflt_limits; struct axi_clkgen *axi_clkgen; + unsigned int pcore_version; struct clk_init_data init; const char *parent_names[2]; const char *clk_name; @@ -556,7 +607,16 @@ static int axi_clkgen_probe(struct platform_device *pdev) return -EINVAL; } - memcpy(&axi_clkgen->limits, dflt_limits, sizeof(axi_clkgen->limits)); + axi_clkgen_read(axi_clkgen, ADI_AXI_REG_VERSION, &pcore_version); + + if (ADI_AXI_PCORE_VER_MAJOR(pcore_version) > 0x04) { + ret = axi_clkgen_setup_limits(axi_clkgen, &pdev->dev); + if (ret) + return ret; + } else { + memcpy(&axi_clkgen->limits, dflt_limits, + sizeof(axi_clkgen->limits)); + } clk_name = pdev->dev.of_node->name; of_property_read_string(pdev->dev.of_node, "clock-output-names", -- 2.48.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 5/6] clk: clk-axi-clkgen move to min/max() 2025-03-13 15:14 [PATCH v2 0/6] clk: clk-axi-clkgen: improvements and some fixes Nuno Sá via B4 Relay ` (3 preceding siblings ...) 2025-03-13 15:14 ` [PATCH v2 4/6] clk: clk-axi-clkgen: detect axi_clkgen_limits at runtime Nuno Sá via B4 Relay @ 2025-03-13 15:14 ` Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 6/6] clk: clk-axi-clkgen: fix coding style issues Nuno Sá via B4 Relay 5 siblings, 0 replies; 10+ messages in thread From: Nuno Sá via B4 Relay @ 2025-03-13 15:14 UTC (permalink / raw) To: linux-clk, linux-fpga Cc: Stephen Boyd, Michael Turquette, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix From: Nuno Sá <nuno.sa@analog.com> Instead of using the type versions of min/max(), use the plain ones as now they are perfectly capable of handling different types like unsigned and non negative integers that are compiletime constant. Signed-off-by: Nuno Sá <nuno.sa@analog.com> --- drivers/clk/clk-axi-clkgen.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/clk-axi-clkgen.c b/drivers/clk/clk-axi-clkgen.c index 8c270ba7626bc24c4385615b7aa08ee95e198881..82a99c3b9063cd2dd8a9dc7fdec81a38feee12b9 100644 --- a/drivers/clk/clk-axi-clkgen.c +++ b/drivers/clk/clk-axi-clkgen.c @@ -144,15 +144,15 @@ static void axi_clkgen_calc_params(const struct axi_clkgen_limits *limits, *best_m = 0; *best_dout = 0; - d_min = max_t(unsigned long, DIV_ROUND_UP(fin, limits->fpfd_max), 1); - d_max = min_t(unsigned long, fin / limits->fpfd_min, 80); + d_min = max(DIV_ROUND_UP(fin, limits->fpfd_max), 1); + d_max = min(fin / limits->fpfd_min, 80); again: fvco_min_fract = limits->fvco_min << fract_shift; fvco_max_fract = limits->fvco_max << fract_shift; - m_min = max_t(unsigned long, DIV_ROUND_UP(fvco_min_fract, fin) * d_min, 1); - m_max = min_t(unsigned long, fvco_max_fract * d_max / fin, 64 << fract_shift); + m_min = max(DIV_ROUND_UP(fvco_min_fract, fin) * d_min, 1); + m_max = min(fvco_max_fract * d_max / fin, 64 << fract_shift); for (m = m_min; m <= m_max; m++) { _d_min = max(d_min, DIV_ROUND_UP(fin * m, fvco_max_fract)); -- 2.48.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 6/6] clk: clk-axi-clkgen: fix coding style issues 2025-03-13 15:14 [PATCH v2 0/6] clk: clk-axi-clkgen: improvements and some fixes Nuno Sá via B4 Relay ` (4 preceding siblings ...) 2025-03-13 15:14 ` [PATCH v2 5/6] clk: clk-axi-clkgen move to min/max() Nuno Sá via B4 Relay @ 2025-03-13 15:14 ` Nuno Sá via B4 Relay 2025-03-14 9:23 ` kernel test robot 2025-03-17 5:26 ` Dan Carpenter 5 siblings, 2 replies; 10+ messages in thread From: Nuno Sá via B4 Relay @ 2025-03-13 15:14 UTC (permalink / raw) To: linux-clk, linux-fpga Cc: Stephen Boyd, Michael Turquette, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix From: Nuno Sá <nuno.sa@analog.com> This is just cosmetics and so no functional changes intended. Signed-off-by: Nuno Sá <nuno.sa@analog.com> --- drivers/clk/clk-axi-clkgen.c | 76 +++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/drivers/clk/clk-axi-clkgen.c b/drivers/clk/clk-axi-clkgen.c index 82a99c3b9063cd2dd8a9dc7fdec81a38feee12b9..c2b5c01698455075ad01d5fad356aa162c53b3bc 100644 --- a/drivers/clk/clk-axi-clkgen.c +++ b/drivers/clk/clk-axi-clkgen.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/mod_devicetable.h> #include <linux/err.h> +#include <linux/types.h> #include <linux/fpga/adi-axi-common.h> @@ -93,7 +94,7 @@ static uint32_t axi_clkgen_lookup_filter(unsigned int m) } } -static const uint32_t axi_clkgen_lock_table[] = { +static const u32 axi_clkgen_lock_table[] = { 0x060603e8, 0x060603e8, 0x080803e8, 0x0b0b03e8, 0x0e0e03e8, 0x111103e8, 0x131303e8, 0x161603e8, 0x191903e8, 0x1c1c03e8, 0x1f1f0384, 0x1f1f0339, @@ -105,7 +106,7 @@ static const uint32_t axi_clkgen_lock_table[] = { 0x1f1f012c, 0x1f1f0113, 0x1f1f0113, 0x1f1f0113, }; -static uint32_t axi_clkgen_lookup_lock(unsigned int m) +static u32 axi_clkgen_lookup_lock(unsigned int m) { if (m < ARRAY_SIZE(axi_clkgen_lock_table)) return axi_clkgen_lock_table[m]; @@ -127,8 +128,9 @@ static const struct axi_clkgen_limits axi_clkgen_zynq_default_limits = { }; static void axi_clkgen_calc_params(const struct axi_clkgen_limits *limits, - unsigned long fin, unsigned long fout, - unsigned int *best_d, unsigned int *best_m, unsigned int *best_dout) + unsigned long fin, unsigned long fout, + unsigned int *best_d, unsigned int *best_m, + unsigned int *best_dout) { unsigned long d, d_min, d_max, _d_min, _d_max; unsigned long m, m_min, m_max; @@ -195,9 +197,9 @@ struct axi_clkgen_div_params { }; static void axi_clkgen_calc_clk_params(unsigned int divider, - unsigned int frac_divider, struct axi_clkgen_div_params *params) + unsigned int frac_divider, + struct axi_clkgen_div_params *params) { - memset(params, 0x0, sizeof(*params)); if (divider == 1) { @@ -224,8 +226,8 @@ static void axi_clkgen_calc_clk_params(unsigned int divider, if (params->edge == 0 || frac_divider == 1) params->low--; - if (((params->edge == 0) ^ (frac_divider == 1)) || - (divider == 2 && frac_divider == 1)) + if ((params->edge == 0 ^ frac_divider == 1) || + (divider == 2 && frac_divider == 1)) params->frac_wf_f = 1; params->frac_phase = params->edge * 4 + frac_divider / 2; @@ -233,13 +235,13 @@ static void axi_clkgen_calc_clk_params(unsigned int divider, } static void axi_clkgen_write(struct axi_clkgen *axi_clkgen, - unsigned int reg, unsigned int val) + unsigned int reg, unsigned int val) { writel(val, axi_clkgen->base + reg); } static void axi_clkgen_read(struct axi_clkgen *axi_clkgen, - unsigned int reg, unsigned int *val) + unsigned int reg, unsigned int *val) { *val = readl(axi_clkgen->base + reg); } @@ -260,7 +262,7 @@ static int axi_clkgen_wait_non_busy(struct axi_clkgen *axi_clkgen) } static int axi_clkgen_mmcm_read(struct axi_clkgen *axi_clkgen, - unsigned int reg, unsigned int *val) + unsigned int reg, unsigned int *val) { unsigned int reg_val; int ret; @@ -284,7 +286,8 @@ static int axi_clkgen_mmcm_read(struct axi_clkgen *axi_clkgen, } static int axi_clkgen_mmcm_write(struct axi_clkgen *axi_clkgen, - unsigned int reg, unsigned int val, unsigned int mask) + unsigned int reg, unsigned int val, + unsigned int mask) { unsigned int reg_val = 0; int ret; @@ -305,8 +308,7 @@ static int axi_clkgen_mmcm_write(struct axi_clkgen *axi_clkgen, return 0; } -static void axi_clkgen_mmcm_enable(struct axi_clkgen *axi_clkgen, - bool enable) +static void axi_clkgen_mmcm_enable(struct axi_clkgen *axi_clkgen, bool enable) { unsigned int val = AXI_CLKGEN_V2_RESET_ENABLE; @@ -322,31 +324,31 @@ static struct axi_clkgen *clk_hw_to_axi_clkgen(struct clk_hw *clk_hw) } static void axi_clkgen_set_div(struct axi_clkgen *axi_clkgen, - unsigned int reg1, unsigned int reg2, unsigned int reg3, - struct axi_clkgen_div_params *params) + unsigned int reg1, unsigned int reg2, + unsigned int reg3, + struct axi_clkgen_div_params *params) { axi_clkgen_mmcm_write(axi_clkgen, reg1, - (params->high << 6) | params->low, 0xefff); + (params->high << 6) | params->low, 0xefff); axi_clkgen_mmcm_write(axi_clkgen, reg2, - (params->frac << 12) | (params->frac_en << 11) | - (params->frac_wf_r << 10) | (params->edge << 7) | - (params->nocount << 6), 0x7fff); + (params->frac << 12) | (params->frac_en << 11) | + (params->frac_wf_r << 10) | (params->edge << 7) | + (params->nocount << 6), 0x7fff); if (reg3 != 0) { axi_clkgen_mmcm_write(axi_clkgen, reg3, - (params->frac_phase << 11) | (params->frac_wf_f << 10), 0x3c00); + (params->frac_phase << 11) | (params->frac_wf_f << 10), + 0x3c00); } } -static int axi_clkgen_set_rate(struct clk_hw *clk_hw, - unsigned long rate, unsigned long parent_rate) +static int axi_clkgen_set_rate(struct clk_hw *clk_hw, unsigned long rate, + unsigned long parent_rate) { struct axi_clkgen *axi_clkgen = clk_hw_to_axi_clkgen(clk_hw); const struct axi_clkgen_limits *limits = &axi_clkgen->limits; unsigned int d, m, dout; struct axi_clkgen_div_params params; - uint32_t power = 0; - uint32_t filter; - uint32_t lock; + u32 power = 0, filter, lock; if (parent_rate == 0 || rate == 0) return -EINVAL; @@ -366,22 +368,22 @@ static int axi_clkgen_set_rate(struct clk_hw *clk_hw, axi_clkgen_calc_clk_params(dout >> 3, dout & 0x7, ¶ms); axi_clkgen_set_div(axi_clkgen, MMCM_REG_CLKOUT0_1, MMCM_REG_CLKOUT0_2, - MMCM_REG_CLKOUT5_2, ¶ms); + MMCM_REG_CLKOUT5_2, ¶ms); axi_clkgen_calc_clk_params(d, 0, ¶ms); axi_clkgen_mmcm_write(axi_clkgen, MMCM_REG_CLK_DIV, - (params.edge << 13) | (params.nocount << 12) | - (params.high << 6) | params.low, 0x3fff); + (params.edge << 13) | (params.nocount << 12) | + (params.high << 6) | params.low, 0x3fff); axi_clkgen_calc_clk_params(m >> 3, m & 0x7, ¶ms); axi_clkgen_set_div(axi_clkgen, MMCM_REG_CLK_FB1, MMCM_REG_CLK_FB2, - MMCM_REG_CLKOUT6_2, ¶ms); + MMCM_REG_CLKOUT6_2, ¶ms); axi_clkgen_mmcm_write(axi_clkgen, MMCM_REG_LOCK1, lock & 0x3ff, 0x3ff); axi_clkgen_mmcm_write(axi_clkgen, MMCM_REG_LOCK2, - (((lock >> 16) & 0x1f) << 10) | 0x1, 0x7fff); + (((lock >> 16) & 0x1f) << 10) | 0x1, 0x7fff); axi_clkgen_mmcm_write(axi_clkgen, MMCM_REG_LOCK3, - (((lock >> 24) & 0x1f) << 10) | 0x3e9, 0x7fff); + (((lock >> 24) & 0x1f) << 10) | 0x3e9, 0x7fff); axi_clkgen_mmcm_write(axi_clkgen, MMCM_REG_FILTER1, filter >> 16, 0x9900); axi_clkgen_mmcm_write(axi_clkgen, MMCM_REG_FILTER2, filter, 0x9900); @@ -410,7 +412,7 @@ static int axi_clkgen_determine_rate(struct clk_hw *hw, } static unsigned int axi_clkgen_get_div(struct axi_clkgen *axi_clkgen, - unsigned int reg1, unsigned int reg2) + unsigned int reg1, unsigned int reg2) { unsigned int val1, val2; unsigned int div; @@ -437,7 +439,7 @@ static unsigned int axi_clkgen_get_div(struct axi_clkgen *axi_clkgen, } static unsigned long axi_clkgen_recalc_rate(struct clk_hw *clk_hw, - unsigned long parent_rate) + unsigned long parent_rate) { struct axi_clkgen *axi_clkgen = clk_hw_to_axi_clkgen(clk_hw); unsigned int d, m, dout; @@ -445,9 +447,9 @@ static unsigned long axi_clkgen_recalc_rate(struct clk_hw *clk_hw, unsigned int val; dout = axi_clkgen_get_div(axi_clkgen, MMCM_REG_CLKOUT0_1, - MMCM_REG_CLKOUT0_2); + MMCM_REG_CLKOUT0_2); m = axi_clkgen_get_div(axi_clkgen, MMCM_REG_CLK_FB1, - MMCM_REG_CLK_FB2); + MMCM_REG_CLK_FB2); axi_clkgen_mmcm_read(axi_clkgen, MMCM_REG_CLK_DIV, &val); if (val & MMCM_CLK_DIV_NOCOUNT) @@ -620,7 +622,7 @@ static int axi_clkgen_probe(struct platform_device *pdev) clk_name = pdev->dev.of_node->name; of_property_read_string(pdev->dev.of_node, "clock-output-names", - &clk_name); + &clk_name); init.name = clk_name; init.ops = &axi_clkgen_ops; -- 2.48.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 6/6] clk: clk-axi-clkgen: fix coding style issues 2025-03-13 15:14 ` [PATCH v2 6/6] clk: clk-axi-clkgen: fix coding style issues Nuno Sá via B4 Relay @ 2025-03-14 9:23 ` kernel test robot 2025-03-17 5:26 ` Dan Carpenter 1 sibling, 0 replies; 10+ messages in thread From: kernel test robot @ 2025-03-14 9:23 UTC (permalink / raw) To: Nuno Sá via B4 Relay, linux-clk, linux-fpga Cc: oe-kbuild-all, Stephen Boyd, Michael Turquette, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix Hi Nuno, kernel test robot noticed the following build warnings: [auto build test WARNING on 82f69876ef45ad66c0b114b786c7c6ac0f6a4580] url: https://github.com/intel-lab-lkp/linux/commits/Nuno-S-via-B4-Relay/clk-clk-axi-clkgen-fix-fpfd_max-frequency-for-zynq/20250313-231624 base: 82f69876ef45ad66c0b114b786c7c6ac0f6a4580 patch link: https://lore.kernel.org/r/20250313-dev-axi-clkgen-limits-v2-6-173ae2ad6311%40analog.com patch subject: [PATCH v2 6/6] clk: clk-axi-clkgen: fix coding style issues config: riscv-randconfig-002-20250314 (https://download.01.org/0day-ci/archive/20250314/202503141741.UAwRQuuG-lkp@intel.com/config) compiler: riscv64-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250314/202503141741.UAwRQuuG-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202503141741.UAwRQuuG-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/clk/clk-axi-clkgen.c: In function 'axi_clkgen_calc_clk_params': >> drivers/clk/clk-axi-clkgen.c:229:35: warning: suggest parentheses around comparison in operand of '^' [-Wparentheses] 229 | if ((params->edge == 0 ^ frac_divider == 1) || | ~~~~~~~~~~~~~^~~~ vim +229 drivers/clk/clk-axi-clkgen.c 198 199 static void axi_clkgen_calc_clk_params(unsigned int divider, 200 unsigned int frac_divider, 201 struct axi_clkgen_div_params *params) 202 { 203 memset(params, 0x0, sizeof(*params)); 204 205 if (divider == 1) { 206 params->nocount = 1; 207 return; 208 } 209 210 if (frac_divider == 0) { 211 params->high = divider / 2; 212 params->edge = divider % 2; 213 params->low = divider - params->high; 214 } else { 215 params->frac_en = 1; 216 params->frac = frac_divider; 217 218 params->high = divider / 2; 219 params->edge = divider % 2; 220 params->low = params->high; 221 222 if (params->edge == 0) { 223 params->high--; 224 params->frac_wf_r = 1; 225 } 226 227 if (params->edge == 0 || frac_divider == 1) 228 params->low--; > 229 if ((params->edge == 0 ^ frac_divider == 1) || 230 (divider == 2 && frac_divider == 1)) 231 params->frac_wf_f = 1; 232 233 params->frac_phase = params->edge * 4 + frac_divider / 2; 234 } 235 } 236 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 6/6] clk: clk-axi-clkgen: fix coding style issues 2025-03-13 15:14 ` [PATCH v2 6/6] clk: clk-axi-clkgen: fix coding style issues Nuno Sá via B4 Relay 2025-03-14 9:23 ` kernel test robot @ 2025-03-17 5:26 ` Dan Carpenter 2025-03-17 16:47 ` Nuno Sá 1 sibling, 1 reply; 10+ messages in thread From: Dan Carpenter @ 2025-03-17 5:26 UTC (permalink / raw) To: Nuno Sá Cc: linux-clk, linux-fpga, Stephen Boyd, Michael Turquette, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix On Thu, Mar 13, 2025 at 03:14:48PM +0000, Nuno Sá wrote: > @@ -224,8 +226,8 @@ static void axi_clkgen_calc_clk_params(unsigned int divider, > > if (params->edge == 0 || frac_divider == 1) > params->low--; > - if (((params->edge == 0) ^ (frac_divider == 1)) || ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > - (divider == 2 && frac_divider == 1)) > + if ((params->edge == 0 ^ frac_divider == 1) || ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This works, but the code was a lot easier to read with parentheses. regards, dan carpenter ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 6/6] clk: clk-axi-clkgen: fix coding style issues 2025-03-17 5:26 ` Dan Carpenter @ 2025-03-17 16:47 ` Nuno Sá 0 siblings, 0 replies; 10+ messages in thread From: Nuno Sá @ 2025-03-17 16:47 UTC (permalink / raw) To: Dan Carpenter, Nuno Sá Cc: linux-clk, linux-fpga, Stephen Boyd, Michael Turquette, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix On Mon, 2025-03-17 at 08:26 +0300, Dan Carpenter wrote: > On Thu, Mar 13, 2025 at 03:14:48PM +0000, Nuno Sá wrote: > > @@ -224,8 +226,8 @@ static void axi_clkgen_calc_clk_params(unsigned int > > divider, > > > > if (params->edge == 0 || frac_divider == 1) > > params->low--; > > - if (((params->edge == 0) ^ (frac_divider == 1)) || > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > > - (divider == 2 && frac_divider == 1)) > > + if ((params->edge == 0 ^ frac_divider == 1) || > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > This works, but the code was a lot easier to read with parentheses. > > Yes, I'll do it in v3. Just waiting a few more days for additional comments. - Nuno Sá ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2025-03-17 16:47 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-03-13 15:14 [PATCH v2 0/6] clk: clk-axi-clkgen: improvements and some fixes Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 1/6] clk: clk-axi-clkgen: fix fpfd_max frequency for zynq Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 2/6] clk: clk-axi-clkgen: make sure to include mod_devicetable.h Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 3/6] include: fpga: adi-axi-common: add new helper macros Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 4/6] clk: clk-axi-clkgen: detect axi_clkgen_limits at runtime Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 5/6] clk: clk-axi-clkgen move to min/max() Nuno Sá via B4 Relay 2025-03-13 15:14 ` [PATCH v2 6/6] clk: clk-axi-clkgen: fix coding style issues Nuno Sá via B4 Relay 2025-03-14 9:23 ` kernel test robot 2025-03-17 5:26 ` Dan Carpenter 2025-03-17 16:47 ` Nuno Sá
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).