Skip to contentSkip to conversation

bus: ti-sysc: Fix handling of invalid clocks

PATCH In review Tony Lindgren 3 participants 3 messages Sep 5, 2019 – Sep 6, 2019

Subsystems (3)
lore
Share & tools
lore

Tony Lindgren

author maintainer
#0 lore raw

PATCH 1/1 bus: ti-sysc: Fix handling of invalid clocks

We can currently get "Unable to handle kernel paging request at virtual address" for invalid clocks with dts node but no driver:

(__clk_get_hw) from [<c0138ebc>] (ti_sysc_find_one_clockdomain+0x18/0x34) (ti_sysc_find_one_clockdomain) from [<c0138f0c>] (ti_sysc_clkdm_init+0x34/0xdc) (ti_sysc_clkdm_init) from [<c0584660>] (sysc_probe+0xa50/0x10e8) (sysc_probe) from [<c065c6ac>] (platform_drv_probe+0x58/0xa8)

Let's add IS_ERR checks to ti_sysc_clkdm_init() as And let's start treating clk_get() with -ENOENT as a proper error. If the clock name is specified in device tree we must succeed with clk_get() to continue. For modules with no clock names specified in device tree we will just ignore the clocks.

Fixes 2b2f7def058a ("bus: ti-sysc: Add support for missing clockdomain handling")
---
 arch/arm/mach-omap2/pdata-quirks.c | 4 ++--
 drivers/bus/ti-sysc.c              | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/pdata-quirks.c +2 -2
