From patchwork Thu Jul 7 08:00:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71566 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1289118qgy; Thu, 7 Jul 2016 01:53:00 -0700 (PDT) X-Received: by 10.98.205.79 with SMTP id o76mr3229798pfg.37.1467881580580; Thu, 07 Jul 2016 01:53:00 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ii4si5488664pab.35.2016.07.07.01.53.00; Thu, 07 Jul 2016 01:53:00 -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 S1756987AbcGGIw5 (ORCPT + 30 others); Thu, 7 Jul 2016 04:52:57 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35772 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933247AbcGGICq (ORCPT ); Thu, 7 Jul 2016 04:02:46 -0400 Received: by mail-wm0-f46.google.com with SMTP id z126so138027402wme.0 for ; Thu, 07 Jul 2016 01:02:45 -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=BK7UGS2jb4MZC6VUJ/4EMYMGNk2OhF6bJ9rDN7dVjYUUEh7hmxr2g2swFMme9Ch2ei dNEfBM9ALZuTZlkOzjq2whXZdgTGql4MHXWVrqeH46qZCFihWWata4CVCSArfzohfdO6 GiISbjMAKsAgVOHA2ZpJHB2bWJDdlmO/NWifs= 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=jOy9avX7jnWdBeZffd49lkfJXOrNVQSMuj7h26z7Q4YR2/xkloqvBUIGcFjKcwKGNn ITRZEgPFl7VPsnUgKzAzG5IDu6i48yKeHvfxzg/Iv+1Uxk4WH6yFaBtO+jUXDc+uCTAV Gv59HLtghn3t40fK5azpGedBf2T6zrtno1/s+pZmzFlN9ZZRahSFZk91tFDjdzWf7Yfb VHq2mNhcjF8Y0SsejCo4UdgC8IqQdLP28a84VHYR3UvKs3W/mkNl2ysO8/1zWqX9kvLx EC4zIbhAFlca99TeVcAI8QqQgQUfCb+6LC+xY0awy+8SfFYl04MOiPN4sk6ZSmwt6obh 0Pjg== X-Gm-Message-State: ALyK8tLJDSJd01SkBXECsi9y++XcI8T8DL4AYVpF8G8U9zIxh8K0DNcGEgvTZ4DkRByhtxr+ X-Received: by 10.194.78.148 with SMTP id b20mr6044529wjx.5.1467878564872; Thu, 07 Jul 2016 01:02:44 -0700 (PDT) Received: from localhost.localdomain (lft31-1-88-121-166-205.fbx.proxad.net. [88.121.166.205]) by smtp.gmail.com with ESMTPSA id v70sm51327wmf.18.2016.07.07.01.02.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:02:44 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH 12/93] clocksource/drivers/clksrc-probe: Introduce init functions with return code Date: Thu, 7 Jul 2016 10:00:45 +0200 Message-Id: <1467878526-1238-12-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467878526-1238-1-git-send-email-daniel.lezcano@linaro.org> References: <577E0BED.3020608@linaro.org> <1467878526-1238-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