LKML Archive on lore.kernel.org
 help / color / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de, daniel.lezcano@linaro.org
Cc: linux-kernel@vger.kernel.org,
	"Sören Brinkmann" <soren.brinkmann@xilinx.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 17/93] clocksource/drivers/cadence_ttc: Convert init function to return error
Date: Thu,  7 Jul 2016 10:00:50 +0200
Message-ID: <1467878526-1238-17-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1467878526-1238-1-git-send-email-daniel.lezcano@linaro.org>

The init functions do not return any error. They behave as the following:

 - panic, thus leading to a kernel crash while another timer may work and
   make the system boot up correctly

 or

 - print an error and let the caller unaware if the state of the system

Change that by converting the init functions to return an error conforming
to the CLOCKSOURCE_OF_RET prototype.

Proper error handling (rollback, errno value) will be changed later case
by case, thus this change just return back an error or success in the init
function.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
---
 drivers/clocksource/cadence_ttc_timer.c | 76 ++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 29 deletions(-)

diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
index 9be6018..e2e7631 100644
--- a/drivers/clocksource/cadence_ttc_timer.c
+++ b/drivers/clocksource/cadence_ttc_timer.c
@@ -322,22 +322,22 @@ static int ttc_rate_change_clocksource_cb(struct notifier_block *nb,
 	return NOTIFY_DONE;
 }
 
