Commit 387ef2a1 authored by Stephen Boyd's avatar Stephen Boyd Committed by Wen Zhiwei
Browse files

clk: qcom: gcc-sm8550: Don't park the USB RCG at registration time 

stable inclusion
from stable-v6.6.51
commit 7c391eaf2c632554d273522da2dc66a94e93512c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYRVR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7c391eaf2c632554d273522da2dc66a94e93512c



--------------------------------

[ Upstream commit 7b6dfa1bbe7f727315d2e05a2fc8e4cfeb779156 ]

Amit Pundir reports that audio and USB-C host mode stops working if the
gcc_usb30_prim_master_clk_src clk is registered and
clk_rcg2_shared_init() parks it on XO. Skip parking this clk at
registration time to fix those issues.

Partially revert commit 01a0a6cc8cfd ("clk: qcom: Park shared RCGs upon
registration") by skipping the parking bit for this clk, but keep the
part where we cache the config register. That's still necessary to
figure out the true parent of the clk at registration time.

Fixes: 01a0a6cc8cfd ("clk: qcom: Park shared RCGs upon registration")
Fixes: 929c75d57566 ("clk: qcom: gcc-sm8550: Mark RCGs shared where applicable")
Cc: Konrad Dybcio <konradybcio@kernel.org>
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Taniya Das <quic_tdas@quicinc.com>
Reported-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Closes: https://lore.kernel.org/CAMi1Hd1KQBE4kKUdAn8E5FV+BiKzuv+8FoyWQrrTHPDoYTuhgA@mail.gmail.com


Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20240819233628.2074654-3-swboyd@chromium.org


Tested-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent e65deb79

drivers/clk/qcom/clk-rcg.h

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ extern const struct clk_ops clk_byte2_ops; 
extern const struct clk_ops clk_pixel_ops;

extern const struct clk_ops clk_gfx3d_ops;

extern const struct clk_ops clk_rcg2_shared_ops;

extern const struct clk_ops clk_rcg2_shared_no_init_park_ops;

extern const struct clk_ops clk_dp_ops;



struct clk_rcg_dfs_data {

drivers/clk/qcom/clk-rcg2.c

+30 −0
Original line number Diff line number Diff line
@@ -1182,6 +1182,36 @@ const struct clk_ops clk_rcg2_shared_ops = { 
};

EXPORT_SYMBOL_GPL(clk_rcg2_shared_ops);



static int clk_rcg2_shared_no_init_park(struct clk_hw *hw)

{

	struct clk_rcg2 *rcg = to_clk_rcg2(hw);



	/*

	 * Read the config register so that the parent is properly mapped at

	 * registration time.

	 */

	regmap_read(rcg->clkr.regmap, rcg->cmd_rcgr + CFG_REG, &rcg->parked_cfg);



	return 0;

}



/*

 * Like clk_rcg2_shared_ops but skip the init so that the clk frequency is left

 * unchanged at registration time.

 */

const struct clk_ops clk_rcg2_shared_no_init_park_ops = {

	.init = clk_rcg2_shared_no_init_park,

	.enable = clk_rcg2_shared_enable,

	.disable = clk_rcg2_shared_disable,

	.get_parent = clk_rcg2_shared_get_parent,

	.set_parent = clk_rcg2_shared_set_parent,

	.recalc_rate = clk_rcg2_shared_recalc_rate,

	.determine_rate = clk_rcg2_determine_rate,

	.set_rate = clk_rcg2_shared_set_rate,

	.set_rate_and_parent = clk_rcg2_shared_set_rate_and_parent,

};

EXPORT_SYMBOL_GPL(clk_rcg2_shared_no_init_park_ops);



/* Common APIs to be used for DFS based RCGR */

static void clk_rcg2_dfs_populate_freq(struct clk_hw *hw, unsigned int l,

				       struct freq_tbl *f)

drivers/clk/qcom/gcc-sm8550.c

+1 −1
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ static struct clk_rcg2 gcc_usb30_prim_master_clk_src = { 
		.parent_data = gcc_parent_data_0,

		.num_parents = ARRAY_SIZE(gcc_parent_data_0),

		.flags = CLK_SET_RATE_PARENT,

		.ops = &clk_rcg2_shared_ops,

		.ops = &clk_rcg2_shared_no_init_park_ops,

	},

};