Re: [PATCH v3 3/6] clk: qcom: smd: Add XO clock for MSM8998

[Bjorn Andersson <bjorn.andersson@linaro.org>]

On Tue 30 Apr 19:26 PDT 2019, Jeffrey Hugo wrote:

> The XO clock generally feeds into other clock controllers as the parent
> for a lot of clock generators.
> 
> Drop the "fake" XO clock in GCC now that it is redundant can will cause a
> namespace conflict.
> 
> Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>
> ---
>  drivers/clk/qcom/clk-smd-rpm.c | 24 ++++++++++++++++++++----
>  drivers/clk/qcom/gcc-msm8998.c | 29 ++++++++++++-----------------
>  2 files changed, 32 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c
> index 22dd42a..55a622df 100644
> --- a/drivers/clk/qcom/clk-smd-rpm.c
> +++ b/drivers/clk/qcom/clk-smd-rpm.c
> @@ -68,7 +68,7 @@
>  	}
>  
>  #define __DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, r_id,    \
> -				    stat_id, r, key)			      \
> +				    stat_id, r, key, ignore_unused)			      \

I expect that we can revert the ignore_unused part once we have a proper
way to deal with resource handover.


Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Regards,
Bjorn

>  	static struct clk_smd_rpm _platform##_##_active;		      \
>  	static struct clk_smd_rpm _platform##_##_name = {		      \
>  		.rpm_res_type = (type),					      \
> @@ -83,6 +83,7 @@
>  			.name = #_name,					      \
>  			.parent_names = (const char *[]){ "xo_board" },	      \
>  			.num_parents = 1,				      \
> +			.flags = (ignore_unused) ? CLK_IGNORE_UNUSED : 0,     \
>  		},							      \
>  	};								      \
>  	static struct clk_smd_rpm _platform##_##_active = {		      \
> @@ -99,6 +100,7 @@
>  			.name = #_active,				      \
>  			.parent_names = (const char *[]){ "xo_board" },	      \
>  			.num_parents = 1,				      \
> +			.flags = (ignore_unused) ? CLK_IGNORE_UNUSED : 0,     \
>  		},							      \
>  	}
>  
> @@ -108,7 +110,17 @@
>  
>  #define DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type, r_id, r)   \
>  		__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type,  \
> -		r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE)
> +		r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE, false)
> +
> +/*
> + * Intended for XO clock where we don't want it turned off during late init
> + * if we don't have a consumer by then, but can turn it off later for deep
> + * sleep
> + */
> +#define DEFINE_CLK_SMD_RPM_BRANCH_SKIP_UNUSED(_platform, _name, _active, type,\
> +					      r_id, r)			      \
> +		__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active, type,  \
> +		r_id, 0, r, QCOM_RPM_SMD_KEY_ENABLE, true)
>  
>  #define DEFINE_CLK_SMD_RPM_QDSS(_platform, _name, _active, type, r_id)	      \
>  		__DEFINE_CLK_SMD_RPM(_platform, _name, _active, type, r_id,   \
> @@ -117,12 +129,12 @@
>  #define DEFINE_CLK_SMD_RPM_XO_BUFFER(_platform, _name, _active, r_id)	      \
>  		__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active,	      \
>  		QCOM_SMD_RPM_CLK_BUF_A, r_id, 0, 1000,			      \
> -		QCOM_RPM_KEY_SOFTWARE_ENABLE)
> +		QCOM_RPM_KEY_SOFTWARE_ENABLE, false)
>  
>  #define DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(_platform, _name, _active, r_id) \
>  		__DEFINE_CLK_SMD_RPM_BRANCH(_platform, _name, _active,	      \
>  		QCOM_SMD_RPM_CLK_BUF_A, r_id, 0, 1000,			      \
> -		QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY)
> +		QCOM_RPM_KEY_PIN_CTRL_CLK_BUFFER_ENABLE_KEY, false)
>  
>  #define to_clk_smd_rpm(_hw) container_of(_hw, struct clk_smd_rpm, hw)
>  
> @@ -656,6 +668,8 @@ static int clk_smd_rpm_enable_scaling(struct qcom_smd_rpm *rpm)
>  };
>  
>  /* msm8998 */
> +DEFINE_CLK_SMD_RPM_BRANCH_SKIP_UNUSED(msm8998, xo, xo_a, QCOM_SMD_RPM_MISC_CLK,
> +				      0, 19200000);
>  DEFINE_CLK_SMD_RPM(msm8998, snoc_clk, snoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 1);
>  DEFINE_CLK_SMD_RPM(msm8998, cnoc_clk, cnoc_a_clk, QCOM_SMD_RPM_BUS_CLK, 2);
>  DEFINE_CLK_SMD_RPM(msm8998, ce1_clk, ce1_a_clk, QCOM_SMD_RPM_CE_CLK, 0);
> @@ -678,6 +692,8 @@ static int clk_smd_rpm_enable_scaling(struct qcom_smd_rpm *rpm)
>  DEFINE_CLK_SMD_RPM_XO_BUFFER(msm8998, rf_clk3, rf_clk3_a, 6);
>  DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8998, rf_clk3_pin, rf_clk3_a_pin, 6);
>  static struct clk_smd_rpm *msm8998_clks[] = {
> +	[RPM_SMD_XO_CLK_SRC] = &msm8998_xo,
> +	[RPM_SMD_XO_A_CLK_SRC] = &msm8998_xo_a,
>  	[RPM_SMD_SNOC_CLK] = &msm8998_snoc_clk,
>  	[RPM_SMD_SNOC_A_CLK] = &msm8998_snoc_a_clk,
>  	[RPM_SMD_CNOC_CLK] = &msm8998_cnoc_clk,
> diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c
> index 0336882..47c3163 100644
> --- a/drivers/clk/qcom/gcc-msm8998.c
> +++ b/drivers/clk/qcom/gcc-msm8998.c
> @@ -11,6 +11,7 @@
>  #include <linux/of.h>
>  #include <linux/of_device.h>
>  #include <linux/clk-provider.h>
> +#include <linux/clk.h>
>  #include <linux/regmap.h>
>  #include <linux/reset-controller.h>
>  
> @@ -117,17 +118,6 @@ enum {
>  	"core_bi_pll_test_se",
>  };
>  
> -static struct clk_fixed_factor xo = {
> -	.mult = 1,
> -	.div = 1,
> -	.hw.init = &(struct clk_init_data){
> -		.name = "xo",
> -		.parent_names = (const char *[]){ "xo_board" },
> -		.num_parents = 1,
> -		.ops = &clk_fixed_factor_ops,
> -	},
> -};
> -
>  static struct pll_vco fabia_vco[] = {
>  	{ 250000000, 2000000000, 0 },
>  	{ 125000000, 1000000000, 1 },
> @@ -2959,10 +2949,6 @@ enum {
>  	.fast_io	= true,
>  };
>  
> -static struct clk_hw *gcc_msm8998_hws[] = {
> -	&xo.hw,
> -};
> -
>  static const struct qcom_cc_desc gcc_msm8998_desc = {
>  	.config = &gcc_msm8998_regmap_config,
>  	.clks = gcc_msm8998_clocks,
> @@ -2971,14 +2957,23 @@ enum {
>  	.num_resets = ARRAY_SIZE(gcc_msm8998_resets),
>  	.gdscs = gcc_msm8998_gdscs,
>  	.num_gdscs = ARRAY_SIZE(gcc_msm8998_gdscs),
> -	.clk_hws = gcc_msm8998_hws,
> -	.num_clk_hws = ARRAY_SIZE(gcc_msm8998_hws),
>  };
>  
>  static int gcc_msm8998_probe(struct platform_device *pdev)
>  {
>  	struct regmap *regmap;
>  	int ret;
> +	struct clk *xo;
> +
> +	/*
> +	 * We must have a valid XO to continue, otherwise having a missing
> +	 * parent on a system critical clock like the uart core clock can
> +	 * result in strange bugs.
> +	 */
> +	xo = clk_get(&pdev->dev, "xo");
> +	if (IS_ERR(xo))
> +		return PTR_ERR(xo);
> +	clk_put(xo);
>  
>  	regmap = qcom_cc_map(pdev, &gcc_msm8998_desc);
>  	if (IS_ERR(regmap))
> -- 
> Qualcomm Datacenter Technologies as an affiliate of Qualcomm Technologies, Inc.
> Qualcomm Technologies, Inc. is a member of the
> Code Aurora Forum, a Linux Foundation Collaborative Project.
>