-static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base,
+static int __init ttc_setup_clocksource(struct clk *clk, void __iomem *base,
 					 u32 timer_width)
 {
 	struct ttc_timer_clocksource *ttccs;
 	int err;
 
 	ttccs = kzalloc(sizeof(*ttccs), GFP_KERNEL);
-	if (WARN_ON(!ttccs))
-		return;
+	if (!ttccs)
+		return -ENOMEM;
 
 	ttccs->ttc.clk = clk;
 
 	err = clk_prepare_enable(ttccs->ttc.clk);
-	if (WARN_ON(err)) {
+	if (err) {
 		kfree(ttccs);
-		return;
+		return err;
 	}
 
 	ttccs->ttc.freq = clk_get_rate(ttccs->ttc.clk);
@@ -345,8 +345,10 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base,
 	ttccs->ttc.clk_rate_change_nb.notifier_call =
 		ttc_rate_change_clocksource_cb;
 	ttccs->ttc.clk_rate_change_nb.next = NULL;
-	if (clk_notifier_register(ttccs->ttc.clk,
-				&ttccs->ttc.clk_rate_change_nb))
+
+	err = clk_notifier_register(ttccs->ttc.clk,
+				    &ttccs->ttc.clk_rate_change_nb);
+	if (err)
 		pr_warn("Unable to register clock notifier.\n");
 
 	ttccs->ttc.base_addr = base;
@@ -368,14 +370,16 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base,
 		     ttccs->ttc.base_addr + TTC_CNT_CNTRL_OFFSET);
 
 	err = clocksource_register_hz(&ttccs->cs, ttccs->ttc.freq / PRESCALE);
-	if (WARN_ON(err)) {
+	if (err) {
 		kfree(ttccs);
-		return;
+		return err;
 	}
 
 	ttc_sched_clock_val_reg = base + TTC_COUNT_VAL_OFFSET;
 	sched_clock_register(ttc_sched_clock_read, timer_width,
 			     ttccs->ttc.freq / PRESCALE);
+
+	return 0;
 }
 
 static int ttc_rate_change_clockevent_cb(struct notifier_block *nb,
@@ -401,30 +405,35 @@ static int ttc_rate_change_clockevent_cb(struct notifier_block *nb,
 	}
 }
 
-static void __init ttc_setup_clockevent(struct clk *clk,
-						void __iomem *base, u32 irq)
+static int __init ttc_setup_clockevent(struct clk *clk,
+				       void __iomem *base, u32 irq)
 {
 	struct ttc_timer_clockevent *ttcce;
 	int err;
 
 	ttcce = kzalloc(sizeof(*ttcce), GFP_KERNEL);
-	if (WARN_ON(!ttcce))
-		return;
+	if (!ttcce)
+		return -ENOMEM;
 
 	ttcce->ttc.clk = clk;
 
 	err = clk_prepare_enable(ttcce->ttc.clk);
-	if (WARN_ON(err)) {
+	if (err) {
 		kfree(ttcce);
-		return;
+		return err;
 	}
 
 	ttcce->ttc.clk_rate_change_nb.notifier_call =
 		ttc_rate_change_clockevent_cb;
 	ttcce->ttc.clk_rate_change_nb.next = NULL;
-	if (clk_notifier_register(ttcce->ttc.clk,
-				&ttcce->ttc.clk_rate_change_nb))
+
+	err = clk_notifier_register(ttcce->ttc.clk,
+				    &ttcce->ttc.clk_rate_change_nb);
+	if (err) {
 		pr_warn("Unable to register clock notifier.\n");
+		return err;
+	}
+
 	ttcce->ttc.freq = clk_get_rate(ttcce->ttc.clk);
 
 	ttcce->ttc.base_addr = base;
@@ -451,13 +460,15 @@ static void __init ttc_setup_clockevent(struct clk *clk,
 
 	err = request_irq(irq, ttc_clock_event_interrupt,
 			  IRQF_TIMER, ttcce->ce.name, ttcce);
-	if (WARN_ON(err)) {
+	if (err) {
 		kfree(ttcce);
-		return;
+		return err;
 	}
 
 	clockevents_config_and_register(&ttcce->ce,
 			ttcce->ttc.freq / PRESCALE, 1, 0xfffe);
+
+	return 0;
 }
 
 /**
@@ -466,17 +477,17 @@ static void __init ttc_setup_clockevent(struct clk *clk,
  * Initializes the timer hardware and register the clock source and clock event
  * timers with Linux kernal timer framework
  */
-static void __init ttc_timer_init(struct device_node *timer)
+static int __init ttc_timer_init(struct device_node *timer)
 {
 	unsigned int irq;
 	void __iomem *timer_baseaddr;
 	struct clk *clk_cs, *clk_ce;
 	static int initialized;
-	int clksel;
+	int clksel, ret;
 	u32 timer_width = 16;
 
 	if (initialized)
-		return;
+		return 0;
 
 	initialized = 1;
 
@@ -488,13 +499,13 @@ static void __init ttc_timer_init(struct device_node *timer)
 	timer_baseaddr = of_iomap(timer, 0);
 	if (!timer_baseaddr) {
 		pr_err("ERROR: invalid timer base address\n");
-		BUG();
+		return -ENXIO;
 	}
 
 	irq = irq_of_parse_and_map(timer, 1);
 	if (irq <= 0) {
 		pr_err("ERROR: invalid interrupt number\n");
-		BUG();
+		return -EINVAL;
 	}
 
 	of_property_read_u32(timer, "timer-width", &timer_width);
@@ -504,7 +515,7 @@ static void __init ttc_timer_init(struct device_node *timer)
 	clk_cs = of_clk_get(timer, clksel);
 	if (IS_ERR(clk_cs)) {
 		pr_err("ERROR: timer input clock not found\n");
-		BUG();
+		return PTR_ERR(clk_cs);
 	}
 
 	clksel = readl_relaxed(timer_baseaddr + 4 + TTC_CLK_CNTRL_OFFSET);
@@ -512,13 +523,20 @@ static void __init ttc_timer_init(struct device_node *timer)
 	clk_ce = of_clk_get(timer, clksel);
 	if (IS_ERR(clk_ce)) {
 		pr_err("ERROR: timer input clock not found\n");
-		BUG();
+		return PTR_ERR(clk_cs);
 	}
 
-	ttc_setup_clocksource(clk_cs, timer_baseaddr, timer_width);
-	ttc_setup_clockevent(clk_ce, timer_baseaddr + 4, irq);
+	ret = ttc_setup_clocksource(clk_cs, timer_baseaddr, timer_width);
+	if (ret)
+		return ret;
+
+	ret = ttc_setup_clockevent(clk_ce, timer_baseaddr + 4, irq);
+	if (ret)
+		return ret;
 
 	pr_info("%s #0 at %p, irq=%d\n", timer->name, timer_baseaddr, irq);
+
+	return 0;
 }
 
-CLOCKSOURCE_OF_DECLARE(ttc, "cdns,ttc", ttc_timer_init);
+CLOCKSOURCE_OF_DECLARE_RET(ttc, "cdns,ttc", ttc_timer_init);
-- 
1.9.1

  parent reply index

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-07  7:59 [GIT PULL] clockevents for 4.8 Daniel Lezcano
2016-07-07  8:00 ` [PATCH 01/93] clocksource/drivers/armada-370-xp: Make syscore_ops static Daniel Lezcano
2016-07-07  8:00   ` [PATCH 02/93] clocksource/drivers/digicolor: Fix warning of non-static function Daniel Lezcano
2016-07-07  8:00   ` [PATCH 03/93] clocksource/drivers/samsung_pwm_timer: Fix endian accessors Daniel Lezcano
2016-07-07  8:00   ` [PATCH 04/93] clocksource/drivers/samsung_pwm: Fix typo in Kconfig Daniel Lezcano
2016-07-07  8:00   ` [PATCH 05/93] dt-bindings: Document rk3399 rk-timer bindings Daniel Lezcano
2016-07-07  8:00   ` [PATCH 06/93] clocksource/drivers/rockchip: Add the dynamic irq flag to the timer Daniel Lezcano
2016-07-07  8:00   ` [PATCH 07/93] clocksource/drivers/rockchip: Add support for the rk3399 SoC Daniel Lezcano
2016-07-07  8:00   ` [PATCH 08/93] arm64: dts: rockchip: Add rktimer device node for rk3399 Daniel Lezcano
2016-07-07  8:00   ` [PATCH 09/93] clocksource/drivers/oxnas-rps: Add Oxford Semiconductor RPS Dual Timer Daniel Lezcano
2016-07-07  8:00   ` [PATCH 10/93] dt-bindings: clocksource: Add Oxford Semiconductor RPS Timer bindings Daniel Lezcano
2016-07-07  8:00   ` [PATCH 11/93] of: Add a new macro to declare_of for one parameter function returning a value Daniel Lezcano
2016-07-07  8:00   ` [PATCH 12/93] clocksource/drivers/clksrc-probe: Introduce init functions with return code Daniel Lezcano
2016-07-07  8:00   ` [PATCH 13/93] clocksource/drivers/rockchip_timer: Convert init function to return error Daniel Lezcano
2016-07-07  8:00   ` [PATCH 14/93] clocksource/drivers/mtk_timer: " Daniel Lezcano
2016-07-07  8:00   ` [PATCH 15/93] clocksource/drivers/exynos_mct: " Daniel Lezcano
2016-07-07  8:00   ` [PATCH 16/93] clocksource/drivers/asm9260: " Daniel Lezcano
2016-07-07  8:00   ` Daniel Lezcano [this message]
2016-07-07  8:00   ` [PATCH 18/93] clocksource/drivers/st_lpc: " Daniel Lezcano
2016-07-07  8:00   ` [PATCH 19/93] clocksource/drivers/dw_apb_timer: " Daniel Lezcano
2016-07-07  8:00   ` [PATCH 20/93] clocksource/drivers/clps711x: " Daniel Lezcano
2016-07-07  8:00   ` [PATCH 21/93] clocksource/drivers/digicolor: " Daniel Lezcano
2016-07-07  8:00   ` [PATCH 22/93] clocksource/drivers/armv7m_systick: " Daniel Lezcano
2016-07-07  8:00   ` [PATCH 23/93] clocksource/drivers/bcm2835_timer: " Daniel Lezcano
2016-07-07  8:00   ` [PATCH 24/93] clocksource/drivers/bcm_kona: " Daniel Lezcano
2016-07-07  8:00   ` [PATCH 25/93] clocksource/drivers/clksrc-dbx500: " Daniel Lezcano
2016-07-07  8:00   ` [PATCH 26/93] clocksource/drivers/fsl_ftm_timer: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 27/93] clocksource/drivers/arm_arch_timer: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 28/93] clocksource/drivers/arm_global_timer: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 29/93] clocksource/drivers/h8300_timer16: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 30/93] clocksource/drivers/h8300_timer8: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 31/93] clocksource/drivers/h8300_tpu: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 32/93] clocksource/drivers/meson6_timer.c: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 33/93] clocksource/drivers/mips-gic-timer: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 34/93] clocksource/drivers/moxart: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 35/93] clocksource/drivers/mps2-timer: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 36/93] clocksource/drivers/mxs: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 37/93] clocksource/drivers/nomadik-mtu: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 38/93] clocksource/drivers/pxa: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 39/93] clocksource/drivers/qcom: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 40/93] clocksource/drivers/samsung_pwm: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 41/93] clocksource/drivers/sun4i: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 42/93] clocksource/drivers/tango_xtal: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 43/93] clocksource/drivers/tegra20: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 44/93] clocksource/drivers/time-armada-370-xp: " Daniel Lezcano
2016-07-12 15:11     ` Anna-Maria Gleixner
2016-07-12 15:18       ` Thomas Gleixner
2016-07-12 15:33       ` Anna-Maria Gleixner
2016-07-12 15:40         ` [tip:timers/core] clocksource/drivers/time-armada-370-xp: Fix return value check tip-bot for Anna-Maria Gleixner
2016-07-07  8:01   ` [PATCH 45/93] clocksource/drivers/time-efm32: Convert init function to return error Daniel Lezcano
2016-07-07  8:01   ` [PATCH 46/93] clocksource/drivers/time-lpc32xx: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 47/93] clocksource/drivers/orion: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 48/93] clocksource/drivers/pistachio: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 49/93] clocksource/drivers/atlas7: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 50/93] clocksource/drivers/atmel-pit: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 51/93] clocksource/drivers/atmel-st: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 52/93] clocksource/drivers/prima2: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 53/93] clocksource/drivers/imx-gpt: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 54/93] clocksource/drivers/integrator-ap: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 55/93] clocksource/drivers/keystone: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 56/93] clocksource/drivers/sp804: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 57/93] clocksource/drivers/stm32: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 58/93] clocksource/drivers/sun5i: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 59/93] clocksource/drivers/ti-32k: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 60/93] clocksource/drivers/u300: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 61/93] clocksource/drivers/versatile: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 62/93] clocksource/drivers/vf_pit_timer: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 63/93] clocksource/drivers/vt8500: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 64/93] clocksource/drivers/zevio: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 65/93] clocksource/drivers/microblaze: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 66/93] clocksource/drivers/ralink: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 67/93] clocksource/drivers/nios2: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 68/93] clocksource/drivers/smp_twd: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 69/93] clocksource/drivers/nps: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 70/93] clocksource/drivers/arc: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 71/93] clocksource/drivers/oxnas-rps: " Daniel Lezcano
2016-07-07  8:01   ` [PATCH 72/93] clocksources: Switch back to the clksrc table Daniel Lezcano
2016-07-07  8:01   ` [PATCH 73/93] clk: Add missing clk_get_sys() stub Daniel Lezcano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467878526-1238-17-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=soren.brinkmann@xilinx.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git
	git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org
	public-inbox-index lkml

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git