diff mbox

[LEDE-DEV,2/2] target/arc770: switch to 4.9 kernel

Message ID 20170306183008.15280-3-Alexey.Brodkin@synopsys.com
State Accepted
Headers show

Commit Message

Alexey Brodkin March 6, 2017, 6:30 p.m. UTC
With update of ARC tools to arc-2016.09 based on GCC v6.x
we have to bump Linux kernel version so both toolchain and
the kernel use the same ARC ABIv4.

Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
---
 target/linux/arc770/Makefile                       |  2 +-
 target/linux/arc770/{config-4.4 => config-4.9}     | 44 ++++++++++++++++------
 ...stmmac-Disable-frame-filtering-completely.patch |  0
 3 files changed, 33 insertions(+), 13 deletions(-)
 rename target/linux/arc770/{config-4.4 => config-4.9} (82%)
 rename target/linux/arc770/{patches-4.4 => patches-4.9}/700-stmmac-Disable-frame-filtering-completely.patch (100%)

Comments

Felix Fietkau March 7, 2017, 6:30 p.m. UTC | #1
On 2017-03-06 19:30, Alexey Brodkin wrote:
> With update of ARC tools to arc-2016.09 based on GCC v6.x
> we have to bump Linux kernel version so both toolchain and
> the kernel use the same ARC ABIv4.
> 
> Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> ---
>  target/linux/arc770/Makefile                       |  2 +-
>  target/linux/arc770/{config-4.4 => config-4.9}     | 44 ++++++++++++++++------
>  ...stmmac-Disable-frame-filtering-completely.patch |  0
>  3 files changed, 33 insertions(+), 13 deletions(-)
>  rename target/linux/arc770/{config-4.4 => config-4.9} (82%)
>  rename target/linux/arc770/{patches-4.4 => patches-4.9}/700-stmmac-Disable-frame-filtering-completely.patch (100%)
> 
This does not build with CONFIG_ALL_KMODS=y:

  MODPOST 735 modules
ERROR: "of_usb_get_phy_mode" [drivers/usb/dwc3/dwc3.ko] undefined!
scripts/Makefile.modpost:91: recipe for target '__modpost' failed
make[5]: *** [__modpost] Error 1
Makefile:1196: recipe for target 'modules' failed
make[4]: *** [modules] Error 2
make[4]: Leaving directory '/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13'
Makefile:25: recipe for target '/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13/.image' failed
make[3]: *** [/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13/.image] Error 2
make[3]: Leaving directory '/var/nbd/lede/target/linux/arc770'
Makefile:13: recipe for target 'install' failed

The cause is that of_usb_get_phy_mode is meant to be built into the
kernel, however since USB is selected as module, this won't work.

Please send any follow-up fixes incrementally, and I will fold them
into the commit in my staging tree.

By the way, when Cc'ing me, please use my @nbd.name address, not the
@openwrt.org one.

Thanks,

- Felix
Alexey Brodkin March 10, 2017, 3 p.m. UTC | #2
Hi Felix,

On Tue, 2017-03-07 at 19:30 +0100, Felix Fietkau wrote:
> On 2017-03-06 19:30, Alexey Brodkin wrote:

> > 

> > With update of ARC tools to arc-2016.09 based on GCC v6.x

> > we have to bump Linux kernel version so both toolchain and

> > the kernel use the same ARC ABIv4.

> > 

> > Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>

> > ---

> >  target/linux/arc770/Makefile                       |  2 +-

> >  target/linux/arc770/{config-4.4 => config-4.9}     | 44 ++++++++++++++++------

> >  ...stmmac-Disable-frame-filtering-completely.patch |  0

> >  3 files changed, 33 insertions(+), 13 deletions(-)

> >  rename target/linux/arc770/{config-4.4 => config-4.9} (82%)

> >  rename target/linux/arc770/{patches-4.4 => patches-4.9}/700-stmmac-Disable-frame-filtering-completely.patch (100%)

> > 

> This does not build with CONFIG_ALL_KMODS=y:

> 

>   MODPOST 735 modules

> ERROR: "of_usb_get_phy_mode" [drivers/usb/dwc3/dwc3.ko] undefined!

> scripts/Makefile.modpost:91: recipe for target '__modpost' failed

> make[5]: *** [__modpost] Error 1

> Makefile:1196: recipe for target 'modules' failed

