linux-kernel - Re: [PATCH] clocksource/OF: remove invalid DT warnings when booting using ACPI

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <55BF9AC4.40208@linaro.org>
Date:	Mon, 03 Aug 2015 18:45:56 +0200
From:	Daniel Lezcano <daniel.lezcano@...aro.org>
To:	Sudeep Holla <sudeep.holla@....com>, linux-kernel@...r.kernel.org
CC:	Rob Herring <robh@...nel.org>, Thomas Gleixner <tglx@...utronix.de>
Subject: Re: [PATCH] clocksource/OF: remove invalid DT warnings when booting
 using ACPI

On 07/23/2015 07:31 PM, Sudeep Holla wrote:
> Since both CONFIG_ACPI and CONFIG_CLKSRC_OF can be enabled on ARM64,
> we get this device tree warnings even when booting using ACPI which is
> not valid. We can use of_have_populated_dt to check if the device tree
> is populated or not and avoid spurious warning.
>
> This patch uses of_have_populated_dt to remove this non legitimate device
> tree warning when booting using ACPI tables.
>
> Signed-off-by: Sudeep Holla <sudeep.holla@....com>
> Cc: Rob Herring <robh@...nel.org>
> Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
> Cc: Thomas Gleixner <tglx@...utronix.de>
> ---
>   drivers/clocksource/clksrc-of.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c
> index 0093a8e49e14..47823a2d7220 100644
> --- a/drivers/clocksource/clksrc-of.c
> +++ b/drivers/clocksource/clksrc-of.c
> @@ -38,6 +38,6 @@ void __init clocksource_of_init(void)
>   		init_func(np);
>   		clocksources++;
>   	}
> -	if (!clocksources)
> +	if (of_have_populated_dt() && !clocksources)
>   		pr_crit("%s: no matching clocksources found\n", __func__);
>   }

Hmm, even if the fix looks correct, it doesn't make sense to put it there.

Why not:

diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index 42f9195..0b8933f 100644
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -69,7 +69,9 @@ void __init time_init(void)
  	u32 arch_timer_rate;

  	of_clk_init(NULL);
-	clocksource_of_init();
+
+	if (of_have_populated_dt())
+		clocksource_of_init();

  	tick_setup_hrtimer_broadcast();





-- 
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/