From patchwork Mon Aug 3 16:45:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 51871 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 2081D228F2 for ; Mon, 3 Aug 2015 16:46:09 +0000 (UTC) Received: by wijp15 with SMTP id p15sf15818309wij.3 for ; Mon, 03 Aug 2015 09:46:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:cc:subject:references:in-reply-to:content-type :content-transfer-encoding:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=y8jl/jXjRcCZClyFg2Rsv3AwoMH18cIHVahat9mj90g=; b=UTYYRwhC+B+8WiABa6SZgKfO0NteqgnC0pM6KTMjo5OnbeoPJiku2CiW3SwA37OdwK dJnWpux3UMPG7GZe9FHHDe/2JNTGx9RyE0icgi8vKDI0xIlRqTPVaV5ajtnAaSC2ot4t fLJi80HqJo8d4P646fpDhzt1LS4BJq0J5pLbhJb2tXl2qL//y9oHmCgK1PxMVE16vcFm yKaufiNhta8y56hx5z8P/HHMlzRTKMGAjNj2wbGPYFcxKixJLpng9r/2VojEwePDmgQt sMNta/N7iSCHPqvTW0aTNwTXVBVXQqsZyOWp7lMqycrtFqKs0na+9no8ufoH3bzyiJ/b SYCQ== X-Gm-Message-State: ALoCoQkKUS7DFqY9iq/26LuS0zLptNBQPd4zW9AH2fh3jJDXEi5ps+midRhF8OTg4r0y0sxuyEFb X-Received: by 10.180.97.9 with SMTP id dw9mr6034362wib.2.1438620368468; Mon, 03 Aug 2015 09:46:08 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.161 with SMTP id x1ls584304lal.45.gmail; Mon, 03 Aug 2015 09:46:08 -0700 (PDT) X-Received: by 10.152.23.234 with SMTP id p10mr17903260laf.52.1438620368141; Mon, 03 Aug 2015 09:46:08 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id ew10si12490780lac.11.2015.08.03.09.46.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2015 09:46:07 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbbud7 with SMTP id ud7so77129050lbb.3 for ; Mon, 03 Aug 2015 09:46:07 -0700 (PDT) X-Received: by 10.112.209.106 with SMTP id ml10mr17524931lbc.112.1438620367857; Mon, 03 Aug 2015 09:46:07 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1966602lba; Mon, 3 Aug 2015 09:46:06 -0700 (PDT) X-Received: by 10.68.241.6 with SMTP id we6mr25504679pbc.127.1438620365857; Mon, 03 Aug 2015 09:46:05 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t10si27342636pds.186.2015.08.03.09.46.04; Mon, 03 Aug 2015 09:46:05 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753886AbbHCQqC (ORCPT + 28 others); Mon, 3 Aug 2015 12:46:02 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:35704 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947AbbHCQqA (ORCPT ); Mon, 3 Aug 2015 12:46:00 -0400 Received: by wibxm9 with SMTP id xm9so129855757wib.0 for ; Mon, 03 Aug 2015 09:45:59 -0700 (PDT) X-Received: by 10.181.13.241 with SMTP id fb17mr37191054wid.13.1438620359196; Mon, 03 Aug 2015 09:45:59 -0700 (PDT) Received: from [192.168.1.150] (185.Red-213-96-199.staticIP.rima-tde.net. [213.96.199.185]) by smtp.googlemail.com with ESMTPSA id jz4sm23752546wjb.16.2015.08.03.09.45.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2015 09:45:57 -0700 (PDT) Message-ID: <55BF9AC4.40208@linaro.org> Date: Mon, 03 Aug 2015 18:45:56 +0200 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Sudeep Holla , linux-kernel@vger.kernel.org CC: Rob Herring , Thomas Gleixner Subject: Re: [PATCH] clocksource/OF: remove invalid DT warnings when booting using ACPI References: <1437672666-4121-1-git-send-email-sudeep.holla@arm.com> In-Reply-To: <1437672666-4121-1-git-send-email-sudeep.holla@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 > Cc: Rob Herring > Cc: Daniel Lezcano > Cc: Thomas Gleixner > --- > 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();