[PATCH V2 5/7] clk: qcom: Add NSS clock Controller driver for IPQ9574
Devi Priya
quic_devipriy at quicinc.com
Tue Sep 19 23:39:18 PDT 2023
On 9/12/2023 7:38 PM, Devi Priya wrote:
>
>
> On 8/25/2023 5:14 PM, Dmitry Baryshkov wrote:
>> On Fri, 25 Aug 2023 at 12:15, Devi Priya <quic_devipriy at quicinc.com>
>> wrote:
>>>
>>> Add Networking Sub System Clock Controller(NSSCC) driver for ipq9574
>>> based
>>> devices.
>>>
>>> Signed-off-by: Devi Priya <quic_devipriy at quicinc.com>
>>> ---
>>> Changes in V2:
>>> - Added depends on ARM64 || COMPILE_TEST in Kconfig
>>> - Added module_platform_driver
>>> - Dropped patch [2/6] - clk: qcom: gcc-ipq9574: Mark nssnoc
>>> clocks as critical
>>> & added pm_clk for nssnoc clocks
>>> - Updated the uniphy clock names
>>>
>>> drivers/clk/qcom/Kconfig | 7 +
>>> drivers/clk/qcom/Makefile | 1 +
>>> drivers/clk/qcom/nsscc-ipq9574.c | 3109 ++++++++++++++++++++++++++++++
>>> 3 files changed, 3117 insertions(+)
>>> create mode 100644 drivers/clk/qcom/nsscc-ipq9574.c
>>>
>>> diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig
>>> index bd9bfb11b328..3ecc11e2c8e3 100644
>>> --- a/drivers/clk/qcom/Kconfig
>>> +++ b/drivers/clk/qcom/Kconfig
>>> @@ -203,6 +203,13 @@ config IPQ_GCC_9574
>>> i2c, USB, SD/eMMC, etc. Select this for the root clock
>>> of ipq9574.
>>>
>>> +config IPQ_NSSCC_9574
>>> + tristate "IPQ9574 NSS Clock Controller"
>>> + depends on ARM64 || COMPILE_TEST
>>> + depends on IPQ_GCC_9574
>>> + help
>>> + Support for NSS clock controller on ipq9574 devices.
>>> +
>>> config MSM_GCC_8660
>>> tristate "MSM8660 Global Clock Controller"
>>> depends on ARM || COMPILE_TEST
>>> diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile
>>> index 4790c8cca426..3f084928962e 100644
>>> --- a/drivers/clk/qcom/Makefile
>>> +++ b/drivers/clk/qcom/Makefile
>>> @@ -30,6 +30,7 @@ obj-$(CONFIG_IPQ_GCC_6018) += gcc-ipq6018.o
>>> obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o
>>> obj-$(CONFIG_IPQ_GCC_8074) += gcc-ipq8074.o
>>> obj-$(CONFIG_IPQ_GCC_9574) += gcc-ipq9574.o
>>> +obj-$(CONFIG_IPQ_NSSCC_9574) += nsscc-ipq9574.o
>>> obj-$(CONFIG_IPQ_LCC_806X) += lcc-ipq806x.o
>>> obj-$(CONFIG_MDM_GCC_9607) += gcc-mdm9607.o
>>> obj-$(CONFIG_MDM_GCC_9615) += gcc-mdm9615.o
>>> diff --git a/drivers/clk/qcom/nsscc-ipq9574.c
>>> b/drivers/clk/qcom/nsscc-ipq9574.c
>>> new file mode 100644
>>> index 000000000000..65bdb449ae5f
>>> --- /dev/null
>>> +++ b/drivers/clk/qcom/nsscc-ipq9574.c
>>> @@ -0,0 +1,3109 @@
>>> +// SPDX-License-Identifier: GPL-2.0-only
>>> +/*
>>> + * Copyright (c) 2021, The Linux Foundation. All rights reserved.
>>> + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights
>>> reserved.
>>> + */
>>> +
>>> +#include <linux/clk-provider.h>
>>> +#include <linux/err.h>
>>> +#include <linux/kernel.h>
>>> +#include <linux/module.h>
>>> +#include <linux/of.h>
>>> +#include <linux/of_device.h>
>>> +#include <linux/regmap.h>
>>> +#include <linux/pm_clock.h>
>>> +#include <linux/pm_runtime.h>
>>> +
>>> +#include <dt-bindings/clock/qcom,ipq9574-nsscc.h>
>>> +#include <dt-bindings/reset/qcom,ipq9574-nsscc.h>
>>> +
>>> +#include "clk-alpha-pll.h"
>>> +#include "clk-branch.h"
>>> +#include "clk-pll.h"
>>> +#include "clk-rcg.h"
>>> +#include "clk-regmap.h"
>>> +#include "clk-regmap-divider.h"
>>> +#include "clk-regmap-mux.h"
>>> +#include "common.h"
>>> +#include "reset.h"
>>> +
>>> +/* Need to match the order of clocks in DT binding */
>>> +enum {
>>> + DT_NSSNOC_NSSCC_CLK,
>>> + DT_NSSNOC_SNOC_CLK,
>>> + DT_NSSNOC_SNOC_1_CLK,
>>
>> Not using the index makes it seem that these clocks are not used,
>> until one scrolls down to pm_clks.
> Okay, got it
>>
>> BTW: The NSSNOC_SNOC clocks make it look like there is an interconnect
>> here (not a simple NIU).
>
> Hi Dmitry, We are exploring on the ICC driver. In the meantime to
> unblock PCIe/NSS changes getting merged, shall we use regmap_update_bits
> and turn on the critical NSSNOC clocks, ANOC & SNOC pcie clocks in the
> probe function of the gcc driver itself as like sm8550 driver to get the
> changes merged?
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/clk/qcom/gcc-sm8550.c#n3347
Hi Dmitry,
Just curious to know if we could send out the next series with the
proposed approach if that holds good.
Thanks,
Devi Priya
>>
>>> + DT_BIAS_PLL_CC_CLK,
>>> + DT_BIAS_PLL_NSS_NOC_CLK,
>>> + DT_BIAS_PLL_UBI_NC_CLK,
>>> + DT_GCC_GPLL0_OUT_AUX,
>>> + DT_UNIPHY0_NSS_RX_CLK,
>>> + DT_UNIPHY0_NSS_TX_CLK,
>>> + DT_UNIPHY1_NSS_RX_CLK,
>>> + DT_UNIPHY1_NSS_TX_CLK,
>>> + DT_UNIPHY2_NSS_RX_CLK,
>>> + DT_UNIPHY2_NSS_TX_CLK,
>>> + DT_XO,
>>
>> As I wrote, please move DT_XO closer to the beginning of the list.
>>
>>> +};
>>> +
>>> +enum {
>>> + P_BIAS_PLL_CC_CLK,
>>> + P_BIAS_PLL_NSS_NOC_CLK,
>>> + P_BIAS_PLL_UBI_NC_CLK,
>>> + P_GCC_GPLL0_OUT_AUX,
>>> + P_UBI32_PLL_OUT_MAIN,
>>> + P_UNIPHY0_NSS_RX_CLK,
>>> + P_UNIPHY0_NSS_TX_CLK,
>>> + P_UNIPHY1_NSS_RX_CLK,
>>> + P_UNIPHY1_NSS_TX_CLK,
>>> + P_UNIPHY2_NSS_RX_CLK,
>>> + P_UNIPHY2_NSS_TX_CLK,
>>> + P_XO,
>>> +};
>>> +
>>> +static const struct alpha_pll_config ubi32_pll_config = {
>>> + .l = 0x3e,
>>> + .alpha = 0x6666,
>>> + .config_ctl_val = 0x200d4aa8,
>>> + .config_ctl_hi_val = 0x3c,
>>> + .main_output_mask = BIT(0),
>>> + .aux_output_mask = BIT(1),
>>> + .pre_div_val = 0x0,
>>> + .pre_div_mask = BIT(12),
>>> + .post_div_val = 0x0,
>>> + .post_div_mask = GENMASK(9, 8),
>>> + .alpha_en_mask = BIT(24),
>>> + .test_ctl_val = 0x1c0000c0,
>>> + .test_ctl_hi_val = 0x4000,
>>> +};
>>> +
>>> +static struct clk_alpha_pll ubi32_pll_main = {
>>> + .offset = 0x28000,
>>> + .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_NSS_HUAYRA],
>>> + .flags = SUPPORTS_DYNAMIC_UPDATE,
>>> + .clkr = {
>>> + .hw.init = &(const struct clk_init_data) {
>>> + .name = "ubi32_pll_main",
>>> + .parent_data = &(const struct clk_parent_data) {
>>> + .index = DT_XO,
>>> + },
>>> + .num_parents = 1,
>>> + .ops = &clk_alpha_pll_huayra_ops,
>>> + },
>>> + },
>>> +};
>>> +
>>> +static struct clk_alpha_pll_postdiv ubi32_pll = {
>>> + .offset = 0x28000,
>>> + .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_NSS_HUAYRA],
>>> + .width = 2,
>>> + .clkr.hw.init = &(const struct clk_init_data) {
>>> + .name = "ubi32_pll",
>>> + .parent_hws = (const struct clk_hw *[]) {
>>> + &ubi32_pll_main.clkr.hw
>>> + },
>>> + .num_parents = 1,
>>> + .ops = &clk_alpha_pll_postdiv_ro_ops,
>>> + .flags = CLK_SET_RATE_PARENT,
>>> + },
>>> +};
>>> +
>>
>> [skipped clock tables, LGTM]
>>
>>> +static const struct of_device_id nss_cc_ipq9574_match_table[] = {
>>> + { .compatible = "qcom,ipq9574-nsscc" },
>>> + { }
>>> +};
>>> +MODULE_DEVICE_TABLE(of, nss_cc_ipq9574_match_table);
>>> +
>>> +static int nss_cc_ipq9574_probe(struct platform_device *pdev)
>>> +{
>>> + struct regmap *regmap;
>>> + struct qcom_cc_desc nsscc_ipq9574_desc = nss_cc_ipq9574_desc;
>>> +
>>> + int ret;
>>> +
>>> + ret = devm_pm_runtime_enable(&pdev->dev);
>>> + if (ret < 0)
>>> + return ret;
>>> +
>>> + ret = devm_pm_clk_create(&pdev->dev);
>>> + if (ret < 0)
>>> + return ret;
>>> +
>>> + ret = of_pm_clk_add_clk(&pdev->dev, "nssnoc_nsscc");
>>
>> As we are switching to DT indices, better add new API that takes index
>> rather than mixing indices and names.
> sure okay
>
> Thanks,
> Devi Priya
>>
>>> + if (ret < 0) {
>>> + dev_err(&pdev->dev, "Failed to acquire nssnoc_nsscc
>>> clock\n");
>>> + return ret;
>>> + }
>>> +
>>> + ret = of_pm_clk_add_clk(&pdev->dev, "nssnoc_snoc");
>>> + if (ret < 0) {
>>> + dev_err(&pdev->dev, "Failed to acquire nssnoc_snoc
>>> clock\n");
>>> + return ret;
>>> + }
>>> +
>>> + ret = of_pm_clk_add_clk(&pdev->dev, "nssnoc_snoc_1");
>>> + if (ret < 0) {
>>> + dev_err(&pdev->dev, "Failed to acquire nssnoc_snoc_1
>>> clock\n");
>>> + return ret;
>>> + }
>>> +
>>> + ret = pm_runtime_get(&pdev->dev);
>>> + if (ret)
>>> + return ret;
>>> +
>>> + regmap = qcom_cc_map(pdev, &nsscc_ipq9574_desc);
>>> + if (IS_ERR(regmap))
>>> + return PTR_ERR(regmap);
>>> +
>>> + clk_alpha_pll_configure(&ubi32_pll_main, regmap,
>>> &ubi32_pll_config);
>>> +
>>> + return qcom_cc_really_probe(pdev, &nsscc_ipq9574_desc, regmap);
>>> +}
>>> +
>>> +static const struct dev_pm_ops nss_cc_pm_ops = {
>>> + SET_RUNTIME_PM_OPS(pm_clk_suspend, pm_clk_resume, NULL)
>>> +};
>>> +
>>> +static struct platform_driver nss_cc_ipq9574_driver = {
>>> + .probe = nss_cc_ipq9574_probe,
>>> + .driver = {
>>> + .name = "qcom,nsscc-ipq9574",
>>> + .of_match_table = nss_cc_ipq9574_match_table,
>>> + .pm = &nss_cc_pm_ops,
>>> + },
>>> +};
>>> +
>>> +module_platform_driver(nss_cc_ipq9574_driver);
>>> +
>>> +MODULE_DESCRIPTION("QTI NSS_CC IPQ9574 Driver");
>>> +MODULE_LICENSE("GPL");
>>> --
>>> 2.34.1
>>>
>>
>>
More information about the linux-arm-kernel
mailing list