Commit d098913a authored by Tony Lindgren's avatar Tony Lindgren
Browse files

bus: ti-sysc: Fix clock handling for no-idle quirks 



NFSroot can fail on dra7 when cpsw is probed using ti-sysc interconnect
target module driver as reported by Keerthy.

Device clocks and the interconnect target module may or may not be
enabled by the bootloader on init, but we currently assume the clocks
and module are on from the bootloader for "ti,no-idle" and
"ti,no-idle-on-init" quirks as reported by Grygorii Strashko.

Let's fix the issue by always enabling clocks init, and
never disable them for "ti,no-idle" quirk. For "ti,no-idle-on-init"
quirk, we must decrement the usage count later on to allow PM
runtime to idle the module if requested.

Fixes: 1a5cd7c2 ("bus: ti-sysc: Enable all clocks directly during init to read revision")
Cc: Keerthy <j-keerthy@ti.com>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Reported-by: default avatarKeerthy <j-keerthy@ti.com>
Reported-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4a65bbb9

drivers/bus/ti-sysc.c

+37 −11
Original line number Diff line number Diff line
@@ -1630,9 +1630,12 @@ static int sysc_init_module(struct sysc *ddata) 
	if (error)

		return error;



	if (manage_clocks) {

	sysc_clkdm_deny_idle(ddata);



	/*

	 * Always enable clocks. The bootloader may or may not have enabled

	 * the related clocks.

	 */

	error = sysc_enable_opt_clocks(ddata);

	if (error)

		return error;
@@ -1640,7 +1643,6 @@ static int sysc_init_module(struct sysc *ddata) 
	error = sysc_enable_main_clocks(ddata);

	if (error)

		goto err_opt_clocks;

	}



	if (!(ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT)) {

		error = sysc_rstctrl_reset_deassert(ddata, true);
@@ -1658,7 +1660,7 @@ static int sysc_init_module(struct sysc *ddata) 
			goto err_main_clocks;

	}



	if (!ddata->legacy_mode && manage_clocks) {

	if (!ddata->legacy_mode) {

		error = sysc_enable_module(ddata->dev);

		if (error)

			goto err_main_clocks;
@@ -1675,6 +1677,7 @@ err_main_clocks: 
	if (manage_clocks)

		sysc_disable_main_clocks(ddata);

err_opt_clocks:

	/* No re-enable of clockdomain autoidle to prevent module autoidle */

	if (manage_clocks) {

		sysc_disable_opt_clocks(ddata);

		sysc_clkdm_allow_idle(ddata);
@@ -2355,6 +2358,28 @@ static void ti_sysc_idle(struct work_struct *work) 


	ddata = container_of(work, struct sysc, idle_work.work);



	/*

	 * One time decrement of clock usage counts if left on from init.

	 * Note that we disable opt clocks unconditionally in this case

	 * as they are enabled unconditionally during init without

	 * considering sysc_opt_clks_needed() at that point.

	 */

	if (ddata->cfg.quirks & (SYSC_QUIRK_NO_IDLE |

				 SYSC_QUIRK_NO_IDLE_ON_INIT)) {

		sysc_clkdm_deny_idle(ddata);

		sysc_disable_main_clocks(ddata);

		sysc_disable_opt_clocks(ddata);

		sysc_clkdm_allow_idle(ddata);

	}



	/* Keep permanent PM runtime usage count for SYSC_QUIRK_NO_IDLE */

	if (ddata->cfg.quirks & SYSC_QUIRK_NO_IDLE)

		return;



	/*

	 * Decrement PM runtime usage count for SYSC_QUIRK_NO_IDLE_ON_INIT

	 * and SYSC_QUIRK_NO_RESET_ON_INIT

	 */

	if (pm_runtime_active(ddata->dev))

		pm_runtime_put_sync(ddata->dev);

}
@@ -2439,7 +2464,8 @@ static int sysc_probe(struct platform_device *pdev) 
	INIT_DELAYED_WORK(&ddata->idle_work, ti_sysc_idle);



	/* At least earlycon won't survive without deferred idle */

	if (ddata->cfg.quirks & (SYSC_QUIRK_NO_IDLE_ON_INIT |

	if (ddata->cfg.quirks & (SYSC_QUIRK_NO_IDLE |

				 SYSC_QUIRK_NO_IDLE_ON_INIT |

				 SYSC_QUIRK_NO_RESET_ON_INIT)) {

		schedule_delayed_work(&ddata->idle_work, 3000);

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE