From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de, daniel.lezcano@linaro.org
Cc: linux-kernel@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 60/93] clocksource/drivers/u300: Convert init function to return error
Date: Thu, 7 Jul 2016 10:01:33 +0200 [thread overview]
Message-ID: <1467878526-1238-60-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: Linus Walleij <linus.walleij@linaro.org>
---
drivers/clocksource/timer-u300.c | 38 +++++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/drivers/clocksource/timer-u300.c b/drivers/clocksource/timer-u300.c
index 1744b24..a6a0dec 100644
--- a/drivers/clocksource/timer-u300.c
+++ b/drivers/clocksource/timer-u300.c
@@ -359,27 +359,37 @@ static struct delay_timer u300_delay_timer;
/*
* This sets up the system timers, clock source and clock event.
*/
-static void __init u300_timer_init_of(struct device_node *np)
+static int __init u300_timer_init_of(struct device_node *np)
{
unsigned int irq;
struct clk *clk;
unsigned long rate;
+ int ret;
u300_timer_base = of_iomap(np, 0);
- if (!u300_timer_base)
- panic("could not ioremap system timer\n");
+ if (!u300_timer_base) {
+ pr_err("could not ioremap system timer\n");
+ return -ENXIO;
+ }
/* Get the IRQ for the GP1 timer */
irq = irq_of_parse_and_map(np, 2);
- if (!irq)
- panic("no IRQ for system timer\n");
+ if (!irq) {
+ pr_err("no IRQ for system timer\n");
+ return -EINVAL;
+ }
pr_info("U300 GP1 timer @ base: %p, IRQ: %u\n", u300_timer_base, irq);
/* Clock the interrupt controller */
clk = of_clk_get(np, 0);
- BUG_ON(IS_ERR(clk));
- clk_prepare_enable(clk);
+ if (IS_ERR(clk))
+ return PTR_ERR(clk);
+
+ ret = clk_prepare_enable(clk);
+ if (ret)
+ return ret;
+
rate = clk_get_rate(clk);
u300_clockevent_data.ticks_per_jiffy = DIV_ROUND_CLOSEST(rate, HZ);
@@ -410,7 +420,9 @@ static void __init u300_timer_init_of(struct device_node *np)
u300_timer_base + U300_TIMER_APP_RGPT1);
/* Set up the IRQ handler */
- setup_irq(irq, &u300_timer_irq);
+ ret = setup_irq(irq, &u300_timer_irq);
+ if (ret)
+ return ret;
/* Reset the General Purpose timer 2 */
writel(U300_TIMER_APP_RGPT2_TIMER_RESET,
@@ -428,9 +440,12 @@ static void __init u300_timer_init_of(struct device_node *np)
u300_timer_base + U300_TIMER_APP_EGPT2);
/* Use general purpose timer 2 as clock source */
- if (clocksource_mmio_init(u300_timer_base + U300_TIMER_APP_GPT2CC,
- "GPT2", rate, 300, 32, clocksource_mmio_readl_up))
+ ret = clocksource_mmio_init(u300_timer_base + U300_TIMER_APP_GPT2CC,
+ "GPT2", rate, 300, 32, clocksource_mmio_readl_up);
+ if (ret) {
pr_err("timer: failed to initialize U300 clock source\n");
+ return ret;
+ }
/* Configure and register the clockevent */
clockevents_config_and_register(&u300_clockevent_data.cevd, rate,
@@ -440,7 +455,8 @@ static void __init u300_timer_init_of(struct device_node *np)
* TODO: init and register the rest of the timers too, they can be
* used by hrtimers!
*/
+ return 0;
}
-CLOCKSOURCE_OF_DECLARE(u300_timer, "stericsson,u300-apptimer",
+CLOCKSOURCE_OF_DECLARE_RET(u300_timer, "stericsson,u300-apptimer",
u300_timer_init_of);
--
1.9.1
next prev parent reply other threads:[~2016-07-07 8:23 UTC|newest]
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 ` [PATCH 17/93] clocksource/drivers/cadence_ttc: " Daniel Lezcano
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 ` Daniel Lezcano [this message]
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-60-git-send-email-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).