Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6eb7133 authored by David Dai's avatar David Dai
Browse files

clk: qcom: camcc: Enable safe config and HW_CTL for all RCGs 



Enable the HW_CTL bit to fix a well-known race condition where the RCG may
hang due to an enable and an update occurring at the same time (according
to clklib documents, the behavior is undefined when this condition occurs,
but typically results in a hung RCG). The HW_CTL bit specifically enables
dynamic switching on the RCG which force enables the RCG and sources before
attempting to update its source/config. Due to a growing number of hardware
enable signals (on some branch downstream) that may enable RCGs unbeknownst to
the clock driver, enabling HW_CTL and using safe config should make interactions
during clock switches safer by forcing dynamic switches even when the clock is
off and ensuring that we're working from a safe source (XO).

Change-Id: I3ced61046bcd792462cb1148c60675aba854629f
Signed-off-by: default avatarDavid Dai <daidavid1@codeaurora.org>
parent 51e8260d

drivers/clk/qcom/camcc-kona.c

+54 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ static struct clk_rcg2 cam_cc_bps_clk_src = { 
	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_bps_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_bps_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -535,6 +536,7 @@ static struct clk_rcg2 cam_cc_camnoc_axi_clk_src = { 
	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_camnoc_axi_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_camnoc_axi_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -561,6 +563,8 @@ static struct clk_rcg2 cam_cc_cci_0_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_cci_0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_cci_0_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -580,6 +584,8 @@ static struct clk_rcg2 cam_cc_cci_1_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_cci_0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_cci_1_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -605,6 +611,8 @@ static struct clk_rcg2 cam_cc_cphy_rx_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_cphy_rx_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_cphy_rx_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -630,6 +638,8 @@ static struct clk_rcg2 cam_cc_csi0phytimer_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_csi0phytimer_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_csi0phytimer_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -649,6 +659,8 @@ static struct clk_rcg2 cam_cc_csi1phytimer_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_csi0phytimer_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_csi1phytimer_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -668,6 +680,8 @@ static struct clk_rcg2 cam_cc_csi2phytimer_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_csi0phytimer_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_csi2phytimer_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -687,6 +701,8 @@ static struct clk_rcg2 cam_cc_csi3phytimer_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_csi0phytimer_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_csi3phytimer_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -706,6 +722,8 @@ static struct clk_rcg2 cam_cc_csi4phytimer_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_csi0phytimer_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_csi4phytimer_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -725,6 +743,8 @@ static struct clk_rcg2 cam_cc_csi5phytimer_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_csi0phytimer_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_csi5phytimer_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -754,6 +774,8 @@ static struct clk_rcg2 cam_cc_fast_ahb_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_fast_ahb_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_fast_ahb_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -785,6 +807,7 @@ static struct clk_rcg2 cam_cc_fd_core_clk_src = { 
	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_fd_core_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_fd_core_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -807,6 +830,7 @@ static struct clk_rcg2 cam_cc_icp_clk_src = { 
	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_fd_core_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_icp_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -838,6 +862,7 @@ static struct clk_rcg2 cam_cc_ife_0_clk_src = { 
	.parent_map = cam_cc_parent_map_2,

	.freq_tbl = ftbl_cam_cc_ife_0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_ife_0_clk_src",

		.parent_names = cam_cc_parent_names_2,
@@ -868,6 +893,7 @@ static struct clk_rcg2 cam_cc_ife_0_csid_clk_src = { 
	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_ife_0_csid_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_ife_0_csid_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -897,6 +923,7 @@ static struct clk_rcg2 cam_cc_ife_1_clk_src = { 
	.parent_map = cam_cc_parent_map_3,

	.freq_tbl = ftbl_cam_cc_ife_1_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_ife_1_clk_src",

		.parent_names = cam_cc_parent_names_3,
@@ -920,6 +947,7 @@ static struct clk_rcg2 cam_cc_ife_1_csid_clk_src = { 
	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_ife_0_csid_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_ife_1_csid_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -946,6 +974,8 @@ static struct clk_rcg2 cam_cc_ife_lite_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_ife_lite_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_ife_lite_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -967,6 +997,7 @@ static struct clk_rcg2 cam_cc_ife_lite_csid_clk_src = { 
	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_cphy_rx_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_ife_lite_csid_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -996,6 +1027,7 @@ static struct clk_rcg2 cam_cc_ipe_0_clk_src = { 
	.parent_map = cam_cc_parent_map_4,

	.freq_tbl = ftbl_cam_cc_ipe_0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_ipe_0_clk_src",

		.parent_names = cam_cc_parent_names_4,
@@ -1019,6 +1051,7 @@ static struct clk_rcg2 cam_cc_jpeg_clk_src = { 
	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_bps_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_jpeg_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -1048,6 +1081,8 @@ static struct clk_rcg2 cam_cc_mclk0_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_1,

	.freq_tbl = ftbl_cam_cc_mclk0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_mclk0_clk_src",

		.parent_names = cam_cc_parent_names_1,
@@ -1067,6 +1102,8 @@ static struct clk_rcg2 cam_cc_mclk1_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_1,

	.freq_tbl = ftbl_cam_cc_mclk0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_mclk1_clk_src",

		.parent_names = cam_cc_parent_names_1,
@@ -1086,6 +1123,8 @@ static struct clk_rcg2 cam_cc_mclk2_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_1,

	.freq_tbl = ftbl_cam_cc_mclk0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_mclk2_clk_src",

		.parent_names = cam_cc_parent_names_1,
@@ -1105,6 +1144,8 @@ static struct clk_rcg2 cam_cc_mclk3_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_1,

	.freq_tbl = ftbl_cam_cc_mclk0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_mclk3_clk_src",

		.parent_names = cam_cc_parent_names_1,
@@ -1124,6 +1165,8 @@ static struct clk_rcg2 cam_cc_mclk4_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_1,

	.freq_tbl = ftbl_cam_cc_mclk0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_mclk4_clk_src",

		.parent_names = cam_cc_parent_names_1,
@@ -1143,6 +1186,8 @@ static struct clk_rcg2 cam_cc_mclk5_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_1,

	.freq_tbl = ftbl_cam_cc_mclk0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_mclk5_clk_src",

		.parent_names = cam_cc_parent_names_1,
@@ -1162,6 +1207,8 @@ static struct clk_rcg2 cam_cc_mclk6_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_1,

	.freq_tbl = ftbl_cam_cc_mclk0_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_mclk6_clk_src",

		.parent_names = cam_cc_parent_names_1,
@@ -1181,6 +1228,8 @@ static struct clk_rcg2 cam_cc_sbi_csid_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_cphy_rx_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_sbi_csid_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -1205,6 +1254,8 @@ static struct clk_rcg2 cam_cc_sleep_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_5,

	.freq_tbl = ftbl_cam_cc_sleep_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_sleep_clk_src",

		.parent_names = cam_cc_parent_names_5,
@@ -1231,6 +1282,7 @@ static struct clk_rcg2 cam_cc_slow_ahb_clk_src = { 
	.parent_map = cam_cc_parent_map_0,

	.freq_tbl = ftbl_cam_cc_slow_ahb_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_slow_ahb_clk_src",

		.parent_names = cam_cc_parent_names_0,
@@ -1255,6 +1307,8 @@ static struct clk_rcg2 cam_cc_xo_clk_src = { 
	.hid_width = 5,

	.parent_map = cam_cc_parent_map_6,

	.freq_tbl = ftbl_cam_cc_xo_clk_src,

	.enable_safe_config = true,

	.flags = HW_CLK_CTRL_MODE,

	.clkr.hw.init = &(struct clk_init_data){

		.name = "cam_cc_xo_clk_src",

		.parent_names = cam_cc_parent_names_6_ao,