> make[4]: *** [modules] Error 2

> make[4]: Leaving directory '/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13'

> Makefile:25: recipe for target '/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13/.image' failed

> make[3]: *** [/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13/.image] Error 2

> make[3]: Leaving directory '/var/nbd/lede/target/linux/arc770'

> Makefile:13: recipe for target 'install' failed

> 

> The cause is that of_usb_get_phy_mode is meant to be built into the

> kernel, however since USB is selected as module, this won't work.

> 

> Please send any follow-up fixes incrementally, and I will fold them

> into the commit in my staging tree.


Sorry for being silent for quite some time on that topic.
It turned to be not that easy reproduce this... and to be honest
I'm not there yet :)

Now a bit more details.

1. For some reason once I enable CONFIG_ALL_KMODS somehow implicitly
libnl gets enabled and its current version simply couldn't be built
with uClibc, see http://lists.infradead.org/pipermail/libnl/2017-March/002301.html

2. Now I'm seeing this:
--------------------------------->8-----------------------------
make[4]: Entering directory `.../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13'
  CC [M]  .../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/siit-1.2/siit.o
.../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/siit-1.2/siit.c: In function 'siit_xmit':
.../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/siit-1.2/siit.c:1169:5: error: 'struct net_device' has no member named 'trans_start'; did
you mean 'mem_start'?
  dev->trans_start = jiffies;
     ^~
--------------------------------->8-----------------------------

So I'm wondering:
1. How did you manage to get over these things (I may expect once I found
a fix for this "siit" more issues appear :)?

2. How come we haven't see issues with ALL_KMOD with 4.4-based kernels?

> By the way, when Cc'ing me, please use my @nbd.name address, not the

> @openwrt.org one.


Sure just used older command line erroneously.

-Alexey
Felix Fietkau March 10, 2017, 3:10 p.m. UTC | #3
On 2017-03-10 16:00, Alexey Brodkin wrote:
> Hi Felix,
> 
> On Tue, 2017-03-07 at 19:30 +0100, Felix Fietkau wrote:
>> On 2017-03-06 19:30, Alexey Brodkin wrote:
>> > 
>> > With update of ARC tools to arc-2016.09 based on GCC v6.x
>> > we have to bump Linux kernel version so both toolchain and
>> > the kernel use the same ARC ABIv4.
>> > 
>> > Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
>> > ---
>> >  target/linux/arc770/Makefile                       |  2 +-
>> >  target/linux/arc770/{config-4.4 => config-4.9}     | 44 ++++++++++++++++------
>> >  ...stmmac-Disable-frame-filtering-completely.patch |  0
>> >  3 files changed, 33 insertions(+), 13 deletions(-)
>> >  rename target/linux/arc770/{config-4.4 => config-4.9} (82%)
>> >  rename target/linux/arc770/{patches-4.4 => patches-4.9}/700-stmmac-Disable-frame-filtering-completely.patch (100%)
>> > 
>> This does not build with CONFIG_ALL_KMODS=y:
>> 
>>   MODPOST 735 modules
>> ERROR: "of_usb_get_phy_mode" [drivers/usb/dwc3/dwc3.ko] undefined!
>> scripts/Makefile.modpost:91: recipe for target '__modpost' failed
>> make[5]: *** [__modpost] Error 1
>> Makefile:1196: recipe for target 'modules' failed
>> make[4]: *** [modules] Error 2
>> make[4]: Leaving directory '/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13'
>> Makefile:25: recipe for target '/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13/.image' failed
>> make[3]: *** [/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13/.image] Error 2
>> make[3]: Leaving directory '/var/nbd/lede/target/linux/arc770'
>> Makefile:13: recipe for target 'install' failed
>> 
>> The cause is that of_usb_get_phy_mode is meant to be built into the
>> kernel, however since USB is selected as module, this won't work.
>> 
>> Please send any follow-up fixes incrementally, and I will fold them
>> into the commit in my staging tree.
> 
> Sorry for being silent for quite some time on that topic.
> It turned to be not that easy reproduce this... and to be honest
> I'm not there yet :)
> 
> Now a bit more details.
> 
> 1. For some reason once I enable CONFIG_ALL_KMODS somehow implicitly
> libnl gets enabled and its current version simply couldn't be built
> with uClibc, see http://lists.infradead.org/pipermail/libnl/2017-March/002301.html
> 
> 2. Now I'm seeing this:
> --------------------------------->8-----------------------------
> make[4]: Entering directory `.../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13'
>   CC [M]  .../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/siit-1.2/siit.o
> .../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/siit-1.2/siit.c: In function 'siit_xmit':
> .../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/siit-1.2/siit.c:1169:5: error: 'struct net_device' has no member named 'trans_start'; did
> you mean 'mem_start'?
>   dev->trans_start = jiffies;
>      ^~
> --------------------------------->8-----------------------------
> 
> So I'm wondering:
> 1. How did you manage to get over these things (I may expect once I found
> a fix for this "siit" more issues appear :)?
I did not run into these issues, because I was building without the
packages feed.

> 2. How come we haven't see issues with ALL_KMOD with 4.4-based kernels?
On linux 4.4, dwc3 didn't call that function.

- Felix
Alexey Brodkin March 10, 2017, 3:57 p.m. UTC | #4
Hi Felix,

On Fri, 2017-03-10 at 16:10 +0100, Felix Fietkau wrote:
> On 2017-03-10 16:00, Alexey Brodkin wrote:

> > 

> > Hi Felix,

> > 

> > On Tue, 2017-03-07 at 19:30 +0100, Felix Fietkau wrote:

> > > 

> > > On 2017-03-06 19:30, Alexey Brodkin wrote:

> > > > 

> > > > 

> > > > With update of ARC tools to arc-2016.09 based on GCC v6.x

> > > > we have to bump Linux kernel version so both toolchain and

> > > > the kernel use the same ARC ABIv4.

> > > > 

> > > > Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>

> > > > ---

> > > >  target/linux/arc770/Makefile                       |  2 +-

> > > >  target/linux/arc770/{config-4.4 => config-4.9}     | 44 ++++++++++++++++------

> > > >  ...stmmac-Disable-frame-filtering-completely.patch |  0

> > > >  3 files changed, 33 insertions(+), 13 deletions(-)

> > > >  rename target/linux/arc770/{config-4.4 => config-4.9} (82%)

> > > >  rename target/linux/arc770/{patches-4.4 => patches-4.9}/700-stmmac-Disable-frame-filtering-completely.patch (100%)

> > > > 

> > > This does not build with CONFIG_ALL_KMODS=y:

> > > 

> > >   MODPOST 735 modules

> > > ERROR: "of_usb_get_phy_mode" [drivers/usb/dwc3/dwc3.ko] undefined!

> > > scripts/Makefile.modpost:91: recipe for target '__modpost' failed

> > > make[5]: *** [__modpost] Error 1

> > > Makefile:1196: recipe for target 'modules' failed

> > > make[4]: *** [modules] Error 2

> > > make[4]: Leaving directory '/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13'

> > > Makefile:25: recipe for target '/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13/.image' failed

> > > make[3]: *** [/var/nbd/lede/build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13/.image] Error 2

> > > make[3]: Leaving directory '/var/nbd/lede/target/linux/arc770'

> > > Makefile:13: recipe for target 'install' failed

> > > 

> > > The cause is that of_usb_get_phy_mode is meant to be built into the

> > > kernel, however since USB is selected as module, this won't work.

> > > 

> > > Please send any follow-up fixes incrementally, and I will fold them

> > > into the commit in my staging tree.

> > 

> > Sorry for being silent for quite some time on that topic.

> > It turned to be not that easy reproduce this... and to be honest

> > I'm not there yet :)

> > 

> > Now a bit more details.

> > 

> > 1. For some reason once I enable CONFIG_ALL_KMODS somehow implicitly

> > libnl gets enabled and its current version simply couldn't be built

> > with uClibc, see https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.infradead.org_pipermail_libnl_2017-2DMarch_002301.html&d=DwICaQ&c=DPL6_

> > X_6JkXFx7AXWqB0tg&r=lqdeeSSEes0GFDDl656eViXO7breS55ytWkhpk5R81I&m=Av73R0CdUxaXu6SIuxCefjNOP7Tna15aS9shJpYiMu0&s=hQbh1lrUWjbyWDe85RK94dK-

> > 9GWyP9oDXTyxGxSbsws&e= 

> > 

> > 2. Now I'm seeing this:

> > --------------------------------->8-----------------------------

> > make[4]: Entering directory `.../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/linux-4.9.13'

> >   CC [M]  .../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/siit-1.2/siit.o

> > .../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/siit-1.2/siit.c: In function 'siit_xmit':

> > .../build_dir/target-arc_arc700_uClibc/linux-arc770_generic/siit-1.2/siit.c:1169:5: error: 'struct net_device' has no member named 'trans_start';

> > did

> > you mean 'mem_start'?

> >   dev->trans_start = jiffies;

> >      ^~

> > --------------------------------->8-----------------------------

> > 

> > So I'm wondering:

> > 1. How did you manage to get over these things (I may expect once I found

> > a fix for this "siit" more issues appear :)?

> I did not run into these issues, because I was building without the

> packages feed.


Completely forgot about feeds, sorry.
So what I did now was "./scripts/feed uninstall -a", selected ARC770 board,
enabled CONFIG_ALL_KMOD and all got built perfectly fine for me.

Any other ideas what's missing in my case?

> 

> > 

> > 2. How come we haven't see issues with ALL_KMOD with 4.4-based kernels?

> On linux 4.4, dwc3 didn't call that function.


Ok that makes sense.

-Alexey
Felix Fietkau March 10, 2017, 3:59 p.m. UTC | #5
On 2017-03-10 16:57, Alexey Brodkin wrote:
> Completely forgot about feeds, sorry.
> So what I did now was "./scripts/feed uninstall -a", selected ARC770 board,
> enabled CONFIG_ALL_KMOD and all got built perfectly fine for me.
> 
> Any other ideas what's missing in my case?
Did you create a fresh config with that option selected?

- Felix
Alexey Brodkin March 10, 2017, 4:01 p.m. UTC | #6
Hi Felix,

On Fri, 2017-03-10 at 16:59 +0100, Felix Fietkau wrote:
> On 2017-03-10 16:57, Alexey Brodkin wrote:
> > 
> > Completely forgot about feeds, sorry.
> > So what I did now was "./scripts/feed uninstall -a", selected ARC770 board,
> > enabled CONFIG_ALL_KMOD and all got built perfectly fine for me.
> > 
> > Any other ideas what's missing in my case?
> Did you create a fresh config with that option selected?

I think so because I
1. "rm -rf build_dir/ staging_dir/ bin/ tmp .config*"
2. "make menuconfig" where selected the board and ALL_KMODS

-Alexey
Felix Fietkau March 12, 2017, 4:06 p.m. UTC | #7
On 2017-03-10 17:01, Alexey Brodkin wrote:
> Hi Felix,
> 
> On Fri, 2017-03-10 at 16:59 +0100, Felix Fietkau wrote:
>> On 2017-03-10 16:57, Alexey Brodkin wrote:
>> > 
>> > Completely forgot about feeds, sorry.
>> > So what I did now was "./scripts/feed uninstall -a", selected ARC770 board,
>> > enabled CONFIG_ALL_KMOD and all got built perfectly fine for me.
>> > 
>> > Any other ideas what's missing in my case?
>> Did you create a fresh config with that option selected?
> 
> I think so because I
> 1. "rm -rf build_dir/ staging_dir/ bin/ tmp .config*"
> 2. "make menuconfig" where selected the board and ALL_KMODS
Please do that with the latest version of my staging tree and send me
the resulting final .config file.

- Felix
Felix Fietkau April 12, 2017, 8:53 a.m. UTC | #8
On 2017-03-12 17:06, Felix Fietkau wrote:
> On 2017-03-10 17:01, Alexey Brodkin wrote:
>> Hi Felix,
>> 
>> On Fri, 2017-03-10 at 16:59 +0100, Felix Fietkau wrote:
>>> On 2017-03-10 16:57, Alexey Brodkin wrote:
>>> > 
>>> > Completely forgot about feeds, sorry.
>>> > So what I did now was "./scripts/feed uninstall -a", selected ARC770 board,
>>> > enabled CONFIG_ALL_KMOD and all got built perfectly fine for me.
>>> > 
>>> > Any other ideas what's missing in my case?
>>> Did you create a fresh config with that option selected?
>> 
>> I think so because I
>> 1. "rm -rf build_dir/ staging_dir/ bin/ tmp .config*"
>> 2. "make menuconfig" where selected the board and ALL_KMODS
> Please do that with the latest version of my staging tree and send me
> the resulting final .config file.
Ping? I still have your changes in my staging tree and I'd like to get
this resolved soon.

- Felix
Alexey Brodkin April 12, 2017, 9:04 a.m. UTC | #9
Hi Felix,


On Wed, 2017-04-12 at 10:53 +0200, Felix Fietkau wrote:
> On 2017-03-12 17:06, Felix Fietkau wrote:
> > 
> > On 2017-03-10 17:01, Alexey Brodkin wrote:
> > > 
> > > Hi Felix,
> > > 
> > > On Fri, 2017-03-10 at 16:59 +0100, Felix Fietkau wrote:
> > > > 
> > > > On 2017-03-10 16:57, Alexey Brodkin wrote:
> > > > > 
> > > > > 
> > > > > Completely forgot about feeds, sorry.
> > > > > So what I did now was "./scripts/feed uninstall -a", selected ARC770 board,
> > > > > enabled CONFIG_ALL_KMOD and all got built perfectly fine for me.
> > > > > 
> > > > > Any other ideas what's missing in my case?
> > > > Did you create a fresh config with that option selected?
> > > 
> > > I think so because I
> > > 1. "rm -rf build_dir/ staging_dir/ bin/ tmp .config*"
> > > 2. "make menuconfig" where selected the board and ALL_KMODS
> > Please do that with the latest version of my staging tree and send me
> > the resulting final .config file.
> Ping? I still have your changes in my staging tree and I'd like to get
> this resolved soon.

I do have this on my todo list but was unfortunately super busy
with other pretty important things.

Anyways I was about to start looking at this so please
stay tuned I expect to update you with my findings very soon.

-Alexey
Alexey Brodkin April 13, 2017, 12:42 p.m. UTC | #10
Hi Felix,

On Wed, 2017-04-12 at 12:04 +0300, Alexey Brodkin wrote:
> Hi Felix,
> 
> 
> On Wed, 2017-04-12 at 10:53 +0200, Felix Fietkau wrote:
> > 
> > On 2017-03-12 17:06, Felix Fietkau wrote:
> > > 
> > > 
> > > On 2017-03-10 17:01, Alexey Brodkin wrote:
> > > > 
> > > > 
> > > > Hi Felix,
> > > > 
> > > > On Fri, 2017-03-10 at 16:59 +0100, Felix Fietkau wrote:
> > > > > 
> > > > > 
> > > > > On 2017-03-10 16:57, Alexey Brodkin wrote:
> > > > > > 
> > > > > > 
> > > > > > 
> > > > > > Completely forgot about feeds, sorry.
> > > > > > So what I did now was "./scripts/feed uninstall -a", selected ARC770 board,
> > > > > > enabled CONFIG_ALL_KMOD and all got built perfectly fine for me.
> > > > > > 
> > > > > > Any other ideas what's missing in my case?
> > > > > Did you create a fresh config with that option selected?
> > > > 
> > > > I think so because I
> > > > 1. "rm -rf build_dir/ staging_dir/ bin/ tmp .config*"
> > > > 2. "make menuconfig" where selected the board and ALL_KMODS
> > > Please do that with the latest version of my staging tree and send me
> > > the resulting final .config file.
> > Ping? I still have your changes in my staging tree and I'd like to get
> > this resolved soon.
> 
> I do have this on my todo list but was unfortunately super busy
> with other pretty important things.
> 
> Anyways I was about to start looking at this so please
> stay tuned I expect to update you with my findings very soon.

As you might have seen from my email to USB mailing list I
was able to nail down the problem (which apparently has nothing to do
with ARC or any other architecture in particular).

I think it worth waiting for comments on the mailing list.
If everybody is happy with my patch I'll submit it to Lede or
you may just pick it up as well - it applies on top of 4.9 perfectly fine.

FWIW that's a link to my message in linux-usb LM:
http://marc.info/?l=linux-usb&m=149208684805545&w=2

-Alexey
Alexey Brodkin April 25, 2017, 1:05 p.m. UTC | #11
Hi Felix,

On Thu, 2017-04-13 at 15:42 +0300, Alexey Brodkin wrote:

[snip]

> As you might have seen from my email to USB mailing list I
> was able to nail down the problem (which apparently has nothing to do
> with ARC or any other architecture in particular).
> 
> I think it worth waiting for comments on the mailing list.
> If everybody is happy with my patch I'll submit it to Lede or
> you may just pick it up as well - it applies on top of 4.9 perfectly fine.
> 
> FWIW that's a link to my message in linux-usb LM:
> http://marc.info/?l=linux-usb&m=149208684805545&w=2

Given there're no signs of activity regarding my patch I'm not sure when
it gets accepted. So I'm wondering if you prefer to wait until it really gets
accepted or I may send it to Lede/OWrt right away so you'll be able to
push my patches with kernel v4.9 for ARC in upstream branch sooner?

-Alexey
Felix Fietkau April 25, 2017, 1:20 p.m. UTC | #12
On 2017-04-25 15:05, Alexey Brodkin wrote:
> Hi Felix,
> 
> On Thu, 2017-04-13 at 15:42 +0300, Alexey Brodkin wrote:
> 
> [snip]
> 
>> As you might have seen from my email to USB mailing list I
>> was able to nail down the problem (which apparently has nothing to do
>> with ARC or any other architecture in particular).
>> 
>> I think it worth waiting for comments on the mailing list.
>> If everybody is happy with my patch I'll submit it to Lede or
>> you may just pick it up as well - it applies on top of 4.9 perfectly fine.
>> 
>> FWIW that's a link to my message in linux-usb LM:
>> http://marc.info/?l=linux-usb&m=149208684805545&w=2
> 
> Given there're no signs of activity regarding my patch I'm not sure when
> it gets accepted. So I'm wondering if you prefer to wait until it really gets
> accepted or I may send it to Lede/OWrt right away so you'll be able to
> push my patches with kernel v4.9 for ARC in upstream branch sooner?
Feel free to submit your patch for LEDE to get the 4.9 update in sooner.

- Felix
diff mbox

Patch

diff --git a/target/linux/arc770/Makefile b/target/linux/arc770/Makefile
index 6492529503..8b164f4ccf 100644
--- a/target/linux/arc770/Makefile
+++ b/target/linux/arc770/Makefile
@@ -12,7 +12,7 @@  BOARDNAME:=Synopsys DesignWare ARC 770D
 MAINTAINER:=Alexey Brodkin <abrodkin@synopsys.com>
 SUBTARGETS:=generic
 
-KERNEL_PATCHVER:=4.4
+KERNEL_PATCHVER:=4.9
 
 DEVICE_TYPE:=developerboard
 
diff --git a/target/linux/arc770/config-4.4 b/target/linux/arc770/config-4.9
similarity index 82%
rename from target/linux/arc770/config-4.4
rename to target/linux/arc770/config-4.9
index f484de30be..2472ce28e4 100644
--- a/target/linux/arc770/config-4.4
+++ b/target/linux/arc770/config-4.9
@@ -1,9 +1,8 @@ 
 # CONFIG_16KSTACKS is not set
 CONFIG_ARC=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set
 # CONFIG_ARCH_HAS_SG_CHAIN is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_ARC_BUILTIN_DTB_NAME=""
 CONFIG_ARC_CACHE=y
@@ -16,18 +15,17 @@  CONFIG_ARC_CACHE_PAGES=y
 CONFIG_ARC_CPU_770=y
 CONFIG_ARC_CURR_IN_REG=y
 CONFIG_ARC_DBG=y
-# CONFIG_ARC_DBG_TLB_MISS_COUNT is not set
 # CONFIG_ARC_DBG_TLB_PARANOIA is not set
 CONFIG_ARC_DW2_UNWIND=y
 CONFIG_ARC_EMUL_UNALIGNED=y
 # CONFIG_ARC_FPU_SAVE_RESTORE is not set
 CONFIG_ARC_HAS_DCACHE=y
 # CONFIG_ARC_HAS_DCCM is not set
-CONFIG_ARC_HAS_HW_MPY=y
 CONFIG_ARC_HAS_ICACHE=y
 # CONFIG_ARC_HAS_ICCM is not set
 CONFIG_ARC_HAS_LLSC=y
 CONFIG_ARC_HAS_SWAPE=y
+CONFIG_ARC_KVADDR_SIZE=256
 # CONFIG_ARC_METAWARE_HLINK is not set
 # CONFIG_ARC_MMU_V1 is not set
 # CONFIG_ARC_MMU_V2 is not set
@@ -36,14 +34,18 @@  CONFIG_ARC_MMU_V3=y
 # CONFIG_ARC_PAGE_SIZE_4K is not set
 CONFIG_ARC_PAGE_SIZE_8K=y
 CONFIG_ARC_PLAT_AXS10X=y
+# CONFIG_ARC_PLAT_EZNPS is not set
 CONFIG_ARC_PLAT_SIM=y
 # CONFIG_ARC_PLAT_TB10X is not set
 CONFIG_ARC_UBOOT_SUPPORT=y
 CONFIG_AXS101=y
 CONFIG_CLKDEV_LOOKUP=y
+CONFIG_CLKSRC_OF=y
+CONFIG_CLKSRC_PROBE=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_COMMON_CLK=y
 # CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_NO_EFFICIENT_FFS=y
 CONFIG_CRC16=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_HASH=y
@@ -52,9 +54,10 @@  CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_DTC=y
 CONFIG_DWMAC_GENERIC=y
-# CONFIG_DWMAC_SUNXI is not set
 CONFIG_DW_APB_ICTL=y
 CONFIG_EXT4_FS=y
+# CONFIG_EZNPS_GIC is not set
+CONFIG_FIXED_PHY=y
 CONFIG_FS_MBCACHE=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -63,12 +66,12 @@  CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
-# CONFIG_GEN_RTC is not set
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
 CONFIG_GPIO_DWAPB=y
 CONFIG_GPIO_GENERIC=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
@@ -80,9 +83,8 @@  CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 CONFIG_HAVE_FUTEX_CMPXCHG=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_HAVE_NET_DSA=y
@@ -97,12 +99,16 @@  CONFIG_ISA_ARCOMPACT=y
 # CONFIG_ISA_ARCV2 is not set
 CONFIG_JBD2=y
 CONFIG_KALLSYMS=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_LEDS_TRIGGER_MTD is not set
 CONFIG_LIBFDT=y
 CONFIG_LINUX_LINK_BASE=0x80000000
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_MDIO_BOARDINFO=y
+# CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MFD_SYSCON=y
+CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_DW=y
@@ -112,6 +118,7 @@  CONFIG_MMC_DW_PLTFM=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MODULES_USE_ELF_RELA=y
+# CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set
 CONFIG_NATIONAL_PHY=y
 CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_NET_CADENCE is not set
@@ -137,8 +144,10 @@  CONFIG_OF_FLATTREE=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_MDIO=y
-CONFIG_OF_MTD=y
 CONFIG_OF_NET=y
+CONFIG_OF_RESERVED_MEM=y
+# CONFIG_PCI is not set
+# CONFIG_PCI_SYSCALL is not set
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_PHYLIB=y
@@ -148,13 +157,23 @@  CONFIG_PREEMPT_COUNT=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_RCU=y
 CONFIG_PTP_1588_CLOCK=y
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SIMPLE=y
 CONFIG_RATIONAL=y
 # CONFIG_RCU_BOOST is not set
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
+# CONFIG_RESET_ATH79 is not set
+# CONFIG_RESET_BERLIN is not set
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RTC is not set
+# CONFIG_RESET_LPC18XX is not set
+# CONFIG_RESET_MESON is not set
+# CONFIG_RESET_PISTACHIO is not set
+# CONFIG_RESET_SOCFPGA is not set
+# CONFIG_RESET_STM32 is not set
+# CONFIG_RESET_SUNXI is not set
+# CONFIG_RESET_ZYNQ is not set
 # CONFIG_SCHED_INFO is not set
 # CONFIG_SCSI_DMA is not set
 CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
@@ -166,13 +185,14 @@  CONFIG_SERIAL_ARC=y
 CONFIG_SERIAL_ARC_CONSOLE=y
 CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_OF_PLATFORM=y
+# CONFIG_SG_POOL is not set
 CONFIG_SRCU=y
 CONFIG_STACKTRACE=y
 CONFIG_STMMAC_ETH=y
 CONFIG_STMMAC_PLATFORM=y
+CONFIG_SWPHY=y
 CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW=y
 CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_USB_SUPPORT=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/arc770/patches-4.4/700-stmmac-Disable-frame-filtering-completely.patch b/target/linux/arc770/patches-4.9/700-stmmac-Disable-frame-filtering-completely.patch
similarity index 100%
rename from target/linux/arc770/patches-4.4/700-stmmac-Disable-frame-filtering-completely.patch
rename to target/linux/arc770/patches-4.9/700-stmmac-Disable-frame-filtering-completely.patch