| Message ID | 20170605074846.30925-1-andrew@aj.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote: > The merging of a number of clocksource drivers into fttmr010 means we > require clock-names to be specified in the Aspeed timer node, else the > clocksource fails to probe and boot hangs. Arnd, Linus' reworked timer driver will go into 4.13. Can we get this patch merged into 4.12 as a fix so we don't end up with a broken boot at any stage? Cheers, Joel > > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> > --- > arch/arm/boot/dts/aspeed-g4.dtsi | 1 + > arch/arm/boot/dts/aspeed-g5.dtsi | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi > index 8c6bc29eb7f6..3e74929d3289 100644 > --- a/arch/arm/boot/dts/aspeed-g4.dtsi > +++ b/arch/arm/boot/dts/aspeed-g4.dtsi > @@ -893,6 +893,7 @@ > //interrupts = <16 17 18 35 36 37 38 39>; > interrupts = <16>; > clocks = <&clk_apb>; > + clock-names = "PCLK"; > }; > > wdt1: wdt@1e785000 { > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi > index a0bea4a6ec77..1e6c701da853 100644 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi > @@ -1000,6 +1000,7 @@ > //interrupts = <16 17 18 35 36 37 38 39>; > interrupts = <16>; > clocks = <&clk_apb>; > + clock-names = "PCLK"; > }; > > > -- > 2.11.0 >
On Mon, Jun 05, 2017 at 06:29:53PM +0930, Joel Stanley wrote: > On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote: > > The merging of a number of clocksource drivers into fttmr010 means we > > require clock-names to be specified in the Aspeed timer node, else the > > clocksource fails to probe and boot hangs. > > Arnd, > > Linus' reworked timer driver will go into 4.13. > > Can we get this patch merged into 4.12 as a fix so we don't end up > with a broken boot at any stage? I can take care of adding this patch in my branch before Linus' changes. -- Daniel
On Tue, Jun 6, 2017 at 6:41 AM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > On Mon, Jun 05, 2017 at 06:29:53PM +0930, Joel Stanley wrote: >> On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote: >> > The merging of a number of clocksource drivers into fttmr010 means we >> > require clock-names to be specified in the Aspeed timer node, else the >> > clocksource fails to probe and boot hangs. >> >> Arnd, >> >> Linus' reworked timer driver will go into 4.13. >> >> Can we get this patch merged into 4.12 as a fix so we don't end up >> with a broken boot at any stage? > > I can take care of adding this patch in my branch before Linus' changes. That should be okay. Thanks Daniel! Cheers, Joel
On Mon, Jun 5, 2017 at 10:59 AM, Joel Stanley <joel@jms.id.au> wrote: > On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote: >> The merging of a number of clocksource drivers into fttmr010 means we >> require clock-names to be specified in the Aspeed timer node, else the >> clocksource fails to probe and boot hangs. > > Arnd, > > Linus' reworked timer driver will go into 4.13. > > Can we get this patch merged into 4.12 as a fix so we don't end up > with a broken boot at any stage? Hmm, can't we make the driver backward-compatible and have it fall back on the first clock if no clk named "PCLK" is found? Otherwise you still have an incompatible change in the DT binding and it will break if someone uses an older dtb with a newer kernel. Arnd
On Tue, Jun 06, 2017 at 11:41:11AM +0200, Arnd Bergmann wrote: > On Mon, Jun 5, 2017 at 10:59 AM, Joel Stanley <joel@jms.id.au> wrote: > > On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote: > >> The merging of a number of clocksource drivers into fttmr010 means we > >> require clock-names to be specified in the Aspeed timer node, else the > >> clocksource fails to probe and boot hangs. > > > > Arnd, > > > > Linus' reworked timer driver will go into 4.13. > > > > Can we get this patch merged into 4.12 as a fix so we don't end up > > with a broken boot at any stage? > > Hmm, can't we make the driver backward-compatible and have it fall > back on the first clock if no clk named "PCLK" is found? Otherwise > you still have an incompatible change in the DT binding and it will > break if someone uses an older dtb with a newer kernel. I would like to avoid to hack the kernel code for backward DT compatible things.
On Wed, Jun 7, 2017 at 2:52 PM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > On Tue, Jun 06, 2017 at 11:41:11AM +0200, Arnd Bergmann wrote: >> On Mon, Jun 5, 2017 at 10:59 AM, Joel Stanley <joel@jms.id.au> wrote: >> > On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote: >> >> The merging of a number of clocksource drivers into fttmr010 means we >> >> require clock-names to be specified in the Aspeed timer node, else the >> >> clocksource fails to probe and boot hangs. >> > >> > Arnd, >> > >> > Linus' reworked timer driver will go into 4.13. >> > >> > Can we get this patch merged into 4.12 as a fix so we don't end up >> > with a broken boot at any stage? >> >> Hmm, can't we make the driver backward-compatible and have it fall >> back on the first clock if no clk named "PCLK" is found? Otherwise >> you still have an incompatible change in the DT binding and it will >> break if someone uses an older dtb with a newer kernel. > > I would like to avoid to hack the kernel code for backward DT compatible > things. How about a fixup in the platform code to add the property then? Arnd
On Wed, Jun 07, 2017 at 04:29:50PM +0200, Arnd Bergmann wrote: > On Wed, Jun 7, 2017 at 2:52 PM, Daniel Lezcano > <daniel.lezcano@linaro.org> wrote: > > On Tue, Jun 06, 2017 at 11:41:11AM +0200, Arnd Bergmann wrote: > >> On Mon, Jun 5, 2017 at 10:59 AM, Joel Stanley <joel@jms.id.au> wrote: > >> > On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote: > >> >> The merging of a number of clocksource drivers into fttmr010 means we > >> >> require clock-names to be specified in the Aspeed timer node, else the > >> >> clocksource fails to probe and boot hangs. > >> > > >> > Arnd, > >> > > >> > Linus' reworked timer driver will go into 4.13. > >> > > >> > Can we get this patch merged into 4.12 as a fix so we don't end up > >> > with a broken boot at any stage? > >> > >> Hmm, can't we make the driver backward-compatible and have it fall > >> back on the first clock if no clk named "PCLK" is found? Otherwise > >> you still have an incompatible change in the DT binding and it will > >> break if someone uses an older dtb with a newer kernel. > > > > I would like to avoid to hack the kernel code for backward DT compatible > > things. > > How about a fixup in the platform code to add the property then? Dunno, do you have an example?
On Thu, Jun 8, 2017 at 3:26 PM, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > On Wed, Jun 07, 2017 at 04:29:50PM +0200, Arnd Bergmann wrote: >> On Wed, Jun 7, 2017 at 2:52 PM, Daniel Lezcano >> <daniel.lezcano@linaro.org> wrote: >> > On Tue, Jun 06, 2017 at 11:41:11AM +0200, Arnd Bergmann wrote: >> >> On Mon, Jun 5, 2017 at 10:59 AM, Joel Stanley <joel@jms.id.au> wrote: >> >> > On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote: >> >> >> The merging of a number of clocksource drivers into fttmr010 means we >> >> >> require clock-names to be specified in the Aspeed timer node, else the >> >> >> clocksource fails to probe and boot hangs. >> >> > >> >> > Arnd, >> >> > >> >> > Linus' reworked timer driver will go into 4.13. >> >> > >> >> > Can we get this patch merged into 4.12 as a fix so we don't end up >> >> > with a broken boot at any stage? >> >> >> >> Hmm, can't we make the driver backward-compatible and have it fall >> >> back on the first clock if no clk named "PCLK" is found? Otherwise >> >> you still have an incompatible change in the DT binding and it will >> >> break if someone uses an older dtb with a newer kernel. >> > >> > I would like to avoid to hack the kernel code for backward DT compatible >> > things. >> >> How about a fixup in the platform code to add the property then? > > Dunno, do you have an example? armada_375_380_coherency_init() adds a "arm,io-coherent" property on some machines, when the DT might be lacking this. Arnd
On Tue, Jun 6, 2017 at 11:41 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Mon, Jun 5, 2017 at 10:59 AM, Joel Stanley <joel@jms.id.au> wrote: >> On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote: >>> The merging of a number of clocksource drivers into fttmr010 means we >>> require clock-names to be specified in the Aspeed timer node, else the >>> clocksource fails to probe and boot hangs. >> >> Arnd, >> >> Linus' reworked timer driver will go into 4.13. >> >> Can we get this patch merged into 4.12 as a fix so we don't end up >> with a broken boot at any stage? > > Hmm, can't we make the driver backward-compatible and have it fall > back on the first clock if no clk named "PCLK" is found? Otherwise > you still have an incompatible change in the DT binding and it will > break if someone uses an older dtb with a newer kernel. I was under the impression that the Aspeed support is still in its infancy and everyone working on it using DT will recompile and bundle the DTB as part of their kernel build at this point in time. Are there people shipping products with DTBs on this, really? Yours, Linus Walleij
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 8c6bc29eb7f6..3e74929d3289 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -893,6 +893,7 @@ //interrupts = <16 17 18 35 36 37 38 39>; interrupts = <16>; clocks = <&clk_apb>; + clock-names = "PCLK"; }; wdt1: wdt@1e785000 { diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index a0bea4a6ec77..1e6c701da853 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -1000,6 +1000,7 @@ //interrupts = <16 17 18 35 36 37 38 39>; interrupts = <16>; clocks = <&clk_apb>; + clock-names = "PCLK"; };
The merging of a number of clocksource drivers into fttmr010 means we require clock-names to be specified in the Aspeed timer node, else the clocksource fails to probe and boot hangs. Signed-off-by: Andrew Jeffery <andrew@aj.id.au> --- arch/arm/boot/dts/aspeed-g4.dtsi | 1 + arch/arm/boot/dts/aspeed-g5.dtsi | 1 + 2 files changed, 2 insertions(+)