@@ -491,11 +491,11 @@ static int ti_sysc_clkdm_init(struct device *dev,
 			      struct clk *fck, struct clk *ick,
 			      struct ti_sysc_cookie *cookie)
 {
-	if (fck)
+	if (!IS_ERR(fck))
 		cookie->clkdm = ti_sysc_find_one_clockdomain(fck);
 	if (cookie->clkdm)
 		return 0;
-	if (ick)
+	if (!IS_ERR(ick))
 		cookie->clkdm = ti_sysc_find_one_clockdomain(ick);
 	if (cookie->clkdm)
 		return 0;
drivers/bus/ti-sysc.c +1 -4
@@ -280,9 +280,6 @@ static int sysc_get_one_clock(struct sysc *ddata, const char *name)
 
 	ddata->clocks[index] = devm_clk_get(ddata->dev, name);
 	if (IS_ERR(ddata->clocks[index])) {
-		if (PTR_ERR(ddata->clocks[index]) == -ENOENT)
-			return 0;
-
 		dev_err(ddata->dev, "clock get error for %s: %li\n",
 			name, PTR_ERR(ddata->clocks[index]));
 
@@ -357,7 +354,7 @@ static int sysc_get_clocks(struct sysc *ddata)
 			continue;
 
 		error = sysc_get_one_clock(ddata, name);
-		if (error && error != -ENOENT)
+		if (error)
 			return error;
 	}
 
Signature · 1 line
2.23.0
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Tony Lindgren

We can currently get "Unable to handle kernel paging request at virtual address" for invalid clocks with dts node but no driver:

(__clk_get_hw) from [<c0138ebc>] (ti_sysc_find_one_clockdomain+0x18/0x34) (ti_sysc_find_one_clockdomain) from [<c0138f0c>] (ti_sysc_clkdm_init+0x34/0xdc) (ti_sysc_clkdm_init) from [<c0584660>] (sysc_probe+0xa50/0x10e8) (sysc_probe) from [<c065c6ac>] (platform_drv_probe+0x58/0xa8)

Quoted 7 lines

Let's add IS_ERR checks to ti_sysc_clkdm_init() as And let's start treating clk_get() with -ENOENT as a proper error. If the clock name is specified in device tree we must succeed with clk_get() to continue. For modules with no clock names specified in device tree we will just ignore the clocks.

Fixes 2b2f7def058a ("bus: ti-sysc: Add support for missing clockdomain handling")
Quoted 45 lines
---
  arch/arm/mach-omap2/pdata-quirks.c | 4 ++--
  drivers/bus/ti-sysc.c              | 5 +----
  2 files changed, 3 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/pdata-quirks.c +2 -2
@@ -491,11 +491,11 @@ static int ti_sysc_clkdm_init(struct device *dev,
  			      struct clk *fck, struct clk *ick,
  			      struct ti_sysc_cookie *cookie)
  {
-	if (fck)
+	if (!IS_ERR(fck))
  		cookie->clkdm = ti_sysc_find_one_clockdomain(fck);
  	if (cookie->clkdm)
  		return 0;
-	if (ick)
+	if (!IS_ERR(ick))
  		cookie->clkdm = ti_sysc_find_one_clockdomain(ick);
  	if (cookie->clkdm)
  		return 0;
drivers/bus/ti-sysc.c +1 -4
@@ -280,9 +280,6 @@ static int sysc_get_one_clock(struct sysc *ddata, const char *name)
 
  	ddata->clocks[index] = devm_clk_get(ddata->dev, name);
  	if (IS_ERR(ddata->clocks[index])) {
-		if (PTR_ERR(ddata->clocks[index]) == -ENOENT)
-			return 0;
-
  		dev_err(ddata->dev, "clock get error for %s: %li\n",
  			name, PTR_ERR(ddata->clocks[index]));
 
@@ -357,7 +354,7 @@ static int sysc_get_clocks(struct sysc *ddata)
  			continue;
 
  		error = sysc_get_one_clock(ddata, name);
-		if (error && error != -ENOENT)
+		if (error)
  			return error;
  	}
 
Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Tested-by on v1 1/1
#2 lore raw
In reply to Tony Lindgren
Quoted 8 lines · Tony Lindgren

We can currently get "Unable to handle kernel paging request at virtual address" for invalid clocks with dts node but no driver:

(__clk_get_hw) from [<c0138ebc>] (ti_sysc_find_one_clockdomain+0x18/0x34) (ti_sysc_find_one_clockdomain) from [<c0138f0c>] (ti_sysc_clkdm_init+0x34/0xdc) (ti_sysc_clkdm_init) from [<c0584660>] (sysc_probe+0xa50/0x10e8) (sysc_probe) from [<c065c6ac>] (platform_drv_probe+0x58/0xa8)

Quoted 4 lines

Let's add IS_ERR checks to ti_sysc_clkdm_init() as And let's start treating clk_get() with -ENOENT as a proper error. If the clock name is specified in device tree we must succeed with clk_get() to continue. For modules with no clock names specified in device tree we will just ignore the clocks.

Tested for DS0 and RTC+DDR modes on AM437x

FWIW

Quoted 48 lines
Fixes 2b2f7def058a ("bus: ti-sysc: Add support for missing clockdomain handling")
---
  arch/arm/mach-omap2/pdata-quirks.c | 4 ++--
  drivers/bus/ti-sysc.c              | 5 +----
  2 files changed, 3 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/pdata-quirks.c +2 -2
@@ -491,11 +491,11 @@ static int ti_sysc_clkdm_init(struct device *dev,
  			      struct clk *fck, struct clk *ick,
  			      struct ti_sysc_cookie *cookie)
  {
-	if (fck)
+	if (!IS_ERR(fck))
  		cookie->clkdm = ti_sysc_find_one_clockdomain(fck);
  	if (cookie->clkdm)
  		return 0;
-	if (ick)
+	if (!IS_ERR(ick))
  		cookie->clkdm = ti_sysc_find_one_clockdomain(ick);
  	if (cookie->clkdm)
  		return 0;
drivers/bus/ti-sysc.c +1 -4
@@ -280,9 +280,6 @@ static int sysc_get_one_clock(struct sysc *ddata, const char *name)
 
  	ddata->clocks[index] = devm_clk_get(ddata->dev, name);
  	if (IS_ERR(ddata->clocks[index])) {
-		if (PTR_ERR(ddata->clocks[index]) == -ENOENT)
-			return 0;
-
  		dev_err(ddata->dev, "clock get error for %s: %li\n",
  			name, PTR_ERR(ddata->clocks[index]));
 
@@ -357,7 +354,7 @@ static int sysc_get_clocks(struct sysc *ddata)
  			continue;
 
  		error = sysc_get_one_clock(ddata, name);
-		if (error && error != -ENOENT)
+		if (error)
  			return error;
  	}