ARM: AM33xx: fix module_wait_ready without clkctrl register

Tero Kristo · tmlind · commit 183e2077d007 · 2016-07-04T07:15:47.000-07:00
If the module has no clkctrl register defined, module_wait_ready should
not try to access this. This can potentially cause an illegal register
access, and result in bad idle reporting also.

Signed-off-by: Tero Kristo &lt;t-kristo@ti.com&gt;
Signed-off-by: Tony Lindgren &lt;tony@atomide.com&gt;
diff --git a/arch/arm/mach-omap2/cm33xx.c b/arch/arm/mach-omap2/cm33xx.c
@@ -220,6 +220,9 @@ static int am33xx_cm_wait_module_ready(u8 part, s16 inst, u16 clkctrl_offs,
 {
 	int i = 0;
 
+	if (!clkctrl_offs)
+		return 0;
+
 	omap_test_timeout(_is_module_ready(inst, clkctrl_offs),
 			  MAX_MODULE_READY_TIME, i);
 

Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,9 @@ static int am33xx_cm_wait_module_ready(u8 part, s16 inst, u16 clkctrl_offs,`
`220`	`220`	`{`
`221`	`221`	`int i = 0;`
`222`	`222`
	`223`	`+ if (!clkctrl_offs)`
	`224`	`+ return 0;`
	`225`	`+`
`223`	`226`	`omap_test_timeout(_is_module_ready(inst, clkctrl_offs),`
`224`	`227`	`MAX_MODULE_READY_TIME, i);`
`225`	`228`