Re: [LEDE-DEV] [PATCH RFC] mac80211: Don't check for platform files with external kernel trees
On 01/08/2018 06:57 AM, Felix Fietkau wrote: > > >> On 8. Jan 2018, at 10:31, Florian Fainelliwrote: >> >> When building with an external kernel tree, do not check the different >> platform files since this is almost guaranteed they are going to differ. >> >> Signed-off-by: Florian Fainelli > But that also means it’s almost always going to break if platform data is > involved on the external kernel tree. > > - Felix If these files are just getting removed from backports, then it will use the kernel versions, this way the structures used by kernel and backports will be the same and it we will run into a compile error in case some member of a structure is accessed which is not in the kernel. This will allow to compile all drivers except ath5k, ath9k and rt2x00 with external kernels and for these drivers it will work when the appropriate changes to the kernel were added before. This will be similar to how we handle bcma and ssb. Hauke ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Bug when processing long lines
On Thu, Jan 11, 2018 at 6:28 PM, Jakub Horákwrote: > Hello LEDE developers, > > I found a bug in procd that gets triggered when long lines are printed > by services whose stdout/stderr are being logged. The bug itself is > explained in the attached patch. > > However, when I was testing the fix, I found out that the bug is present > in other places, mostly those that call "ustream_get_read_buf" function. > Some examples: > > - ubox/log/logread.c:logread_fb_data_cb() - when buffer passed on the > descriptor is larger than 4096, reception stops > - netifd/main.c:netifd_process_log_read_cb - this is a place that seems > to have this bug fixed, but still has incorrect handling of NUL bytes > - libubox/examples/ustream-example.c:client_read_cb - this is probably > the place that originated this broken bit of code > - uhttpd/relay.c:relay_process_headers - another place that seems broken > > I've attached an init script (that goes to /etc/init.d/flood) and three > Lua programs (flood[123].lua) that trigger this behavior: > - flood1.lua writes long message to stdout, that triggers this behavior > in procd > - flood2.lua writes message that gets correctly processed by procd, but > triggers the bug in logread > - flood3.lua writes message with embedded zeros > > I don't post patches to mailing lists very often, so I apologize if I'm > sending this in a wrong format or in a too broken english. Hey, Patches usually are sent with git send-mail. So "git send-mail 0001-procd-Fix-behavior-when-parsing-long-lines.patch --to=openwrt-de...@lists.openwrt.org" [ FWIW: LEDE has merged back to OpenWrt :) ] Now about the patch. - str = ustream_get_read_buf(s, NULL); + str = ustream_get_read_buf(s, ); if (!str) break; - newline = strchr(str, '\n'); - if (!newline) - break; - - *newline = 0; + /* search for '\n', take into account NUL bytes */ + newline = memchr(str, '\n', buflen); + if (!newline) { + /* is there a room in buffer? */ + if (buflen < s->r.buffer_len) { + /* yes - bailout, newline may still come */ + break; + } else { + /* no - force newline */ + len = buflen; It's weird that this would happen here, since there should be a ustream_reserve() call that would guarantee that there is sufficient buffer size. I could be wrong, or it could be a bug somewhere; who knows ? In any case, if this is a correct approach, I think you should also add *(str + len) = 0 ; to make sure the string is null-terminated. + } + } else { + *newline = 0; + len = newline + 1 - str; + } + /* "str" is NUL terminated by ustream_get_read_buf */ ulog(prio, "%s\n", str); - - len = newline + 1 - str; ustream_consume(s, len); Alex > > Best regards, > Jakub Horak > > ___ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev > ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] owrt landing page
1) sidebar I think it should have some background to make it readable, and possible a slight font increase. 2) logo see [1] for the thread about the logo. Nothing was decided. I personally agree that having one of the logos from there would be great, we'd need to ask the developers/project owners for a vote on this as the logo is their own decision to make. This will probably take months, so for now just use the current logo. 3) my idea was to move in a "legacy" section only the parts the current LEDE wiki already has (and are the up-to-date ones), while all other stuff that does not have an equivalent is just added as-is to the current wiki (just linked in the right place). 1. http://lists.infradead.org/pipermail/lede-dev/2017-May/007783.html -Alberto On 01/10/2018 10:56 PM, Thomas Endt wrote: Hi John, First results on a private demowiki, see: https://lede-project.org/_media/wiki/ledewiki-owrtstyling.jpg 1) red marking: What are we going to do with the sidebar (raw, untouched styling; could be beautified)? Keep or remove? 2) blue marking: I remember there was some discussion about a new, fresh logo. I think now with the move to the LEDE codebase is the right time to refresh the wiki a bit too. Does anybody remember where that discussion happened and what the outcome was? 3) I changed my mind regarding hard cut. The OpenWrt wiki is still rw, and we should keep it that way until we have a plan on how to accomplish the actual merge of the wikis. Thomas -Ursprüngliche Nachricht- Von: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] Im Auftrag von Thomas Endt Gesendet: Samstag, 6. Januar 2018 18:06 An: 'John Crispin'; 'LEDE Development List'; 'LEDE Project Administration'; 'OpenWrt Development List' Betreff: Re: [OpenWrt-Devel] [LEDE-DEV] owrt landing page Hi John, Since the styling is based on CSS, we would need the OpenWrt wiki's CSS for that. Once we have that, it will be relatively easy. But instead of doing the merge of the wikis step by step, I would suggest a hard cut. 1.) Make OpenWrt wiki read only -> I can do that or Imre 2.) Create .tgz of OpenWrt wiki and hand it over to LEDE wiki admins -> Imre 3.) Move LEDE wiki to OpenWrt styling (apply OpenWrt theme and CSS to LEDE wiki) -> I can do that. Some help of CSS experienced guys could be necessary for hard cases. 4.) Move content of old OpenWrt wiki to new OpenWrt wiki (former LEDE) -> I can take the toh part (devicepages); dataentries will be taken from LEDE since they are way more up to date and contain more datafields. -> Rest of the wiki: A plan needs to be worked out what will be carried over from old to new OpenWrt wiki -> Community discussion I'm in the starting blocks since weeks, waiting only for the GO and the OpenWrt wiki sources, and I'm sure, we will have some helping heands ready to start the wiki merge. Thomas -Ursprüngliche Nachricht- Von: Lede-dev [mailto:lede-dev-boun...@lists.infradead.org] Im Auftrag von John Crispin Gesendet: Freitag, 5. Januar 2018 18:54 An: LEDE Development List; LEDE Project Administration; OpenWrt Development List Betreff: [LEDE-DEV] owrt landing page Hi, could someone please help us with rebranding the lede landing page to an openwrt colour/theme ? i would like to see this swithced over within the next 7 days. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] Bug when processing long lines
Hello LEDE developers, I found a bug in procd that gets triggered when long lines are printed by services whose stdout/stderr are being logged. The bug itself is explained in the attached patch. However, when I was testing the fix, I found out that the bug is present in other places, mostly those that call "ustream_get_read_buf" function. Some examples: - ubox/log/logread.c:logread_fb_data_cb() - when buffer passed on the descriptor is larger than 4096, reception stops - netifd/main.c:netifd_process_log_read_cb - this is a place that seems to have this bug fixed, but still has incorrect handling of NUL bytes - libubox/examples/ustream-example.c:client_read_cb - this is probably the place that originated this broken bit of code - uhttpd/relay.c:relay_process_headers - another place that seems broken I've attached an init script (that goes to /etc/init.d/flood) and three Lua programs (flood[123].lua) that trigger this behavior: - flood1.lua writes long message to stdout, that triggers this behavior in procd - flood2.lua writes message that gets correctly processed by procd, but triggers the bug in logread - flood3.lua writes message with embedded zeros I don't post patches to mailing lists very often, so I apologize if I'm sending this in a wrong format or in a too broken english. Best regards, Jakub Horak #!/bin/sh /etc/rc.common START=99 USE_PROCD=1 PROG=/bin/flood1.lua start_service() { config_load cgminer procd_open_instance procd_set_param command "$PROG" procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-0} procd_set_param stdout 1 procd_set_param stderr 1 procd_close_instance } stop_service() { echo stop } service_triggers() { procd_add_reload_trigger "flood" } #!/usr/bin/lua require 'nixio' print('flood 1 starting') print(('x'):rep(4096)) print('flood 1 done') io.stdout:flush() while true do print('flood 1 tick') nixio.nanosleep(1) end #!/usr/bin/lua require 'nixio' print('flood 2 starting') print(('x'):rep(4050)) print('flood 2 done') io.stdout:flush() while true do nixio.nanosleep(1) end #!/usr/bin/lua require 'nixio' print('flood 3 starting') io.write('hello\0world') io.stdout:flush() print('flood 3 done') io.stdout:flush() while true do nixio.nanosleep(1) end From c4ea27994bfa81e38dff9ccf9a92a33b5c612407 Mon Sep 17 00:00:00 2001 From: Jakub HorakDate: Thu, 11 Jan 2018 16:47:50 +0100 Subject: [PATCH] procd: Fix behavior when parsing long lines Processing of service stdout/stderr is silently stopped when long lines (>4096 bytes) are encountered. Moreover, when NUL byte (0) is received on input, the processing is stopped as well. When reading long lines procd waits until a newline character is received even though receive buffer is full. At that moment the file-descriptor is removed from epoll and communication stopson that descriptor stops. Similar thing happens with NUL byte, only that the newline is not found because "NUL" stops strchr() from processing further down the string. This patch corrects the behavior: long lines are broken into smaller ones with forced newline and NUL bytes are skipped when searching for a newline. Signed-off-by: Jakub Horak --- service/instance.c | 26 ++ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/service/instance.c b/service/instance.c index a968a0b..0293099 100644 --- a/service/instance.c +++ b/service/instance.c @@ -461,24 +461,34 @@ instance_stdio(struct ustream *s, int prio, struct service_instance *in) { char *newline, *str, *arg0, ident[32]; int len; + int buflen; arg0 = basename(blobmsg_data(blobmsg_data(in->command))); snprintf(ident, sizeof(ident), "%s[%d]", arg0, in->proc.pid); ulog_open(ULOG_SYSLOG, LOG_DAEMON, ident); do { - str = ustream_get_read_buf(s, NULL); + str = ustream_get_read_buf(s, ); if (!str) break; - newline = strchr(str, '\n'); - if (!newline) - break; - - *newline = 0; + /* search for '\n', take into account NUL bytes */ + newline = memchr(str, '\n', buflen); + if (!newline) { + /* is there a room in buffer? */ + if (buflen < s->r.buffer_len) { +/* yes - bailout, newline may still come */ +break; + } else { +/* no - force newline */ +len = buflen; + } + } else { + *newline = 0; + len = newline + 1 - str; + } + /* "str" is NUL terminated by ustream_get_read_buf */ ulog(prio, "%s\n", str); - - len = newline + 1 - str; ustream_consume(s, len); } while (1); -- 2.7.4 signature.asc Description: OpenPGP digital signature ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 1/2] ltq-atm: rewrite tx path to use IRQs
On 11 January 2018 at 12:54, Kevin Darbyshire-Bryantwrote: > > >> On 10 Jan 2018, at 18:47, Antti Seppälä wrote: >>> >>> diff --git a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h >>> b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h >>> index 2f754c982b2a..398be7d8282a 100644 >>> --- a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h >>> +++ b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h >>> @@ -1799,7 +1840,6 @@ static int ltq_atm_probe(struct platform_device *pdev) >>>int ret; >>>int port_num; >>>struct port_cell_info port_cell = {0}; >>> - int i, j; >> >> One small nit about the patch though - the above change seems >> unintended and causes a compilation failure. > > Have to say I don’t hit that issue at all. Build on master no problem at for > Netgear DGN3500. > > I wonder what I’m doing wrong? > My bad. I used lede-17.01.4 sources in my tests instead of master branch. In master the change does not cause any ill effects. Sorry for the noise. However, the patch makes an excellent stable release backport candidate as it fixes quite a long-standing issue. So depending on future release plans it has now been tested to work with the stable release as well :) Br, -- Antti ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 2/9] cns3xxx: copy patches for kernel 4.14
Signed-off-by: Koen Vandeputte--- .../patches-4.14/000-cns3xxx_arch_include.patch| 8 + .../patches-4.14/001-arm_openwrt_machtypes.patch | 7 + .../010-arm_introduce-dma-fiq-irq-broadcast.patch | 80 + .../patches-4.14/020-watchdog_support.patch| 185 + .../cns3xxx/patches-4.14/025-smp_support.patch | 30 .../cns3xxx/patches-4.14/030-pcie_clock.patch | 11 ++ .../cns3xxx/patches-4.14/040-fiq_support.patch | 40 + .../linux/cns3xxx/patches-4.14/045-twd_base.patch | 43 + .../linux/cns3xxx/patches-4.14/055-pcie_io.patch | 19 +++ .../cns3xxx/patches-4.14/060-pcie_abort.patch | 109 .../patches-4.14/065-pcie_skip_inactive.patch | 11 ++ .../cns3xxx/patches-4.14/070-i2c_support.patch | 31 .../cns3xxx/patches-4.14/075-spi_support.patch | 51 ++ .../cns3xxx/patches-4.14/080-sata_support.patch| 26 +++ target/linux/cns3xxx/patches-4.14/090-timers.patch | 103 .../patches-4.14/093-add-virt-pci-io-mapping.patch | 41 + .../cns3xxx/patches-4.14/095-gpio_support.patch| 67 .../patches-4.14/097-l2x0_cmdline_disable.patch| 69 .../cns3xxx/patches-4.14/100-laguna_support.patch | 46 + .../101-laguna_sdhci_card_detect.patch | 14 ++ .../patches-4.14/110-pci_isolated_interrupts.patch | 95 +++ ...ER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch | 23 +++ .../patches-4.14/200-broadcom_phy_reinit.patch | 14 ++ .../cns3xxx/patches-4.14/210-dwc2_defaults.patch | 47 ++ 24 files changed, 1170 insertions(+) create mode 100644 target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch create mode 100644 target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch create mode 100644 target/linux/cns3xxx/patches-4.14/010-arm_introduce-dma-fiq-irq-broadcast.patch create mode 100644 target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/025-smp_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/030-pcie_clock.patch create mode 100644 target/linux/cns3xxx/patches-4.14/040-fiq_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/045-twd_base.patch create mode 100644 target/linux/cns3xxx/patches-4.14/055-pcie_io.patch create mode 100644 target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch create mode 100644 target/linux/cns3xxx/patches-4.14/065-pcie_skip_inactive.patch create mode 100644 target/linux/cns3xxx/patches-4.14/070-i2c_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/075-spi_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/080-sata_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/090-timers.patch create mode 100644 target/linux/cns3xxx/patches-4.14/093-add-virt-pci-io-mapping.patch create mode 100644 target/linux/cns3xxx/patches-4.14/095-gpio_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/097-l2x0_cmdline_disable.patch create mode 100644 target/linux/cns3xxx/patches-4.14/100-laguna_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/101-laguna_sdhci_card_detect.patch create mode 100644 target/linux/cns3xxx/patches-4.14/110-pci_isolated_interrupts.patch create mode 100644 target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch create mode 100644 target/linux/cns3xxx/patches-4.14/200-broadcom_phy_reinit.patch create mode 100644 target/linux/cns3xxx/patches-4.14/210-dwc2_defaults.patch diff --git a/target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch b/target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch new file mode 100644 index ..f98fe0c2ba66 --- /dev/null +++ b/target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch @@ -0,0 +1,8 @@ +--- a/arch/arm/mach-cns3xxx/Makefile b/arch/arm/mach-cns3xxx/Makefile +@@ -1,3 +1,5 @@ ++ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include ++ + obj-$(CONFIG_ARCH_CNS3XXX)+= cns3xxx.o + cns3xxx-y += core.o pm.o + cns3xxx-$(CONFIG_ATAGS) += devices.o diff --git a/target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch b/target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch new file mode 100644 index ..32f977fafc4b --- /dev/null +++ b/target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch @@ -0,0 +1,7 @@ +--- a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types +@@ -1006,3 +1006,4 @@ eco5_bx2 MACH_ECO5_BX2 ECO5_BX2 4572 + eukrea_cpuimx28sd MACH_EUKREA_CPUIMX28SD EUKREA_CPUIMX28SD 4573 + domotab MACH_DOMOTABDOMOTAB 4574 + pfla03MACH_PFLA03 PFLA03 4575
[LEDE-DEV] [PATCH 9/9] cns3xxx: remove linux 4.9 support
Signed-off-by: Koen Vandeputte--- target/linux/cns3xxx/config-4.9| 300 - .../patches-4.9/000-cns3xxx_arch_include.patch | 8 - .../patches-4.9/001-arm_openwrt_machtypes.patch| 7 - .../010-arm_introduce-dma-fiq-irq-broadcast.patch | 80 -- .../cns3xxx/patches-4.9/020-watchdog_support.patch | 185 - .../cns3xxx/patches-4.9/025-smp_support.patch | 30 --- .../linux/cns3xxx/patches-4.9/030-pcie_clock.patch | 11 - .../cns3xxx/patches-4.9/040-fiq_support.patch | 40 --- .../linux/cns3xxx/patches-4.9/045-twd_base.patch | 43 --- target/linux/cns3xxx/patches-4.9/055-pcie_io.patch | 19 -- .../linux/cns3xxx/patches-4.9/060-pcie_abort.patch | 109 .../patches-4.9/065-pcie_skip_inactive.patch | 11 - .../cns3xxx/patches-4.9/070-i2c_support.patch | 31 --- .../cns3xxx/patches-4.9/075-spi_support.patch | 51 .../cns3xxx/patches-4.9/080-sata_support.patch | 26 -- target/linux/cns3xxx/patches-4.9/090-timers.patch | 103 --- .../patches-4.9/093-add-virt-pci-io-mapping.patch | 41 --- .../cns3xxx/patches-4.9/095-gpio_support.patch | 67 - .../patches-4.9/097-l2x0_cmdline_disable.patch | 69 - .../cns3xxx/patches-4.9/100-laguna_support.patch | 46 .../patches-4.9/101-laguna_sdhci_card_detect.patch | 14 - .../patches-4.9/110-pci_isolated_interrupts.patch | 95 --- ...ER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch | 23 -- .../patches-4.9/200-broadcom_phy_reinit.patch | 14 - .../cns3xxx/patches-4.9/210-dwc2_defaults.patch| 47 25 files changed, 1470 deletions(-) delete mode 100644 target/linux/cns3xxx/config-4.9 delete mode 100644 target/linux/cns3xxx/patches-4.9/000-cns3xxx_arch_include.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/001-arm_openwrt_machtypes.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/010-arm_introduce-dma-fiq-irq-broadcast.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/020-watchdog_support.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/025-smp_support.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/030-pcie_clock.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/040-fiq_support.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/045-twd_base.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/055-pcie_io.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/060-pcie_abort.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/065-pcie_skip_inactive.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/070-i2c_support.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/075-spi_support.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/080-sata_support.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/090-timers.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/093-add-virt-pci-io-mapping.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/095-gpio_support.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/097-l2x0_cmdline_disable.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/100-laguna_support.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/101-laguna_sdhci_card_detect.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/110-pci_isolated_interrupts.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch delete mode 100644 target/linux/cns3xxx/patches-4.9/200-broadcom_phy_reinit.patch delete mode 100644 target/linux/cns3xxx/patches-4.9/210-dwc2_defaults.patch diff --git a/target/linux/cns3xxx/config-4.9 b/target/linux/cns3xxx/config-4.9 deleted file mode 100644 index 36b4857c2352.. --- a/target/linux/cns3xxx/config-4.9 +++ /dev/null @@ -1,300 +0,0 @@ -CONFIG_ALIGNMENT_TRAP=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_CNS3XXX=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_ARCH_HAS_SG_CHAIN=y -CONFIG_ARCH_HAS_TICK_BROADCAST=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_MULTI_CPU_AUTO is not set -CONFIG_ARCH_MULTI_V6=y -CONFIG_ARCH_MULTI_V6_V7=y -CONFIG_ARCH_NR_GPIO=0 -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -# CONFIG_ARM_CPU_SUSPEND is not set -CONFIG_ARM_GIC=y -CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_ARM_HEAVY_MB=y -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARM_THUMB=y -CONFIG_ATA=y -CONFIG_ATAGS=y -# CONFIG_ATA_SFF is not set -CONFIG_ATA_VERBOSE_ERROR=y
[LEDE-DEV] [PATCH 3/9] cns3xxx: refresh kernel 4.14 config
Signed-off-by: Koen Vandeputte--- target/linux/cns3xxx/config-4.14 | 104 --- 1 file changed, 97 insertions(+), 7 deletions(-) diff --git a/target/linux/cns3xxx/config-4.14 b/target/linux/cns3xxx/config-4.14 index 36b4857c2352..5a1aab95f254 100644 --- a/target/linux/cns3xxx/config-4.14 +++ b/target/linux/cns3xxx/config-4.14 @@ -1,9 +1,14 @@ +# CONFIG_AIO is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_ARCH_CNS3XXX=y +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_ARCH_HAS_TICK_BROADCAST=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y @@ -13,6 +18,8 @@ CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y @@ -20,6 +27,7 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +# CONFIG_ARCH_WANTS_THP_SWAP is not set CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARM=y @@ -38,16 +46,19 @@ CONFIG_AUTO_ZRELADDR=y CONFIG_BCM_NET_PHYLIB=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_SCSI_REQUEST=y CONFIG_BROADCOM_PHY=y CONFIG_CACHE_L2X0=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_NONE is not set +CONFIG_CC_STACKPROTECTOR_REGULAR=y CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLKSRC_OF=y -CONFIG_CLKSRC_PROBE=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMDLINE="console=ttyS0,115200" CONFIG_CMDLINE_FORCE=y CONFIG_CNS3XXX_ETH=y CONFIG_COMMON_CLK=y +CONFIG_COREDUMP=y CONFIG_CPU_32v6=y CONFIG_CPU_32v6K=y CONFIG_CPU_ABRT_EV6=y @@ -62,8 +73,11 @@ CONFIG_CPU_HAS_ASID=y CONFIG_CPU_PABRT_V6=y CONFIG_CPU_RMAP=y # CONFIG_CPU_SW_DOMAIN_PAN is not set +CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_V6=y CONFIG_CPU_V6K=y +CONFIG_CRASH_DUMP=y +CONFIG_CRC_CCITT=m CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_HASH2=y @@ -73,27 +87,37 @@ CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_DEBUG_ALIGN_RODATA=y CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_UART_8250 is not set # CONFIG_DEBUG_USER is not set CONFIG_DMA_CACHE_FIQ_BROADCAST=y +# CONFIG_DMA_NOOP_OPS is not set +# CONFIG_DMA_VIRT_OPS is not set +# CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EEPROM_AT24=y +CONFIG_ELF_CORE=y +CONFIG_EXPORTFS=y CONFIG_FIQ=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FRAME_POINTER=y +CONFIG_FUTEX_PI=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_GENERIC_PCI_IOMAP=y @@ -107,6 +131,7 @@ CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_SYSFS=y +# CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y @@ -123,7 +148,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_ARM_SCU=y CONFIG_HAVE_ARM_TWD=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CBPF_JIT=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y @@ -133,6 +157,8 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_EBPF_JIT=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y @@ -154,6 +180,7 @@ CONFIG_HAVE_SMP=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_UID16=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +# CONFIG_HNS3 is not set CONFIG_HWMON=y CONFIG_HZ_FIXED=0 CONFIG_HZ_PERIODIC=y @@ -161,20 +188,41 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_CNS3XXX=y +# CONFIG_INITRAMFS_FORCE is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_IOMMU_HELPER=y +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IPV6=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_IPV6_PIMSM_V2 is not set +CONFIG_IPV6_SUBTREES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m
[LEDE-DEV] [PATCH 6/9] cns3xxx: remove deprecated uart flags
Flag UPF_NO_TXEN_TEST is deprecated. Remove it. Signed-off-by: Koen Vandeputte--- .../150-laguna-delete-deprecated-uart-flags.patch | 29 ++ 1 file changed, 29 insertions(+) create mode 100644 target/linux/cns3xxx/patches-4.14/150-laguna-delete-deprecated-uart-flags.patch diff --git a/target/linux/cns3xxx/patches-4.14/150-laguna-delete-deprecated-uart-flags.patch b/target/linux/cns3xxx/patches-4.14/150-laguna-delete-deprecated-uart-flags.patch new file mode 100644 index ..11a630e502ff --- /dev/null +++ b/target/linux/cns3xxx/patches-4.14/150-laguna-delete-deprecated-uart-flags.patch @@ -0,0 +1,29 @@ +--- a/arch/arm/mach-cns3xxx/laguna.c b/arch/arm/mach-cns3xxx/laguna.c +@@ -389,7 +389,7 @@ static struct plat_serial8250_port lagun + .mapbase= (CNS3XXX_UART0_BASE), + .irq= IRQ_CNS3XXX_UART0, + .iotype = UPIO_MEM, +- .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_NO_TXEN_TEST | UPF_IOREMAP, ++ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_IOREMAP, + .regshift = 2, + .uartclk= 2400, + .type = PORT_16550A, +@@ -397,7 +397,7 @@ static struct plat_serial8250_port lagun + .mapbase= (CNS3XXX_UART1_BASE), + .irq= IRQ_CNS3XXX_UART1, + .iotype = UPIO_MEM, +- .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_NO_TXEN_TEST | UPF_IOREMAP, ++ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_IOREMAP, + .regshift = 2, + .uartclk= 2400, + .type = PORT_16550A, +@@ -405,7 +405,7 @@ static struct plat_serial8250_port lagun + .mapbase= (CNS3XXX_UART2_BASE), + .irq= IRQ_CNS3XXX_UART2, + .iotype = UPIO_MEM, +- .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_NO_TXEN_TEST | UPF_IOREMAP, ++ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_IOREMAP, + .regshift = 2, + .uartclk= 2400, + .type = PORT_16550A, -- 2.7.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 4/9] cns3xxx: update patches for 4.14
Signed-off-by: Koen Vandeputte--- .../patches-4.14/000-cns3xxx_arch_include.patch| 3 +- .../patches-4.14/001-arm_openwrt_machtypes.patch | 11 ++- .../cns3xxx/patches-4.14/075-spi_support.patch | 12 +-- target/linux/cns3xxx/patches-4.14/090-timers.patch | 2 +- .../patches-4.14/200-broadcom_phy_reinit.patch | 19 ++-- .../cns3xxx/patches-4.14/210-dwc2_defaults.patch | 102 - 6 files changed, 85 insertions(+), 64 deletions(-) diff --git a/target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch b/target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch index f98fe0c2ba66..3ae759021a55 100644 --- a/target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch +++ b/target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch @@ -1,6 +1,7 @@ --- a/arch/arm/mach-cns3xxx/Makefile +++ b/arch/arm/mach-cns3xxx/Makefile -@@ -1,3 +1,5 @@ +@@ -1,4 +1,6 @@ + # SPDX-License-Identifier: GPL-2.0 +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include + obj-$(CONFIG_ARCH_CNS3XXX)+= cns3xxx.o diff --git a/target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch b/target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch index 32f977fafc4b..17a83ea7aff3 100644 --- a/target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch +++ b/target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch @@ -1,7 +1,10 @@ --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types -@@ -1006,3 +1006,4 @@ eco5_bx2 MACH_ECO5_BX2 ECO5_BX2 4572 - eukrea_cpuimx28sd MACH_EUKREA_CPUIMX28SD EUKREA_CPUIMX28SD 4573 - domotab MACH_DOMOTABDOMOTAB 4574 - pfla03MACH_PFLA03 PFLA03 4575 +@@ -448,6 +448,7 @@ gplugd MACH_GPLUGD GPLUGD 2625 + qsd8x50a_st1_5MACH_QSD8X50A_ST1_5 QSD8X50A_ST1_5 2627 + mx23evk MACH_MX23EVKMX23EVK 2629 + ap4evbMACH_AP4EVB AP4EVB 2630 +gw2388MACH_GW2388 GW2388 2635 + mityomapl138 MACH_MITYOMAPL138 MITYOMAPL1382650 + guruplug MACH_GURUPLUG GURUPLUG2659 + spear310 MACH_SPEAR310 SPEAR3102660 diff --git a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch index aeda7a326915..8a51eb396b47 100644 --- a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch +++ b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch @@ -1,6 +1,6 @@ --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -199,6 +199,13 @@ config SPI_CLPS711X +@@ -206,6 +206,13 @@ config SPI_CLPS711X This enables dedicated general purpose SPI/Microwire1-compatible master mode interface (SSI1) for CLPS711X-based CPUs. @@ -16,7 +16,7 @@ depends on (M520x || M523x || M5249 || M525x || M527x || M528x || M532x) --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -29,6 +29,7 @@ obj-$(CONFIG_SPI_BITBANG)+= spi-bitban +@@ -31,6 +31,7 @@ obj-$(CONFIG_SPI_BITBANG)+= spi-bitban obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o obj-$(CONFIG_SPI_CADENCE) += spi-cadence.o obj-$(CONFIG_SPI_CLPS711X)+= spi-clps711x.o @@ -26,7 +26,7 @@ obj-$(CONFIG_SPI_DLN2)+= spi-dln2.o --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h -@@ -763,6 +763,10 @@ struct spi_transfer { +@@ -799,6 +799,10 @@ struct spi_transfer { u32 speed_hz; struct list_head transfer_list; @@ -39,13 +39,13 @@ /** --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -985,6 +985,9 @@ static int spi_transfer_one_message(stru +@@ -1021,6 +1021,9 @@ static int spi_transfer_one_message(stru list_for_each_entry(xfer, >transfers, transfer_list) { trace_spi_transfer_start(msg, xfer); + xfer->last_in_message_list = + list_is_last(>transfer_list, >transfers); + - spi_statistics_add_transfer_stats(statm, xfer, master); - spi_statistics_add_transfer_stats(stats, xfer, master); + spi_statistics_add_transfer_stats(statm, xfer, ctlr); + spi_statistics_add_transfer_stats(stats, xfer, ctlr); diff --git a/target/linux/cns3xxx/patches-4.14/090-timers.patch b/target/linux/cns3xxx/patches-4.14/090-timers.patch index 6f7713f209e8..34a4934d62fb 100644 --- a/target/linux/cns3xxx/patches-4.14/090-timers.patch +++ b/target/linux/cns3xxx/patches-4.14/090-timers.patch @@ -30,7 +30,7 @@ twd_local_timer_register(_twd_local_timer); }
[LEDE-DEV] [PATCH 8/9] cns3xxx: switch to kernel 4.14
Signed-off-by: Koen Vandeputte--- target/linux/cns3xxx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/cns3xxx/Makefile b/target/linux/cns3xxx/Makefile index 817bb317ef97..93b8d7da4d40 100644 --- a/target/linux/cns3xxx/Makefile +++ b/target/linux/cns3xxx/Makefile @@ -14,7 +14,7 @@ CPU_TYPE:=mpcore CPU_SUBTYPE:=vfp MAINTAINER:=Felix Fietkau -KERNEL_PATCHVER:=4.9 +KERNEL_PATCHVER:=4.14 define Target/Description Build images for Cavium Networks Econa CNS3xxx based boards, -- 2.7.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 1/9] cns3xxx: copy config for kernel 4.14
Signed-off-by: Koen Vandeputte--- target/linux/cns3xxx/config-4.14 | 300 +++ 1 file changed, 300 insertions(+) create mode 100644 target/linux/cns3xxx/config-4.14 diff --git a/target/linux/cns3xxx/config-4.14 b/target/linux/cns3xxx/config-4.14 new file mode 100644 index ..36b4857c2352 --- /dev/null +++ b/target/linux/cns3xxx/config-4.14 @@ -0,0 +1,300 @@ +CONFIG_ALIGNMENT_TRAP=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ARCH_CNS3XXX=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MULTIPLATFORM=y +# CONFIG_ARCH_MULTI_CPU_AUTO is not set +CONFIG_ARCH_MULTI_V6=y +CONFIG_ARCH_MULTI_V6_V7=y +CONFIG_ARCH_NR_GPIO=0 +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARM=y +# CONFIG_ARM_CPU_SUSPEND is not set +CONFIG_ARM_GIC=y +CONFIG_ARM_HAS_SG_CHAIN=y +CONFIG_ARM_HEAVY_MB=y +CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARM_THUMB=y +CONFIG_ATA=y +CONFIG_ATAGS=y +# CONFIG_ATA_SFF is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_AUTO_ZRELADDR=y +CONFIG_BCM_NET_PHYLIB=y +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BROADCOM_PHY=y +CONFIG_CACHE_L2X0=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_CLKSRC_OF=y +CONFIG_CLKSRC_PROBE=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_CMDLINE="console=ttyS0,115200" +CONFIG_CMDLINE_FORCE=y +CONFIG_CNS3XXX_ETH=y +CONFIG_COMMON_CLK=y +CONFIG_CPU_32v6=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_ABRT_EV6=y +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_CPU_CACHE_V6=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y +CONFIG_CPU_HAS_ASID=y +# CONFIG_CPU_ICACHE_DISABLE is not set +CONFIG_CPU_PABRT_V6=y +CONFIG_CPU_RMAP=y +# CONFIG_CPU_SW_DOMAIN_PAN is not set +CONFIG_CPU_TLB_V6=y +CONFIG_CPU_V6K=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +# CONFIG_DEBUG_UART_8250 is not set +# CONFIG_DEBUG_USER is not set +CONFIG_DMA_CACHE_FIQ_BROADCAST=y +CONFIG_DTC=y +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_EEPROM_AT24=y +CONFIG_FIQ=y +CONFIG_FIXED_PHY=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_FRAME_POINTER=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GLOB=y +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_IRQCHIP=y +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_GPIO_SYSFS=y +CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_ARM_SCU=y +CONFIG_HAVE_ARM_TWD=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_CBPF_JIT=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_IDE=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_SMP=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_UID16=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HWMON=y +CONFIG_HZ_FIXED=0 +CONFIG_HZ_PERIODIC=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_CNS3XXX=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_IOMMU_HELPER=y
[LEDE-DEV] [PATCH 5/9] cns3xxx: fix ethernet IRQ imbalance in 4.14
Kernel 4.14 contains more warnings regarding NAPI usage, which showed following warning: [ 4016.42] [ cut here ] [ 4016.43] WARNING: CPU: 1 PID: 14 at kernel/irq/manage.c:525 __enable_irq+0x3c/0x78 [ 4016.44] Unbalanced enable for IRQ 51 [ 4016.44] Modules linked in: ath9k ath9k_common pppoe ppp_async ath9k_hw ath pppox ppp_generic nf_conntrack_ipv6 mac80211 iptable_nat ipt_REJECT ipt_MASQUERADE cfg80211 xt_time xt_tcpudp xt_state xt_nat xt_multiport xt_mark xt_mac xt_limit xt_conntrack xt_comment xt_TCPMSS xt_REDIRECT xt_LOG slhc nf_reject_ipv4 nf_nat_redirs [ 4016.50] CPU: 1 PID: 14 Comm: ksoftirqd/1 Tainted: GW 4.14.11 #0 [ 4016.50] Hardware name: Gateworks Corporation Laguna Platform [ 4016.51] Backtrace: [ 4016.51] [] (dump_backtrace) from [] (show_stack+0x18/0x1c) [ 4016.52] r7:c059df4b r6: r5:6093 r4: [ 4016.53] [] (show_stack) from [] (dump_stack+0x94/0xb4) [ 4016.53] [] (dump_stack) from [] (__warn+0xc8/0xf8) [ 4016.54] r7:c059df4b r6:c015144c r5: r4:cf863e08 [ 4016.55] [] (__warn) from [] (warn_slowpath_fmt+0x40/0x48) [ 4016.55] r9:cf863eb0 r8:0036 r7: r6:c0636360 r5:0033 r4:cf80a500 [ 4016.56] [] (warn_slowpath_fmt) from [] (__enable_irq+0x3c/0x78) [ 4016.57] r3:0033 r2:c059e0c5 [ 4016.57] [] (__enable_irq) from [] (enable_irq+0x64/0x7c) [ 4016.58] [] (enable_irq) from [] (eth_poll+0x28c/0x558) [ 4016.59] r5:d08926c0 r4:cf894488 [ 4016.59] [] (eth_poll) from [] (net_rx_action+0xfc/0x2e8) [ 4016.60] r10:cf863eb8 r9:cf863eb0 r8:0001 r7:0f7b5000 r6:c0636360 r5:cfdeb360 [ 4016.61] r4:cf894488 [ 4016.61] [] (net_rx_action) from [] (__do_softirq+0xe0/0x228) [ 4016.62] r10:0100 r9:c070204c r8:c0702040 r7:0003 r6:0008 r5:4003 [ 4016.62] r4:cf862000 [ 4016.63] [] (__do_softirq) from [] (run_ksoftirqd+0x34/0x58) [ 4016.63] r10:c0133964 r9: r8:0001 r7: r6:c070b44c r5:cf862000 [ 4016.64] r4:cf8037e0 [ 4016.64] [] (run_ksoftirqd) from [] (smpboot_thread_fn+0x178/0x190) [ 4016.65] [] (smpboot_thread_fn) from [] (kthread+0x11c/0x138) [ 4016.66] r9:cf8037e0 r8:cf802cdc r7:cf839df8 r6:cf803800 r5: r4:cf802cc0 [ 4016.67] [] (kthread) from [] (ret_from_fork+0x14/0x3c) [ 4016.68] r10: r9: r8: r7: r6: r5:c0130880 [ 4016.68] r4:cf803800 r3:cf862000 [ 4016.69] ---[ end trace 51114df08f429115 ]--- This is triggered by calling eth_schedule_poll(sw) after the IRQ has been re-enabled. Rework the network code to only enable IRQ's again if NAPI agrees it's safe to do so. Also only re-enable IRQ *after* cleaning up the RX ring and re-enabling DMA, which otherwise resulted in ugly warnings regarding dirty page fragments. These popped up nearly immediately when building the kernel with O2 iso Os. --> Note that this change fixes stability issues, at the cost of ~8% throughput performance. While at it, also change the iface name being used in warning prints, making it more obvious: "switch%d" --> "cns3xxx_eth" The changes have been tested on 4 boards, each moving ~30TB of data Signed-off-by: Koen Vandeputte--- .../140-fix-ethernet-irq-imbalance.patch | 77 ++ 1 file changed, 77 insertions(+) create mode 100644 target/linux/cns3xxx/patches-4.14/140-fix-ethernet-irq-imbalance.patch diff --git a/target/linux/cns3xxx/patches-4.14/140-fix-ethernet-irq-imbalance.patch b/target/linux/cns3xxx/patches-4.14/140-fix-ethernet-irq-imbalance.patch new file mode 100644 index ..3538586f6ff8 --- /dev/null +++ b/target/linux/cns3xxx/patches-4.14/140-fix-ethernet-irq-imbalance.patch @@ -0,0 +1,77 @@ +--- a/drivers/net/ethernet/cavium/cns3xxx_eth.c b/drivers/net/ethernet/cavium/cns3xxx_eth.c +@@ -712,26 +712,20 @@ static int eth_poll(struct napi_struct * + } + + rx_ring->cur_index = i; +- if (!received) { +- napi_complete(napi); +- enable_irq(sw->rx_irq); +- budget = 0; +- +- /* If 1 or more frames came in during IRQ enable, re-schedule */ +- if (rx_ring->desc[i].cown) +- eth_schedule_poll(sw); +- } +- +- spin_lock_bh(_lock); +- eth_complete_tx(sw); +- spin_unlock_bh(_lock); + + cns3xxx_alloc_rx_buf(sw, received); +- + wmb(); + enable_rx_dma(sw); + +- return budget; ++ if (received < budget && napi_complete_done(napi, received)) { ++ enable_irq(sw->rx_irq); ++ } ++ ++ spin_lock_bh(_lock); ++ eth_complete_tx(sw); ++ spin_unlock_bh(_lock); ++ ++ return received; + } + + static void eth_set_desc(struct sw *sw, struct _tx_ring *tx_ring, int index, +@@ -856,18 +850,6 @@ static void cns3xxx_get_drvinfo(struct n +
[LEDE-DEV] [PATCH 0/9] cns3xxx, update to kernel 4.14
Everything works afaics Patches were used to alter base files in order to maintain backwards compatiblity with kernel 4.9 by simply reverting "cns3xxx: switch to kernel 4.14". The final patch to remove kernel 4.9 support can be used at any time later on. Full bootlog: https://pastebin.com/raw/BtHc276U This patchset requires "config: support new symbol intro'd in kernel 4.12" to be in first so all needed symbols are present Koen Vandeputte (9): cns3xxx: copy config for kernel 4.14 cns3xxx: copy patches for kernel 4.14 cns3xxx: refresh kernel 4.14 config cns3xxx: update patches for 4.14 cns3xxx: fix ethernet IRQ imbalance in 4.14 cns3xxx: remove deprecated uart flags cns3xxx: refresh patches cns3xxx: switch to kernel 4.14 cns3xxx: remove linux 4.9 support target/linux/cns3xxx/Makefile | 2 +- target/linux/cns3xxx/config-4.14 | 390 + target/linux/cns3xxx/config-4.9| 300 .../patches-4.14/000-cns3xxx_arch_include.patch| 9 + .../patches-4.14/001-arm_openwrt_machtypes.patch | 10 + .../010-arm_introduce-dma-fiq-irq-broadcast.patch | 80 + .../patches-4.14/020-watchdog_support.patch| 185 ++ .../cns3xxx/patches-4.14/025-smp_support.patch | 30 ++ .../cns3xxx/patches-4.14/030-pcie_clock.patch | 11 + .../cns3xxx/patches-4.14/040-fiq_support.patch | 40 +++ .../linux/cns3xxx/patches-4.14/045-twd_base.patch | 43 +++ .../linux/cns3xxx/patches-4.14/055-pcie_io.patch | 19 + .../cns3xxx/patches-4.14/060-pcie_abort.patch | 109 ++ .../patches-4.14/065-pcie_skip_inactive.patch | 11 + .../cns3xxx/patches-4.14/070-i2c_support.patch | 31 ++ .../cns3xxx/patches-4.14/075-spi_support.patch | 51 +++ .../cns3xxx/patches-4.14/080-sata_support.patch| 26 ++ target/linux/cns3xxx/patches-4.14/090-timers.patch | 103 ++ .../patches-4.14/093-add-virt-pci-io-mapping.patch | 41 +++ .../cns3xxx/patches-4.14/095-gpio_support.patch| 67 .../patches-4.14/097-l2x0_cmdline_disable.patch| 69 .../cns3xxx/patches-4.14/100-laguna_support.patch | 46 +++ .../101-laguna_sdhci_card_detect.patch | 14 + .../patches-4.14/110-pci_isolated_interrupts.patch | 95 + ...ER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch | 23 ++ .../140-fix-ethernet-irq-imbalance.patch | 77 .../150-laguna-delete-deprecated-uart-flags.patch | 29 ++ .../patches-4.14/200-broadcom_phy_reinit.patch | 15 + .../cns3xxx/patches-4.14/210-dwc2_defaults.patch | 63 .../patches-4.9/000-cns3xxx_arch_include.patch | 8 - .../patches-4.9/001-arm_openwrt_machtypes.patch| 7 - .../010-arm_introduce-dma-fiq-irq-broadcast.patch | 80 - .../cns3xxx/patches-4.9/020-watchdog_support.patch | 185 -- .../cns3xxx/patches-4.9/025-smp_support.patch | 30 -- .../linux/cns3xxx/patches-4.9/030-pcie_clock.patch | 11 - .../cns3xxx/patches-4.9/040-fiq_support.patch | 40 --- .../linux/cns3xxx/patches-4.9/045-twd_base.patch | 43 --- target/linux/cns3xxx/patches-4.9/055-pcie_io.patch | 19 - .../linux/cns3xxx/patches-4.9/060-pcie_abort.patch | 109 -- .../patches-4.9/065-pcie_skip_inactive.patch | 11 - .../cns3xxx/patches-4.9/070-i2c_support.patch | 31 -- .../cns3xxx/patches-4.9/075-spi_support.patch | 51 --- .../cns3xxx/patches-4.9/080-sata_support.patch | 26 -- target/linux/cns3xxx/patches-4.9/090-timers.patch | 103 -- .../patches-4.9/093-add-virt-pci-io-mapping.patch | 41 --- .../cns3xxx/patches-4.9/095-gpio_support.patch | 67 .../patches-4.9/097-l2x0_cmdline_disable.patch | 69 .../cns3xxx/patches-4.9/100-laguna_support.patch | 46 --- .../patches-4.9/101-laguna_sdhci_card_detect.patch | 14 - .../patches-4.9/110-pci_isolated_interrupts.patch | 95 - ...ER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch | 23 -- .../patches-4.9/200-broadcom_phy_reinit.patch | 14 - .../cns3xxx/patches-4.9/210-dwc2_defaults.patch| 47 --- 53 files changed, 1688 insertions(+), 1471 deletions(-) create mode 100644 target/linux/cns3xxx/config-4.14 delete mode 100644 target/linux/cns3xxx/config-4.9 create mode 100644 target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch create mode 100644 target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch create mode 100644 target/linux/cns3xxx/patches-4.14/010-arm_introduce-dma-fiq-irq-broadcast.patch create mode 100644 target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/025-smp_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/030-pcie_clock.patch create mode 100644 target/linux/cns3xxx/patches-4.14/040-fiq_support.patch create mode 100644 target/linux/cns3xxx/patches-4.14/045-twd_base.patch create mode 100644
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.76
Tested-by: Koen VandeputteTargets: cns3xxx, imx6 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] ipq806x: replace linux, part-probe with a proper partitions subnode
From: Rafał MiłeckiThis solution is more upstream compatible as it only requires specifying of_match_table in the parser code and doesn't depend on linux,part-probe which is solution made generic by a LEDE downstream patch that can't be upstreamed. Signed-off-by: Rafał Miłecki --- .../ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 4 +++- .../ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 4 +++- .../ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 4 +++- .../0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch| 9 - 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index fa4f05bdbe..33fcbc54bf 100644 --- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -122,7 +122,9 @@ spi-max-frequency = <5000>; reg = <0>; - linux,part-probe = "qcom-smem"; + partitions { + compatible = "qcom,smem"; + }; }; }; }; diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index 15165b9b72..6069311da9 100644 --- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -182,7 +182,9 @@ spi-max-frequency = <5120>; reg = <0>; - linux,part-probe = "qcom-smem"; + partitions { + compatible = "qcom,smem"; + }; }; }; }; diff --git a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index 403054cc97..05517bdf40 100644 --- a/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-4.9/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -234,7 +234,9 @@ spi-max-frequency = <5000>; reg = <0>; - linux,part-probe = "qcom-smem"; + partitions { + compatible = "qcom,smem"; + }; }; }; }; diff --git a/target/linux/ipq806x/patches-4.9/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch b/target/linux/ipq806x/patches-4.9/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch index ad0b09b115..a888b063a1 100644 --- a/target/linux/ipq806x/patches-4.9/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch +++ b/target/linux/ipq806x/patches-4.9/0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch @@ -34,7 +34,7 @@ Signed-off-by: Ram Chandra Jangir # --- /dev/null +++ b/drivers/mtd/qcom_smem_part.c -@@ -0,0 +1,228 @@ +@@ -0,0 +1,235 @@ +/* + * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * @@ -240,10 +240,17 @@ Signed-off-by: Ram Chandra Jangir + return smem_parts->len; +} + ++static const struct of_device_id qcom_smem_of_match_table[] = { ++ { .compatible = "qcom,smem" }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, qcom_smem_of_match_table); ++ +static struct mtd_part_parser qcom_smem_parser = { + .owner = THIS_MODULE, + .parse_fn = parse_qcom_smem_partitions, + .name = "qcom-smem", ++ .of_match_table = qcom_smem_of_match_table, +}; + +static int __init qcom_smem_parser_init(void) -- 2.11.0 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v2] config: support new symbol intro'd in kernel 4.12
Symbol CONFIG_INITRAMFS_FORCE allows to ignore the value passed by the bootloader. By default, all symbols containing INITRAMFS are wiped from the final config and then re-added conditionally. Add support for this symbol, as the build will stop otherwise questioning the user about this option: * Restart config... * * * General setup * Cross-compiler tool prefix (CROSS_COMPILE) [] Compile also drivers which will not load (COMPILE_TEST) [N/y/?] n ... Initial RAM filesystem and RAM disk (initramfs/initrd) support (BLK_DEV_INITRD) [Y/n/?] y Initramfs source file(s) (INITRAMFS_SOURCE) [] Ignore the initramfs passed by the bootloader (INITRAMFS_FORCE) [N/y/?] (NEW) Signed-off-by: Koen Vandeputte--- v2 --> fix copy/paste error in error description + a typo config/Config-images.in| 7 +++ include/kernel-defaults.mk | 3 +++ 2 files changed, 10 insertions(+) diff --git a/config/Config-images.in b/config/Config-images.in index 607659114e67..90e873edb8ea 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -52,6 +52,13 @@ menu "Target Images" help Kernel uses specified external cpio as INITRAMFS_SOURCE. + config TARGET_INITRAMFS_FORCE +bool "Force" +depends on TARGET_ROOTFS_INITRAMFS +default n +help + Ignore the initramfs passed by the bootloader. + comment "Root filesystem archives" config TARGET_ROOTFS_CPIOGZ diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index f0618633b292..33f3a8210ff0 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -63,6 +63,8 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(call Kernel/SetInitramfs/PreConfigure) echo 'CONFIG_INITRAMFS_ROOT_UID=$(shell id -u)' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_GID=$(shell id -g)' >> $(LINUX_DIR)/.config + echo 'CONFIG_INITRAMFS_FORCE=y' >> $(LINUX_DIR)/.config + echo "$(if $(CONFIG_TARGET_INITRAMFS_FORCE),CONFIG_INITRAMFS_FORCE=y,# CONFIG_INITRAMFS_FORCE is not set)" >> $(LINUX_DIR)/.config echo "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE),CONFIG_INITRAMFS_COMPRESSION_NONE=y,# CONFIG_INITRAMFS_COMPRESSION_NONE is not set)" >> $(LINUX_DIR)/.config echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),CONFIG_INITRAMFS_COMPRESSION_GZIP=y\nCONFIG_RD_GZIP=y,# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set\n# CONFIG_RD_GZIP is not set)" >> $(LINUX_DIR)/.config echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),CONFIG_INITRAMFS_COMPRESSION_BZIP2=y\nCONFIG_RD_BZIP2=y,# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set\n# CONFIG_RD_BZIP2 is not set)" >> $(LINUX_DIR)/.config @@ -78,6 +80,7 @@ define Kernel/SetNoInitramfs mv $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.old grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config.set echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config.set + echo '# CONFIG_INITRAMFS_FORCE is not set' >> $(LINUX_DIR)/.config.set endef define Kernel/Configure/Default -- 2.7.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] config: support new symbol intro'd in kernel 4.12
Symbol CONFIG_INITRAMFS_FORCE allows to ignore the value passes by the bootloader. By default, all symbols containing INITRAMFS are wiped from the final config and then re-added conditionally. Add support for this symbol, as the build will stop otherwise questioning the user about this option: * Restart config... * * * General setup * Cross-compiler tool prefix (CROSS_COMPILE) [] Compile also drivers which will not load (COMPILE_TEST) [N/y/?] n ... Initial RAM filesystem and RAM disk (initramfs/initrd) support (BLK_DEV_INITRD) [Y/n/?] y Initramfs source file(s) (INITRAMFS_SOURCE) [] (NEW) Signed-off-by: Koen Vandeputte--- config/Config-images.in| 7 +++ include/kernel-defaults.mk | 3 +++ 2 files changed, 10 insertions(+) diff --git a/config/Config-images.in b/config/Config-images.in index 607659114e67..90e873edb8ea 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -52,6 +52,13 @@ menu "Target Images" help Kernel uses specified external cpio as INITRAMFS_SOURCE. + config TARGET_INITRAMFS_FORCE +bool "Force" +depends on TARGET_ROOTFS_INITRAMFS +default n +help + Ignore the initramfs passed by the bootloader. + comment "Root filesystem archives" config TARGET_ROOTFS_CPIOGZ diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index f0618633b292..33f3a8210ff0 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -63,6 +63,8 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(call Kernel/SetInitramfs/PreConfigure) echo 'CONFIG_INITRAMFS_ROOT_UID=$(shell id -u)' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_GID=$(shell id -g)' >> $(LINUX_DIR)/.config + echo 'CONFIG_INITRAMFS_FORCE=y' >> $(LINUX_DIR)/.config + echo "$(if $(CONFIG_TARGET_INITRAMFS_FORCE),CONFIG_INITRAMFS_FORCE=y,# CONFIG_INITRAMFS_FORCE is not set)" >> $(LINUX_DIR)/.config echo "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE),CONFIG_INITRAMFS_COMPRESSION_NONE=y,# CONFIG_INITRAMFS_COMPRESSION_NONE is not set)" >> $(LINUX_DIR)/.config echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),CONFIG_INITRAMFS_COMPRESSION_GZIP=y\nCONFIG_RD_GZIP=y,# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set\n# CONFIG_RD_GZIP is not set)" >> $(LINUX_DIR)/.config echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),CONFIG_INITRAMFS_COMPRESSION_BZIP2=y\nCONFIG_RD_BZIP2=y,# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set\n# CONFIG_RD_BZIP2 is not set)" >> $(LINUX_DIR)/.config @@ -78,6 +80,7 @@ define Kernel/SetNoInitramfs mv $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.old grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config.set echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config.set + echo '# CONFIG_INITRAMFS_FORCE is not set' >> $(LINUX_DIR)/.config.set endef define Kernel/Configure/Default -- 2.7.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] .gitignore: add .project & .cproject for eclipse users
Hi Hans Thanks for the hint, I updated the patch with my SoB. Catrinel -Original Message- From: Hans Dedecker [mailto:dedec...@gmail.com] Sent: Mittwoch, 10. Januar 2018 22:04 To: Catrinel Catrinescu Cc: LEDE Development List Subject: Re: [LEDE-DEV] [PATCH v2] .gitignore: add .project & .cproject for eclipse users On Tue, Jan 9, 2018 at 3:39 PM, Catrinel Catrinescuwrote: > For eclipse users, .project is always created inside the project. > For users of CDT within Eclipse, add also .cproject, thanks Dirk > Feytons. Hi, The patch is missing a SoB; see https://lede-project.org/submitting-patches for guidelines Hans ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 1/2] ltq-atm: rewrite tx path to use IRQs
> On 10 Jan 2018, at 18:47, Antti Seppäläwrote: >> >> diff --git a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h >> b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h >> index 2f754c982b2a..398be7d8282a 100644 >> --- a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h >> +++ b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h >> @@ -1799,7 +1840,6 @@ static int ltq_atm_probe(struct platform_device *pdev) >>int ret; >>int port_num; >>struct port_cell_info port_cell = {0}; >> - int i, j; > > One small nit about the patch though - the above change seems > unintended and causes a compilation failure. Have to say I don’t hit that issue at all. Build on master no problem at for Netgear DGN3500. I wonder what I’m doing wrong? Cheers, Kevin signature.asc Description: Message signed with OpenPGP ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v3] ar71xx: add ew-balin platform from Embedded Wireless
Add the Embedded Wireless "Balin" platform, based on AR9344: http://www.embeddedwireless.de/uploads/Balin_data_2016_10.pdf The module comes already with the current vanilla OpenWRT firmware, so no need to install "factory"-image, or any other stuff:-) Signed-off-by: Catrinel Catrinescu--- .../linux/ar71xx/base-files/etc/board.d/02_network | 6 ++ target/linux/ar71xx/base-files/etc/diag.sh | 3 + .../etc/uci-defaults/03_network-switchX-migration | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 + .../ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-4.4 | 1 + target/linux/ar71xx/config-4.9 | 1 + .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 11 ++ target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 + .../ar71xx/files/arch/mips/ath79/mach-ew-balin.c | 112 + .../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 + target/linux/ar71xx/image/generic.mk | 9 ++ target/linux/ar71xx/mikrotik/config-default| 1 + target/linux/ar71xx/nand/config-default| 1 + 14 files changed, 152 insertions(+) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-ew-balin.c diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index fb61792bf4..4919e7c983 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -368,6 +368,12 @@ ar71xx_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" ;; + ew-balin) + ucidef_set_interface_raw "usb2" "usb0" "static" + ucidef_set_interface_raw "usb3" "usb0" "static" + ucidef_add_switch "switch0" \ + "0@eth0" "5:lan:4" "4:lan:5" "3:wan" + ;; ew-dorin) ucidef_add_switch "switch0" \ "0@eth0" "1:lan" "2:lan" "3:wan" diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 6cbb3576d8..ca73d5f62b 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -193,6 +193,9 @@ get_status_led() { el-mini) status_led="easylink:green:system" ;; + ew-balin) + status_led="balin:green:status" + ;; ew-dorin|\ ew-dorin-router) status_led="dorin:green:status" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration index 29fdde40a0..898082f552 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration @@ -53,6 +53,7 @@ dir-615-e1|\ dir-615-e4|\ dir-825-c1|\ ebr-2310-c1|\ +ew-balin|\ ew-dorin|\ ew-dorin-router|\ ja76pf|\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index b5440230a5..162742a94c 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -640,6 +640,9 @@ ar71xx_board_detect() { *"EL-MINI") name="el-mini" ;; + *EmbWir-Balin) + name="ew-balin" + ;; *"EmbWir-Dorin") name="ew-dorin" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index ecf6820a2b..9dceadc563 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -237,6 +237,7 @@ platform_check_image() { epg5000|\ esr1750|\ esr900|\ + ew-balin|\ ew-dorin|\ ew-dorin-router|\ gl-ar150|\ diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 5a8004a03e..36b266f21c 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -109,6 +109,7 @@ CONFIG_ATH79_MACH_ENS202EXT=y CONFIG_ATH79_MACH_EPG5000=y CONFIG_ATH79_MACH_ESR1750=y CONFIG_ATH79_MACH_ESR900=y +CONFIG_ATH79_MACH_EW_BALIN=y CONFIG_ATH79_MACH_EW_DORIN=y CONFIG_ATH79_MACH_F9K1115V2=y CONFIG_ATH79_MACH_FRITZ300E=y diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9 index 4334d25b80..d51fe5f797 100644 --- a/target/linux/ar71xx/config-4.9 +++ b/target/linux/ar71xx/config-4.9 @@ -107,6 +107,7 @@ CONFIG_ATH79_MACH_ENS202EXT=y CONFIG_ATH79_MACH_EPG5000=y CONFIG_ATH79_MACH_ESR1750=y CONFIG_ATH79_MACH_ESR900=y +CONFIG_ATH79_MACH_EW_BALIN=y CONFIG_ATH79_MACH_EW_DORIN=y
[LEDE-DEV] [PATCH v3] .gitignore: add .project & .cproject for eclipse users
For eclipse users, .project is always created inside the project. For users of CDT within Eclipse, add also .cproject, thanks Dirk Feytons. Signed-off-by: Catrinel Catrinescu--- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index aff13e1136..84e1a9d6d1 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ key-build* .emacs.desktop* TAGS*~ git-src +.project +.cproject -- 2.14.3 (Apple Git-98) ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Espressobin mvebu64
Hi Tomasz, On Monday 08 January 2018 11:35 PM, Tomasz Maciej Nowak wrote: I updated my tree from the previous time You probably saw it. Most of the features are complete. It requires to edit U-Boot environment with this value: bootcmd=load mmc 0:1 0x4d0 boot.scr; source 0x4d0 With that it should boot without manual intervention. I am able to successfully compile from the updated tree. After doing saveenv for above mentioned bootcmd, the board boots without any manual intervention after plugging in the power. What is left out: a) mini PCIe shouldn't work ATM here are some patches: https://patchwork.ozlabs.org/cover/819585 You should omit the last one, I do not have a mini-PCIe card to test it out. Moreover, I could not figure out how to use patchworks to download the patch. b) booting from other mediums than SD card It boots fine from SD Card. c) sysupgrade on other mediums than SD card. Sysupgrade for a 4 GB image took 871s(14 min). And it was waiting forever at "reboot: Restarting system". Had to disconnect and connect power again. Below are the sysupgade logs: killall: telnetd: no process killed killall: dropbear: no process killed Sending TERM to remaining processes ... logd rpcd netifd odhcpd snmpd sh sysupgrade ping sleep ubus ntpd S99adb-enablemo adb adb rngd dnsmasq mwan3track mwan3track ubusd Sending KILL to remaining processes ... sleep Switching to ramdisk... [56983.185304] EXT4-fs (mmcblk0p2): re-mounted. Opts: block_validity,delalloc,barrier,user_xattr Performing system upgrade... 0+79955 records in 0+79955 records out [57853.233153] EXT4-fs (mmcblk0p1): mounted filesystem without journal. Opts: (null) Upgrade completed Rebooting system... umount: can't unmount /dev: Resource busy umount: can't unmount /tmp: Resource busy umount: can't unmount /proc: Invalid argument [57854.543510] reboot: Restarting system = Additionally, * Able to configure lan0/1 as a WAN to use with mwan3 * Didn't yet try creating VLAN tagged WANs using lan0/1, as some ISPs here provide VLAN * Perl didn't compile - it couldn't find config for aarch64 - need to request maintainer for Perl I believe. * Squid didn't compile as well - should request squid package maintainer? Please let me know if you want me to test further hardware and scenarios. Thanks & regards, Nishant ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev