From patchwork Tue Jun 28 10:30:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71070 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1519253qgy; Tue, 28 Jun 2016 04:01:07 -0700 (PDT) X-Received: by 10.66.196.203 with SMTP id io11mr655452pac.107.1467111667431; Tue, 28 Jun 2016 04:01:07 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kg10si7515180pad.131.2016.06.28.04.01.07; Tue, 28 Jun 2016 04:01:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752982AbcF1LBD (ORCPT + 30 others); Tue, 28 Jun 2016 07:01:03 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:35516 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752246AbcF1KdE (ORCPT ); Tue, 28 Jun 2016 06:33:04 -0400 Received: by mail-wm0-f41.google.com with SMTP id v199so133580960wmv.0 for ; Tue, 28 Jun 2016 03:33:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3TVIsXK0OWXjHgXpiiPWa08s49ZynZ4Fk8kQbMXnb3k=; b=gu+jU5SmfIS2tE312OHshpTyfFhl6Wl+00LPjvODcPuyBbvPYYppQAC7xBoGSU0Xwm a24J+4qIFYq5nrQPw9oL3t1uA84ox/V3JTweT4SYw+y4zM71AZdbQoaSK8H9i52hTXrT vdqvCAOP0aIKiosOUJ0Y9IPMmJn1VRA1l9IDw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3TVIsXK0OWXjHgXpiiPWa08s49ZynZ4Fk8kQbMXnb3k=; b=PvHae0NfmLYP1gINFVgcp2xLzx929ZuSQP1Ex1TsVLVCmnmZBARxeBy3HP67etlGhw 0N7YUY88fvJGuntZ6735BInK+B+BPI+RV9wfVn1L3GkcVDpCtonv7hYdKhECbbnsvBsO IpMFoYs9vj14onad7CMBzzocpb1iQPclXk2JMHMWQQEKX/xV+VyTzeL/ztwMraZRJNE3 ZRav1FaZXMR4vKTPqGd8aQQ880EIQsk0vH7wF/fBG/5yHAOB7yOaUineci3ay/qCdaBF Enzb7g9k/f47PwLXAmS5hhMDUIBZM1bdNPtRQCBIhvCMKOMGMbm+OxjeT3x1npMTD0p0 ZY7A== X-Gm-Message-State: ALyK8tKslOuWfiuT100yfyk+pjrmEbkoxfVMDu9oK0y7pYB3TYyTpYvwCqWX+nmpwFvsWhH7 X-Received: by 10.194.178.167 with SMTP id cz7mr2607188wjc.66.1467109982549; Tue, 28 Jun 2016 03:33:02 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id a84sm5377403wma.0.2016.06.28.03.33.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:33:01 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH 12/92] clocksource/drivers/clksrc-probe: Introduce init functions with return code Date: Tue, 28 Jun 2016 12:30:31 +0200 Message-Id: <1467109911-11060-12-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467109911-11060-1-git-send-email-daniel.lezcano@linaro.org> References: <577251A4.7030508@linaro.org> <1467109911-11060-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the clksrc-probe is not able to handle any error from the init functions. There are different issues with the current code: - the code is duplicated in the init functions by writing error - every driver tends to panic in its own init function - counting the number of clocksources is not reliable This patch adds another table to store the functions returning an error. The table is temporary while we convert all the drivers to return an error and will disappear. Signed-off-by: Daniel Lezcano --- drivers/clocksource/clksrc-probe.c | 22 ++++++++++++++++++++++ include/asm-generic/vmlinux.lds.h | 2 ++ include/linux/clocksource.h | 3 +++ 3 files changed, 27 insertions(+) -- 1.9.1 diff --git a/drivers/clocksource/clksrc-probe.c b/drivers/clocksource/clksrc-probe.c index 7cb6c92..5fa6a55 100644 --- a/drivers/clocksource/clksrc-probe.c +++ b/drivers/clocksource/clksrc-probe.c @@ -20,16 +20,22 @@ #include extern struct of_device_id __clksrc_of_table[]; +extern struct of_device_id __clksrc_ret_of_table[]; static const struct of_device_id __clksrc_of_table_sentinel __used __section(__clksrc_of_table_end); +static const struct of_device_id __clksrc_ret_of_table_sentinel + __used __section(__clksrc_ret_of_table_end); + void __init clocksource_probe(void) { struct device_node *np; const struct of_device_id *match; of_init_fn_1 init_func; + of_init_fn_1_ret init_func_ret; unsigned clocksources = 0; + int ret; for_each_matching_node_and_match(np, __clksrc_of_table, &match) { if (!of_device_is_available(np)) @@ -40,6 +46,22 @@ void __init clocksource_probe(void) clocksources++; } + for_each_matching_node_and_match(np, __clksrc_ret_of_table, &match) { + if (!of_device_is_available(np)) + continue; + + init_func_ret = match->data; + + ret = init_func_ret(np); + if (ret) { + pr_err("Failed to initialize '%s': %d", + of_node_full_name(np), ret); + continue; + } + + clocksources++; + } + clocksources += acpi_probe_device_table(clksrc); if (!clocksources) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 6a67ab9..8c6c626 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -173,6 +173,7 @@ *(__##name##_of_table_end) #define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc) +#define CLKSRC_RET_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc_ret) #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) #define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk) #define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu) @@ -531,6 +532,7 @@ CLK_OF_TABLES() \ RESERVEDMEM_OF_TABLES() \ CLKSRC_OF_TABLES() \ + CLKSRC_RET_OF_TABLES() \ IOMMU_OF_TABLES() \ CPU_METHOD_OF_TABLES() \ CPUIDLE_METHOD_OF_TABLES() \ diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 44a1aff..15c3839 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -246,6 +246,9 @@ extern int clocksource_i8253_init(void); #define CLOCKSOURCE_OF_DECLARE(name, compat, fn) \ OF_DECLARE_1(clksrc, name, compat, fn) +#define CLOCKSOURCE_OF_DECLARE_RET(name, compat, fn) \ + OF_DECLARE_1_RET(clksrc_ret, name, compat, fn) + #ifdef CONFIG_CLKSRC_PROBE extern void clocksource_probe(void); #else