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
Subject: [PATCH 27/93] clocksource/drivers/arm_arch_timer: Convert init function to return error
Date: Thu,  7 Jul 2016 10:01:00 +0200
Message-ID: <1467878526-1238-27-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>
---
 drivers/clocksource/arm_arch_timer.c | 52 +++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 4814446..d0cda68 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -693,25 +693,26 @@ arch_timer_needs_probing(int type, const struct of_device_id *matches)
 	return needs_probing;
 }
 
-static void __init arch_timer_common_init(void)
+static int __init arch_timer_common_init(void)
 {
 	unsigned mask = ARCH_CP15_TIMER | ARCH_MEM_TIMER;
 
 	/* Wait until both nodes are probed if we have two timers */
 	if ((arch_timers_present & mask) != mask) {
 		if (arch_timer_needs_probing(ARCH_MEM_TIMER, arch_timer_mem_of_match))
-			return;
+			return 0;
 		if (arch_timer_needs_probing(ARCH_CP15_TIMER, arch_timer_of_match))
-			return;
+			return 0;
 	}
 
 	arch_timer_banner(arch_timers_present);
 	arch_counter_register(arch_timers_present);
-	arch_timer_arch_init();
+	return arch_timer_arch_init();
 }
 
-static void __init arch_timer_init(void)
+static int __init arch_timer_init(void)
 {
+	int ret;
 	/*
 	 * If HYP mode is available, we know that the physical timer
 	 * has been configured to be accessible from PL1. Use it, so
@@ -739,23 +740,30 @@ static void __init arch_timer_init(void)
 
 		if (!has_ppi) {
 			pr_warn("arch_timer: No interrupt available, giving up\n");
-			return;
+			return -EINVAL;
 		}
 	}
 
-	arch_timer_register();
-	arch_timer_common_init();
+	ret = arch_timer_register();
+	if (ret)
+		return ret;
+
+	ret = arch_timer_common_init();
+	if (ret)
+		return ret;
 
 	arch_timer_kvm_info.virtual_irq = arch_timer_ppi[VIRT_PPI];
+	
+	return 0;
 }
 
-static void __init arch_timer_of_init(struct device_node *np)
+static int __init arch_timer_of_init(struct device_node *np)
 {
 	int i;
 
 	if (arch_timers_present & ARCH_CP15_TIMER) {
 		pr_warn("arch_timer: multiple nodes in dt, skipping\n");
-		return;
+		return 0;
 	}
 
 	arch_timers_present |= ARCH_CP15_TIMER;
@@ -774,23 +782,23 @@ static void __init arch_timer_of_init(struct device_node *np)
 	    of_property_read_bool(np, "arm,cpu-registers-not-fw-configured"))
 		arch_timer_uses_ppi = PHYS_SECURE_PPI;
 
-	arch_timer_init();
+	return arch_timer_init();
 }
-CLOCKSOURCE_OF_DECLARE(armv7_arch_timer, "arm,armv7-timer", arch_timer_of_init);
-CLOCKSOURCE_OF_DECLARE(armv8_arch_timer, "arm,armv8-timer", arch_timer_of_init);
+CLOCKSOURCE_OF_DECLARE_RET(armv7_arch_timer, "arm,armv7-timer", arch_timer_of_init);
+CLOCKSOURCE_OF_DECLARE_RET(armv8_arch_timer, "arm,armv8-timer", arch_timer_of_init);
 
-static void __init arch_timer_mem_init(struct device_node *np)
+static int __init arch_timer_mem_init(struct device_node *np)
 {
 	struct device_node *frame, *best_frame = NULL;
 	void __iomem *cntctlbase, *base;
-	unsigned int irq;
+	unsigned int irq, ret = -EINVAL;
 	u32 cnttidr;
 
 	arch_timers_present |= ARCH_MEM_TIMER;
 	cntctlbase = of_iomap(np, 0);
 	if (!cntctlbase) {
 		pr_err("arch_timer: Can't find CNTCTLBase\n");
-		return;
+		return -ENXIO;
 	}
 
 	cnttidr = readl_relaxed(cntctlbase + CNTTIDR);
@@ -830,6 +838,7 @@ static void __init arch_timer_mem_init(struct device_node *np)
 		best_frame = of_node_get(frame);
 	}
 
+	ret= -ENXIO;
 	base = arch_counter_base = of_iomap(best_frame, 0);
 	if (!base) {
 		pr_err("arch_timer: Can't map frame's registers\n");
@@ -841,6 +850,7 @@ static void __init arch_timer_mem_init(struct device_node *np)
 	else
 		irq = irq_of_parse_and_map(best_frame, 0);
 
+	ret = -EINVAL;
 	if (!irq) {
 		pr_err("arch_timer: Frame missing %s irq",
 		       arch_timer_mem_use_virtual ? "virt" : "phys");
@@ -848,13 +858,17 @@ static void __init arch_timer_mem_init(struct device_node *np)
 	}
 
 	arch_timer_detect_rate(base, np);
-	arch_timer_mem_register(base, irq);
-	arch_timer_common_init();
+	ret = arch_timer_mem_register(base, irq);
+	if (ret)
+		goto out;
+
+	return arch_timer_common_init();
 out:
 	iounmap(cntctlbase);
 	of_node_put(best_frame);
+	return ret;
 }
-CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem",
+CLOCKSOURCE_OF_DECLARE_RET(armv7_arch_timer_mem, "arm,armv7-timer-mem",
 		       arch_timer_mem_init);
 
 #ifdef CONFIG_ACPI
-- 
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   ` [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   ` Daniel Lezcano [this message]
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-27-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.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

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