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

[Daniel Lezcano]

On 08/03/2015 06:56 PM, Sudeep Holla wrote:
> On 03/08/15 17:45, Daniel Lezcano wrote:
> > 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@xxxxxxx>
> > > Cc: Rob Herring <robh@xxxxxxxxxx>
> > > Cc: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
> > > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> > > ---
> > >    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.
>
> I thought of exactly the same at first. IMO, we are not fixing it at the
> source but at the call site instead which is fine and I don't have
> strong opinion on that. However I also came to know recently that
> CONFIG_OF can be now enabled on x86, so I preferred that.

I prefer to not call clocksource_of_init if the DT is not populated.


--
 <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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/