Re: [LEDE-DEV] [PATCH v2] ipq806x: add kernel 4.14 support
On 17/05/18 13:47, Ram Chandra Jangir wrote: Thanks Michael for confirming this, Can you please help to update the kernel partition size to 4MB for R7800 and send it as patch to community (lede-dev@lists.infradead.org)? This will help to enable kernel v4.14 for all ipq806x based boards. hang on, that would break sysupgrade or not ? John John, I do not have d7800, r7500, r7500v2 & vr2600v and hence seeking help to update partition size for these boards. Thanks, Ram -Original Message- From: Michael Yartys [mailto:michael.yar...@protonmail.com] Sent: Saturday, May 05, 2018 2:26 AM To: Stefan Lippers-Hollmann Cc: Ram Chandra Jangir ; msm-...@mcclintock.net; lede-dev@lists.infradead.org; nar...@codeaurora.org Subject: Re: [LEDE-DEV] [PATCH v2] ipq806x: add kernel 4.14 support Hi Can confirm that this works on my NETGEAR R7800 (ipq8065). The WLAN PCIe issues have been fixed. I've also included my dmesg output in the attachment. Thanks a lot for the help, Ram! Michael On 4 May 2018 9:40 PM, Stefan Lippers-Hollmann wrote: Hi On 2018-05-04, Ram Chandra Jangir wrote: - Rebased the patches for 4.14 - Dropped spi-qup and 0027, 0028, 0029 clk patches since it's already included in upstream. Tested on IPQ AP148 Board: 1. NOR boot and NAND boot 2. Tested USB and PCIe interfaces 3. WDOG test 4. cpu frequency scaling 5. ethernet, 2G and 5G WiFi 6. ubi sysupgrade Signed-off-by: Ram Chandra Jangir rjan...@codeaurora.org Changes since v1: Fixes PCIe ext reset for IPQ8065 boards With these changes my ZyXEL nbg6817 (ipq8065) works fine (PCIe and wlan), thanks a lot! New, working, gzip compressed dmesg, attached. Regards Stefan Lippers-Hollmann 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 mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] Moving the mailing lists
Hi All, In order to bring the OpenWrt mailing list back to operational status, we are moving them to the infradead server. The 2 current LEDE lists will be renamed * lede-dev->openwrt-dev * lede-adm -> openwrt-adm the old names will get redirected to the new ones, so mails sent to either of the LEDE ones will pop up on the OpenWrt ones. Additionally we will send out an automated invite to ~4,5k mail addresses that we believe to have previously been subscribed to the OpenWrt mailing list. We will do our best to filter out duplicates, however some of you might get an invite although you are already subscribed. Additionally make sure that you update any email filter you might have. lets hope for a smooth transition ... John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 1/4] staging: mt7621-gpio: remove redundant owner assignments of drivers
On 17/05/18 02:42, Rosen Penev wrote:
From: HariPrasath Elango
Remove the reduntant owner initialization from this platform driver as
the platform_driver_register() takes care of it.
Signed-off-by: HariPrasath Elango
Reviewed-by: NeilBrown
Signed-off-by: Greg Kroah-Hartman
---
I am not really sure if it makes sense to backport of this essentially
no-op patches.
John
.../0028-GPIO-ralink-add-mt7621-gpio-controller.patch | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/target/linux/ramips/patches-4.14/0028-GPIO-ralink-add-mt7621-gpio-controller.patch
b/target/linux/ramips/patches-4.14/0028-GPIO-ralink-add-mt7621-gpio-controller.patch
index d657274efe..ea341dc33c 100644
---
a/target/linux/ramips/patches-4.14/0028-GPIO-ralink-add-mt7621-gpio-controller.patch
+++
b/target/linux/ramips/patches-4.14/0028-GPIO-ralink-add-mt7621-gpio-controller.patch
@@ -48,7 +48,7 @@ Signed-off-by: John Crispin
+obj-$(CONFIG_GPIO_MT7621)+= gpio-mt7621.o
--- /dev/null
+++ b/drivers/gpio/gpio-mt7621.c
-@@ -0,0 +1,354 @@
+@@ -0,0 +1,353 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
@@ -391,7 +391,6 @@ Signed-off-by: John Crispin
+ .probe = mediatek_gpio_probe,
+ .driver = {
+ .name = "mt7621_gpio",
-+ .owner = THIS_MODULE,
+ .of_match_table = mediatek_gpio_match,
+ },
+};
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] fstools: add middle layer (original root overlay) to overlayfs when pivot the /overlay to the USB disk.
On 11/05/18 11:18, Andrzej Lossowsk wrote:
Currently after pivot to the USB disk (extroot),
configuration and data from original root overlay are gone.
Still accessible, but all previous configuration steps must be repeated
(or data from original root overlay must be copied to new USB disk overlay).
The idea is to "merge" original root overlay with overlay from the USB disk.
Using overlayfs multiple lower layers it can be done.
All data from original root overlay will be accessible (as readonly layer)
after pivot to the USB disk.
Original root overlay (for exmaple /dev/mtdblock3) will be mounted to
/overlay/internal (as readonly)
Upper directory from original root overlay (/dev/mtdblock3/upper) will be the
top (readonly layer),
then "/" will be the bottom layer (readonly layer), an extroot still will be
upper (writable layer).
Hi,
some code style comments inline.
john
Signed-off-by: Andrzej Lossowski
---
libfstools/extroot.c| 65 -
libfstools/libfstools.h | 3 +++
libfstools/mount.c | 27 +---
3 files changed, 90 insertions(+), 5 deletions(-)
diff --git a/libfstools/extroot.c b/libfstools/extroot.c
index 418df94..bbb0a3a 100644
--- a/libfstools/extroot.c
+++ b/libfstools/extroot.c
@@ -22,6 +22,7 @@
#include
#include "libfstools.h"
+#include "volume.h"
char const *extroot_prefix = NULL;
@@ -104,7 +105,7 @@ int mount_extroot(void)
if (mount_move("/tmp/extroot", "", "/overlay"))
{
ULOG_ERR("moving extroot failed - continue
normal boot\n");
umount("/tmp/extroot/overlay");
- } else if (fopivot("/overlay", "/rom")) {
+ } else if (fopivot_multi("/overlay", "/rom")) {
ULOG_ERR("switching to extroot failed -
continue normal boot\n");
umount("/overlay");
} else {
@@ -119,3 +120,65 @@ int mount_extroot(void)
}
return -1;
}
+
+int fopivot_multi(char *rw_root, char *ro_root)
+{
+ if (mount_internal_overlay()) {
+ ULOG_ERR("mounting /tmp/overlay failed\n");
+ } else if (mkdir("/overlay/internal", 0755)) {
+ ULOG_ERR("failed to mkdir /overlay/internal: %m\n");
+ } else if (mount_move("/tmp/overlay", "/overlay/internal", "")) {
+ umount("/tmp/overlay");
+ } else if (mfopivot(rw_root, ro_root, "/overlay/internal/upper")) {
+ umount("/overlay/internal");
+ } else {
+ return 0;
+ }
dont build a if then else chain. call a function check the return value
and exit if there is a fail. worste case use a goto if you want a single
return point.
+ return -1;
+}
+
+int mount_internal_overlay()
move this above fopivot_multi, make it static and drop the prototype
inside the header2
+{
+ struct volume *v = volume_find("rootfs_data");
+
+ if (!v)
+ return -1;
+
+ volume_init(v);
+ char *mp;
dont define variables in the middle of a function please
+ mp = find_mount_point(v->blk, 0);
+ if (mp) {
+ ULOG_ERR("rootfs_data:%s is already mounted as %s\n", v->blk,
mp);
+ return -1;
+ }
+
+ char *fstype;
same here
+ switch (volume_identify(v)) {
+ case FS_EXT4:
+ fstype = "ext4";
+ break;
+ case FS_F2FS:
+ fstype = "f2fs";
+ break;
+ case FS_UBIFS:
+ fstype = "ubifs";
+ break;
+ case FS_JFFS2:
+ default:
+ fstype = "jffs2";
+ break;
+ }
+
+ if (mkdir("/tmp/overlay", 0755)) {
+ ULOG_ERR("failed to mkdir /tmp/overlay: %m\n");
+ return -1;
+ }
+
+ if (mount(v->blk, "/tmp/overlay", fstype, MS_NOATIME | MS_RDONLY,
NULL)) {
+ ULOG_ERR("failed to mount -t %s %s /tmp/overlay: %m\n", fstype,
v->blk);
+ return -1;
+ }
+
+ return 0;
+}
+
diff --git a/libfstools/libfstools.h b/libfstools/libfstools.h
index f27307a..8c740a4 100644
--- a/libfstools/libfstools.h
+++ b/libfstools/libfstools.h
@@ -46,6 +46,9 @@ extern int mount_overlay(struct volume *v);
extern int mount_move(const char *oldroot, const char *newroot, const char
*dir);
extern int pivot(char *new, char *old);
extern int fopivot(char *rw_root, char *ro_root);
+extern int mfopivot(char *rw_root, char *ro_lowerlevel0, char *ro_lowerlevel1);
+extern int fopivot_multi(char *rw_root, char *ro_root);
+extern int mount_internal_overlay();
extern int ramoverlay(void);
extern int find_overlay_mount(char *overlay);
diff --git a
[LEDE-DEV] patchwork pre 2018
Hi, I'd like to close everything in patchwork from 2017 and ask people to resubmit in case they still think its applicable. a few patches are still delegated. please remove your delegation if you do not plan to handle the patches in the coming days. I'll close everything on the weekend that is not delegated. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] Add support for Flexible I/O Tester
On 13/05/18 20:58, Dragan Stancevic wrote: A lot of SoC boards come with integrated SATA it would be nice to be able to use fio to test performance of those boards. ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev Hi Dragan, please propose this as a PR on the packages feed on github John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] new ath79 target
On 08/05/18 05:31, Paul Blazejowski wrote: John, I wanted to ask if the Netgear WNDR3700v4 router will also be ported to the new ath97 target down the road? And possibly get 4.14 or newer kernel? Thanks! Hi Paul, the aim is to move all board over mid term. 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
Re: [LEDE-DEV] Lack of DNS robustness for openwrt.org
On 07/05/18 20:34, Arjen de Korte wrote: Citeren Jo-Philipp Wich : Hi Bjørn, the current timings of the DO zone are: ;; ANSWER SECTION: openwrt.org. 1800 IN SOA ns1.digitalocean.com. hostmaster.openwrt.org. ( 1525688668 ; serial 10800 ; refresh (3 hours) 3600 ; retry (1 hour) 604800 ; expire (1 week) 1800 ; minimum (30 minutes) ) This all looks fine, but what slightly worries me that the nameservers listed in the Whois information for openwrt.org still mention the old ones: whois openwrt.org Domain Name: OPENWRT.ORG Registry Domain ID: D104186352-LROR Registrar WHOIS Server: whois.tucows.com Registrar URL: http://www.tucows.com Updated Date: 2018-05-06T20:40:09Z [...] Name Server: ARRAKIS.DUNE.HU Name Server: BELATEGEUSE.DUNE.HU Name Server: SOAPSTONE.YURI.ORG.UK I've switched nameservers for several of my domains (including .org) and I recall this never took more than a few hours. It could be I'm impatient, but as of now, when running a trace, the above are still listed as the openwrt.org nameservers. Of course, *caches* would show stale data for up to a day, but running 'dig soa +trace openwrt.org' should resolve to the DO nameservers by now. Hi, nameservers were switched over to DO at 5 am CEST today. things should start smoothing out shortly. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] new ath79 target
On 07/05/18 08:13, John Crispin wrote: Hi, I have just pushed the new ath79 target to trunk. This will replace ar71xx mid term, switching the target over to pure OF. a few boards are already supported, would be great if people could start moving boards over that they use. I am available to help via ML, mail, irc, ... AHB wifi is still missing but we'll get that working the next few days. John small note as i know a few folks are already starting to use the target, the set_speed() and set_mii() callbacks used inside ag71xx_main/adjust_link are not fully implemented for some of the newer QCA silicon as i did not have access to that HW. I already added empty if clauses for the relevant SoCs. so if you are not getting any link up and/or traffic flow, this should be the first place to look. If you fail to recognize the PHYs also let me know and paste your dts while doing so, John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] ath79: relicense DTS files to the GPL 2.0+ / MIT
On 07/05/18 11:31, Rafał Miłecki wrote: On 7 May 2018 at 10:46, Felix Fietkau wrote: On 2018-05-07 09:47, Rafał Miłecki wrote: From: Rafał Miłecki Some maintainers prefer DTS files licensed under permissive license like MIT / BSD. As all DT bindings should be OS independent and DTS files are pretty separated from Linux code it probably makes sense to share them across projects. The safest solution is to use dual licensing: that way it stays clear these files can be used in GPL projects without depending on current belief of licenses compatibility. Signed-off-by: Rafał Miłecki Some of these files are based on upstream GPL code, did you contact the original authors already? I wasn't aware of that. I assumed they are all John's work based on our quick IRC conversation: [09:08] blogic: are you author for target/linux/ath79/dts/*.dts files? [09:08] *of [09:14] rmilecki: yes [09:14] rmilecki: feel free to change the license text and push a fix ah sorry i forgot about that, let me fix it ... ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] igmpproxy: bump to 0.2.1
Hi Kevin, apparently you have a 10->11 patch in your tree that needs to be applied prior to the 11->12 update John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH V2] ath79: relicense DTS files to the GPL 2.0+ / MIT
On 07/05/18 10:10, Rafał Miłecki wrote: From: Rafał Miłecki Some maintainers prefer DTS files licensed under permissive license like MIT / BSD. As all DT bindings should be OS independent and DTS files are pretty separated from Linux code it probably makes sense to share them across projects. The safest solution is to use dual licensing: that way it stays clear these files can be used in GPL projects without depending on current belief of licenses compatibility. Signed-off-by: Rafał Miłecki Acked-by: John Crispin --- V2: Use the new "GPL-2.0-or-later" identifier --- target/linux/ath79/dts/ar7100.dtsi | 2 +- target/linux/ath79/dts/ar7161_netgear_wndr3800.dts | 2 +- target/linux/ath79/dts/ar7241.dtsi | 2 +- target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts| 2 +- target/linux/ath79/dts/ar7241_ubnt-nano-m.dts | 2 +- target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts| 2 +- target/linux/ath79/dts/ar7241_ubnt-unifi.dts | 2 +- target/linux/ath79/dts/ar7241_ubnt-xm.dts | 2 +- target/linux/ath79/dts/ar7241_ubnt-xm.dtsi | 2 +- target/linux/ath79/dts/ar7242.dtsi | 2 +- target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts | 2 +- target/linux/ath79/dts/ar724x.dtsi | 2 +- target/linux/ath79/dts/ar9132.dtsi | 2 +- target/linux/ath79/dts/ar9132_tl_wr1043nd_v1.dts | 2 +- target/linux/ath79/dts/ar9330.dtsi | 2 +- target/linux/ath79/dts/ar9330_gl_ar150.dts | 2 +- target/linux/ath79/dts/ar9331.dtsi | 2 +- target/linux/ath79/dts/ar9331_dpt_module.dts | 2 +- target/linux/ath79/dts/ar9331_dragino_ms14.dts | 2 +- target/linux/ath79/dts/ar9331_ew_dorin.dts | 2 +- target/linux/ath79/dts/ar9331_omega.dts| 2 +- target/linux/ath79/dts/ar9331_tl_mr3020.dts| 2 +- target/linux/ath79/dts/ath79.dtsi | 2 +- target/linux/ath79/dts/qca9557.dtsi| 2 +- target/linux/ath79/dts/qca9558_om5p_ac.dts | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi index d4a973f505..9957b8df60 100644 --- a/target/linux/ath79/dts/ar7100.dtsi +++ b/target/linux/ath79/dts/ar7100.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include #include "ath79.dtsi" diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts index 60102b03ab..ba6e9ae03c 100644 --- a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts +++ b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; #include diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi index f2efbe4358..91ebea54e0 100644 --- a/target/linux/ath79/dts/ar7241.dtsi +++ b/target/linux/ath79/dts/ar7241.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "ar724x.dtsi" diff --git a/target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts index d14e2fdcb0..067c612516 100644 --- a/target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; #include "ar7241_ubnt-xm.dtsi" diff --git a/target/linux/ath79/dts/ar7241_ubnt-nano-m.dts b/target/linux/ath79/dts/ar7241_ubnt-nano-m.dts index 91fbac039e..8fbd7a6eec 100644 --- a/target/linux/ath79/dts/ar7241_ubnt-nano-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt-nano-m.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; #include "ar7241_ubnt-xm.dtsi" diff --git a/target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts b/target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts index ef2e407b87..e1ef6d7095 100644 --- a/target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; #include "ar7241_ubnt-xm.dtsi" diff --git a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts b/target/linux/ath79/dts/ar7241_ubnt-unifi.dts index c1829cb4f9..aaafb08424 100644 --- a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts +++ b/target/linux/ath79/dts/ar7241_ubnt-unifi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; #include
Re: [LEDE-DEV] Lack of DNS robustness for openwrt.org
On 07/05/18 09:11, Jo-Philipp Wich wrote: Hi Joerg, John. I created an openwrt.org zone on Digital Ocean now so you could delegate the name servers to ns1.digitalocean.com, ns2.digitalocean.com and ns3.digitalocean.com, maybe with one of the SPI machines thrown into the mix... ~ Jo Hi Joerg, We concluded as per vote on this ML that we would like to switch the DNS over to the machines Jow named above. Thanks alot for your help in getting this done ! John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] new ath79 target
Hi, I have just pushed the new ath79 target to trunk. This will replace ar71xx mid term, switching the target over to pure OF. a few boards are already supported, would be great if people could start moving boards over that they use. I am available to help via ML, mail, irc, ... AHB wifi is still missing but we'll get that working the next few days. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Lack of DNS robustness for openwrt.org
On 06/05/18 22:44, Joerg Jaspert wrote: On 15029 March 1977, Bjørn Mork wrote: 1) update the .org delegation to include *all* NS records for the openwrt.org zone I added the soapstone one to the registrar for now, as thats an easy step to do. 3) possibly consider adding/replacing DNS servers with more robust (anycasted?) solutions. Adding or replacing secondaries should at least be a no-brainer If *wanted*, SPI nameservers can be used as secondaries. Hi Joerg, I am liasion to the SPI if I am not mistaken so i can just ask you to do that right ? If so, please add spi as secondary. We should also consider moving primary to the DO servers, but that would require a vote and a thread on the adm channels. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Lack of DNS robustness for openwrt.org
On 06/05/18 17:44, David Woodhouse wrote: Hello, I apologize for bringing up this long-standing issue at a time where you all have need to other issues to take care of. But it's again become a real pressing issue, at least seen from the networks I have a presence in. We can host it (primary or just secondary) on ns[123].infradead.org if it helps... why not move primary to digital ocean ? John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] 18.06 Status?
On 06/05/18 09:43, Jaap Buurman wrote: Dear John, That is most excellent to hear :) Please disregard my previous comment. Where did this decision take place by the way? I tried searching the mailing list but couldn't find anything. My apologies for bothering the mailing list with this porposal while it was already taken care of. Yours sincerely, Jaap Buurman On Sat, May 5, 2018, 19:57 John Crispin <mailto:j...@phrozen.org>> wrote: On 05/05/18 12:27, Jaap Buurman wrote: > Hi all, > > I feel like everybody is just waiting for everybody to agree what > features we want in before coming up with the next step of picking a > date. Obviously this isn't working out very well. Why not turn things > around? Pick a date in a few weeks time on which the Master branch > will be split to a 18.0X branch. If nobody complains before that date > the branch goes on as planned. People can obviously get in the > features they want before said date. If somebody deems a particular > feature very important to be included in this branch, but feels like > it will not be finished before said date, he/she can request a delay > stating: > > -What he/she would like to include > -Why this is so important to be included before the branch. > -How much extra time this will need by proposing a new date > -Perhaps a request for help implementing said change > > Should this proposal be accepted, we will reschedule the date from > there. If the other people don't think it is important enough to > postpone the release, the old date will stand. This way, we can simply > move forward if nobody complains about a particular date instead of > the waiting around for others that is going on right now. What does > everybody else think of this idea? What seems like a reasonable date? > And who would be willing to take on the task of splitting the branch > at said date to make sure we'll be actually moving forward with the > plan at said date? > > Yours sincerely, > > Jaap Buurman > > On Wed, May 2, 2018 at 4:41 AM, Eric Luehrsen mailto:ericluehr...@gmail.com>> wrote: >> On 05/01/2018 10:47 AM, Hannu Nyman wrote: >>> I think that the main source tree is in pretty good shape, so branching >>> off the 18.0X rather soon might make sense >> >> I would also think its time to branch 18.[something-soon], and rather than >> focus on work that needs yet to be completed, look to cut hardware and >> packages that are not ready for a release. There is always some heart ache >> when such decisions are made, but at a point those decisions do need to be >> made. Without an official release to punctuate both the core team and other >> packagers hard work, OpenWrt/LEDE could risk losing support from the >> community and its limited sponsorship. I imagine this project means >> something personally to the core team, so those risks should be considered. >> >> - Eric >> >> >> ___ >> lede-adm mailing list >> lede-...@lists.infradead.org <mailto:lede-...@lists.infradead.org> >> http://lists.infradead.org/mailman/listinfo/lede-adm > ___ > Lede-dev mailing list > Lede-dev@lists.infradead.org <mailto:Lede-dev@lists.infradead.org> > http://lists.infradead.org/mailman/listinfo/lede-dev we agreed already to branch on friday but delayed it till start of the week as we ran out of time before calling it a day. John Hi, please dont top post. The discussion happened here on the ML. we exchanged mails that we will do a 18.06 and now with june coming up we exchanged 5 lines on IRC trying to figure out when we have time to do the branching. this whole discussion is just creating FUD. we announced 18.06 almost 2 months ago and now with june coming up we are executing the plan. no more no less. i really dont understand the commotion. thanks to alberto for providing some useful comments to the discussion. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] 18.06 Status?
On 05/05/18 12:27, Jaap Buurman wrote: Hi all, I feel like everybody is just waiting for everybody to agree what features we want in before coming up with the next step of picking a date. Obviously this isn't working out very well. Why not turn things around? Pick a date in a few weeks time on which the Master branch will be split to a 18.0X branch. If nobody complains before that date the branch goes on as planned. People can obviously get in the features they want before said date. If somebody deems a particular feature very important to be included in this branch, but feels like it will not be finished before said date, he/she can request a delay stating: -What he/she would like to include -Why this is so important to be included before the branch. -How much extra time this will need by proposing a new date -Perhaps a request for help implementing said change Should this proposal be accepted, we will reschedule the date from there. If the other people don't think it is important enough to postpone the release, the old date will stand. This way, we can simply move forward if nobody complains about a particular date instead of the waiting around for others that is going on right now. What does everybody else think of this idea? What seems like a reasonable date? And who would be willing to take on the task of splitting the branch at said date to make sure we'll be actually moving forward with the plan at said date? Yours sincerely, Jaap Buurman On Wed, May 2, 2018 at 4:41 AM, Eric Luehrsen wrote: On 05/01/2018 10:47 AM, Hannu Nyman wrote: I think that the main source tree is in pretty good shape, so branching off the 18.0X rather soon might make sense I would also think its time to branch 18.[something-soon], and rather than focus on work that needs yet to be completed, look to cut hardware and packages that are not ready for a release. There is always some heart ache when such decisions are made, but at a point those decisions do need to be made. Without an official release to punctuate both the core team and other packagers hard work, OpenWrt/LEDE could risk losing support from the community and its limited sponsorship. I imagine this project means something personally to the core team, so those risks should be considered. - Eric ___ lede-adm mailing list lede-...@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-adm ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev we agreed already to branch on friday but delayed it till start of the week as we ran out of time before calling it a day. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH V1][RFC][procd] udevtrigger: trigger devices w/o dev sysfs entry
On 22/03/18 16:22, Sergiy Kibrik wrote:
A lot of devices aren't represented via major/minor numbers
and thus don't have dev entry in their sysfs directory, like
network devices, USB, power supplies etc.
It looks to be the rigth thing to trigger them as well.
Anyway, it's up to the hotplug daemon to decide what to do with devices,
it needs full vision of what's present in the system.
Signed-off-by: Sergiy Kibrik
Hi,
sorry for the late reply. i just ran this patch on a router and it slows
boot down by ~1sec due to having to process a huge pile of extra events.
--- before ---
[ 5.124584] random: procd: uninitialized urandom read (4 bytes read)
Press the [f] key and hit [enter] to enter failsafe mode
Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level
[ 7.489347] procd: - early -
--- after ---
[ 5.128390] random: procd: uninitialized urandom read (4 bytes read)
Press the [f] key and hit [enter] to enter failsafe mode
Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level
[ 8.345346] procd: - early -
are you trying to grab events for a specific device type ? maybe we can
narrow this down a bit more and not process all events during coldplug.
John
---
plug/udevtrigger.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/plug/udevtrigger.c b/plug/udevtrigger.c
index f87a95e..d6c4c4c 100644
--- a/plug/udevtrigger.c
+++ b/plug/udevtrigger.c
@@ -161,9 +161,8 @@ static int device_list_insert(const char *path)
dbg("add '%s'" , path);
- /* we only have a device, if we have a dev and an uevent file */
- if (!device_has_attribute(path, "/dev", S_IRUSR) ||
- !device_has_attribute(path, "/uevent", S_IWUSR))
+ /* we only have a device, if we have an uevent file */
+ if (!device_has_attribute(path, "/uevent", S_IWUSR))
return -1;
strlcpy(devpath, &path[4], sizeof(devpath));
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] kernel: bump kernel 4.4 to 4.4.131 for 17.01
Hi,
i am afraid you need to refresh once more, fails to apply since the ipv6
fix to patch 670
John
On 03/05/18 21:00, Etienne Haarsma wrote:
* Refreshed patches
Compile-tested: ar71xx
Run-tested: ar71xx
Signed-off-by: Etienne Haarsma
---
include/kernel-version.mk| 4 ++--
...03-mtd_fix_cfi_cmdset_0002_status_check.patch | 14 +++---
...11-mtd-cfi_cmdset_0002-force-word-write.patch | 6 +++---
.../patches-4.4/0029-Add-dwc_otg-driver.patch| 2 +-
...mdset_0002-add-buffer-write-cmd-timeout.patch | 2 +-
.../patches-4.4/630-packet_socket_type.patch | 16
...cting-with-source-address-failed-policy.patch | 14 +++---
...-fix-cfi-cmdset-0002-erase-status-check.patch | 4 ++--
...37-mtd-cfi-cmdset-0002-force-word-write.patch | 6 +++---
9 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 5f2f87a4af..f10bbcabbc 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,10 +3,10 @@
LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .43
-LINUX_VERSION-4.4 = .129
+LINUX_VERSION-4.4 = .131
LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
-LINUX_KERNEL_HASH-4.4.129 =
a165c4bada6a8d2355727ef6c97669e8c87c48f28bb410af34741c87fcf4712b
+LINUX_KERNEL_HASH-4.4.131 =
65127add35c45acda866d10860e80bfdcc19b6c21e30e5dc9b92020a44d7c709
ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip
$(LINUX_VERSION-$(KERNEL_PATCHVER)))
diff --git
a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
b/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
index 1ccce4ecec..8f41d9432c 100644
---
a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
+++
b/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1632,8 +1632,8 @@ static int __xipram do_write_oneword(str
+@@ -1633,8 +1633,8 @@ static int __xipram do_write_oneword(str
break;
}
@@ -11,7 +11,7 @@
/* Latency issues. Drop the lock, wait a while and retry */
UDELAY(map, chip, adr, 1);
-@@ -1649,6 +1649,8 @@ static int __xipram do_write_oneword(str
+@@ -1650,6 +1650,8 @@ static int __xipram do_write_oneword(str
ret = -EIO;
}
@@ -20,7 +20,7 @@
xip_enable(map, chip, adr);
op_done:
if (mode == FL_OTP_WRITE)
-@@ -2227,7 +2229,6 @@ static int cfi_amdstd_panic_write(struct
+@@ -2228,7 +2230,6 @@ static int cfi_amdstd_panic_write(struct
return 0;
}
@@ -28,7 +28,7 @@
/*
* Handle devices with one erase region, that only implement
* the chip erase command.
-@@ -2291,8 +2292,8 @@ static int __xipram do_erase_chip(struct
+@@ -2293,8 +2294,8 @@ static int __xipram do_erase_chip(struct
chip->erase_suspended = 0;
}
@@ -39,7 +39,7 @@
if (time_after(jiffies, timeo)) {
printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -2312,6 +2313,7 @@ static int __xipram do_erase_chip(struct
+@@ -2314,6 +2315,7 @@ static int __xipram do_erase_chip(struct
ret = -EIO;
}
@@ -47,7 +47,7 @@
chip->state = FL_READY;
xip_enable(map, chip, adr);
DISABLE_VPP(map);
-@@ -2380,9 +2382,9 @@ static int __xipram do_erase_oneblock(st
+@@ -2383,9 +2385,9 @@ static int __xipram do_erase_oneblock(st
chip->erase_suspended = 0;
}
@@ -59,7 +59,7 @@
}
if (time_after(jiffies, timeo)) {
-@@ -2404,6 +2406,7 @@ static int __xipram do_erase_oneblock(st
+@@ -2407,6 +2409,7 @@ static int __xipram do_erase_oneblock(st
ret = -EIO;
}
diff --git a/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch
index 39c5478182..28c6ad875d 100644
---
a/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch
+++
b/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch
@@ -35,7 +35,7 @@
/* Atmel chips don't use the same PRI format as AMD chips */
static void fixup_convert_atmel_pri(struct mtd_info *mtd)
-@@ -1791,6 +1795,7 @@ static int cfi_amdstd_write_words(struct
+@@ -1792,6 +1796,7 @@ static int cfi_amdstd_write_words(struct
/*
* FIXME: interleaved mode not tested, and probably not supported!
*/
@@ -43,7 +43,7 @@
static int __xipram do_write_buffer(struct map_info *map, struct flchip
*chip,
unsigned long adr, const u_char *buf,
int len)
-@@ -1919,7 +1924,6 @@ static int __xipram do_write_bu
Re: [LEDE-DEV] [PATCH v1 0/3] at91 patch series.
On 02/05/18 20:20, sandeepsheriker.mallikar...@microchip.com wrote: Hi John, These patches should be applied on top of patch "[LEDE-DEV, 09/12] u-boot-at91: fix DTC command not found." (i.e Patch series subject [LEDE-DEV, 01/12] at91bootstrap:update to v3.8.10).However all of these patches have been accepted in http://patchwork.ozlabs.org/project/lede/list and I still don't see these accepted patches in master branch. do you want me to send a new patch series with all changes that have been accepted along these new patches ? Regards, Sandeep Sheriker M I'll give it a try tomorrow. If i fail i'll let you know and you can send a v3 :-D John -Original Message- From: John Crispin [mailto:j...@phrozen.org] Sent: Tuesday, May 1, 2018 10:28 PM To: Sandeep Sheriker Mallikarjun - C17018 ; lede- d...@lists.infradead.org Subject: Re: [LEDE-DEV] [PATCH v1 0/3] at91 patch series. On 02/05/18 00:43, Sandeep Sheriker Mallikarjun wrote: sending below 3 patches with rebase. Sandeep Sheriker Mallikarjun (3): at91: reorganize at91 subtargets at91: Add SAMA5D2 PTC EK board at91: refreshing kernel configurations. Hi, I am having problems applying this series ontop of current HEAD. do i need to apply any other patches before these work ? John package/boot/at91bootstrap/Makefile| 28 +- package/boot/uboot-at91/Makefile | 36 +- target/linux/at91/Makefile | 2 +- target/linux/at91/base-files/lib/at91.sh | 3 + target/linux/at91/config-4.9 | 445 ++--- target/linux/at91/image/Makefile | 51 ++- target/linux/at91/image/sama5.mk | 101 - target/linux/at91/image/sama5d2.mk | 31 ++ target/linux/at91/image/sama5d3.mk | 33 ++ target/linux/at91/image/sama5d4.mk | 19 + target/linux/at91/legacy/config-default| 239 +++ ...105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch | 442 target/linux/at91/sama5/config-default | 52 --- target/linux/at91/sama5/target.mk | 9 - target/linux/at91/sama5d2/config-default | 287 + target/linux/at91/sama5d2/target.mk| 10 + target/linux/at91/sama5d3/config-default | 287 + target/linux/at91/sama5d3/target.mk| 10 + target/linux/at91/sama5d4/config-default | 287 + target/linux/at91/sama5d4/target.mk| 10 + 20 files changed, 2152 insertions(+), 230 deletions(-) delete mode 100644 target/linux/at91/image/sama5.mk create mode 100644 target/linux/at91/image/sama5d2.mk create mode 100644 target/linux/at91/image/sama5d3.mk create mode 100644 target/linux/at91/image/sama5d4.mk create mode 100644 target/linux/at91/patches-4.9/105-ARM-at91-build- dtb-for-sama5d2-ptc-Ek.patch delete mode 100644 target/linux/at91/sama5/config-default delete mode 100644 target/linux/at91/sama5/target.mk create mode 100644 target/linux/at91/sama5d2/config-default create mode 100644 target/linux/at91/sama5d2/target.mk create mode 100644 target/linux/at91/sama5d3/config-default create mode 100644 target/linux/at91/sama5d3/target.mk create mode 100644 target/linux/at91/sama5d4/config-default create mode 100644 target/linux/at91/sama5d4/target.mk ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1 0/3] at91 patch series.
On 02/05/18 00:43, Sandeep Sheriker Mallikarjun wrote: sending below 3 patches with rebase. Sandeep Sheriker Mallikarjun (3): at91: reorganize at91 subtargets at91: Add SAMA5D2 PTC EK board at91: refreshing kernel configurations. Hi, I am having problems applying this series ontop of current HEAD. do i need to apply any other patches before these work ? John package/boot/at91bootstrap/Makefile| 28 +- package/boot/uboot-at91/Makefile | 36 +- target/linux/at91/Makefile | 2 +- target/linux/at91/base-files/lib/at91.sh | 3 + target/linux/at91/config-4.9 | 445 ++--- target/linux/at91/image/Makefile | 51 ++- target/linux/at91/image/sama5.mk | 101 - target/linux/at91/image/sama5d2.mk | 31 ++ target/linux/at91/image/sama5d3.mk | 33 ++ target/linux/at91/image/sama5d4.mk | 19 + target/linux/at91/legacy/config-default| 239 +++ ...105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch | 442 target/linux/at91/sama5/config-default | 52 --- target/linux/at91/sama5/target.mk | 9 - target/linux/at91/sama5d2/config-default | 287 + target/linux/at91/sama5d2/target.mk| 10 + target/linux/at91/sama5d3/config-default | 287 + target/linux/at91/sama5d3/target.mk| 10 + target/linux/at91/sama5d4/config-default | 287 + target/linux/at91/sama5d4/target.mk| 10 + 20 files changed, 2152 insertions(+), 230 deletions(-) delete mode 100644 target/linux/at91/image/sama5.mk create mode 100644 target/linux/at91/image/sama5d2.mk create mode 100644 target/linux/at91/image/sama5d3.mk create mode 100644 target/linux/at91/image/sama5d4.mk create mode 100644 target/linux/at91/patches-4.9/105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch delete mode 100644 target/linux/at91/sama5/config-default delete mode 100644 target/linux/at91/sama5/target.mk create mode 100644 target/linux/at91/sama5d2/config-default create mode 100644 target/linux/at91/sama5d2/target.mk create mode 100644 target/linux/at91/sama5d3/config-default create mode 100644 target/linux/at91/sama5d3/target.mk create mode 100644 target/linux/at91/sama5d4/config-default create mode 100644 target/linux/at91/sama5d4/target.mk ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] build: log time taken by each packages/steps
On 30/04/18 21:55, Etienne Champetier wrote: The idea is to easily get the list of packages taking the most time to build, and see if we can improve them v1: Use SetupHostCommand as recommended by John v2: add space after 'time:', remove useless /usr/bin/time from SetupHostCommand Signed-off-by: Etienne Champetier Hi, just tried this patch. the output of looks like such time: package/libs/openssl/compile#19.67#5.56#31.33 it looks a bit odd and is not very prominent in the log. John --- include/prereq-build.mk | 4 include/subdir.mk | 1 + 2 files changed, 5 insertions(+) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 5b9a7e049d..bac5fdc84c 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -138,6 +138,10 @@ $(eval $(call SetupHostCommand,bzip2,Please install 'bzip2', \ $(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \ wget --version | grep GNU)) +$(eval $(call SetupHostCommand,gtime,Please install GNU 'time', \ + gtime --version 2>&1 | grep GNU, \ + time --version 2>&1 | grep GNU)) + $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \ perl --version | grep "perl.*v5")) diff --git a/include/subdir.mk b/include/subdir.mk index 79a80528ae..ed4f7537d5 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -43,6 +43,7 @@ log_make = \ $(if $(BUILD_LOG), \ set -o pipefail; \ mkdir -p $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4));) \ + gtime -f "time: $(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2)\#%U\#%S\#%e" -- \ $$(SUBMAKE) $(subdir_make_opts) $(if $(3),$(3)-)$(2) \ $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2).txt) ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] sysctl: Protect hard/symlinks by default.
On 30/04/18 22:15, Rosen Penev wrote: There is no usecase for not protecting symlinks that I know of in OpenWrt. Not even on desktop systems where you have multiple users with a shell. Hi, patch descriptions should be wrapped at 75 chars John Signed-off-by: Rosen Penev v2: Move to 10-default.conf file. --- package/base-files/files/etc/sysctl.d/10-default.conf | 4 1 file changed, 4 insertions(+) diff --git a/package/base-files/files/etc/sysctl.d/10-default.conf b/package/base-files/files/etc/sysctl.d/10-default.conf index 98867b7..bfe26ca 100644 --- a/package/base-files/files/etc/sysctl.d/10-default.conf +++ b/package/base-files/files/etc/sysctl.d/10-default.conf @@ -5,6 +5,10 @@ kernel.panic=3 kernel.core_pattern=/tmp/%e.%t.%p.%s.core fs.suid_dumpable=2 +#enable hard/symlink protection +fs.protected_hardlinks=1 +fs.protected_symlinks=1 + net.ipv4.conf.default.arp_ignore=1 net.ipv4.conf.all.arp_ignore=1 net.ipv4.ip_forward=1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] uboot-envtools: Change download to git.
On 30/04/18 22:10, Rosen Penev wrote: Currently, the build system uses an openwrt mirror which does not currently workand FTP can be unreliable under several circumstances (Ubuntu 16.04 WSL being an example). This change implicitly allows using all the mirrors to download. Changing this to git also allows using .tar.xz archives which are smaller. Size difference: 10416503 u-boot-2015.10.tar.bz2 8351456 u-boot-2015.10.tar.xz Signed-off-by: Rosen Penev Hi, patch does not apply, looks like you have a prior patch in your tree removing the mirror ? John v2: Change git URL from GitHub to official mirror. v3: Change URL to HTTPS now that Wolfgang Denke added support. v4: Rebased against current master. New sizes: 12304292 u-boot-2018.03.tar.bz2 10060652 u-boot-2018.03.tar.xz --- package/boot/uboot-envtools/Makefile | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index 4f7cf57..2f8dd0a 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -12,10 +12,13 @@ PKG_DISTNAME:=u-boot PKG_VERSION:=2018.03 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/u-boot-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://ftp.denx.de/pub/u-boot -PKG_HASH:=7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd +PKG_SOURCE_PROTO:=git +PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=https://git.denx.de/u-boot.git +PKG_SOURCE_VERSION:=f95ab1fb6e37f0601f397091bb011edf7a98b890 +PKG_MIRROR_HASH:=b50d8b6fe0d90b92c8c147457b1b4c2ed1cdb03191085cfc57fdad77c0bfffab PKG_BUILD_DEPENDS:=fstools ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] sysctl: Protect hard/symlinks by default.
On 30/04/18 22:15, Rosen Penev wrote: There is no usecase for not protecting symlinks that I know of in OpenWrt. Not even on desktop systems where you have multiple users with a shell. Signed-off-by: Rosen Penev v2: Move to 10-default.conf file. Hi, no need to resend but in future please put the v1->v2 info below the tear line (---) and add V2 to the description ([PATCH V2]) John --- package/base-files/files/etc/sysctl.d/10-default.conf | 4 1 file changed, 4 insertions(+) diff --git a/package/base-files/files/etc/sysctl.d/10-default.conf b/package/base-files/files/etc/sysctl.d/10-default.conf index 98867b7..bfe26ca 100644 --- a/package/base-files/files/etc/sysctl.d/10-default.conf +++ b/package/base-files/files/etc/sysctl.d/10-default.conf @@ -5,6 +5,10 @@ kernel.panic=3 kernel.core_pattern=/tmp/%e.%t.%p.%s.core fs.suid_dumpable=2 +#enable hard/symlink protection +fs.protected_hardlinks=1 +fs.protected_symlinks=1 + net.ipv4.conf.default.arp_ignore=1 net.ipv4.conf.all.arp_ignore=1 net.ipv4.ip_forward=1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] wireguard: add distinction for remote and local endpoint ip
On 19/02/18 19:54, Thomas Huehn wrote:
This patch fixes a bug when someone tries to set up a Wireguard tunnel
to an endpoint where its ip belongs to a local subnet, e.g. in a Freifunk
olsr mesh. The call of proto_add_host_dependency() is just needed in cases
where the endpoint is reachable via a default gateway but not in such cases
where the endpoint is part of a local subnet.
Signed-off-by: Thomas Huehn
Hi,
this should be fixed in trunk due to a netifd update. please let us know
if you are still seeing this issue.
John
---
package/network/services/wireguard/files/wireguard.sh | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/network/services/wireguard/files/wireguard.sh
b/package/network/services/wireguard/files/wireguard.sh
index 7b18a2e0ecdb..36ed80d9e7aa 100644
--- a/package/network/services/wireguard/files/wireguard.sh
+++ b/package/network/services/wireguard/files/wireguard.sh
@@ -16,6 +16,10 @@ fi
init_proto "$@"
}
+is_remote_ip() {
+ ip route get $1 | grep "via $(ip route | grep -m1 default | cut -d" "
-f3)"
+}
+
proto_wireguard_init_config() {
proto_config_add_string "private_key"
@@ -174,7 +178,9 @@ proto_wireguard_setup() {
sed -E 's/\[?([0-9.:a-f]+)\]?:([0-9]+)/\1 \2/' | \
while IFS=$'\t ' read -r key address port; do
[ -n "${port}" ] || continue
-proto_add_host_dependency "${config}" "${address}"
+is_remote_ip ${address} && {
+ logger -t Wireguard "no local route to endpoint - call
proto_add_host_dependency()"
+ proto_add_host_dependency "${config}" "${address}"
done
proto_send_update "${config}"
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] uboot-envtools: Change download to git.
On 16/03/18 01:26, Rosen Penev wrote: Currently, the build system uses an openwrt mirror which does not currently workand FTP can be unreliable under several circumstances (Ubuntu 16.04 WSL being an example). This change implicitly allows using all the mirrors to download. Changing this to git also allows using .tar.xz archives which are smaller. Size difference: 10416503 u-boot-2015.10.tar.bz2 8351456 u-boot-2015.10.tar.xz Signed-off-by: Rosen Penev Hi, patch no longer applies since the last envtools update. please rebase/send, Thanks ! John v2: Change git URL from GitHub to official mirror. v3: Change URL to HTTPS now that Wolfgang Denke added support. --- package/boot/uboot-envtools/Makefile | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index 442cf3fd83..9b1ed6967b 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -12,12 +12,13 @@ PKG_DISTNAME:=u-boot PKG_VERSION:=2015.10 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/u-boot-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=\ - http://mirror2.openwrt.org/sources \ - ftp://ftp.denx.de/pub/u-boot -PKG_HASH:=bdc68d5f9455ad933b059c735d983f2c8b6b552dafb062e5ff1444f623021955 +PKG_SOURCE_PROTO:=git +PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=https://git.denx.de/u-boot.git +PKG_SOURCE_VERSION:=5ec0003b19cbdf06ccd6941237cbc0d1c3468e2d +PKG_MIRROR_HASH:=e207d996ebfff7335eed99789e3dcb9da071499f347fcdd86725b9d4dac5a5bb PKG_BUILD_DEPENDS:=fstools ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH 0/4] Gemini forward-port to kernel v4.14
On 29/04/18 20:32, Roman Yeryomin wrote:
On 2018-04-27 09:18, John Crispin wrote:
On 17/04/18 00:34, Roman Yeryomin wrote:
On 2018-04-15 20:22, Roman Yeryomin wrote:
On 2018-04-14 20:36, Hans Ulli Kroll wrote:
Hi Roman
On Tue, 10 Apr 2018, Linus Walleij wrote:
On Mon, Apr 9, 2018 at 12:38 PM, Roman Yeryomin
wrote:
> I have tested them quickly yesterday on nas4220b board.
Although I've
> managed to boot it (had to fix rootfs image) ethernet and usb
didn't work.
> And I didn't check anything else.
> I didn't yet look at the code but before I dive there I have a
question: did
> you have a chance to test it yourself on any of the boards? And
if yes,
> which one?
I think the fotg controller gets stalled after a port reset.
Please check attached (untested) patch for openwrt.
I can test this next week by myself
+diff --git a/drivers/usb/host/fotg210-hcd.c
b/drivers/usb/host/fotg210-hcd.c
+index 2acc51b0be5a..bc9efb49adc7 100644
+--- a/drivers/usb/host/fotg210-hcd.c
b/drivers/usb/host/fotg210-hcd.c
+@@ -1653,6 +1653,10 @@ static int fotg210_hub_control(struct usb_hcd
*hcd, u16 typeReq, u16 wValue,
+ /* see what we found out */
+ temp = check_reset_complete(fotg210, wIndex,
status_reg,
+ fotg210_readl(fotg210, status_reg));
++
++ /* restart schedule */
++ fotg210->command |= CMD_RUN;
++ fotg210_writel(fotg210, fotg210->command,
&fotg210->regs->command);
+ }
+
+ if (!(temp & (PORT_RESUME|PORT_RESET))) {
+--
+2.16.2
+
Didn't work for me :(
I've found why it didn't work:
[ 5.845199] Warning! fotg210_hcd should always be loaded before
uhci_hcd and ohci_hcd, not after
After fixing kernel config and applying your patch it works.
So your patch works and is needed indeed.
But there are other problems.
Second USB (USB1) port cannot be initialized and only USB0 is working:
[ 5.843831] fotg210_hcd: FOTG210 Host Controller (EHCI) Driver
[ 5.844298] pinctrl-gemini 4000.syscon:pinctrl: ACTIVATE
function "usb" with group "usbgrp"
[ 5.845067] fotg210-hcd 6800.usb: initialized Gemini PHY
[ 5.845095] fotg210-hcd 6800.usb: Faraday USB2.0 Host Controller
[ 5.845176] fotg210-hcd 6800.usb: new USB bus registered,
assigned bus number 1
[ 5.845696] fotg210-hcd 6800.usb: irq 29, io mem 0x6800
[ 5.877212] fotg210-hcd 6800.usb: USB 2.0 started, EHCI 1.00
[ 5.880314] hub 1-0:1.0: USB hub found
[ 5.880546] hub 1-0:1.0: 1 port detected
[ 5.904768] pinctrl-gemini 4000.syscon:pinctrl: pin T6 USB
GNDA U20 already requested by 6800.usb; cannot claim for
6900.usb
[ 5.904807] pinctrl-gemini 4000.syscon:pinctrl: pin-305
(6900.usb) status -22
[ 5.904845] pinctrl-gemini 4000.syscon:pinctrl: could not
request pin 305 (T6 USB GNDA U20) from group usbgrp on device
pinctrl-gemini
[ 5.904872] fotg210-hcd 6900.usb: Error applying setting,
reverse things back
[ 5.904928] fotg210-hcd: probe of 6900.usb failed with error -22
After removing pinctrl from USB1 it is initialized but then only
USB1 is working, USB0 is seen but there are no interrupts.
Didn't yet look at the code, maybe you will know where to fix right
away.
Regards,
Roman
Hi,
how shall we proceed ? merge 1, 2 and 3, let roman fix the regressions
and then merge 4 ? or drop the series for now and let you guys send a
V2 with the regression fixes integrated ?
Hi John,
I've prepared 4.14 branch here
https://github.com/yeryomin/openwrt/commits/gemini-4.14
I think it can be merged in it's current state. The only problem I'm
aware of is that usb is not fully working (afaik, Hans is working on it).
Linus, could you test that branch on your device and see if network is
working by default?
Regards,
Roman
Great, please send patches or a PR once you feel happy with the series.
John
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 3/3] sysctl: Protect hard/symlinks by default.
On 31/03/18 00:18, Rosen Penev wrote: There is no usecase for not protecting symlinks that I know of in OpenWrt. Not even on desktop systems where you have multiple users with a shell. Signed-off-by: Rosen Penev Hi, does not apply due to bee696d66c95337d91fc0256afbf481dc93ddb27 please fix/resend John --- package/base-files/files/etc/sysctl.conf | 4 1 file changed, 4 insertions(+) diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf index 61a43057a1..790fc02654 100644 --- a/package/base-files/files/etc/sysctl.conf +++ b/package/base-files/files/etc/sysctl.conf @@ -5,6 +5,10 @@ fs.suid_dumpable=2 #disable kernel pointer access from normal users kernel.kptr_restrict=1 +#enable hard/symlink protection +fs.protected_hardlinks=1 +fs.protected_symlinks=1 + net.ipv4.conf.default.arp_ignore=1 net.ipv4.conf.all.arp_ignore=1 net.ipv4.ip_forward=1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] mvebu: Switch Turris Omnia to use ath10k-ct driver and firmware.
On 31/03/18 00:19, Rosen Penev wrote: My testing has shown both ath10k and firmware to be unstable. Here is a summary of results done over two weeks: ath10k + QCA firmware = driver crash, WiFi dies completely. ath10k + CT firmware = driver crash. WiFi dies completely. ath10k-ct + QCA firmware = firmware crash. WiFi does not die*. ath10k-ct + CT firmware = I have not gotten either to crash. WiFi does not die completely with scenario 3 as mac80211 is able to restart the hardware. From my testing, it dies twice a day. I have no idea what triggers it. My best guess is an Apple iPhone. I also tried QCA firmware 37. No difference. Hi, there will always be combos of FW/drv version that will/not work. this can change over time back and fwd between stock and -ct code bases. -ct has been opt-in since it was merged. It would be uch better to figure out which FW works and why the driver dies. Otherwise we'll start flipping back and fwd between stock/-ct versions with each update on each wmac silicon / arch combo constantly. John Signed-off-by: Rosen Penev --- target/linux/mvebu/image/cortex-a9.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk index d9defe880d..a6529220ea 100644 --- a/target/linux/mvebu/image/cortex-a9.mk +++ b/target/linux/mvebu/image/cortex-a9.mk @@ -152,7 +152,7 @@ define Device/turris-omnia DEVICE_TITLE := Turris Omnia DEVICE_PACKAGES := \ mkf2fs e2fsprogs kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \ -wpad-mini kmod-ath9k kmod-ath10k ath10k-firmware-qca988x +wpad-mini kmod-ath9k kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGES := $$(IMAGE_PREFIX)-sysupgrade.img.gz omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz IMAGE/$$(IMAGE_PREFIX)-sysupgrade.img.gz := boot-img | sdcard-img | gzip | append-metadata IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] build: log time taken by each packages/steps
On 31/03/18 06:22, Etienne Champetier wrote: The idea is to easily get the list of packages taking the most time to build, and see if we can improve them Use SetupHostCommand as recommended by John Signed-off-by: Etienne Champetier --- include/prereq-build.mk | 5 + include/subdir.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 6a423d2c7d..7d5b2f2b45 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -139,6 +139,11 @@ $(eval $(call SetupHostCommand,bzip2,Please install 'bzip2', \ $(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \ wget --version | grep GNU)) +$(eval $(call SetupHostCommand,gtime,Please install GNU 'time', \ + gtime --version 2>&1 | grep GNU, \ + /usr/bin/time --version 2>&1 | grep GNU, \ Hi, i think the line above should be removed. happy to merge the patch once that has been done and florian's space request was added John + time --version 2>&1 | grep GNU)) + $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \ perl --version | grep "perl.*v5")) diff --git a/include/subdir.mk b/include/subdir.mk index 79a80528ae..546ed57ae6 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -43,6 +43,7 @@ log_make = \ $(if $(BUILD_LOG), \ set -o pipefail; \ mkdir -p $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4));) \ + gtime -f "time:$(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2)\#%U\#%S\#%e" -- \ $$(SUBMAKE) $(subdir_make_opts) $(if $(3),$(3)-)$(2) \ $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2).txt) ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] download: skip hash check without a download hash
On 30/03/18 17:34, Hauke Mehrtens wrote: If the package doe not contain a PKG_HASH just skip the check instead of making the download fail. The scripts/download.pl script will automatically skip the hash check in case the hash value equals skip, otherwise it fails. Signed-off-by: Hauke Mehrtens --- include/download.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/download.mk b/include/download.mk index 2ba8a7bdf4..b14ce2a39a 100644 --- a/include/download.mk +++ b/include/download.mk @@ -239,11 +239,11 @@ define Download/Defaults URL_FILE:= PROTO:= HASH=$$(MD5SUM) - MD5SUM:=x + MD5SUM:=skip SUBDIR:= MIRROR:=1 MIRROR_HASH=$$(MIRROR_MD5SUM) - MIRROR_MD5SUM:=x + MIRROR_MD5SUM:=skip VERSION:= OPTS:= endef Hi, I am against merging this patch. b30ba14e2a858cfebcfdbc38348ab96a6d179556 fixed an error where we had a copy/paste mess up of a hash causing a none valid length. we would think that there is hash that gets checked but it would never be validated. Adding your patch would introduce a similar case where a typo in the variable name would make us believe that a hash is present but in reality there it none. I'd prefer that the Makefile would have the skip inside it and that the buildsystem would then skip the validation. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 10/12] at91: reorganize at91 subtargets
On 02/04/18 18:34, Sandeep Sheriker Mallikarjun wrote:
reorganizing at91 subtargets based on sama5 soc features and this fix
below problems.
1. able to set neon flags to sama5d2 & sama5d4 subtargets.
2. fix the make clean which removes all the subtargets in bin folder.
3. able to configure kernel specific to subtarget.
4. able to set vfpu4 flags to samad3 subtargets.
Signed-off-by: Sandeep Sheriker Mallikarjun
Hi,
due to me letting these rot too long 10 11 and 12/12 dont apply any
longer. copuld you rebase/send them please ?
John
---
package/boot/at91bootstrap/Makefile| 12 +-
package/boot/uboot-at91/Makefile | 18 +-
target/linux/at91/Makefile |2 +-
target/linux/at91/image/Makefile | 51 +-
target/linux/at91/image/sama5.mk | 101 --
target/linux/at91/image/sama5d2.mk | 23 +
target/linux/at91/image/sama5d3.mk | 33 +
target/linux/at91/image/sama5d4.mk | 20 +
target/linux/at91/sama5/target.mk |9 -
.../linux/at91/{sama5 => sama5d2}/config-default |0
target/linux/at91/sama5d2/target.mk| 10 +
target/linux/at91/sama5d3/config-default | 1311
target/linux/at91/sama5d3/target.mk| 10 +
target/linux/at91/sama5d4/config-default | 1311
target/linux/at91/sama5d4/target.mk| 10 +
15 files changed, 2798 insertions(+), 123 deletions(-)
delete mode 100644 target/linux/at91/image/sama5.mk
create mode 100644 target/linux/at91/image/sama5d2.mk
create mode 100644 target/linux/at91/image/sama5d3.mk
create mode 100644 target/linux/at91/image/sama5d4.mk
delete mode 100644 target/linux/at91/sama5/target.mk
rename target/linux/at91/{sama5 => sama5d2}/config-default (100%)
create mode 100644 target/linux/at91/sama5d2/target.mk
create mode 100644 target/linux/at91/sama5d3/config-default
create mode 100644 target/linux/at91/sama5d3/target.mk
create mode 100644 target/linux/at91/sama5d4/config-default
create mode 100644 target/linux/at91/sama5d4/target.mk
diff --git a/package/boot/at91bootstrap/Makefile
b/package/boot/at91bootstrap/Makefile
index fbe44c4..b350555 100644
--- a/package/boot/at91bootstrap/Makefile
+++ b/package/boot/at91bootstrap/Makefile
@@ -24,63 +24,73 @@ include $(INCLUDE_DIR)/package.mk
define AT91Bootstrap/Default
BUILD_TARGET:=at91
- BUILD_SUBTARGET:=sama5
HIDDEN:=1
AT91BOOTSTRAP_IMAGE:=at91bootstrap.bin
endef
define AT91Bootstrap/sama5d2_xplaineddf_uboot
TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (SPI Flash)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d2_xplained
endef
define AT91Bootstrap/sama5d2_xplaineddf_qspi_uboot
TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (QSPI Flash)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d2_xplained
endef
define AT91Bootstrap/sama5d2_xplainedsd_uboot
TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (SDcard/EMMC)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d2_xplained
endef
define AT91Bootstrap/sama5d3_xplainednf_uboot
TITLE:=AT91Bootstrap for SAMA5D3 Xplained board (Nand Flash)
+ BUILD_SUBTARGET:=sama5d3
BUILD_DEVICES:=at91-sama5d3_xplained
endef
define AT91Bootstrap/sama5d3_xplainedsd_uboot
TITLE:=AT91Bootstrap for SAMA5D3 Xplained board (SDcard)
+ BUILD_SUBTARGET:=sama5d3
BUILD_DEVICES:=at91-sama5d3_xplained
endef
define AT91Bootstrap/sama5d4_xplainednf_uboot_secure
TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (Nand Flash)
+ BUILD_SUBTARGET:=sama5d4
BUILD_DEVICES:=at91-sama5d4_xplained
endef
define AT91Bootstrap/sama5d4_xplaineddf_uboot_secure
TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (SPI Flash)
+ BUILD_SUBTARGET:=sama5d4
BUILD_DEVICES:=at91-sama5d4_xplained
endef
define AT91Bootstrap/sama5d4_xplainedsd_uboot_secure
TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (SDcard)
+ BUILD_SUBTARGET:=sama5d4
BUILD_DEVICES:=at91-sama5d4_xplained
endef
define AT91Bootstrap/sama5d27_som1_eksd_uboot
TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (SDcard0)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d27_som1_ek
endef
define AT91Bootstrap/sama5d27_som1_eksd1_uboot
TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (SDcard1)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d27_som1_ek
endef
define AT91Bootstrap/sama5d27_som1_ekqspi_uboot
TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (QSPI Flash)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d27_som1_ek
endef
diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile
index 73a2d62..b336321 100644
--- a/package/boot/uboot-at91/Makefile
+++ b/package/boot/uboot-at91/Makefile
@@ -40,55 +40,55 @@ endef
Re: [LEDE-DEV] [PATCH] samba36: add hotplug script
On 12/04/18 11:41, Rosy Song wrote: Add hotplug handle script for storage devices, this will add corresponding option in the /etc/config/samba file automatically. If user do not want this feature, it can be cancel via samba relevant menu option. Hi, patch as such looks ok. however i am not sure if we want to always add any and every device we see into uci unconditionally. also having this as a compile option for the main package is bad as it will result in release builds never seeing this feature. please move it to a separate package inside the same Makefile and a small nitpick at the end of the patch ... John Signed-off-by: Rosy Song --- package/network/services/samba36/Makefile | 11 +++ .../network/services/samba36/files/lib/samba.sh| 83 ++ .../network/services/samba36/files/samba.hotplug | 11 +++ 3 files changed, 105 insertions(+) create mode 100644 package/network/services/samba36/files/lib/samba.sh create mode 100644 package/network/services/samba36/files/samba.hotplug [...] diff --git a/package/network/services/samba36/files/samba.hotplug b/package/network/services/samba36/files/samba.hotplug new file mode 100644 index 00..d4c8e7c5f5 --- /dev/null +++ b/package/network/services/samba36/files/samba.hotplug @@ -0,0 +1,11 @@ +. /lib/samba/samba.sh + +samba_dev_filter $DEVNAME +[ "$FLAG_DEV_TYPE" = "not-mtd" ] || exit + +config_load samba +case $ACTION in + add) samba_add_section $DEVNAME;; + remove) samba_delete_section $DEVNAME;; +esac +uci commit uci commit samba should be enough here. ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] iptables: link extension libraries with -lm
On 27/04/18 16:05, Alin Năstac wrote:
According to "Automatic variables" chapter of make manual, $* expands
to the pattern matched by % in an implicit rule.
However, the make rules in which this patch use the $* variable is an
explicit rule, hence $* expansion will be empty.
On Fri, Apr 27, 2018 at 8:41 AM, John Crispin wrote:
On 24/04/18 10:05, Alin Nastac wrote:
This fixes an iptables link error when kernel config include
CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
related to the missing -lm argument on the linker command line. Error is
caused by
the odd looking linker argument ${$*_LIBADD} which get expanded to an
empty string.
Hi,
the $* usage is correct
src/%.c:
echo $*
->src/example (bei src/example.c)
please provide your diffconfig so i can reproduce your issue locally.
John
Hi,
please try not to top post. and see if this fixes your issue please. -->
https://pastebin.com/qbMfwGer
John
Signed-off-by: Alin Nastac
---
package/network/utils/iptables/patches/600-shared-libext.patch | 10
+-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/package/network/utils/iptables/patches/600-shared-libext.patch
b/package/network/utils/iptables/patches/600-shared-libext.patch
index a906d40..17e7fbe 100644
--- a/package/network/utils/iptables/patches/600-shared-libext.patch
+++ b/package/network/utils/iptables/patches/600-shared-libext.patch
@@ -28,27 +28,27 @@
-libext.a: initext.o ${libext_objs}
- ${AM_VERBOSE_AR} ${AR} crs $@ $^;
+libiptext.so: initext.o ${libext_objs}
-+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@
$^ -L../libxtables/.libs -lxtables ${$*_LIBADD};
++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@
$^ -L../libxtables/.libs -lxtables ${xt_statistic_LIBADD}
${xt_connlabel_LIBADD};
-libext_ebt.a: initextb.o ${libext_ebt_objs}
- ${AM_VERBOSE_AR} ${AR} crs $@ $^;
+libiptext_ebt.so: initextb.o ${libext_ebt_objs}
-+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@
$^ -L../libxtables/.libs -lxtables ${$*_LIBADD};
++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@
$^ -L../libxtables/.libs -lxtables ${xt_statistic_LIBADD}
${xt_connlabel_LIBADD};
-libext_arpt.a: initexta.o ${libext_arpt_objs}
- ${AM_VERBOSE_AR} ${AR} crs $@ $^;
+libiptext_arpt.so: initexta.o ${libext_arpt_objs}
-+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@
$^ -L../libxtables/.libs -lxtables ${$*_LIBADD};
++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@
$^ -L../libxtables/.libs -lxtables ${xt_statistic_LIBADD}
${xt_connlabel_LIBADD};
-libext4.a: initext4.o ${libext4_objs}
- ${AM_VERBOSE_AR} ${AR} crs $@ $^;
+libiptext4.so: initext4.o ${libext4_objs}
-+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@
$^ -L../libxtables/.libs -lxtables ${$*_LIBADD};
++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@
$^ -L../libxtables/.libs -lxtables ${xt_statistic_LIBADD}
${xt_connlabel_LIBADD};
-libext6.a: initext6.o ${libext6_objs}
- ${AM_VERBOSE_AR} ${AR} crs $@ $^;
+libiptext6.so: initext6.o ${libext6_objs}
-+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@
$^ -L../libxtables/.libs -lxtables ${$*_LIBADD};
++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@
$^ -L../libxtables/.libs -lxtables ${xt_statistic_LIBADD}
${xt_connlabel_LIBADD};
initext_func := $(addprefix xt_,${pfx_build_static})
initextb_func := $(addprefix ebt_,${pfb_build_static})
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] libusb: Update to 1.0.22
On 28/04/18 07:13, Rosen Penev wrote: Switched download from SourceForge to GitHub. It seems the author migrated to that. Also fixed the website URL as the SourceForge link is dead. Compile tested on ar71xx and mvebu. Small size decrease on ar71xx: 30444 vs. 30099 bytes. Signed-off-by: Rosen Penev Hi, This is V3 of the patch, why is this not indicated in the subject. please also make sure to add the change log of the patch below the tear line. John --- package/libs/libusb/Makefile | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libs/libusb/Makefile b/package/libs/libusb/Makefile index 2d1d9c2..362d742 100644 --- a/package/libs/libusb/Makefile +++ b/package/libs/libusb/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libusb -PKG_VERSION:=1.0.21 +PKG_VERSION:=1.0.22 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b +PKG_SOURCE_URL:=https://github.com/libusb/libusb/releases/download/v$(PKG_VERSION) +PKG_HASH:=75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157 PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=0 @@ -28,7 +28,7 @@ define Package/libusb-1.0 CATEGORY:=Libraries TITLE:=A library for accessing Linux USB devices DEPENDS:=+libpthread +librt - URL:=http://libusb.wiki.sourceforge.net/ + URL:=http://libusb.info/ endef define Package/libusb-1.0/description ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] fstools: use ramoverlay if no rootfs_data and rootfs is ro
On 27/04/18 14:05, Arvid E. Picciani wrote:
- libfstools/mtd.c no longer fails if volume is ro.
- mount_root ramoverlay if no rootfs_data and rootfs is ro
Hi,
this approach is an ugly hack. please do the following
mtd_ope() should always try to open as r/w and if that fails try ro.
then store that state inside the context.
mtd_volume_load() shoiuld then get an extra param called rw, which
checks, if set, if the ctx also has rw set. if not return an error. that
way there is no need for ultra cumbersome reopen logic.
and please do use the ML and dont send patches directly. they wont be
picked up by patchwork and will bitrot in my mailbox.
John
Signed-off-by: Arvid E. Picciani
---
libfstools/mtd.c| 35 ++-
libfstools/volume.c | 24
libfstools/volume.h | 1 +
mount_root.c| 11 +++
4 files changed, 58 insertions(+), 13 deletions(-)
diff --git a/libfstools/mtd.c b/libfstools/mtd.c
index 77c71ee..4ff10ca 100644
--- a/libfstools/mtd.c
+++ b/libfstools/mtd.c
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
#include "libfstools.h"
@@ -32,15 +33,18 @@ struct mtd_volume {
int fd;
int idx;
char*chr;
+ int is_writable;
};
static struct driver mtd_driver;
-static int mtd_open(const char *mtd, int block)
+static int mtd_open(const char *mtd, int block, int open_writable)
{
FILE *fp;
char dev[PATH_MAX];
- int i, ret, flags = O_RDWR | O_SYNC;
+ int i, ret, flags = O_SYNC;
+ if (open_writable)
+ flags |= O_RDWR;
if ((fp = fopen("/proc/mtd", "r"))) {
while (fgets(dev, sizeof(dev), fp)) {
@@ -70,24 +74,29 @@ static void mtd_volume_close(struct mtd_volume *p)
p->fd = 0;
}
-static int mtd_volume_load(struct mtd_volume *p)
+static int mtd_volume_load(struct mtd_volume *p, int open_writable)
{
struct volume *v = &p->v;
struct mtd_info_user mtdInfo;
struct erase_info_user mtdLockInfo;
if (p->fd) {
- lseek(p->fd, 0, SEEK_SET);
- return 0;
+ if (!open_writable || p->is_writable) {
+ lseek(p->fd, 0, SEEK_SET);
+ return 0;
+ } else {
+ close(p->fd);
+ p->fd = 0;
+ }
}
if (!p->chr)
return -1;
- p->fd = mtd_open(p->chr, 0);
+ p->fd = mtd_open(p->chr, 0, open_writable);
if (p->fd < 0) {
p->fd = 0;
- ULOG_ERR("Could not open mtd device: %s\n", p->chr);
+ ULOG_ERR("Could not open mtd device%s: %s\n", open_writable ? " writable":
"", p->chr);
return -1;
}
@@ -174,7 +183,7 @@ static struct volume *mtd_volume_find(char *name)
snprintf(buffer, sizeof(buffer), "/dev/mtd%s", idx);
p->chr = strdup(buffer);
- if (mtd_volume_load(p)) {
+ if (mtd_volume_load(p, 0)) {
ULOG_ERR("reading %s failed\n", v->name);
free(p);
return NULL;
@@ -190,7 +199,7 @@ static int mtd_volume_identify(struct volume *v)
__u16 jffs2;
size_t sz;
- if (mtd_volume_load(p)) {
+ if (mtd_volume_load(p, 0)) {
ULOG_ERR("reading %s failed\n", v->name);
return -1;
}
@@ -228,7 +237,7 @@ static int mtd_volume_erase(struct volume *v, int offset,
int len)
struct erase_info_user eiu;
int first_block, num_blocks;
- if (mtd_volume_load(p))
+ if (mtd_volume_load(p, 1))
return -1;
if (offset % v->block_size || len % v->block_size) {
@@ -270,7 +279,7 @@ static int mtd_volume_init(struct volume *v)
struct mtd_info_user mtdinfo;
int ret;
- if (mtd_volume_load(p))
+ if (mtd_volume_load(p, 0))
return -1;
ret = ioctl(p->fd, MEMGETINFO, &mtdinfo);
@@ -291,7 +300,7 @@ static int mtd_volume_read(struct volume *v, void *buf, int
offset, int length)
{
struct mtd_volume *p = container_of(v, struct mtd_volume, v);;
- if (mtd_volume_load(p))
+ if (mtd_volume_load(p, 0))
return -1;
if (lseek(p->fd, offset, SEEK_SET) == (off_t) -1) {
@@ -311,7 +320,7 @@ static int mtd_volume_write(struct volume *v, void *buf,
int offset, int length)
{
struct mtd_volume *p = container_of(v, struct mtd_volume, v);;
- if (mtd_volume_load(p))
+ if (mtd_volume_load(p, 1))
return -1;
if (lseek(p->fd, offset, SEEK_SET) == (off_t) -1) {
diff --git a/libfstools/volume.c b/libfstools/volume.c
index 0d293d5..9b8a6af 100644
--- a/libfstools/volume.c
+++ b/libfstools/volume.c
@@ -14,6 +14,10 @@
#include
#include
#include
+#include
+#include
+#include
+#include
#include "libfstools.h"
#include "volume.h"
@@ -41,3 +45,23
Re: [LEDE-DEV] [PATCH] kernel: Activate CONFIG_BRIDGE_VLAN_FILTERING
On 02/04/18 16:42, Hauke Mehrtens wrote: This allows to configure VLAN aware bridges in Linux, it is also possible to offload these VLAN aware bridges with DSA to some hardware, which is supported by most of the DSA drivers. This adds support for the VLAN features mentioned in bridge man page: http://man7.org/linux/man-pages/man8/bridge.8.html This increases the kernel size of an lzma compressed Lantiq xrx200 kernel by 4.774 Bytes. Without brdige vlan: 1.771.351 bt_homehub-v5a-kernel.bin With brdige vlan: 1.776.125 bt_homehub-v5a-kernel.bin maybe we should add a dsa FEATURES flag and tie this up together ? John Signed-off-by: Hauke Mehrtens --- target/linux/generic/config-4.14 | 2 +- target/linux/generic/config-4.9 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index a27198335d..05dbc834f3 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -625,7 +625,7 @@ CONFIG_BRIDGE=y CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_BRIDGE_NETFILTER is not set # CONFIG_BRIDGE_NF_EBTABLES is not set -# CONFIG_BRIDGE_VLAN_FILTERING is not set +CONFIG_BRIDGE_VLAN_FILTERING=y # CONFIG_BROADCOM_PHY is not set CONFIG_BROKEN_ON_SMP=y # CONFIG_BSD_DISKLABEL is not set diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9 index 3f050c205c..b34a094f69 100644 --- a/target/linux/generic/config-4.9 +++ b/target/linux/generic/config-4.9 @@ -597,7 +597,7 @@ CONFIG_BRIDGE=y CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_BRIDGE_NETFILTER is not set # CONFIG_BRIDGE_NF_EBTABLES is not set -# CONFIG_BRIDGE_VLAN_FILTERING is not set +CONFIG_BRIDGE_VLAN_FILTERING=y # CONFIG_BROADCOM_PHY is not set CONFIG_BROKEN_ON_SMP=y # CONFIG_BSD_DISKLABEL is not set ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] libusb: Update to 1.0.22
On 02/04/18 03:11, Rosen Penev wrote: Switched download from SourceForge to GitHub. It seems the author migrated to that. Also fixed the website URL as the SourceForge link is dead. Replaced the $(fPIC) macro with PKG_ASLR_PIE. They're both functionally identital. very much not so. PKG_ASLR_PIE adds TARGET_LDFLAGS += -specs=$(INCLUDE_DIR)/hardened-build-ld. please fix/resend John Compile tested on ar71xx and mvebu. Small size decrease on ar71xx: 30444 vs. 30099 bytes. Signed-off-by: Rosen Penev --- package/libs/libusb/Makefile | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libs/libusb/Makefile b/package/libs/libusb/Makefile index 2d1d9c2b50..e9fe3fcec3 100644 --- a/package/libs/libusb/Makefile +++ b/package/libs/libusb/Makefile @@ -8,15 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libusb -PKG_VERSION:=1.0.21 +PKG_VERSION:=1.0.22 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b +PKG_SOURCE_URL:=https://github.com/libusb/libusb/releases/download/v$(PKG_VERSION) +PKG_HASH:=75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157 PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=0 +PKG_ASLR_PIE:=1 PKG_LICENSE:=LGPL-2.1 PKG_MAINTAINER := Felix Fietkau @@ -28,7 +29,7 @@ define Package/libusb-1.0 CATEGORY:=Libraries TITLE:=A library for accessing Linux USB devices DEPENDS:=+libpthread +librt - URL:=http://libusb.wiki.sourceforge.net/ + URL:=http://libusb.info/ endef define Package/libusb-1.0/description @@ -36,7 +37,6 @@ define Package/libusb-1.0/description many different operating systems. endef -TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ --disable-udev \ --disable-log ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] 17:01 gcc: gcc 6.3.0 fix comparison between pointer and integer
On 21/04/18 14:54, Etienne Haarsma wrote: Cherry picked from trunk. Signed-off-by: Etienne Haarsma thanks, did a git cherry-pick -x 22e2b402aee17684781ae705a91fb3645299de9c John --- toolchain/gcc/patches/6.3.0/960-fix-ubsan-defref.patch | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 toolchain/gcc/patches/6.3.0/960-fix-ubsan-defref.patch diff --git a/toolchain/gcc/patches/6.3.0/960-fix-ubsan-defref.patch b/toolchain/gcc/patches/6.3.0/960-fix-ubsan-defref.patch new file mode 100644 index 00..72d86c1498 --- /dev/null +++ b/toolchain/gcc/patches/6.3.0/960-fix-ubsan-defref.patch @@ -0,0 +1,11 @@ +--- a/gcc/ubsan.c b/gcc/ubsan.c +@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc) + + expanded_location xloc = expand_location (loc); + if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0 +- || xloc.file == '\0' || xloc.file[0] == '\xff' ++ || xloc.file[0] == '\0' || xloc.file[0] == '\xff' + || xloc.file[1] == '\xff') + return false; + ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] iptables: link extension libraries with -lm
On 24/04/18 10:05, Alin Nastac wrote:
This fixes an iptables link error when kernel config include
CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
related to the missing -lm argument on the linker command line. Error is caused
by
the odd looking linker argument ${$*_LIBADD} which get expanded to an empty
string.
Hi,
the $* usage is correct
src/%.c:
echo $*
->src/example (bei src/example.c)
please provide your diffconfig so i can reproduce your issue locally.
John
Signed-off-by: Alin Nastac
---
package/network/utils/iptables/patches/600-shared-libext.patch | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/network/utils/iptables/patches/600-shared-libext.patch
b/package/network/utils/iptables/patches/600-shared-libext.patch
index a906d40..17e7fbe 100644
--- a/package/network/utils/iptables/patches/600-shared-libext.patch
+++ b/package/network/utils/iptables/patches/600-shared-libext.patch
@@ -28,27 +28,27 @@
-libext.a: initext.o ${libext_objs}
- ${AM_VERBOSE_AR} ${AR} crs $@ $^;
+libiptext.so: initext.o ${libext_objs}
-+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $^
-L../libxtables/.libs -lxtables ${$*_LIBADD};
++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $^
-L../libxtables/.libs -lxtables ${xt_statistic_LIBADD} ${xt_connlabel_LIBADD};
-libext_ebt.a: initextb.o ${libext_ebt_objs}
- ${AM_VERBOSE_AR} ${AR} crs $@ $^;
+libiptext_ebt.so: initextb.o ${libext_ebt_objs}
-+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $^
-L../libxtables/.libs -lxtables ${$*_LIBADD};
++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $^
-L../libxtables/.libs -lxtables ${xt_statistic_LIBADD} ${xt_connlabel_LIBADD};
-libext_arpt.a: initexta.o ${libext_arpt_objs}
- ${AM_VERBOSE_AR} ${AR} crs $@ $^;
+libiptext_arpt.so: initexta.o ${libext_arpt_objs}
-+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $^
-L../libxtables/.libs -lxtables ${$*_LIBADD};
++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $^
-L../libxtables/.libs -lxtables ${xt_statistic_LIBADD} ${xt_connlabel_LIBADD};
-libext4.a: initext4.o ${libext4_objs}
- ${AM_VERBOSE_AR} ${AR} crs $@ $^;
+libiptext4.so: initext4.o ${libext4_objs}
-+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $^
-L../libxtables/.libs -lxtables ${$*_LIBADD};
++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $^
-L../libxtables/.libs -lxtables ${xt_statistic_LIBADD} ${xt_connlabel_LIBADD};
-libext6.a: initext6.o ${libext6_objs}
- ${AM_VERBOSE_AR} ${AR} crs $@ $^;
+libiptext6.so: initext6.o ${libext6_objs}
-+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $^
-L../libxtables/.libs -lxtables ${$*_LIBADD};
++ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $^
-L../libxtables/.libs -lxtables ${xt_statistic_LIBADD} ${xt_connlabel_LIBADD};
initext_func := $(addprefix xt_,${pfx_build_static})
initextb_func := $(addprefix ebt_,${pfb_build_static})
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH 0/4] Gemini forward-port to kernel v4.14
On 17/04/18 00:34, Roman Yeryomin wrote:
On 2018-04-15 20:22, Roman Yeryomin wrote:
On 2018-04-14 20:36, Hans Ulli Kroll wrote:
Hi Roman
On Tue, 10 Apr 2018, Linus Walleij wrote:
On Mon, Apr 9, 2018 at 12:38 PM, Roman Yeryomin
wrote:
> I have tested them quickly yesterday on nas4220b board. Although
I've
> managed to boot it (had to fix rootfs image) ethernet and usb
didn't work.
> And I didn't check anything else.
> I didn't yet look at the code but before I dive there I have a
question: did
> you have a chance to test it yourself on any of the boards? And
if yes,
> which one?
I think the fotg controller gets stalled after a port reset.
Please check attached (untested) patch for openwrt.
I can test this next week by myself
+diff --git a/drivers/usb/host/fotg210-hcd.c
b/drivers/usb/host/fotg210-hcd.c
+index 2acc51b0be5a..bc9efb49adc7 100644
+--- a/drivers/usb/host/fotg210-hcd.c
b/drivers/usb/host/fotg210-hcd.c
+@@ -1653,6 +1653,10 @@ static int fotg210_hub_control(struct usb_hcd
*hcd, u16 typeReq, u16 wValue,
+ /* see what we found out */
+ temp = check_reset_complete(fotg210, wIndex, status_reg,
+ fotg210_readl(fotg210, status_reg));
++
++ /* restart schedule */
++ fotg210->command |= CMD_RUN;
++ fotg210_writel(fotg210, fotg210->command,
&fotg210->regs->command);
+ }
+
+ if (!(temp & (PORT_RESUME|PORT_RESET))) {
+--
+2.16.2
+
Didn't work for me :(
I've found why it didn't work:
[ 5.845199] Warning! fotg210_hcd should always be loaded before
uhci_hcd and ohci_hcd, not after
After fixing kernel config and applying your patch it works.
So your patch works and is needed indeed.
But there are other problems.
Second USB (USB1) port cannot be initialized and only USB0 is working:
[ 5.843831] fotg210_hcd: FOTG210 Host Controller (EHCI) Driver
[ 5.844298] pinctrl-gemini 4000.syscon:pinctrl: ACTIVATE
function "usb" with group "usbgrp"
[ 5.845067] fotg210-hcd 6800.usb: initialized Gemini PHY
[ 5.845095] fotg210-hcd 6800.usb: Faraday USB2.0 Host Controller
[ 5.845176] fotg210-hcd 6800.usb: new USB bus registered,
assigned bus number 1
[ 5.845696] fotg210-hcd 6800.usb: irq 29, io mem 0x6800
[ 5.877212] fotg210-hcd 6800.usb: USB 2.0 started, EHCI 1.00
[ 5.880314] hub 1-0:1.0: USB hub found
[ 5.880546] hub 1-0:1.0: 1 port detected
[ 5.904768] pinctrl-gemini 4000.syscon:pinctrl: pin T6 USB GNDA
U20 already requested by 6800.usb; cannot claim for 6900.usb
[ 5.904807] pinctrl-gemini 4000.syscon:pinctrl: pin-305
(6900.usb) status -22
[ 5.904845] pinctrl-gemini 4000.syscon:pinctrl: could not
request pin 305 (T6 USB GNDA U20) from group usbgrp on device
pinctrl-gemini
[ 5.904872] fotg210-hcd 6900.usb: Error applying setting,
reverse things back
[ 5.904928] fotg210-hcd: probe of 6900.usb failed with error -22
After removing pinctrl from USB1 it is initialized but then only USB1
is working, USB0 is seen but there are no interrupts.
Didn't yet look at the code, maybe you will know where to fix right away.
Regards,
Roman
Hi,
how shall we proceed ? merge 1, 2 and 3, let roman fix the regressions
and then merge 4 ? or drop the series for now and let you guys send a V2
with the regression fixes integrated ?
John
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] ar71xx: Add userspace support for Mikrotik rb-2011iLS
On 16/04/18 01:25, Simon Paterson wrote:
Kernel support already present.
Patch adds userspace for the 'iLS' suffix model of the RB2011 family.
Enables correct initial switch settings, sysupgrade, etc.
https://mikrotik.com/product/RB2011iLS-IN
Signed-off-by: Simon Paterson
Hi Simon,
patch looks good, however it is whitespace mangled. either you
copy&pasted it or your mail client chewed it up. please use "git
send-email" and resend it.
John
diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds
b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index cf24e465a3..906c4b715f 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -616,6 +616,7 @@ rb-962uigs-5hact2hnt)
ucidef_set_led_timer "user" "USER/SFP" "rb:green:user" "1000" "1000"
;;
rb-2011il|\
+rb-2011ils|\
rb-2011l|\
rb-2011uas|\
rb-2011uas-2hnd|\
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 dfe97e8133..cbbcf53946 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -315,12 +315,14 @@ ar71xx_setup_interfaces()
;;
db120|\
rb-2011il|\
+ rb-2011ils|\
rb-2011l|\
rb-2011uas|\
rb-2011uas-2hnd|\
rb-2011uias|\
rb-2011uias-2hnd)
case "$board" in
+ rb-2011ils|\
rb-2011uas*|\
rb-2011uias|\
rb-2011uias-2hnd)
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index 797c30f8a5..19dd4c2a13 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -335,6 +335,7 @@ get_status_led() {
status_led="$board:green:wan"
;;
rb-2011il|\
+ rb-2011ils|\
rb-2011l|\
rb-2011uas|\
rb-2011uas-2hnd)
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..0388fb6dc9 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
@@ -86,6 +86,7 @@ rb-450)
db120|\
rb-2011il|\
+rb-2011ils|\
rb-2011l|\
rb-2011uas-2hnd)
migrate_switch_name "eth0" "switch0"
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 7249cb6151..95314a2881 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -944,6 +944,9 @@ ar71xx_board_detect() {
*"RouterBOARD 2011iL")
name="rb-2011il"
;;
+ *"RouterBOARD 2011iLS")
+ name="rb-2011ils"
+ ;;
*"RouterBOARD 2011L")
name="rb-2011l"
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 376984a14a..702d97a8ed 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -550,6 +550,7 @@ platform_check_image() {
rb-951ui-2hnd|\
rb-2011l|\
rb-2011il|\
+ rb-2011ils|\
rb-2011uas|\
rb-2011uas-2hnd|\
rb-2011uias|\
@@ -843,6 +844,7 @@ platform_do_upgrade() {
rb-951g-2hnd|\
rb-951ui-2hnd|\
rb-2011il|\
+ rb-2011ils|\
rb-2011l|\
rb-2011uas|\
rb-2011uas-2hnd|\
___
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] [PATCH v2] dropbear: automatically add firewall rules based on the config
On 18/04/18 15:49, Pierre Lebleu wrote:
An extra option (AllowedClientIPs:list) is available to allow
specific clients to use this service.
Hi,
description fails to mention the FW rules being added.
v2: do not create the firewall data if there is no valid interface.
this v2 info needs to go below the tear line
one more comment inline ...
Signed-off-by: Pierre Lebleu
---
.../network/services/dropbear/files/dropbear.init | 49 --
1 file changed, 46 insertions(+), 3 deletions(-)
diff --git a/package/network/services/dropbear/files/dropbear.init
b/package/network/services/dropbear/files/dropbear.init
index 2225113..38cb674 100755
--- a/package/network/services/dropbear/files/dropbear.init
+++ b/package/network/services/dropbear/files/dropbear.init
@@ -43,15 +43,41 @@ validate_section_dropbear()
'IdleTimeout:uinteger:0' \
'MaxAuthTries:uinteger:3' \
'RecvWindowSize:uinteger:0' \
+ 'AllowedClientIPs:list(ipaddr)' \
'mdns:bool:1'
}
+add_fw_rules()
+{
+ local intf="$1"
+ local port="$2"
+ local client="$3"
+
+ [ -z "${intf}" ] && return
+ local zone=$(fw3 -q network "${intf}")
+ [ -z "${zone}" ] && return
+
+ json_add_array firewall
+
+ json_add_object ""
+ json_add_string type rule
+ json_add_string src "${zone}"
+ json_add_string proto tcp
+ json_add_string dest_port "${port}"
+ [ -n "${client}" ] && json_add_string src_ip "${client}"
I have to admit that i am not sure if this is a good approach. the rule
should not be added for anything but the explictly allowed IPS
John
+ json_add_string target ACCEPT
+ json_close_object
+
+ json_close_array
+}
+
dropbear_instance()
{
local PasswordAuth enable Interface GatewayPorts \
RootPasswordAuth RootLogin rsakeyfile \
BannerFile Port SSHKeepAlive IdleTimeout \
- MaxAuthTries RecvWindowSize mdns ipaddrs
+ MaxAuthTries RecvWindowSize AllowedClientIPs \
+ mdns ipaddrs
validate_section_dropbear "${1}" || {
echo "validation failed"
@@ -69,7 +95,8 @@ dropbear_instance()
PIDCOUNT="$(( ${PIDCOUNT} + 1))"
local pid_file="/var/run/${NAME}.${PIDCOUNT}.pid"
- procd_open_instance
+ procd_open_instance "${1}"
+
procd_set_param command "$PROG" -F -P "$pid_file"
[ "${PasswordAuth}" -eq 0 ] && procd_append_param command -s
[ "${GatewayPorts}" -eq 1 ] && procd_append_param command -a
@@ -83,8 +110,20 @@ dropbear_instance()
[ "${MaxAuthTries}" -ne 0 ] && procd_append_param command -T
"${MaxAuthTries}"
[ "${RecvWindowSize}" -gt 0 -a "${RecvWindowSize}" -le 1048576 ] && \
procd_append_param command -W "${RecvWindowSize}"
- [ "${mdns}" -ne 0 ] && procd_add_mdns "ssh" "tcp" "$Port"
"daemon=dropbear"
procd_set_param respawn
+
+ procd_open_data
+
+ [ "${mdns}" -ne 0 ] && {
+ json_add_object "mdns"
+ procd_add_mdns_service "ssh" "tcp" "$Port" "daemon=dropbear"
+ json_close_object
+ }
+
+ add_fw_rules "${Interface}" "${Port}" "${AllowedClientIPs}"
+
+ procd_close_data
+
procd_close_instance
}
@@ -130,6 +169,10 @@ start_service()
config_foreach dropbear_instance dropbear
}
+service_started() {
+ procd_set_config_changed firewall
+}
+
service_triggers()
{
local interfaces
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] u-boot: Switch to HTTP for downloads
On 19/04/18 22:36, Rosen Penev wrote: The first mirror is dead and the second is FTP, which can be unreliable at times. Tested on Ubuntu 16.04 WSL. Signed-off-by: Rosen Penev --- package/boot/uboot-envtools/Makefile | 4 +--- package/boot/uboot-xburst/Makefile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile index c8eafbe..5f3584d 100644 --- a/package/boot/uboot-envtools/Makefile +++ b/package/boot/uboot-envtools/Makefile @@ -14,9 +14,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/u-boot-$(PKG_VERSION) PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=\ - http://mirror2.openwrt.org/sources \ dont drop mirror2 please just switch it to https John - ftp://ftp.denx.de/pub/u-boot +PKG_SOURCE_URL:=http://ftp.denx.de/pub/u-boot PKG_HASH:=7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd PKG_BUILD_DEPENDS:=fstools diff --git a/package/boot/uboot-xburst/Makefile b/package/boot/uboot-xburst/Makefile index 413289a..20138e0 100644 --- a/package/boot/uboot-xburst/Makefile +++ b/package/boot/uboot-xburst/Makefile @@ -14,9 +14,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:= \ - http://mirror2.openwrt.org/sources \ - ftp://ftp.denx.de/pub/u-boot +PKG_SOURCE_URL:=http://ftp.denx.de/pub/u-boot PKG_HASH:=6d094cafa7ecea8b671fbdcd21130b6a4f5744fc47dd263e101ed5d3629dffd4 PKG_TARGETS:=bin ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 2/2] firmware-utils: mkdapimg2: Fix a few issues discovered by clang
On 23/04/18 01:22, Rosen Penev wrote:
I used clang -Weverything and fixed most of the warnings displayed.
this is an explanation of what you did and not what the patch does
John
Signed-off-by: Rosen Penev
---
tools/firmware-utils/src/mkdapimg2.c | 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/tools/firmware-utils/src/mkdapimg2.c
b/tools/firmware-utils/src/mkdapimg2.c
index 59c9f00..89febbc 100644
--- a/tools/firmware-utils/src/mkdapimg2.c
+++ b/tools/firmware-utils/src/mkdapimg2.c
@@ -58,7 +58,7 @@
#define MAX_FW_VER_LEN16
#define MAX_REG_LEN 8
-struct img_hdr_struct {
+static struct img_hdr_struct {
uint32_t hdr_len;
uint32_t checksum;
uint32_t total_size;
@@ -68,17 +68,17 @@ struct img_hdr_struct {
char fw_reg[MAX_REG_LEN];
} imghdr ;
-char *progname;
+static char *progname;
-void
+static void
perrexit(int code, char *msg)
{
fprintf(stderr, "%s: %s: %s\n", progname, msg, strerror(errno));
exit(code);
}
-void
-usage()
+static void
+usage(void)
{
fprintf(stderr, "usage: %s -s signature [-v version] [-r region] [-k uImage part size]
-i -o \n", progname);
exit(1);
@@ -92,7 +92,7 @@ main(int ac, char *av[])
char region[MAX_REG_LEN];
int kernel = 0;
- FILE *ifile, *ofile;
+ FILE *ifile = NULL, *ofile = NULL;
int c;
uint32_t cksum;
@@ -138,7 +138,7 @@ main(int ac, char *av[])
strncpy(region, optarg, MAX_REG_LEN);
break;
case 'k':
- kernel = strtoul(optarg, &ptr, 0);
+ kernel = strtol(optarg, &ptr, 0);
if(ptr[0] == 'k'){
kernel *= 1000;
}
@@ -156,10 +156,8 @@ main(int ac, char *av[])
}
}
- if (signature[0] == 0 || ifile == NULL || ofile == NULL) {
+ if (signature[0] == 0 || ifile == NULL || ofile == NULL)
usage();
- exit(1);
- }
for (bcnt = 0, cksum = 0 ; (c = fgetc(ifile)) != EOF ; bcnt++)
cksum += c & 0xff;
@@ -178,7 +176,7 @@ main(int ac, char *av[])
strncpy(imghdr.fw_ver, version, MAX_FW_VER_LEN);
strncpy(imghdr.fw_reg, region, MAX_REG_LEN);
- if (fwrite(&imghdr, sizeof(imghdr), 1, ofile) < 0)
+ if (fwrite(&imghdr, sizeof(imghdr), 1, ofile) != 1)
perrexit(2, "fwrite header on output");
while ((c = fgetc(ifile)) != EOF) {
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH fstools] libfstools: fix foreachdir() to pass dir with a trailing slash
On 13/04/18 13:26, Rafał Miłecki wrote:
From: Rafał Miłecki
Commit cc63723d886fd ("overlay: use lstat rather than stat and make sure
there are no trailing spaces") changed behavior of foreachdir() breaking
some callbacks. Before that modification all callbacks were getting
directory with a trailing slash. Above commit started removing them.
This broke handle_whiteout() which doesn't work at all since then. It
constructs file paths incorrectly: slash is missing between directory
and a file name. It seems noone noticed it for years because this issue
got hidden by switch2jffs() which also handles whiteouts with its system
command "cp -a" call.
Fix that regression by setting trailing slash back - right after calling
lstat(). Also to keep code simple just skip all entries that aren't
directories. This keeps conditions for removing/setting trailing slash
trivial. A side effect is not calling callbacks for files which is a
free bonus optimization.
Fixes: cc63723d886fd ("overlay: use lstat rather than stat and make sure there are
no trailing spaces")
Signed-off-by: Rafał Miłecki
Acked-by: John Crispin
---
libfstools/overlay.c | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/libfstools/overlay.c b/libfstools/overlay.c
index 1d69f5a..a41364c 100644
--- a/libfstools/overlay.c
+++ b/libfstools/overlay.c
@@ -88,15 +88,25 @@ foreachdir(const char *dir, int (*cb)(const char*))
sprintf(globdir, "%s/*", dir);
+ /* Include GLOB_MARK as callbacks expect a trailing slash */
if (!glob(globdir, GLOB_NOESCAPE | GLOB_MARK | GLOB_ONLYDIR, NULL, &gl))
for (j = 0; j < gl.gl_pathc; j++) {
char *dir = gl.gl_pathv[j];
int len = strlen(gl.gl_pathv[j]);
+ int err;
- if (len > 1 && dir[len - 1] == '/')
+ /* Quick way of skipping files */
+ if (dir[len - 1] != '/')
+ continue;
+
+ /* lstat needs path without a trailing slash */
+ if (len > 1)
dir[len - 1] = '\0';
+ err = lstat(gl.gl_pathv[j], &s);
+ if (len > 1)
+ dir[len - 1] = '/';
- if (!lstat(gl.gl_pathv[j], &s) && !S_ISLNK(s.st_mode))
+ if (!err && !S_ISLNK(s.st_mode))
foreachdir(gl.gl_pathv[j], cb);
}
cb(dir);
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH fstools] libfstools: move mount points when switching to JFFS2
On 16/04/18 16:11, Rafał Miłecki wrote:
From: Rafał Miłecki
Switching from "tmpfs" to "jffs2" happens after JFFS2 formatting is
done. During that time user can use filesystem (thanks to RAM) and the
role of switch2jffs() is to copy all changes to the JFFS2 overlay
partition.
What wasn't handled so far was moving mount points. User can create
custom mounts, cp command won't copy them and umounting "tmpfs" will
cause these mounts to go away. To preserve them switch2jffs() has to
find all custom mount points and move them to the new filesystem.
Signed-off-by: Rafał Miłecki
Acked-by: John Crispin
---
libfstools/overlay.c | 46 +-
1 file changed, 45 insertions(+), 1 deletion(-)
diff --git a/libfstools/overlay.c b/libfstools/overlay.c
index a41364c..ebc43f7 100644
--- a/libfstools/overlay.c
+++ b/libfstools/overlay.c
@@ -112,6 +112,24 @@ foreachdir(const char *dir, int (*cb)(const char*))
cb(dir);
}
+static void foreach_mount(int (*cb)(const char *, const char *))
+{
+ FILE *fp = fopen("/proc/mounts", "r");
+ static char line[256];
+
+ if (!fp)
+ return;
+
+ while (fgets(line, sizeof(line), fp)) {
+ char device[32], mount_point[32];
+
+ if (sscanf(line, "%31s %31s %*s %*s %*u %*u", device,
mount_point) == 2)
+ cb(device, mount_point);
+ }
+
+ fclose(fp);
+}
+
void
overlay_delete(const char *dir, bool _keep_sysupgrade)
{
@@ -135,6 +153,19 @@ overlay_mount(struct volume *v, char *fs)
return 0;
}
+/**
+ * move_mount - move mount point to the new root
+ */
+static int move_mount(const char *device, const char *mount_point)
+{
+ static const char *prefix = "/tmp/root/";
+
+ if (strncmp(mount_point, prefix, strlen(prefix)))
+ return 0;
+
+ return mount_move(prefix, "/", mount_point + strlen(prefix));
+}
+
static int
switch2jffs(struct volume *v)
{
@@ -174,7 +205,20 @@ switch2jffs(struct volume *v)
return -1;
}
- return fopivot("/overlay", "/rom");
+ ret = fopivot("/overlay", "/rom");
+
+ /*
+* Besides copying overlay data from "tmpfs" to "jffs2" we should also
+* move mount points that user could create during JFFS2 formatting.
+* This has to happen after fopivot call because:
+* 1) It's trivial to find mount points to move then (/tmp/root/...).
+* 2) We can't do that earlier using /rom/overlay/upper/ as overlay(fs)
+*doesn't support mounts. Mounting to upper dir don't make overlay
+*/propagate/ files to the target dir.
+*/
+ foreach_mount(move_mount);
+
+ return ret;
}
int
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH fstools] libfstools: add "const" to char pointer arguments in mount_move()
On 16/04/18 14:30, Rafał Miłecki wrote:
From: Rafał Miłecki
That function never modifies these strings so it can/should use consts.
It makes it a bit more flexible as now callers can also pass consts.
Signed-off-by: Rafał Miłecki
Acked-by: John Crispin
---
libfstools/libfstools.h | 2 +-
libfstools/mount.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libfstools/libfstools.h b/libfstools/libfstools.h
index 0398c96..f27307a 100644
--- a/libfstools/libfstools.h
+++ b/libfstools/libfstools.h
@@ -43,7 +43,7 @@ extern int mount_extroot(void);
extern int mount_snapshot(struct volume *v);
extern int mount_overlay(struct volume *v);
-extern int mount_move(char *oldroot, char *newroot, char *dir);
+extern int mount_move(const char *oldroot, const char *newroot, const char
*dir);
extern int pivot(char *new, char *old);
extern int fopivot(char *rw_root, char *ro_root);
extern int ramoverlay(void);
diff --git a/libfstools/mount.c b/libfstools/mount.c
index 4dc6e3a..c7f2789 100644
--- a/libfstools/mount.c
+++ b/libfstools/mount.c
@@ -32,7 +32,7 @@ extern int pivot_root(const char *new_root, const char
*put_old);
* @newroot: new directory for the mount point
*/
int
-mount_move(char *oldroot, char *newroot, char *dir)
+mount_move(const char *oldroot, const char *newroot, const char *dir)
{
#ifndef MS_MOVE
#define MS_MOVE (1 << 13)
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] Wifi-related kernel-oops on mt7621 after 4.14 update
On 12/04/18 12:42, Kristian Evensen wrote: Hello, I have recently updated some ramips mt7621-devices (ZBT WG3526) to the latest nightly. Almost everything seems to work fine, but using either wifi interface in client mode seems triggers an oops. I see two different oops-messages: Message 1: [ 66.442802] CPU 1 Unable to handle kernel paging request at virtual address e9e9e0d5, epc == 8f3e060c, ra == 8ec86fac [ 66.453460] Oops[#1]: [ 66.455743] CPU: 1 PID: 3679 Comm: wifib Tainted: GW 4.14.32 #0 [ 66.462857] task: 8e223200 task.stack: 8e1b4000 [ 66.467374] $ 0 : 0001 7abc2e80 0020 [ 66.472612] $ 4 : 8ec48bc0 8e76dc20 e9e9dae0 8e1b5848 [ 66.477847] $ 8 : 8ec4902c 80452968 00ee4000 ff80 [ 66.483061] $12 : 80583f8c 0040 77f0f3c0 [ 66.488276] $16 : 8ec49560 8f578000 8e76d480 8ec48bc0 [ 66.493493] $20 : 0002 8e1b5cb8 0008 [ 66.498711] $24 : 77e74ff0 [ 66.503937] $28 : 8e1b4000 8e1b5780 8ec86fac [ 66.509153] Hi: [ 66.512020] Lo: 0068 [ 66.514913] epc : 8f3e060c 0x8f3e060c [ 66.518866] ra: 8ec86fac sta_set_sinfo+0xcc/0xbb0 [mac80211] [ 66.524843] Status: 11007c03 KERNEL EXL IE [ 66.529015] Cause : 4088 (ExcCode 02) [ 66.533005] BadVA : e9e9e0d5 [ 66.535869] PrId : 0001992f (MIPS 1004Kc) [ 66.539941] Modules linked in: rt2800pci rt2800mmio rt2800lib qcserial ppp_async option usb_wwan rt2x00pci rt2x00mmio rt2x00lib rndis_host qmi_wwan ppp_generic nf_nat_pptp nf_conntrack_pptp nf_conntrack_ipv6p [ 66.610889] nf_nat_snmp_basic nf_nat_sip nf_nat_redirect nf_nat_proto_gre nf_nat_masquerade_ipv4 nf_nat_irc nf_conntrack_ipv4 nf_nat_ipv4 nf_nat_h323 nf_nat_ftp nf_nat_amanda nf_nat nf_log_ipv4 nf_flow_tablt [ 66.681822] ip_set_hash_netiface ip_set_hash_netport ip_set_hash_netnet ip_set_hash_net ip_set_hash_netportnet ip_set_hash_mac ip_set_hash_ipportnet ip_set_hash_ipportip ip_set_hash_ipport ip_set_hash_ipmarm [ 66.753184] ohci_hcd ehci_platform sd_mod scsi_mod ehci_hcd gpio_button_hotplug usbcore nls_base usb_common mii [ 66.763357] Process wifib (pid: 3679, threadinfo=8e1b4000, task=8e223200, tls=77f10ec0) [ 66.771321] Stack : 8e1b5848 8f578000 [ 66.779654] 8e76d480 8ec48bc0 8f578130 0002 8e1b5cb8 0008 8ec86fac [ 66.787987] 0100 8e134628 0007 8e1b5b98 8e134628 8e1b5b90 8ec49014 [ 66.796325] 8e76d000 fffe 0002 8e1b5cb8 8ec9e338 8ec315ac [ 66.804661] 01d2 8058 8e134628 8e068840 8ec1fb28 [ 66.812996] ... [ 66.815446] Call Trace: [ 66.817894] [<8f3e060c>] 0x8f3e060c [ 66.821370] Code: 000630c0 02063021 94f40002 <90d205f5> 00e0b025 1682 3253 2414001f 96d50004 [ 66.831098] [ 66.833187] ---[ end trace 8c8a003de3eabcd8 ]--- [ 66.841897] Kernel panic - not syncing: Fatal exception [ 66.849317] Rebooting in 3 seconds.. Message 2: [ 132.613293] CPU 0 Unable to handle kernel paging request at virtual address ea9160d5, epc == 8f2c060c, ra == 8ec86fac [ 132.623927] Oops[#1]: [ 132.626199] CPU: 0 PID: 41 Comm: kworker/u8:3 Tainted: GW 4.14.32 #0 [ 132.633882] Workqueue: phy0 ieee80211_ibss_leave [mac80211] [ 132.639431] task: 8fd48c80 task.stack: 8fd94000 [ 132.643933] $ 0 : 0001 7ac52e80 0020 [ 132.649141] $ 4 : 8f2d0bc0 8e04dc20 ea915ae0 8f122400 [ 132.654350] $ 8 : 80452970 8fc02b00 0005376b [ 132.659558] $12 : 12d8 001c [ 132.664766] $16 : 8f2d1560 8f58a000 8e04d480 8f2d0bc0 [ 132.669973] $20 : 0001 8f2d1014 [ 132.675181] $24 : 3b9aca00 [ 132.680390] $28 : 8fd94000 8fd95c88 8ece1618 8ec86fac [ 132.685605] Hi: 07d0 [ 132.688473] Lo: 0bb8 [ 132.691357] epc : 8f2c060c 0x8f2c060c [ 132.695235] ra: 8ec86fac sta_set_sinfo+0xcc/0xbb0 [mac80211] [ 132.701212] Status: 11008403 KERNEL EXL IE [ 132.705391] Cause : 4088 (ExcCode 02) [ 132.709380] BadVA : ea9160d5 [ 132.712247] PrId : 0001992f (MIPS 1004Kc) [ 132.716320] Modules linked in: rt2800pci rt2800mmio rt2800lib qcserial ppp_async option usb_wwan rt2x00pci rt2x00mmio rt2x00lib rndis_host qmi_wwan ppp_generic nf_nat_pptp nf_conntrack_pptp nf_conntrack_ipv6p [ 132.787381] nf_nat_snmp_basic nf_nat_sip nf_nat_redirect nf_nat_proto_gre nf_nat_masquerade_ipv4 nf_nat_irc nf_conntrack_ipv4 nf_nat_ipv4 nf_nat_h323 nf_nat_ftp nf_nat_amanda nf_nat nf_log_ipv4 nf_flow_tablt [ 132.858369] ip_set_hash_netiface ip_set_hash_netport ip_set_hash_netnet ip_set_hash_net ip_set_hash_netportnet ip_set_hash_mac ip_set_hash_ipportnet ip_set_hash_ipportip ip_set_hash_ipport ip_set_hash_ipmarm [ 132.929808] ohci_hcd ehci_platform sd_mod scsi_mod ehci_hcd gpio_button_hotplug usbcore nls_base usb_common mii [ 132.939989] Process kworker/u
Re: [LEDE-DEV] [PATCH 10/12] at91: reorganize at91 subtargets
On 02/04/18 18:34, Sandeep Sheriker Mallikarjun wrote:
reorganizing at91 subtargets based on sama5 soc features and this fix
below problems.
1. able to set neon flags to sama5d2 & sama5d4 subtargets.
2. fix the make clean which removes all the subtargets in bin folder.
3. able to configure kernel specific to subtarget.
4. able to set vfpu4 flags to samad3 subtargets.
Signed-off-by: Sandeep Sheriker Mallikarjun
Ok, this is where you spli tthem up...
John
---
package/boot/at91bootstrap/Makefile| 12 +-
package/boot/uboot-at91/Makefile | 18 +-
target/linux/at91/Makefile |2 +-
target/linux/at91/image/Makefile | 51 +-
target/linux/at91/image/sama5.mk | 101 --
target/linux/at91/image/sama5d2.mk | 23 +
target/linux/at91/image/sama5d3.mk | 33 +
target/linux/at91/image/sama5d4.mk | 20 +
target/linux/at91/sama5/target.mk |9 -
.../linux/at91/{sama5 => sama5d2}/config-default |0
target/linux/at91/sama5d2/target.mk| 10 +
target/linux/at91/sama5d3/config-default | 1311
target/linux/at91/sama5d3/target.mk| 10 +
target/linux/at91/sama5d4/config-default | 1311
target/linux/at91/sama5d4/target.mk| 10 +
15 files changed, 2798 insertions(+), 123 deletions(-)
delete mode 100644 target/linux/at91/image/sama5.mk
create mode 100644 target/linux/at91/image/sama5d2.mk
create mode 100644 target/linux/at91/image/sama5d3.mk
create mode 100644 target/linux/at91/image/sama5d4.mk
delete mode 100644 target/linux/at91/sama5/target.mk
rename target/linux/at91/{sama5 => sama5d2}/config-default (100%)
create mode 100644 target/linux/at91/sama5d2/target.mk
create mode 100644 target/linux/at91/sama5d3/config-default
create mode 100644 target/linux/at91/sama5d3/target.mk
create mode 100644 target/linux/at91/sama5d4/config-default
create mode 100644 target/linux/at91/sama5d4/target.mk
diff --git a/package/boot/at91bootstrap/Makefile
b/package/boot/at91bootstrap/Makefile
index fbe44c4..b350555 100644
--- a/package/boot/at91bootstrap/Makefile
+++ b/package/boot/at91bootstrap/Makefile
@@ -24,63 +24,73 @@ include $(INCLUDE_DIR)/package.mk
define AT91Bootstrap/Default
BUILD_TARGET:=at91
- BUILD_SUBTARGET:=sama5
HIDDEN:=1
AT91BOOTSTRAP_IMAGE:=at91bootstrap.bin
endef
define AT91Bootstrap/sama5d2_xplaineddf_uboot
TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (SPI Flash)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d2_xplained
endef
define AT91Bootstrap/sama5d2_xplaineddf_qspi_uboot
TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (QSPI Flash)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d2_xplained
endef
define AT91Bootstrap/sama5d2_xplainedsd_uboot
TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (SDcard/EMMC)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d2_xplained
endef
define AT91Bootstrap/sama5d3_xplainednf_uboot
TITLE:=AT91Bootstrap for SAMA5D3 Xplained board (Nand Flash)
+ BUILD_SUBTARGET:=sama5d3
BUILD_DEVICES:=at91-sama5d3_xplained
endef
define AT91Bootstrap/sama5d3_xplainedsd_uboot
TITLE:=AT91Bootstrap for SAMA5D3 Xplained board (SDcard)
+ BUILD_SUBTARGET:=sama5d3
BUILD_DEVICES:=at91-sama5d3_xplained
endef
define AT91Bootstrap/sama5d4_xplainednf_uboot_secure
TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (Nand Flash)
+ BUILD_SUBTARGET:=sama5d4
BUILD_DEVICES:=at91-sama5d4_xplained
endef
define AT91Bootstrap/sama5d4_xplaineddf_uboot_secure
TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (SPI Flash)
+ BUILD_SUBTARGET:=sama5d4
BUILD_DEVICES:=at91-sama5d4_xplained
endef
define AT91Bootstrap/sama5d4_xplainedsd_uboot_secure
TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (SDcard)
+ BUILD_SUBTARGET:=sama5d4
BUILD_DEVICES:=at91-sama5d4_xplained
endef
define AT91Bootstrap/sama5d27_som1_eksd_uboot
TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (SDcard0)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d27_som1_ek
endef
define AT91Bootstrap/sama5d27_som1_eksd1_uboot
TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (SDcard1)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d27_som1_ek
endef
define AT91Bootstrap/sama5d27_som1_ekqspi_uboot
TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (QSPI Flash)
+ BUILD_SUBTARGET:=sama5d2
BUILD_DEVICES:=at91-sama5d27_som1_ek
endef
diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile
index 73a2d62..b336321 100644
--- a/package/boot/uboot-at91/Makefile
+++ b/package/boot/uboot-at91/Makefile
@@ -40,55 +40,55 @@ endef
define U-Boot/sama5d3_xplained_nandflash
NAME:=SAMA5D3 Xplained board (NandFl
Re: [LEDE-DEV] [PATCH 03/12] uboot-at91: fetch uboot src from u-boot-at91 github
On 02/04/18 18:34, Sandeep Sheriker Mallikarjun wrote: fetching uboot src from linux4sam/u-boot-at91 github for all at91 target. Signed-off-by: Sandeep Sheriker Mallikarjun Hi, Whats the difference between these uboots ? I am guessing its pre-patched ? John --- package/boot/uboot-at91/Makefile | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index cad12ec..27b113e 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -7,10 +7,12 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=2016.05 +PKG_VERSION:=linux4sam_5.8 PKG_RELEASE:=1 -PKG_HASH:=87d02275615aaf0cd007b54cbe9fbadceef2bee7c79e6c323ea1ae8956dcb171 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/linux4sam/u-boot-at91.git +PKG_SOURCE_VERSION:=59f202622154f82e708a6ca2bf86350a5c1b2d33 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk @@ -30,7 +32,9 @@ endef define U-Boot/at91sam9x5ek_nandflash NAME:=AT91SAM9X5-EK board (NandFlash) BUILD_SUBTARGET:=legacy - BUILD_DEVICES:=at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek + BUILD_DEVICES:=at91sam9g15ek at91sam9g25ek \ + at91sam9g35ek at91sam9x25ek \ +at91sam9x35ek endef define U-Boot/sama5d3_xplained_nandflash @@ -87,9 +91,10 @@ UBOOT_TARGETS := \ sama5d4_xplained_nandflash define Build/Compile - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - KCFLAGS="$(filter-out -fstack-protector -mfloat-abi=hard, $(TARGET_CFLAGS)) -mfloat-abi=soft" + +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ + CROSS_COMPILE=$(TARGET_CROSS) \ + KCFLAGS="$(filter-out -fstack-protector \ + -mfloat-abi=hard, $(TARGET_CFLAGS)) -mfloat-abi=soft" endef $(eval $(call BuildPackage/U-Boot)) ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [LEDE-DEV, 3/3] fstools: fix lost mount point when first boot
On 29/03/18 10:25, rosys...@rosinson.com wrote:
When firmware is new flashed and reboot with a storage device plug in its usb
interface. Though the filesystem is not ready (FS_STATE_UNKNOWN), the
/dev/sda1 still mount on /mnt/sda1 by block-mount, then the system switching
jffs...
root@OpenWrt:~# dmesg
..
[ 32.224522] jffs2_scan_eraseblock(): End of filesystem marker found at 0x0
[ 32.270514] jffs2_build_filesystem(): unlocking the mtd device...
[ 32.278711] jffs2_build_filesystem(): erasing all blocks after the end
marker...
root@OpenWrt:~# mount
..
/dev/sda1 on /mnt/sda1 type exfat
(rw,relatime,fmask=,dmask=,allow_utime=0022,iocharset=utf8,namecase=0,errors=remount-ro)
mountd(pid1314) on /tmp/run/blockd type autofs
(rw,relatime,fd=7,pgrp=1,timeout=30,minproto=5,maxproto=5,indirect)
After few miniutes, when filesystem is ready (FS_STATE_READY, /overlay/.fs_state
-> 2)
the /dev/sda1 lost its mount point
root@OpenWrt:~# dmesg
...
[ 207.439407] jffs2: notice: (1336) jffs2_build_xattr_subsystem: complete
building xattr subsystem, 0 of xdatum (0 unchecked, 0 orphan) and 0 of xref (0
dead, 0 orphan) found.
root@OpenWrt:~# mount
..
**no /mnt/sda1 found**
..
Signed-off-by: Rosy Song
Hi
the description explains the bug but fails to expalin how the patch
solves the problem. I am also struggeling to understand the problem. You
are trying to use sda1 as jffs2 but there is a exfat already present so
that they collide ?
John
---
mount_root.c | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/mount_root.c b/mount_root.c
index dffb0a6..110e4fd 100644
--- a/mount_root.c
+++ b/mount_root.c
@@ -101,6 +101,7 @@ stop(int argc, char *argv[1])
static int
done(int argc, char *argv[1])
{
+ int ret;
struct volume *v = volume_find("rootfs_data");
if (!v)
@@ -109,7 +110,15 @@ done(int argc, char *argv[1])
switch (volume_identify(v)) {
case FS_NONE:
case FS_DEADCODE:
- return jffs2_switch(v);
+ ret = jffs2_switch(v);
+ /*
+ * Devices mounted under /mnt will lost their mount point(see
switch2jffs())
+ * if the filesystem's(/overlay) state is not FS_STATE_READY,
+ * this action can fix it.
+ */
+ if (!access("/sbin/block", X_OK))
+ system("/sbin/block mount");
+ return ret;
case FS_EXT4:
case FS_F2FS:
--
2.13.3
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 mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [LEDE-DEV,2/3] fstools: fix potential memory leak
On 29/03/18 10:25, rosys...@rosinson.com wrote:
Fix potential memory leak in fstools
Signed-off-by: Rosy Song
Hi,
the description is wrong, this fixes a potential null pointer deref and
i dont really see how probing of a FS would work without a magic so we
probably wont ever hit this case ?
John
---
libblkid-tiny/libblkid-tiny.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libblkid-tiny/libblkid-tiny.c b/libblkid-tiny/libblkid-tiny.c
index ccfaf63..12cab6f 100644
--- a/libblkid-tiny/libblkid-tiny.c
+++ b/libblkid-tiny/libblkid-tiny.c
@@ -282,7 +282,7 @@ int probe_block(char *block, struct blkid_struct_probe *pr)
mag = &idinfos[i]->magics[0];
- while (mag->magic) {
+ while (mag && mag->magic) {
int off = (mag->kboff * 1024) + mag->sboff;
char magic[32] = { 0 };
--
2.13.3
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 mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [LEDE-DEV, 1/3] fstools: add exfat filesystem support
On 29/03/18 11:57, Jo-Philipp Wich wrote: Hi, fstools will use the full libblkid if it is installed on the system, this should also enable support for all filesystems supported by the full libblkid. Adding more and more exotic stuff to libblkid-tiny will bloat the default fstools install for all users, so we should avoid that - imho. Regards, Jo fully agree with Jow. NAK from me on this one John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 3/3] lantiq: add support for AVM FRITZ!Box 7412
On 09/03/18 20:55, John Crispin wrote:
On 09/03/18 20:17, Valentin Spreckels wrote:
Specification:
- SoC: Lantiq VRX 220
- CPU Cores: 2x MIPS 34Kc at 500 MHz
- RAM: 128 MiB 250 MHz
- Storage: 128 MiB NAND flash
- Ethernet: built-in Fast Ethernet switch, only port 2 is used
- Wireless: Atheros AR9287-BL1A b/g/n with 2 pcb antennas
- Modem: built-in A/VDSL2 modem
- DECT: Dialog SC14441
- LEDs: 1 two-color, 4 one-color
- Buttons: 2
- FXS: 1 port via TAE or RJ12 connector
Working:
- ethernet
- wifi
- leds
- buttons
- dsl
Not working:
- Second cpu core
- FXS
- DECT
Installation:
1. Use the eva_ramboot.py script to load an initramfs image on the
device. Run it a few seconds after turning the device on.
$ scripts/flashing eva_ramboot 192.168.178.1
bin/targets/lantiq/xrx200/openwrt-lantiq-xrx200-avm_fritz7412-initramfs-kernel.bin
If it fails to find the device try the ip address 169.254.120.1.
(Firmware updates or the recovery tool apparently change it.)
2. The device will load it in ram and boot it. You can reach it under
the openwrt default ip address 192.168.1.1.
3. Check if the key linux_fs_start is not set to 1 in tffs:
$ fritz_tffs_nand -d /dev/mtd1 -n linux_fs_start
If it is set to 1, the bootloader will select the wrong set of
partitions. Restart the box and install an FritzOS upgrade or do a
recovery. Afterwards start again at step 1.
4. Run sysupgrade to persistently install OpenWRT.
Signed-off-by: Valentin Spreckels
---
.../linux/lantiq/base-files/etc/board.d/02_network | 8 +
.../etc/hotplug.d/firmware/12-ath9k-eeprom | 3 +
.../lantiq/base-files/lib/upgrade/platform.sh | 2 +-
.../files-4.14/arch/mips/boot/dts/FRITZ7412.dts | 241
.../files-4.9/arch/mips/boot/dts/FRITZ7412.dts | 242
+
.../lantiq/files-4.9/arch/mips/boot/dts/vr9.dtsi | 2 +-
target/linux/lantiq/image/Makefile | 13 ++
7 files changed, 509 insertions(+), 2 deletions(-)
create mode 100644
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7412.dts
create mode 100644
target/linux/lantiq/files-4.9/arch/mips/boot/dts/FRITZ7412.dts
diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network
b/target/linux/lantiq/base-files/etc/board.d/02_network
index ca974b071e..defdc1a94d 100755
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -154,6 +154,14 @@ avm,fritz7360sl)
"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
;;
+avm,fritz7412)
+ tffsdev=$(find_mtd_chardev "nand-tffs")
+ annex="b"
+ lan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n maca)
+ wan_mac=$(/usr/bin/fritz_tffs_nand -d $tffsdev -n macdsl)
dont use absolute paths please ...
+ ucidef_set_interface_lan 'eth0'
+ ;;
+
siemens,gigaset-sx76x)
annex="b"
ucidef_add_switch "switch0" \
diff --git
a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
b/target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
index 498a509012..68181c7b87 100644
---
a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
+++
b/target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
@@ -141,6 +141,9 @@ case "$FIRMWARE" in
avm,fritz3370|avm,fritz7320|avm,fritz7360sl)
ath9k_eeprom_extract "urlader" 2437 0
;;
+ avm,fritz7412)
+ /usr/bin/fritz_cal_extract -i 1 -s 0x1e000 -e 0x207
-l 4096 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader")
absolute path ...
+ ;;
tplink,tdw8970|tplink,tdw8980)
ath9k_eeprom_extract "boardconfig" 135168 0
;;
diff --git a/target/linux/lantiq/base-files/lib/upgrade/platform.sh
b/target/linux/lantiq/base-files/lib/upgrade/platform.sh
index 2e58cb799a..7a43e7e12e 100755
--- a/target/linux/lantiq/base-files/lib/upgrade/platform.sh
+++ b/target/linux/lantiq/base-files/lib/upgrade/platform.sh
@@ -9,7 +9,7 @@ platform_do_upgrade() {
local board=$(board_name)
case "$board" in
-
bt,homehub-v2b|bt,homehub-v3a|bt,homehub-v5a|zyxel,p-2812hnu-f1|zyxel,p-2812hnu-f3)
+
avm,fritz7412|bt,homehub-v2b|bt,homehub-v3a|bt,homehub-v5a|zyxel,p-2812hnu-f1|zyxel,p-2812hnu-f3)
please turn this into |\
multi|\
line)
nand_do_upgrade $1
;;
*)
diff --git
a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7412.dts
b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7412.dts
new file mode 100644
index 00..5bcd140520
--- /dev/null
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7412.dts
i'll leave the dts review to mkresin, there is a newline spacing issue
for sure. :-)
all in all, thanks, nice patch ser
Re: [LEDE-DEV] [PATCH 2/3] scripts: add EVA ramboot script
On 09/03/18 20:17, Valentin Spreckels wrote:
The bootloader on the FRITZ!Box 7412 crashes when flashing images. Thus
the AVM recovery tool uses another approach: It uses the bootloader to
load a small linux system into the ram and boot it from there. This
system will then flash the image.
This script mimics the behavior: It loads an openwrt initramfs image.
After this a sysupgrade can be done to persistently install openwrt.
Signed-off-by: Valentin Spreckels
I have been using an ugly shell script to do the same for a few years so ...
Acked-by: John Crispin
---
scripts/flashing/eva_ramboot.py | 37 +
1 file changed, 37 insertions(+)
create mode 100755 scripts/flashing/eva_ramboot.py
diff --git a/scripts/flashing/eva_ramboot.py b/scripts/flashing/eva_ramboot.py
new file mode 100755
index 00..b825d2768b
--- /dev/null
+++ b/scripts/flashing/eva_ramboot.py
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+
+from ftplib import FTP
+from sys import argv
+from os import stat
+
+assert len(argv) == 3
+ip = argv[1]
+image = argv[2]
+
+size = stat(image).st_size
+# arbitrary size limit, to prevent the address calculations from overflows etc.
+assert size < 0x200
+
+# We need to align the address. A page boundary seems to be sufficient on
7362sl
+# and 7412
+addr = ((0x800 - size) & ~0xfff)
+haddr = 0x8000 + addr
+img = open(image, "rb")
+
+ftp = FTP(ip, 'adam2', 'adam2')
+
+def adam(cmd):
+ print("> %s"%(cmd))
+ resp = ftp.sendcmd(cmd)
+ print("< %s"%(resp))
+ assert resp[0:3] == "200"
+
+ftp.set_pasv(True)
+# The following parameters allow booting the avm recovery system with this
+# script.
+adam('SETENV memsize 0x%08x'%(addr))
+adam('SETENV kernel_args_tmp mtdram1=0x%08x,0x8800'%(haddr))
+adam('MEDIA SDRAM')
+ftp.storbinary('STOR 0x%08x 0x8800'%(haddr), img)
+img.close()
+ftp.close()
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 1/3] fritz-tools: add fritz_tffs_nand_read tool
Hi Valentin,
nitpicks inline ...
On 09/03/18 20:17, Valentin Spreckels wrote:
This tool reads informations from AVM TFFS 3.0 filesystems on nand
flash. AVM uses this on newer FRITZ!Boxes (e.g. 7412) without SPI or nor
flash.
Signed-off-by: Valentin Spreckels
---
package/utils/fritz-tools/Makefile | 15 +
package/utils/fritz-tools/src/CMakeLists.txt | 3 +-
.../utils/fritz-tools/src/fritz_tffs_nand_read.c | 558 +
3 files changed, 575 insertions(+), 1 deletion(-)
create mode 100644 package/utils/fritz-tools/src/fritz_tffs_nand_read.c
diff --git a/package/utils/fritz-tools/Makefile
b/package/utils/fritz-tools/Makefile
index 7c547e6f97..a4d69bdf71 100644
--- a/package/utils/fritz-tools/Makefile
+++ b/package/utils/fritz-tools/Makefile
@@ -21,6 +21,15 @@ define Package/fritz-tffs/description
Utility to partially read the TFFS filesystems.
endef
+define Package/fritz-tffs-nand
+ $(call Package/fritz-tools/Default)
+ TITLE:=Utility to partially read the TFFS filesystems on NAND flash
+endef
+
+define Package/fritz-tffs-nand/description
+ Utility to partially read the TFFS filesystems on NAND flash.
+endef
+
define Package/fritz-caldata
$(call Package/fritz-tools/Default)
DEPENDS:=+zlib
@@ -36,10 +45,16 @@ define Package/fritz-tffs/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/fritz_tffs_read $(1)/usr/bin/fritz_tffs
endef
+define Package/fritz-tffs-nand/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/fritz_tffs_nand_read
$(1)/usr/bin/fritz_tffs_nand
+endef
+
define Package/fritz-caldata/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/fritz_cal_extract $(1)/usr/bin/
endef
$(eval $(call BuildPackage,fritz-tffs))
+$(eval $(call BuildPackage,fritz-tffs-nand))
$(eval $(call BuildPackage,fritz-caldata))
diff --git a/package/utils/fritz-tools/src/CMakeLists.txt
b/package/utils/fritz-tools/src/CMakeLists.txt
index 021dc7733a..85b815712e 100644
--- a/package/utils/fritz-tools/src/CMakeLists.txt
+++ b/package/utils/fritz-tools/src/CMakeLists.txt
@@ -9,7 +9,8 @@ FIND_PATH(zlib_include_dir zlib.h)
INCLUDE_DIRECTORIES(${zlib_include_dir})
ADD_EXECUTABLE(fritz_tffs_read fritz_tffs_read.c)
+ADD_EXECUTABLE(fritz_tffs_nand_read fritz_tffs_nand_read.c)
ADD_EXECUTABLE(fritz_cal_extract fritz_cal_extract.c)
TARGET_LINK_LIBRARIES(fritz_cal_extract z)
-INSTALL(TARGETS fritz_tffs_read fritz_cal_extract RUNTIME DESTINATION bin)
+INSTALL(TARGETS fritz_tffs_read fritz_tffs_nand_read fritz_cal_extract RUNTIME
DESTINATION bin)
diff --git a/package/utils/fritz-tools/src/fritz_tffs_nand_read.c
b/package/utils/fritz-tools/src/fritz_tffs_nand_read.c
new file mode 100644
index 00..6f30c2bbdb
--- /dev/null
+++ b/package/utils/fritz-tools/src/fritz_tffs_nand_read.c
@@ -0,0 +1,558 @@
+/*
+ * A tool for reading the TFFS partitions (a name-value storage usually
+ * found in AVM Fritz!Box based devices) on nand flash.
+ *
+ * Copyright (c) 2018 Valentin Spreckels
+ *
+ * Based on the fritz_tffs_read tool:
+ * Copyright (c) 2015-2016 Martin Blumenstingl
+ * and on the TFFS 2.0 kernel driver from AVM:
+ * Copyright (c) 2004-2007 AVM GmbH
+ * and the TFFS 3.0 kernel driver from AVM:
+ * Copyright (C) 2004-2014 AVM GmbH
+ * and the OpenWrt TFFS kernel driver:
+ * Copyright (c) 2013 John Crispin
+ *
my owrt mail addr has been invalid since the reboot. please use
j...@phrozen.org
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define DEFAULT_TFFS_SIZE (256 * 1024)
+
+#define TFFS_ID_END0x
+#define TFFS_ID_TABLE_NAME 0x01ff
+
+#define TFFS_BLOCK_HEADER_MAGIC0x41564d5f54464653ULL
+#define TFFS_VERSION 0x0003
+#define TFFS_ENTRY_HEADER_SIZE 0x18
+#define TFFS_MAXIMUM_SEGMENT_SIZE (0x800 - TFFS_ENTRY_HEADER_SIZE)
+
+#define TFFS_SECTOR_SIZE 0x0800
+#define TFFS_SECTOR_OOB_SIZE 0x0040
+#define TFFS_SECTORS_PER_PAGE 2
+
+#define TFFS_SEGMENT_CLEARED 0x
+
+static char *progname;
+static char *mtddev;
+static
Re: [LEDE-DEV] [PATCH] ramips: fix mt7620 sdhci OF match variable name
On 24/02/18 18:59, Marek Behún wrote:
The variable rt288x_wdt_match is not event present in the file the
patch is creating, 4 lines above the variable is called
mt7620_sdhci_match instead. Seems like someone forgot to change
name of the variable when copying the OF definition code from watchdog
driver.
Signed-off-by: Marek Behun
oh dear, you found a real nice copy pasta gem there :-D
---
.../patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch | 2 +-
.../patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
b/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index d3a088b736..b0d635f87f 100644
---
a/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++
b/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -4748,7 +4748,7 @@ Signed-off-by: John Crispin
+ { .compatible = "ralink,mt7620-sdhci" },
+ {},
+};
-+MODULE_DEVICE_TABLE(of, rt288x_wdt_match);
++MODULE_DEVICE_TABLE(of, mt7620_sdhci_match);
+
+static struct platform_driver mt_msdc_driver = {
+.probe = msdc_drv_probe,
diff --git
a/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
b/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index 004ac239db..5559ed8eab 100644
---
a/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++
b/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -4748,7 +4748,7 @@ Signed-off-by: John Crispin
+ { .compatible = "ralink,mt7620-sdhci" },
+ {},
+};
-+MODULE_DEVICE_TABLE(of, rt288x_wdt_match);
++MODULE_DEVICE_TABLE(of, mt7620_sdhci_match);
+
+static struct platform_driver mt_msdc_driver = {
+.probe = msdc_drv_probe,
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] kernel version status
On 19/02/18 13:54, Maciej Soltysiak wrote: Hi John, As a user of an ar71xx (WNDR3800) on OpenWrt, I'd like to ask if your desire is that ar71xx never gets bumped up to anything higher than 4.9 or it's just not 4.14 because of some specific reasons related to 4.14? IOW, shall I be looking for a replacement because I'll stay on 4.9 forever? Best regards, Maciej On Mon, Feb 19, 2018 at 7:41 AM, John Crispin <mailto:j...@phrozen.org>> wrote: On 18/02/18 22:43, Hauke Mehrtens wrote: The next OpenWrt release will use kernel 4.9 and kernel 4.14 depending on the target. All targets that are *not* on either kernel 4.9 or 4.14 will not be included in the next release. I did some overview of the kernel version some months ago here: http://lists.infradead.org/pipermail/lede-dev/2017-October/009446.html <http://lists.infradead.org/pipermail/lede-dev/2017-October/009446.html> Here is the current situation as of today: The following targets are on kernel 4.14 and are fine: * apm821xx * archs38 * armvirt * cns3xxx * malta * mediatek * octeon * octeontx * sunxi * x86 The following targets are on kernel 4.9 and are fine: * ar71xx * ar7 * arc770 * at91 There are some patches for kernel 4.14 on the mailing list waiting for response from author * ath25 * bcm53xx patches for 4.14 are available in master * brcm2708 * brcm47xx * brcm63xx patches for 4.14 are available in master * imx6 There are some patches for kernel 4.14 on the mailing list which is being worked on * ipq806x * ixp4xx * kirkwood * lantiq patches for 4.14 are in Mathias Kresin's staging tree. * layerscape * mpc85xx * mvebu patches for 4.14 are available in master I would like to get this to kernel 4.14 by default soon. * mxs * omap * orion * pistachio * ramips patches for 4.14 are available in master * rb532 * uml The following targets are on kernel 4.4 and will probably not be included in the next release: * gemini * oxnas * zynq The following targets are on kernel 3.18 and will probably not be included in the next release: * adm5120 * adm8668 * au1000 * mcs814x I have patches which port this target to 4.4 in my tree, but nobody tested them. https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.4 <https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.4> * ppc40x * ppc44x * xburst I have patches which port this target to 4.4 in my tree, but nobody tested them https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.4 <https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.4> This target is on kernel 4.1 (WTF): * omap24xx All the targets which are not on kernel 4.9 or 4.14 will probably not be included in the next release, I also haven't seen any activity for any of them to get support for more recent kernel versions, if you need them please take care now. Hauke Hi Hauke, I planned to make that list today, thanks for taking care of it !. I would like to see ar71xx and ramips stay on v4.9, regardless of there being patches for v4.14. I would also like to see ar71xx never being bumped to v4.14, I spent a few days last week revamping my old ath79 port and would like to see a hard cut, moving QCA mips target to OF only post release. John ___ openwrt-devel mailing list openwrt-de...@lists.openwrt.org <mailto:openwrt-de...@lists.openwrt.org> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel <https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel> Hi Maciej please dont top post. ath79 is the same as ar71xx but uses dts files instead of mach files John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] kernel version status
On 19/02/18 12:09, Arjen de Korte wrote: Citeren John Crispin : On 18/02/18 22:43, Hauke Mehrtens wrote: The next OpenWrt release will use kernel 4.9 and kernel 4.14 depending on the target. All targets that are *not* on either kernel 4.9 or 4.14 will not be included in the next release. I did some overview of the kernel version some months ago here: http://lists.infradead.org/pipermail/lede-dev/2017-October/009446.html Here is the current situation as of today: The following targets are on kernel 4.14 and are fine: * apm821xx * archs38 * armvirt * cns3xxx * malta * mediatek * octeon * octeontx * sunxi * x86 The following targets are on kernel 4.9 and are fine: * ar71xx * ar7 * arc770 * at91 There are some patches for kernel 4.14 on the mailing list waiting for response from author * ath25 * bcm53xx patches for 4.14 are available in master * brcm2708 * brcm47xx * brcm63xx patches for 4.14 are available in master * imx6 There are some patches for kernel 4.14 on the mailing list which is being worked on * ipq806x * ixp4xx * kirkwood * lantiq patches for 4.14 are in Mathias Kresin's staging tree. * layerscape * mpc85xx * mvebu patches for 4.14 are available in master I would like to get this to kernel 4.14 by default soon. * mxs * omap * orion * pistachio * ramips patches for 4.14 are available in master * rb532 * uml The following targets are on kernel 4.4 and will probably not be included in the next release: * gemini * oxnas * zynq The following targets are on kernel 3.18 and will probably not be included in the next release: * adm5120 * adm8668 * au1000 * mcs814x I have patches which port this target to 4.4 in my tree, but nobody tested them. https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.4 * ppc40x * ppc44x * xburst I have patches which port this target to 4.4 in my tree, but nobody tested them https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.4 This target is on kernel 4.1 (WTF): * omap24xx All the targets which are not on kernel 4.9 or 4.14 will probably not be included in the next release, I also haven't seen any activity for any of them to get support for more recent kernel versions, if you need them please take care now. Hauke Hi Hauke, I planned to make that list today, thanks for taking care of it !. I would like to see ar71xx and ramips stay on v4.9, regardless of there being patches for v4.14. I would also like to see ar71xx never being bumped to v4.14, I spent a few days last week revamping my old ath79 port and would like to see a hard cut, moving QCA mips target to OF only post release. Out of curiosity, what is the reason not to bump ar71xx to v4.14? Looking at the projected EOL of kernels, the move from v4.4 (Feb, 2022) to v4.9 (Jan, 2019) drastically reduced the time remaining for this platform. we have long planned to move ar71xx over to OF and decided that this might be the right time to do so. currently units will have ~300k on flash for mac files and ~1,5M in ram for them. the target is pretty messy at places, so moving it to OF will only give us advantages. John 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 mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] kernel version status
On 18/02/18 22:43, Hauke Mehrtens wrote: The next OpenWrt release will use kernel 4.9 and kernel 4.14 depending on the target. All targets that are *not* on either kernel 4.9 or 4.14 will not be included in the next release. I did some overview of the kernel version some months ago here: http://lists.infradead.org/pipermail/lede-dev/2017-October/009446.html Here is the current situation as of today: The following targets are on kernel 4.14 and are fine: * apm821xx * archs38 * armvirt * cns3xxx * malta * mediatek * octeon * octeontx * sunxi * x86 The following targets are on kernel 4.9 and are fine: * ar71xx * ar7 * arc770 * at91 There are some patches for kernel 4.14 on the mailing list waiting for response from author * ath25 * bcm53xx patches for 4.14 are available in master * brcm2708 * brcm47xx * brcm63xx patches for 4.14 are available in master * imx6 There are some patches for kernel 4.14 on the mailing list which is being worked on * ipq806x * ixp4xx * kirkwood * lantiq patches for 4.14 are in Mathias Kresin's staging tree. * layerscape * mpc85xx * mvebu patches for 4.14 are available in master I would like to get this to kernel 4.14 by default soon. * mxs * omap * orion * pistachio * ramips patches for 4.14 are available in master * rb532 * uml The following targets are on kernel 4.4 and will probably not be included in the next release: * gemini * oxnas * zynq The following targets are on kernel 3.18 and will probably not be included in the next release: * adm5120 * adm8668 * au1000 * mcs814x I have patches which port this target to 4.4 in my tree, but nobody tested them. https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.4 * ppc40x * ppc44x * xburst I have patches which port this target to 4.4 in my tree, but nobody tested them https://git.lede-project.org/?p=lede/hauke/staging.git;a=shortlog;h=refs/heads/kernel-4.4 This target is on kernel 4.1 (WTF): * omap24xx All the targets which are not on kernel 4.9 or 4.14 will probably not be included in the next release, I also haven't seen any activity for any of them to get support for more recent kernel versions, if you need them please take care now. Hauke Hi Hauke, I planned to make that list today, thanks for taking care of it !. I would like to see ar71xx and ramips stay on v4.9, regardless of there being patches for v4.14. I would also like to see ar71xx never being bumped to v4.14, I spent a few days last week revamping my old ath79 port and would like to see a hard cut, moving QCA mips target to OF only post release. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH v3 0/4]: imx6: update to Linux 4.14
On 18/02/18 16:35, Hauke Mehrtens wrote: On 02/18/2018 12:35 PM, John Crispin wrote: On 17/02/18 13:30, Hauke Mehrtens wrote: On 02/15/2018 05:34 PM, Tim Harvey wrote: Testted on a Gateworks GW54xx. Does not support enabling imx-drm modules yet as those will need some adjustments based on kernel configs. v3: - included missing patch for pcie enumeration fix v2: - move dwc pci patch to generic (Koen) - added E1000E driver (used on GW552x) - remove unnecessary EXT2/EXT3 (Michael) - remove config default config for 14.4 Tim Harvey (4): kernel: backport dwc pci enumeration fix imx6: add support for Linux 4.14 imx6: switch to Linux 4.14 imx6: remove support for 4.9 Hi Tim, can you please test compile this with the following configuration and fix the problems that show up: $ ./scripts/diffconfig.sh CONFIG_TARGET_imx6=y CONFIG_TARGET_imx6_Generic=y CONFIG_TARGET_BOARD="imx6" CONFIG_ALL_KMODS=y running that test just now I already tried this yesterday and it failed for me. Hauke i fixed up the missing symbols manually 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
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH v3 0/4]: imx6: update to Linux 4.14
On 17/02/18 13:30, Hauke Mehrtens wrote: On 02/15/2018 05:34 PM, Tim Harvey wrote: Testted on a Gateworks GW54xx. Does not support enabling imx-drm modules yet as those will need some adjustments based on kernel configs. v3: - included missing patch for pcie enumeration fix v2: - move dwc pci patch to generic (Koen) - added E1000E driver (used on GW552x) - remove unnecessary EXT2/EXT3 (Michael) - remove config default config for 14.4 Tim Harvey (4): kernel: backport dwc pci enumeration fix imx6: add support for Linux 4.14 imx6: switch to Linux 4.14 imx6: remove support for 4.9 Hi Tim, can you please test compile this with the following configuration and fix the problems that show up: $ ./scripts/diffconfig.sh CONFIG_TARGET_imx6=y CONFIG_TARGET_imx6_Generic=y CONFIG_TARGET_BOARD="imx6" CONFIG_ALL_KMODS=y running that test just now John Hauke ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH v3 1/4] kernel: backport dwc pci enumeration fix
On 17/02/18 13:33, Hauke Mehrtens wrote: On 02/15/2018 05:34 PM, Tim Harvey wrote: Backport of: http://patchwork.ozlabs.org/patch/860701/ Signed-off-by: Tim Harvey --- .../generic/pending-4.14/812-pci-dwc-fix-enumeration.patch| 11 +++ 1 file changed, 11 insertions(+) create mode 100644 target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch diff --git a/target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch b/target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch new file mode 100644 index 000..ce9e815 --- /dev/null +++ b/target/linux/generic/pending-4.14/812-pci-dwc-fix-enumeration.patch Please put this into target/linux/generic/backport-4.14/ as this is or will be a backport from the mainline kernel. the patch is not in the subsystem tree for some formal reasons. I have taken the original version that Koen sent and replaced the one Tim sent with it. I've alos left the patch inside the pending folder John Can you also add the original commit comment. @@ -0,0 +1,11 @@ +--- a/drivers/pci/dwc/pcie-designware-host.c b/drivers/pci/dwc/pcie-designware-host.c +@@ -607,7 +607,7 @@ void dw_pcie_setup_rc(struct pcie_port * + /* setup bus numbers */ + val = dw_pcie_readl_dbi(pci, PCI_PRIMARY_BUS); + val &= 0xff00; +- val |= 0x00010100; ++ val |= 0x00ff0100; + dw_pcie_writel_dbi(pci, PCI_PRIMARY_BUS, val); + + /* setup command register */ ___ 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] [PATCH] busybox: re-enable telnet applet
On 20/06/17 19:13, Stefan Tomanek wrote: While sshd should be favoured over telnetd, having a telnet client on the router is useful for connecting to other devices in the same LAN. Signed-off-by: Stefan Tomanek sorry for the late reply, it has been discussed over and over and the decision was made to not enable telnet by default. sorry ... John --- package/utils/busybox/Config-defaults.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in index 1977e7f..9e0efcf 100644 --- a/package/utils/busybox/Config-defaults.in +++ b/package/utils/busybox/Config-defaults.in @@ -2289,10 +2289,10 @@ config BUSYBOX_DEFAULT_TCPSVD default n config BUSYBOX_DEFAULT_TELNET bool - default n + default y config BUSYBOX_DEFAULT_FEATURE_TELNET_TTYPE bool - default n + default y config BUSYBOX_DEFAULT_FEATURE_TELNET_AUTOLOGIN bool default n ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] 18.03/4
Hi, whats on the critical todo list for the upcoming release ? i still have a few minor things that I'll be adding shortly, apart from that I am currently not aware of any huge problems. the release will be a mix between 4.9 and 4.14 afaik !? John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] ubox/logread: add re-connect capability
On 24/11/17 14:06, Zefir Kurtisi wrote:
When logd is restarted while 'logread -f' is running, the
logread process terminates, which cumbers debugging in
different use-cases.
This patch adds re-connect functionality to logread. In
follow mode, when the ustream to logd is disconnected,
instead of terminating, it tries to re-connect to logd
and re-issue the original request.
Signed-off-by: Zefir Kurtisi
Hi Zefir,
I have just pushed a different version of the patch, thanks for
reporting the problem
John
---
v2: in follow mode, don't exit if the initial
ubus lookup for logd fails
log/logread.c | 143 +-
1 file changed, 91 insertions(+), 52 deletions(-)
diff --git a/log/logread.c b/log/logread.c
index ad06f2a..8229c98 100644
--- a/log/logread.c
+++ b/log/logread.c
@@ -65,6 +65,10 @@ static int log_type = LOG_STDOUT;
static int log_size, log_udp, log_follow, log_trailer_null = 0;
static int log_timestamp;
static int last_errno = 0;
+static struct ubus_context *ctx;
+static int lines;
+
+static void logread_reconnect_cb(struct uloop_timeout *timeout);
static const char* getcodetext(int value, CODE *codetable) {
CODE *i;
@@ -268,29 +272,82 @@ static void logread_fd_data_cb(struct ustream *s, int
bytes)
}
}
+/*
+ * Reconnect Handling
+ * while following log
+ * - after logd removal
+ * - destroy ustream
+ * - cyclically try to re-connect to new logd object
+ * - re-issue original request
+ *
+ * Note: if a re-connection appears while a 'logread -l' request is active, the
+ * number of returned lines will not match (i.e. you get some lines from
+ * the old instance plus the number of lines requested from the new one)
+ */
+
+/* flag to prevent printing error messages during reconnect cycles */
+static int object_reconnect_active;
+
+static void logread_restart_reconnect_timer(struct uloop_timeout *timeout)
+{
+ const int LOG_RECONNECT_TIMEOUT_MS = 250;
+ uloop_timeout_set(timeout, LOG_RECONNECT_TIMEOUT_MS);
+}
+
static void logread_fd_state_cb(struct ustream *s)
{
- uloop_end();
+ static struct uloop_timeout ubus_timer;
+ /* force re-opening of stream */
+ s->free(s);
+
+ object_reconnect_active = 1;
+ ubus_timer.cb = logread_reconnect_cb;
+ logread_restart_reconnect_timer(&ubus_timer);
}
static void logread_fd_cb(struct ubus_request *req, int fd)
{
static struct ustream_fd test_fd;
-
test_fd.stream.notify_read = logread_fd_data_cb;
test_fd.stream.notify_state = logread_fd_state_cb;
ustream_fd_init(&test_fd, fd);
}
-int main(int argc, char **argv)
+static int logread_process(void)
{
+ static struct blob_buf b;
static struct ubus_request req;
- struct ubus_context *ctx;
uint32_t id;
+ int ret = ubus_lookup_id(ctx, "log", &id);
+ if (ret) {
+ if (!object_reconnect_active)
+ fprintf(stderr, "Failed to find log object\n");
+ return ret;
+ }
+ blob_buf_init(&b, 0);
+ blobmsg_add_u8(&b, "stream", 1);
+ if (lines)
+ blobmsg_add_u32(&b, "lines", lines);
+ else if (log_follow)
+ blobmsg_add_u32(&b, "lines", 0);
+
+ ubus_invoke_async(ctx, id, "read", b.head, &req);
+ req.fd_cb = logread_fd_cb;
+ ubus_complete_request_async(ctx, &req);
+
+ return 0;
+}
+
+static void logread_reconnect_cb(struct uloop_timeout *timeout)
+{
+ if (logread_process())
+ logread_restart_reconnect_timer(timeout);
+}
+
+int main(int argc, char **argv)
+{
const char *ubus_socket = NULL;
- int ch, ret, lines = 0;
- static struct blob_buf b;
- int tries = 5;
+ int ch, ret;
signal(SIGPIPE, SIG_IGN);
@@ -354,58 +411,40 @@ int main(int argc, char **argv)
}
ubus_add_uloop(ctx);
- /* ugly ugly ugly ... we need a real reconnect logic */
- do {
- ret = ubus_lookup_id(ctx, "log", &id);
- if (ret) {
- fprintf(stderr, "Failed to find log object: %s\n",
ubus_strerror(ret));
- sleep(1);
- continue;
- }
-
- blob_buf_init(&b, 0);
- blobmsg_add_u8(&b, "stream", 1);
- blobmsg_add_u8(&b, "oneshot", !log_follow);
- if (lines)
- blobmsg_add_u32(&b, "lines", lines);
- else if (log_follow)
- blobmsg_add_u32(&b, "lines", 0);
- if (log_follow) {
- if (pid_file) {
- FILE *fp = fopen(pid_file, "w+");
- if (fp) {
- fprintf(fp, "%d", getpid());
- fclose(fp);
- }
+
Re: [LEDE-DEV] [PATCH] ag71xx: Add some unlikely calls + rearange some stuff in hard_start_xmit.
On 13/02/18 23:53, Rosen Penev wrote:
Based on Qualcomm driver. Improves iperf3 throughput by ~20mbps on transmit on
Archer C7v4.
this is missing the description of what the patch does.
John
Signed-off-by: Rosen Penev
---
.../drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
index 95682b7641..d32f220178 100644
---
a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+++
b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -797,11 +797,14 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff
*skb,
if (ag71xx_has_ar8216(ag))
ag71xx_add_ar8216_header(ag, skb);
- if (skb->len <= 4) {
+ dma_cache_sync (NULL, skb->data, skb->len, DMA_TO_DEVICE);
+
+ if (unlikely(skb->len <= 4)) {
DBG("%s: packet len is too small\n", ag->dev->name);
goto err_drop;
}
+ netdev_sent_queue(dev, skb->len);
dma_addr = dma_map_single(&dev->dev, skb->data, skb->len,
DMA_TO_DEVICE);
@@ -817,27 +820,24 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
ring->buf[i].len = skb->len;
ring->buf[i].skb = skb;
- netdev_sent_queue(dev, skb->len);
-
skb_tx_timestamp(skb);
desc->ctrl &= ~DESC_EMPTY;
ring->curr += n;
- /* flush descriptor */
- wmb();
-
ring_min = 2;
if (ring->desc_split)
ring_min *= AG71XX_TX_RING_DS_PER_PKT;
- if (ring->curr - ring->dirty >= ring_size - ring_min) {
+ if (unlikely(ring->curr - ring->dirty >= ring_size - ring_min)) {
DBG("%s: tx queue full\n", dev->name);
netif_stop_queue(dev);
}
DBG("%s: packet injected into TX queue\n", ag->dev->name);
+ /* flush descriptor */
+ wmb();
/* enable TX engine */
ag71xx_wr(ag, AG71XX_REG_TX_CTRL, TX_CTRL_TXE);
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH-v2 1/3] Update to latest ath10k-ct driver, enable AHB.
On 13/02/18 19:27, Ben Greear wrote:
What is the status on this?
I have some new firmware/driver changes I'd like to get upstream
as well, but this series is stuck in limbo. The first two patches
should should be useful for anyone using my ath10k-ct stuff, and the
third will at least help IPQ4019 have a better chance at running my
code, even if they cannot currently select the options w/out applying
a few patches to relax some of the REQUIRES stuff that the 4019
platforms may currently have.
Thanks,
Ben
Hi Ben,
was going to send an email, ... what happened to patch 3/3 ?
John
On 01/19/2018 04:27 PM, gree...@candelatech.com wrote:
From: Ben Greear
The driver updates include:
ath10k driver backport to fix WPA 'pn' related security bugs
(4.13 based driver only currently),
a fix for off-channel TX for CT wave-1 firmware, a likely
fix for napi related crashes, and a backport of the firmware fetch
patch.
AHB is needed for the IPQ4019 platform radios.
Signed-off-by: Ben Greear
---
v2: Don't remove stock 4019 firmware from 4019 platform depends.
Add ability to load ct-firmware-[52].bin before other firmware.
Add ath10k-ct driver specific firmware option for 4019.
Verified driver loads on Jalapeno board.
package/kernel/ath10k-ct/Makefile | 14 +
...ctivate-user-space-firmware-loading-again.patch | 36
--
2 files changed, 8 insertions(+), 42 deletions(-)
delete mode 100644
package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch
diff --git a/package/kernel/ath10k-ct/Makefile
b/package/kernel/ath10k-ct/Makefile
index fe094e7..83d3a05 100644
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -9,8 +9,8 @@ PKG_LICENSE_FILES:=
PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2017-06-13
-PKG_SOURCE_VERSION:=bded1823912549017d819d1796273b3134c3de20
-PKG_MIRROR_HASH:=616174650e12a82edb6b6bd18ac186e2c6a48fdad0082df9d2011ab20940814b
+PKG_SOURCE_VERSION:=e1edd74d5f0c5291b0be72c81033e74e267929d4
+PKG_MIRROR_HASH:=945dc7110017a80c33cac20d9d2a9beda0a6a98b50178319403568098534e60a
PKG_MAINTAINER:=Ben Greear
PKG_BUILD_PARALLEL:=1
@@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/ath10k-ct
SUBMENU:=Wireless Drivers
TITLE:=ath10k-ct driver optimized for CT ath10k firmware
- DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT
+@DRIVER_11AC_SUPPORT @PCI_SUPPORT +kmod-hwmon-core
+ DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT
+@DRIVER_11AC_SUPPORT +@DRIVER_11W_SUPPORT +kmod-hwmon-core
FILES:=\
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko
@@ -50,9 +50,11 @@ ifdef CONFIG_PACKAGE_MAC80211_MESH
endif
CT_MAKEDEFS += CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m
-# No AHB support enabled yet. Could conditionally enable it later.
-#CT_MAKEDEFS += CONFIG_ATH10K_AHB=y
-#NOSTDINC_FLAGS += -DCONFIG_ATH10K_AHB
+
+# This AHB logic is needed for IPQ4019 radios
+CT_MAKEDEFS += CONFIG_ATH10K_AHB=m
+NOSTDINC_FLAGS += -DCONFIG_ATH10K_AHB
+
NOSTDINC_FLAGS += -DSTANDALONE_CT
ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
diff --git
a/package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch
b/package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch
deleted file mode 100644
index dc02a9d..000
---
a/package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c0cc00f250e19c717fc9cdbdb7f55aaa569c7498 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens
-Date: Thu, 24 Aug 2017 23:06:41 +0200
-Subject: [PATCH] ath10k: activate user space firmware loading again
-
-In commit 9f5bcfe93315 ("ath10k: silence firmware file probing
-warnings") the firmware loading was changed from request_firmware() to
-request_firmware_direct() to silence some warnings in case it fails.
-request_firmware_direct() directly searches in the file system only and
-does not send a hotplug event to user space in case it could not find
-the firmware directly.
-In LEDE we use a user space script to extract the calibration data from
-the flash memory which gets triggered by the hotplug event. This way
the
-firmware gets extracted from some vendor specific partition when the
-driver requests this firmware. This mechanism does not work any more
-after this change.
-
-Fixes: 9f5bcfe93315 ("ath10k: silence firmware file probing warnings")
-Signed-off-by: Hauke Mehrtens
-Cc: Michal Kazior
-Signed-off-by: Kalle Valo
- ath10k-4.13/core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
a/ath10k-4.13/core.c
-+++ b/ath10k-4.13/core.c
-@@ -556,7 +556,7 @@ static const struct firmware *ath10k_fet
- dir = ".";
-
- snprintf(filename, sizeof(filename), "%s/%s", dir, file);
-- ret = request_firmware_direct(&f
Re: [LEDE-DEV] Bug when processing long lines
On 11/01/18 17:28, Jakub Horák wrote: 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 Hi Jakub, i've just posted and alternative solution. could you help test it please ? 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] [PATCH] procd: fix ustream deadlock when there are 0 bytes or no newlines
Signed-off-by: John Crispin
---
service/instance.c | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/service/instance.c b/service/instance.c
index 917b003..27e35b1 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -469,18 +469,20 @@ instance_stdio(struct ustream *s, int prio, struct
service_instance *in)
ulog_open(ULOG_SYSLOG, LOG_DAEMON, ident);
do {
- str = ustream_get_read_buf(s, NULL);
+ str = ustream_get_read_buf(s, &len);
if (!str)
break;
- newline = strchr(str, '\n');
- if (!newline)
+ newline = memchr(str, '\n', len);
+ if (!newline && (s->r.buffer_len != len))
break;
- *newline = 0;
+ if (newline) {
+ *newline = 0;
+ len = newline + 1 - str;
+ }
ulog(prio, "%s\n", str);
- len = newline + 1 - str;
ustream_consume(s, len);
} while (1);
--
2.11.0
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] ar71xx: Orders the names of the devices alphabetically.
On 17/01/18 14:16, Arne Zachlod wrote:
Signed-off-by: Arne Zachlod
---
target/linux/ar71xx/base-files/etc/board.d/01_leds | 236 ++---
.../ar71xx/base-files/etc/board.d/03_gpio_switches | 12 +-
target/linux/ar71xx/base-files/etc/diag.sh | 40 ++--
3 files changed, 144 insertions(+), 144 deletions(-)
[...]
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index 6cbb3576d8..5c60ebd6a8 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -72,6 +72,23 @@ get_status_led() {
tl-wr902ac-v1)
status_led="$board:green:power"
;;
+ archer-c5|\
+ archer-c7|\
+ tl-mr10u|\
+ tl-mr12u|\
+ tl-mr13u|\
+ tl-wdr4300|\
+ tl-wdr4900-v2|\
+ tl-wr703n|\
+ tl-wr710n|\
+ tl-wr720n-v3|\
+ tl-wr802n-v1|\
+ tl-wr810n|\
+ tl-wr810n-v2|\
+ tl-wr940n-v4|\
+ tl-wr941nd-v6)
+ status_led="tp-link:blue:system"
+ ;;
ap90q|\
cpe830|\
cpe870|\
@@ -103,9 +120,6 @@ get_status_led() {
rocket-m-xw)
status_led="ubnt:green:link4"
;;
- rocket-m-ti)
- status_led="ubnt:green:link6"
- ;;
bxu2000n-2-a1)
status_led="bhu:green:status"
;;
@@ -337,6 +351,9 @@ get_status_led() {
sc300m)
status_led="$board:blue:power"
;;
+ rocket-m-ti)
+ status_led="ubnt:green:link6"
+ ;;
this looks wrong, sorting r behind s ?
John
routerstation|\
routerstation-pro)
status_led="ubnt:green:rf"
@@ -414,23 +431,6 @@ get_status_led() {
tl-wr941nd-v5)
status_led="tp-link:green:system"
;;
- archer-c5|\
- archer-c7|\
- tl-mr10u|\
- tl-mr12u|\
- tl-mr13u|\
- tl-wdr4300|\
- tl-wdr4900-v2|\
- tl-wr703n|\
- tl-wr710n|\
- tl-wr720n-v3|\
- tl-wr802n-v1|\
- tl-wr810n|\
- tl-wr810n-v2|\
- tl-wr940n-v4|\
- tl-wr941nd-v6)
- status_led="tp-link:blue:system"
- ;;
tl-wr841n-v9)
status_led="tp-link:green:qss"
;;
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] ar71xx: add support for Ubiquiti Litebeam M5
On 17/01/18 14:23, Arne Zachlod wrote:
Specification:
- SoC: Atheros AR9342
- Flash: 8 MiB
- RAM: 64 MiB
- UART: 1x UART on PCB - 115200 8N1
- Ethernet: 1 x 100 Mbit with passive PoE (24V/0.2A)
Doesn't work:
* Flash via TFTP with Uiquiti Uboot
Installation via vendor firmware:
- upload factory image via webinterface
Signed-off-by: Arne Zachlod
---
target/linux/ar71xx/base-files/etc/board.d/01_leds | 4 ++
.../linux/ar71xx/base-files/etc/board.d/02_network | 1 +
target/linux/ar71xx/base-files/etc/diag.sh | 3 ++
target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 ++
.../ar71xx/base-files/lib/upgrade/platform.sh | 1 +
.../ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c| 58 ++
.../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 +
target/linux/ar71xx/image/ubnt.mk | 7 +++
this file does not exist. please fix/resend
John
8 files changed, 78 insertions(+)
diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds
b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index 150ef91b48..ebdfb142d4 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -363,6 +363,10 @@ hornet-ub-x2)
ucidef_set_led_wlan "wlan" "WLAN" "alfa:blue:wlan" "phy0tpt"
ucidef_set_led_usbdev "usb" "USB" "alfa:blue:usb" "1-1"
;;
+lbe-m5)
+ ucidef_set_led_netdev "lan" "LAN" "ubnt:green:lan" "eth0"
+ ucidef_set_led_wlan "wlan" "WLAN" "ubnt:green:wlan" "phy0tpt"
+ ;;
mc-mac1200r)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "mercury:green:wlan2g" "phy1tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "mercury:green:wlan5g" "phy0tpt"
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..86d6ffd91d 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -78,6 +78,7 @@ ar71xx_setup_interfaces()
fritz300e|\
gl-usb150|\
hiveap-121|\
+ lbe-m5|\
loco-m-xw|\
mr12|\
mr16|\
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index 5c60ebd6a8..5042e7a008 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -236,6 +236,9 @@ get_status_led() {
jwap230)
status_led="$board:green:led1"
;;
+ lbe-m5)
+ status_led="ubnt:green:sys"
+ ;;
ls-sr71)
status_led="ubnt:green:d22"
;;
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index b5440230a5..00a4acc6e0 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -711,6 +711,9 @@ ar71xx_board_detect() {
*"Lima"*)
name="lima"
;;
+ *"Litebeam M5"*)
+ name="lbe-m5"
+ ;;
*"Loco M XW")
name="loco-m-xw"
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index ecf6820a2b..4e839f12c1 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -248,6 +248,7 @@ platform_check_image() {
hiwifi-hc6361|\
hornet-ub-x2|\
jwap230|\
+ lbe-m5|\
lima|\
loco-m-xw|\
mzk-w04nu|\
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
index 55cf52d19e..8afb3ad054 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
@@ -12,6 +12,7 @@
#include
#include
+#include
#include
#include
#include
@@ -503,6 +504,60 @@ static void __init ubnt_loco_m_xw_setup(void)
ath79_register_eth(0);
}
+#define UBNT_LBE_M5_GPIO_LED_LAN 13
+#define UBNT_LBE_M5_GPIO_LED_WLAN 14
+#define UBNT_LBE_M5_GPIO_LED_SYS 16
+
+static struct gpio_led ubnt_lbe_m5_leds_gpio[] __initdata = {
+ {
+ .name = "ubnt:green:lan",
+ .gpio = UBNT_LBE_M5_GPIO_LED_LAN,
+ .active_low = 1,
+ }, {
+ .name = "ubnt:green:wlan",
+ .gpio = UBNT_LBE_M5_GPIO_LED_WLAN,
+ .active_low = 1,
+ }, {
+ .name = "ubnt:green:sys",
+ .gpio = UBNT_LBE_M5_GPIO_LED_SYS,
+ .active_low = 1,
+ },
+};
+
+static void __init ubnt_lbe_m5_setup(void)
+{
+ u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff);
+
+ ath79_register_m25p80
Re: [LEDE-DEV] [PATCH] curl: Switch all TLS libraries to use ca-bundle.
On 25/01/18 04:29, Rosen Penev wrote: On Wed, Jan 24, 2018 at 1:56 PM, Hauke Mehrtens wrote: On 01/24/2018 05:28 AM, Rosen Penev wrote: At least one application (transmission) depends on CURL_CA_BUNDLE being set in order to operate properly (Could not connect to tracker errors). As far as I can tell, there's no real drawback to doing this for all TLS libraries supported by curl. Do all of these libraries support --with-ca-bundle ? OpenSSL I know does. GnuTLS most likely does as it seems to be geared towards desktop systems. Hi, "most likely" is not good enough. please compile/runtime test your patches for all possible combos before posting them. John Signed-off-by: Rosen Penev --- package/network/utils/curl/Makefile | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 17fcf70..930bd10 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -111,13 +111,15 @@ CONFIGURE_ARGS += \ --without-nss \ --without-libmetalink \ --without-librtmp \ + --without-ca-path \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ \ - $(if $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-cyassl) \ - $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-gnutls) \ - $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-ssl) \ - $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-mbedtls) \ + $(if $(CONFIG_LIBCURL_WOLFSSL),--with-cyassl="$(STAGING_DIR)/usr",--without-cyassl) \ + $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \ + $(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr",--without-ssl) \ + $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr",--without-mbedtls) \ \ $(if $(CONFIG_LIBCURL_LIBIDN),--with-libidn="$(STAGING_DIR)/usr",--without-libidn) \ $(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \ ___ 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] [PATCH 0/4] imx6: update to Linux 4.14
On 01/02/18 23:35, Tim Harvey wrote: Tested on a Gateworks GW54xx Tim Harvey (4): kernel: add missing config symbols imx6: add support for Linux 4.14 imx6: switch to kernel 4.14 imx6: remove support for 4.9 Hi, karl and hauke posted some comments to the series. I've marked the whole series as "changes requested". please send a v3 with them incorporated. John target/linux/generic/config-4.14 | 9 +- target/linux/imx6/Makefile | 2 +- target/linux/imx6/config-4.14 | 526 + target/linux/imx6/config-4.9 | 497 .../files-4.9/arch/arm/boot/dts/imx6dl-gw5904.dts | 19 - .../files-4.9/arch/arm/boot/dts/imx6q-gw5904.dts | 23 - .../arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 629 - target/linux/imx6/patches-4.14/100-bootargs.patch | 11 + .../linux/imx6/patches-4.14/200-disable-msi.patch | 18 + .../imx6/patches-4.14/300-fix-enumeration.patch| 11 + ...-imx-add-gateworks-ventana-gw5904-support.patch | 18 - target/linux/imx6/patches-4.9/100-bootargs.patch | 11 - .../linux/imx6/patches-4.9/200-disable-msi.patch | 22 - .../imx6/patches-4.9/210-disable-uart-dma.patch| 23 - 14 files changed, 575 insertions(+), 1244 deletions(-) create mode 100644 target/linux/imx6/config-4.14 delete mode 100644 target/linux/imx6/config-4.9 delete mode 100644 target/linux/imx6/files-4.9/arch/arm/boot/dts/imx6dl-gw5904.dts delete mode 100644 target/linux/imx6/files-4.9/arch/arm/boot/dts/imx6q-gw5904.dts delete mode 100644 target/linux/imx6/files-4.9/arch/arm/boot/dts/imx6qdl-gw5904.dtsi create mode 100644 target/linux/imx6/patches-4.14/100-bootargs.patch create mode 100644 target/linux/imx6/patches-4.14/200-disable-msi.patch create mode 100644 target/linux/imx6/patches-4.14/300-fix-enumeration.patch delete mode 100644 target/linux/imx6/patches-4.9/0001-arm-dts-imx-add-gateworks-ventana-gw5904-support.patch delete mode 100644 target/linux/imx6/patches-4.9/100-bootargs.patch delete mode 100644 target/linux/imx6/patches-4.9/200-disable-msi.patch delete mode 100644 target/linux/imx6/patches-4.9/210-disable-uart-dma.patch ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] pistachio target
Hi, the imgtecs pistachio target is apparently EOL'ed and there is no support for it anymore. imgtec promised to maintain the target inside our tree but with their current situation don't appear to be able to do so in future. I'd like to drop the target ASAP. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 1/2] service: add func for string config change check
Hi
could you resend this with a description text ? I figured out what the
patch does but it would be nice to have it as part of the commit history.
same for the group id patch please ...
John
On 11/02/18 13:07, Yousong Zhou wrote:
Signed-off-by: Yousong Zhou
---
service/instance.c | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/service/instance.c b/service/instance.c
index 12c2efe..c3f8b56 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -588,6 +588,11 @@ instance_restart(struct service_instance *in)
uloop_timeout_set(&in->timeout, in->term_timeout * 1000);
}
+static bool string_changed(const char *a, const char *b)
+{
+ return !((!a && !b) || (a && b && !strcmp(a, b)));
+}
+
static bool
instance_config_changed(struct service_instance *in, struct service_instance
*in_new)
{
@@ -615,14 +620,7 @@ instance_config_changed(struct service_instance *in,
struct service_instance *in
if (in->gid != in_new->gid)
return true;
- if (in->pidfile && in_new->pidfile)
- if (strcmp(in->pidfile, in_new->pidfile))
- return true;
-
- if (in->pidfile && !in_new->pidfile)
- return true;
-
- if (!in->pidfile && in_new->pidfile)
+ if (string_changed(in->pidfile, in_new->pidfile))
return true;
if (in->respawn_retry != in_new->respawn_retry)
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Predict sysupgrade file name
On 31/01/18 16:00, Yury Shvedov wrote: Hi all, I have a task to universal automatically predict sysupgrade (or factory) file name on the board, with already installed openwrt. The filename format is clear inside buildroot, but I can't find the way to learn CONFIG_TARGET_BOARD and CONFIG_TARGET_SUBTARGET variables values inside running system. I can pass them to my package, but it will not rebuilt when CONFIG_TARGET_SUBTARGET changed and will left invalid. I can clean it manually every time, but this way is unacceptable. Is there any common way to get that values or *sysupgrade.* filename from running system or make package rebuild each time? Hi cat /etc/openwrt_release | grep DISTRIB_TARGET DISTRIB_TARGET='mediatek/32' John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] [RFC] build: log time taken by each packages/steps
On 21/01/18 00:01, Etienne Champetier wrote: The idea is to easily get the list of packages taking the most time to build, and see if we can improve them Sending as RFC as this is a quick hack that might break in some case (different implementation of time) Signed-off-by: Etienne Champetier Hi Etienne, the time command should be set up in include/prereq-build.mk, the SetupHostCommand. might also make sense to just print the time on the shell, always ... and not only when LOG is enabled John --- include/subdir.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/subdir.mk b/include/subdir.mk index 79a80528ae..85d2daf1bd 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -42,7 +42,8 @@ log_make = \ $(if $(call debug,$(1),v),,@)+ \ $(if $(BUILD_LOG), \ set -o pipefail; \ - mkdir -p $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4));) \ + mkdir -p $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4)); \ + /usr/bin/time -f $(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2)\#\#%U\#%S\#%e -a -o $(BUILD_LOG_DIR)/time.txt -- ) \ $$(SUBMAKE) $(subdir_make_opts) $(if $(3),$(3)-)$(2) \ $(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2).txt) ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH iwinfo] nl80211: Do not block when driver aborts scan
On 09/01/18 15:16, osiverts...@gmail.com wrote:
From: Olof Sivertsson
Drivers may abort a scan by calling cfg80211_scan_done() with a struct
cfg80211_scan_info that sets aborted to true.
To avoid blocking forever consider both NL80211_CMD_NEW_SCAN_RESULTS
and NL80211_CMD_SCAN_ABORTED when waiting for scan results.
Tested with Broadcom's bcmdhd driver.
Signed-off-by: Olof Sivertsson
Hi Olof,
Jow prepare an alternate solution ot the problem
https://git.openwrt.org/?p=project/iwinfo.git;a=commitdiff;h=75c572074f272f0b983d888f7dd23ee59719c6b0
https://git.openwrt.org/?p=project/iwinfo.git;a=commitdiff;h=fb749bf51a7855ee955fc221acdc51b94231db2b
John
---
iwinfo_nl80211.c | 12
iwinfo_nl80211.h | 1 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c
index 2776531..d84da24 100644
--- a/iwinfo_nl80211.c
+++ b/iwinfo_nl80211.c
@@ -510,7 +510,7 @@ static int nl80211_wait_cb(struct nl_msg *msg, void *arg)
struct nl80211_event_conveyor *cv = arg;
struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
- if (gnlh->cmd == cv->wait)
+ if (gnlh->cmd == cv->wait || gnlh->cmd == cv->cancel)
cv->recv = gnlh->cmd;
return NL_SKIP;
@@ -521,9 +521,9 @@ static int nl80211_wait_seq_check(struct nl_msg *msg, void
*arg)
return NL_OK;
}
-static int nl80211_wait(const char *family, const char *group, int cmd)
+static int nl80211_wait(const char *family, const char *group, int wait, int
cancel)
{
- struct nl80211_event_conveyor cv = { .wait = cmd };
+ struct nl80211_event_conveyor cv = { .wait = wait, .cancel = cancel };
struct nl_cb *cb;
int err = 0;
@@ -544,6 +544,9 @@ static int nl80211_wait(const char *family, const char *group, int cmd)
nl_cb_put(cb);
+ if (cv.recv == cancel)
+ return -ECANCELED;
+
return err;
}
@@ -2091,7 +2094,8 @@ static int nl80211_get_scanlist_nl(const char *ifname, char *buf, int *len)
if (nl80211_request(ifname, NL80211_CMD_TRIGGER_SCAN, 0, NULL, NULL))
goto out;
- if (nl80211_wait("nl80211", "scan", NL80211_CMD_NEW_SCAN_RESULTS))
+ if (nl80211_wait("nl80211", "scan",
+NL80211_CMD_NEW_SCAN_RESULTS,
NL80211_CMD_SCAN_ABORTED))
goto out;
if (nl80211_request(ifname, NL80211_CMD_GET_SCAN, NLM_F_DUMP,
diff --git a/iwinfo_nl80211.h b/iwinfo_nl80211.h
index bb5117e..38089d2 100644
--- a/iwinfo_nl80211.h
+++ b/iwinfo_nl80211.h
@@ -49,6 +49,7 @@ struct nl80211_msg_conveyor {
struct nl80211_event_conveyor {
int wait;
+ int cancel;
int recv;
};
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] patchwork
On 19/01/18 08:55, Alexandru Ardelean wrote: On Fri, Jan 19, 2018 at 3:02 AM, Val Kulkov wrote: On 18 January 2018 at 19:49, Alberto Bursi wrote: On 01/19/2018 01:05 AM, Val Kulkov wrote: There is more than a handful of PRs currently bit-rotting in openwrt/packages that are ready for merging, with all requested changes in place since many months ago. Auto-closing such PRs will offend the contributors who would see their effort go down the drain only because no one in the LEDE/OpenWrt community had the time to review and merge their PRs. Github has "labels" for PRs, so I think such timeout should look for "needs changes" label or something like that. See this PR https://github.com/openwrt/openwrt/pull/655 (on the right, the red label) -Alberto Problem is, the "Change requested" label does not necessarily mean that the requested changes have not been implemented by the contributors. There have been cases where a PRs gets labelled with "Change requested", then the contributor makes all changes as requested, and then nothing happens for many months because no one among members with write privileges has the time to review and merge the PR. I feel we are complicating things a bit too much before we've even started :) I think it would be good to start as simple as possible and see what other pain-points arise. Offending people with auto-closed PRs is a potential issue. This is already [sort of] happening with delayed PRs/submissions. Best I can think of handling this is the wording of the auto-close message. But I would not worry about making the lives of contributors easier [since they come & go]. I would worry about making the lives of core devs easier, since their number is rarely changing, and they have to put in the effort. I started working on a script, here is how it works. its pretty much the same for patchwork and github with the difference that on github we write comments and patchwork we send mails. after 90 days we send a note saying "it stalled pleases remind folks and help get it merged" after 120 days we close it with a note saying "sorry try again, something did not work out". John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [OpenWrt-Devel] [PATCH 0/5] x86: add support for microcode update
On 17/01/18 20:41, Zoltan HERPAI wrote: Hi, This series will add support for microcode update on x86 targets, in light of the recent security issues. While other distributions use an early initramfs approach to update the microcode as early as possible, in OpenWrt the earliest place where we can do this is preinit. due to the importance of this i would propose, that we add a dedicated step inside procd that calls right before preinit. John The Intel microcode package is using the source package by Debian, the AMD microcode package is downloaded from the linux-firmware git repository. This was tested on various Intel-based desktops with ancient BIOSes. Once the series is merged into trunk, this could/should be backported into 17.01 and 15.05 without too much hassle. Thanks, Zoltan H Zoltan HERPAI (5): x86: enable microcode loading for Intel and AMD firmware: add microcode package for AMD64 tools: add iucode-tool firmware: add microcode package for Intel packages: intel-microcode: update to 20180108 package/firmware/intel-microcode/Makefile | 51 ++ .../intel-microcode/files/intel-microcode.preinit | 8 package/firmware/linux-firmware/x86.mk | 9 package/system/iucode-tool/Makefile| 47 target/linux/x86/config-4.14 | 5 ++- target/linux/x86/config-4.9| 5 ++- 6 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 package/firmware/intel-microcode/Makefile create mode 100644 package/firmware/intel-microcode/files/intel-microcode.preinit create mode 100644 package/firmware/linux-firmware/x86.mk create mode 100644 package/system/iucode-tool/Makefile ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 1/2] procd/base-files: move init.d locking to rc.common
On 18/01/18 09:14, John Crispin wrote:
rather than using flock for procd enabled services we add locking to the
rc.common code.
Signed-off-by: John Crispin
---
package/base-files/files/etc/rc.common | 6 ++
package/system/procd/files/procd.sh| 15 ---
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/package/base-files/files/etc/rc.common
b/package/base-files/files/etc/rc.common
index 3e237170b4..180ee83acd 100755
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -148,4 +148,10 @@ ${INIT_TRACE:+set -x}
ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}"
list_contains ALL_COMMANDS "$action" || action=help
+
+local basescript=$(readlink "$initscript")
+local service_name="$(basename ${basescript:-$initscript})"
+
+lock -w /var/lock/init.d_${service_name}.lock
the -w is wrong here and needs to be removed
John`
$action "$@"
+lock -u /var/lock/init.d_${service_name}.lock
diff --git a/package/system/procd/files/procd.sh
b/package/system/procd/files/procd.sh
index b4b6faa662..b7d7b94ff1 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -38,20 +38,6 @@
PROCD_RELOAD_DELAY=1000
_PROCD_SERVICE=
-procd_lock() {
- local basescript=$(readlink "$initscript")
- local service_name="$(basename ${basescript:-$initscript})"
-
- flock -n 1000 &> /dev/null
- if [ "$?" != "0" ]; then
- exec 1000>/var/lock/procd_${service_name}.lock
- flock 1000
- if [ "$?" != "0" ]; then
- logger "warning: procd flock for $service_name failed"
- fi
- fi
-}
-
_procd_call() {
local old_cb
@@ -61,7 +47,6 @@ _procd_call() {
}
_procd_wrapper() {
- procd_lock
while [ -n "$1" ]; do
eval "$1() { _procd_call _$1 \"\$@\"; }"
shift
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 1/2] procd/base-files: move init.d locking to rc.common
rather than using flock for procd enabled services we add locking to the
rc.common code.
Signed-off-by: John Crispin
---
package/base-files/files/etc/rc.common | 6 ++
package/system/procd/files/procd.sh| 15 ---
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/package/base-files/files/etc/rc.common
b/package/base-files/files/etc/rc.common
index 3e237170b4..180ee83acd 100755
--- a/package/base-files/files/etc/rc.common
+++ b/package/base-files/files/etc/rc.common
@@ -148,4 +148,10 @@ ${INIT_TRACE:+set -x}
ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled
depends ${EXTRA_COMMANDS}"
list_contains ALL_COMMANDS "$action" || action=help
+
+local basescript=$(readlink "$initscript")
+local service_name="$(basename ${basescript:-$initscript})"
+
+lock -w /var/lock/init.d_${service_name}.lock
$action "$@"
+lock -u /var/lock/init.d_${service_name}.lock
diff --git a/package/system/procd/files/procd.sh
b/package/system/procd/files/procd.sh
index b4b6faa662..b7d7b94ff1 100644
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -38,20 +38,6 @@
PROCD_RELOAD_DELAY=1000
_PROCD_SERVICE=
-procd_lock() {
- local basescript=$(readlink "$initscript")
- local service_name="$(basename ${basescript:-$initscript})"
-
- flock -n 1000 &> /dev/null
- if [ "$?" != "0" ]; then
- exec 1000>/var/lock/procd_${service_name}.lock
- flock 1000
- if [ "$?" != "0" ]; then
- logger "warning: procd flock for $service_name failed"
- fi
- fi
-}
-
_procd_call() {
local old_cb
@@ -61,7 +47,6 @@ _procd_call() {
}
_procd_wrapper() {
- procd_lock
while [ -n "$1" ]; do
eval "$1() { _procd_call _$1 \"\$@\"; }"
shift
--
2.11.0
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 2/2] Revert "busybox: enable flock by default"
This reverts commit 2277cd1249a6952228f36b768beea117c91123a0. Signed-off-by: John Crispin --- package/utils/busybox/Config-defaults.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in index 4e429f4371..afb7d48f8c 100644 --- a/package/utils/busybox/Config-defaults.in +++ b/package/utils/busybox/Config-defaults.in @@ -1497,7 +1497,7 @@ config BUSYBOX_DEFAULT_FINDFS default n config BUSYBOX_DEFAULT_FLOCK bool - default y + default n config BUSYBOX_DEFAULT_FDFLUSH bool default n -- 2.11.0 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2] procd: add timing to start/stop logging
On 17/01/18 10:54, Koen Vandeputte wrote:
On 2018-01-17 10:43, Karl Vogel wrote:
Shows how long an initd task took, for example:
procd: stop /etc/init.d/dropbear running - took 0.088824s
procd: Update service dnsmasq
procd: Update instance dnsmasq::dnsmasq
procd: running /etc/init.d/dnsmasq running
procd: start /etc/init.d/dnsmasq running
procd: stop /etc/init.d/dnsmasq running - took 0.092586s
Signed-off-by: Karl Vogel
---
rcS.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/rcS.c b/rcS.c
index dd3b76d..acfb6a0 100644
--- a/rcS.c
+++ b/rcS.c
@@ -37,6 +37,7 @@ static struct runqueue q, r;
struct initd {
struct ustream_fd fd;
struct runqueue_process proc;
+ struct timeval tv_start;
char *file;
char *param;
};
@@ -70,6 +71,7 @@ static void q_initd_run(struct runqueue *q, struct
runqueue_task *t)
int pipefd[2];
pid_t pid;
+ gettimeofday(&s->tv_start, NULL);
DEBUG(2, "start %s %s \n", s->file, s->param);
if (pipe(pipefd) == -1) {
ERROR("Failed to create pipe: %m\n");
@@ -106,8 +108,11 @@ static void q_initd_run(struct runqueue *q,
struct runqueue_task *t)
static void q_initd_complete(struct runqueue *q, struct
runqueue_task *p)
{
struct initd *s = container_of(p, struct initd, proc.task);
+ struct timeval tv_stop, tv_res;
- DEBUG(2, "stop %s %s \n", s->file, s->param);
+ gettimeofday(&tv_stop, NULL);
+ timersub(&tv_stop, &s->tv_start, &tv_res);
+ DEBUG(2, "stop %s %s - took %lu.%06lus\n", s->file, s->param,
tv_res.tv_sec, tv_res.tv_usec);
ustream_free(&s->fd.stream);
close(s->fd.fd.fd);
free(s);
Isn't it better to use a monotonic time source here to measure elapsed
time?
|This way you avoid racing issues should NTP sync kick in during
execution.
|||clock_gettime(CLOCK_MONOTONIC, ...)
that occurred to me aswell as i was just testing the patch inside a vm :-)
John
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] jshn: add functionality to read big JSON
On 17/01/18 10:44, Arjen de Korte wrote:
Citeren John Crispin :
On 07/01/18 18:08, Christian Beier wrote:
The existing read functionality feeds the complete JSON to jshn as a
cmdline argument, leading to `-ash: jshn: Argument list too long`
errors for JSONs bigger than ca. 100KB.
This commit adds the ability to read the JSON directly from a file if
wanted, removing this shell-imposed size limit.
Tested on x86-64 and ar71xx. An mmap()-based solution was also
evaluated,
but found to make no performance difference on either platform.
Signed-off-by: Christian Beier
Hi Christian,
comment inline ...
---
jshn.c | 30 --
sh/jshn.sh | 4
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/jshn.c b/jshn.c
index 3188af5..eb72fb7 100644
--- a/jshn.c
+++ b/jshn.c
@@ -25,6 +25,8 @@
#include
#include
#include
+#include
+#include
#include "list.h"
#include "avl.h"
@@ -305,7 +307,7 @@ out:
static int usage(const char *progname)
{
- fprintf(stderr, "Usage: %s [-n] [-i] -r |-w\n",
progname);
+ fprintf(stderr, "Usage: %s [-n] [-i] -r |-R
|-w\n", progname);
return 2;
}
@@ -338,6 +340,10 @@ int main(int argc, char **argv)
struct env_var *vars;
int i;
int ch;
+ int fd;
+ struct stat sb;
+ char *fbuf;
+ int ret;
avl_init(&env_vars, avl_strcmp_var, false, NULL);
for (i = 0; environ[i]; i++);
@@ -359,7 +365,7 @@ int main(int argc, char **argv)
avl_insert(&env_vars, &vars[i].avl);
}
- while ((ch = getopt(argc, argv, "p:nir:w")) != -1) {
+ while ((ch = getopt(argc, argv, "p:nir:R:w")) != -1) {
switch(ch) {
case 'p':
var_prefix = optarg;
@@ -367,6 +373,26 @@ int main(int argc, char **argv)
break;
case 'r':
return jshn_parse(optarg);
+ case 'R':
+ if ((fd = open(optarg, O_RDONLY)) == -1) {
+ fprintf(stderr, "Error opening %s\n", optarg);
+ return 3;
+ }
+ if (fstat(fd, &sb) == -1) {
+ fprintf(stderr, "Error getting size of %s\n", optarg);
+ close(fd);
+ return 3;
+ }
+ if (!(fbuf = malloc(sb.st_size)) || read(fd, fbuf,
sb.st_size) != sb.st_size) {
+ fprintf(stderr, "Error reading %s\n", optarg);
+ free(fbuf);
this will blow up if the malloc fails.
How would it? If the malloc fails and returns a NULL pointer, the read
will not be performed. Free'ing a NULL pointer is allowed, so although
assigning a value in an if() statement is considered a no-no by some
(including me), there is no reason for it to blow up.
ok, point taken
please spli the if clause up into 2 blocks
Agreed (but for a different reason). A memory allocation error is
different from failure to read from a file and error handlers should
not treat them the same.
John
+ close(fd);
+ return 3;
+ }
+ ret = jshn_parse(fbuf);
+ free(fbuf);
+ close(fd);
+ return ret;
case 'w':
return jshn_format(no_newline, indent);
case 'n':
diff --git a/sh/jshn.sh b/sh/jshn.sh
index 1090814..66baccb 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -180,6 +180,10 @@ json_load() {
eval "`jshn -r "$1"`"
}
+json_load_file() {
+ eval "`jshn -R "$1"`"
+}
+
json_dump() {
jshn "$@" ${JSON_PREFIX:+-p "$JSON_PREFIX"} -w
}
___
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 mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 9/9] cns3xxx: remove linux 4.9 support
Hi merged the first 8 patches, please rework this to additionally fold the irq imbalance patch into the files/... dir John On 11/01/18 16:04, Koen Vandeputte wrote: 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=
Re: [LEDE-DEV] [PATCH] jshn: add functionality to read big JSON
On 07/01/18 18:08, Christian Beier wrote:
The existing read functionality feeds the complete JSON to jshn as a
cmdline argument, leading to `-ash: jshn: Argument list too long`
errors for JSONs bigger than ca. 100KB.
This commit adds the ability to read the JSON directly from a file if
wanted, removing this shell-imposed size limit.
Tested on x86-64 and ar71xx. An mmap()-based solution was also evaluated,
but found to make no performance difference on either platform.
Signed-off-by: Christian Beier
Hi Christian,
comment inline ...
---
jshn.c | 30 --
sh/jshn.sh | 4
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/jshn.c b/jshn.c
index 3188af5..eb72fb7 100644
--- a/jshn.c
+++ b/jshn.c
@@ -25,6 +25,8 @@
#include
#include
#include
+#include
+#include
#include "list.h"
#include "avl.h"
@@ -305,7 +307,7 @@ out:
static int usage(const char *progname)
{
- fprintf(stderr, "Usage: %s [-n] [-i] -r |-w\n", progname);
+ fprintf(stderr, "Usage: %s [-n] [-i] -r |-R |-w\n",
progname);
return 2;
}
@@ -338,6 +340,10 @@ int main(int argc, char **argv)
struct env_var *vars;
int i;
int ch;
+ int fd;
+ struct stat sb;
+ char *fbuf;
+ int ret;
avl_init(&env_vars, avl_strcmp_var, false, NULL);
for (i = 0; environ[i]; i++);
@@ -359,7 +365,7 @@ int main(int argc, char **argv)
avl_insert(&env_vars, &vars[i].avl);
}
- while ((ch = getopt(argc, argv, "p:nir:w")) != -1) {
+ while ((ch = getopt(argc, argv, "p:nir:R:w")) != -1) {
switch(ch) {
case 'p':
var_prefix = optarg;
@@ -367,6 +373,26 @@ int main(int argc, char **argv)
break;
case 'r':
return jshn_parse(optarg);
+ case 'R':
+ if ((fd = open(optarg, O_RDONLY)) == -1) {
+ fprintf(stderr, "Error opening %s\n", optarg);
+ return 3;
+ }
+ if (fstat(fd, &sb) == -1) {
+ fprintf(stderr, "Error getting size of %s\n",
optarg);
+ close(fd);
+ return 3;
+ }
+ if (!(fbuf = malloc(sb.st_size)) || read(fd, fbuf,
sb.st_size) != sb.st_size) {
+ fprintf(stderr, "Error reading %s\n", optarg);
+ free(fbuf);
this will blow up if the malloc fails. please spli the if clause up into
2 blocks
John
+ close(fd);
+ return 3;
+ }
+ ret = jshn_parse(fbuf);
+ free(fbuf);
+ close(fd);
+ return ret;
case 'w':
return jshn_format(no_newline, indent);
case 'n':
diff --git a/sh/jshn.sh b/sh/jshn.sh
index 1090814..66baccb 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -180,6 +180,10 @@ json_load() {
eval "`jshn -r "$1"`"
}
+json_load_file() {
+ eval "`jshn -R "$1"`"
+}
+
json_dump() {
jshn "$@" ${JSON_PREFIX:+-p "$JSON_PREFIX"} -w
}
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] ipq806x: replace linux, part-probe with a proper partitions subnode
On 16/01/18 20:34, Stefan Lippers-Hollmann wrote: Hi On 2018-01-11, Rafał Miłecki wrote: From: Rafał Miłecki This 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. [...] Tested-by: Stefan Lippers-Hollmann Acked-by: John Crispin [0.00] OF: fdt:Machine model: ZyXEL NBG6817 ... [0.00] Kernel command line: rootfstype=squashfs,ext4 rootwait noinitrd root=/dev/mmcblk0p8 [0.00] Bootloader command line (ignored): board=NBG6817 root=/dev/mmcblk0p8 rootwait zld_ver=2.04 console=ttyHSL1,115200n8 mtdparts=m25p80:0xC(SBL)ro,0x4(TZ)ro,0x4(RPM)ro,0x8(u-boot)ro,0x1(env)ro,0x1(ART)ro,0x1(dualflag),0x21(reserved) ... [1.136985] spi_qup 1a28.spi: IN:block:16, fifo:64, OUT:block:16, fifo:64 [1.138996] m25p80 spi32766.0: mx25u3235f (4096 Kbytes) [1.144963] 13 qcom-smem partitions found on MTD device spi32766.0 [1.149927] Creating 13 MTD partitions on "spi32766.0": [1.156097] 0x-0x0002 : "0:SBL1" [1.162380] 0x0002-0x0004 : "0:MIBIB" [1.167429] 0x0004-0x0006 : "0:SBL2" [1.172427] 0x0006-0x000a : "0:SBL3" [1.177536] 0x000a-0x000b : "0:DDRCONFIG" [1.182473] 0x000b-0x000c : "0:SSD" [1.187679] 0x000c-0x0010 : "0:TZ" [1.192342] 0x0010-0x0014 : "0:RPM" [1.197190] 0x0014-0x001c : "0:APPSBL" [1.202027] 0x001c-0x001d : "0:APPSBLENV" [1.207300] 0x001d-0x001e : "0:ART" [1.212693] 0x001e-0x001f : "0:DUAL_FLAG" [1.217453] 0x001f-0x0040 : "0:RESERVED" Regards Stefan Lippers-Hollmann ___ 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] [PATCH] ar71xx: add support for Ubiquiti Litebeam M5
On 16/01/18 21:43, Arne Zachlod wrote:
Specification:
- SoC: Atheros AR9342
- Flash: 8 MiB
- RAM: 64 MiB
- UART: 1x UART on PCB - 115200 8N1
- Ethernet: 1 x 100 Mbit with passive PoE (24V/0.2A)
Doesn't work:
* Flash via TFTP with Uiquiti Uboot
Installation via vendor firmware:
- upload factory image via webinterface
Signed-off-by: Arne Zachlod
Hi Arne,
comments inline ...
---
target/linux/ar71xx/base-files/etc/board.d/01_leds | 5 ++
.../linux/ar71xx/base-files/etc/board.d/02_network | 1 +
target/linux/ar71xx/base-files/etc/diag.sh | 3 ++
target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 ++
.../ar71xx/base-files/lib/upgrade/platform.sh | 1 +
.../ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c| 58 ++
.../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 +
target/linux/ar71xx/image/ubnt.mk | 7 +++
8 files changed, 79 insertions(+)
diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds
b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index e5baa90db8..79fc8ec5e2 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -147,6 +147,11 @@ rocket-m-xw)
ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "ubnt:green:link3" "wlan0" "51" "100"
"-50" "13"
ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "ubnt:green:link4" "wlan0" "76" "100"
"-75" "13"
;;
+lbe-m5)
+ ucidef_set_led_netdev "lan" "LAN" "ubnt:green:lan" "eth0"
+ ucidef_set_led_wlan "wlan" "WLAN" "ubnt:green:wlan" "phy0tpt"
+ ucidef_set_led_default "sys" "SYS" "ubnt:green:sys" "1"
+ ;;
alphabetical ordering please
rocket-m-ti)
ucidef_set_led_rssi "rssiverylow" "RSSIVERYLOW" "ubnt:green:link1" "wlan0" "1" "100"
"0" "13"
ucidef_set_led_rssi "rssilow" "RSSILOW" "ubnt:green:link2" "wlan0" "26" "100"
"-25" "13"
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..86d6ffd91d 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -78,6 +78,7 @@ ar71xx_setup_interfaces()
fritz300e|\
gl-usb150|\
hiveap-121|\
+ lbe-m5|\
loco-m-xw|\
mr12|\
mr16|\
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index 6cbb3576d8..f37541c75f 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -103,6 +103,9 @@ get_status_led() {
rocket-m-xw)
status_led="ubnt:green:link4"
;;
+ lbe-m5)
+ status_led="ubnt:green:sys"
+ ;;
alphabetical ordering please
rocket-m-ti)
status_led="ubnt:green:link6"
;;
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index b5440230a5..00a4acc6e0 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -711,6 +711,9 @@ ar71xx_board_detect() {
*"Lima"*)
name="lima"
;;
+ *"Litebeam M5"*)
+ name="lbe-m5"
+ ;;
*"Loco M XW")
name="loco-m-xw"
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index ecf6820a2b..4e839f12c1 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -248,6 +248,7 @@ platform_check_image() {
hiwifi-hc6361|\
hornet-ub-x2|\
jwap230|\
+ lbe-m5|\
lima|\
loco-m-xw|\
mzk-w04nu|\
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
index 55cf52d19e..8afb3ad054 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
@@ -12,6 +12,7 @@
#include
#include
+#include
#include
#include
#include
@@ -503,6 +504,60 @@ static void __init ubnt_loco_m_xw_setup(void)
ath79_register_eth(0);
}
+#define UBNT_LBE_M5_GPIO_LED_LAN 13
+#define UBNT_LBE_M5_GPIO_LED_WLAN 14
+#define UBNT_LBE_M5_GPIO_LED_SYS 16
+
+static struct gpio_led ubnt_lbe_m5_leds_gpio[] __initdata = {
+ {
+ .name = "ubnt:green:lan",
+ .gpio = UBNT_LBE_M5_GPIO_LED_LAN,
+ .active_low = 1,
+ }, {
+ .name = "ubnt:green:wlan",
+ .gpio = UBNT_LBE_M5_GPIO_LED_WLAN,
+ .active_low = 1,
+ }, {
+ .name = "ubnt:green:sys",
+
Re: [LEDE-DEV] [PATCH] procd: add timing to start/stop logging
On 16/01/18 10:49, Karl Vogel wrote:
Shows how long an initd task took, for example:
procd: stop /etc/init.d/dropbear running - took 0.088824 us
procd: Update service dnsmasq
procd: Update instance dnsmasq::dnsmasq
procd: running /etc/init.d/dnsmasq running
procd: start /etc/init.d/dnsmasq running
procd: stop /etc/init.d/dnsmasq running - took 0.092586 us
Hi Karl,
nitpicks inline...
Signed-off-by: Karl Vogel
---
rcS.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/rcS.c b/rcS.c
index dd3b76d..59c9038 100644
--- a/rcS.c
+++ b/rcS.c
@@ -37,6 +37,7 @@ static struct runqueue q, r;
struct initd {
struct ustream_fd fd;
struct runqueue_process proc;
+ struct timeval tstart;
call it tv_start please
char *file;
char *param;
};
@@ -70,6 +71,7 @@ static void q_initd_run(struct runqueue *q, struct
runqueue_task *t)
int pipefd[2];
pid_t pid;
+ gettimeofday(&s->tstart, NULL);
DEBUG(2, "start %s %s \n", s->file, s->param);
if (pipe(pipefd) == -1) {
ERROR("Failed to create pipe: %m\n");
@@ -106,8 +108,11 @@ static void q_initd_run(struct runqueue *q, struct
runqueue_task *t)
static void q_initd_complete(struct runqueue *q, struct runqueue_task *p)
{
struct initd *s = container_of(p, struct initd, proc.task);
+ struct timeval tstop, tres;
tv_stop and tv_res
- DEBUG(2, "stop %s %s \n", s->file, s->param);
+ gettimeofday(&tstop, NULL);
+ timersub(&tstop, &s->tstart, &tres);
+ DEBUG(2, "stop %s %s - took %lu.%06lu us\n", s->file, s->param,
tres.tv_sec, tres.tv_usec);
the unit should be seconds and not usecs ?!
John
ustream_free(&s->fd.stream);
close(s->fd.fd.fd);
free(s);
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v4] ar71xx: add ew-balin platform from Embedded Wireless
Hi,
patch is whitespace mangled and does not apply. How did you send the patch ?
[...]
--- 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
here
+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
and here
John
+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/files/arch/mips/ath79/Kconfig.openwrt
b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index 1198fcb74b..a94c5a3a2e 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -702,6 +702,17 @@ config ATH79_MACH_ESR900
select ATH79_DEV_WMAC
select ATH79_NVRAM
+config ATH79_MACH_EW_BALIN
+ bool "embedded wireless Balin Platform support"
+ select SOC_AR934X
+ select ATH79_DEV_M25P80
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
+ select ATH79_DEV_WMAC
+ select ATH79_DEV_ETH
+ select ATH79_DEV_USB
+ select ATH79_DEV_AP9X_PCI if PCI
+
config ATH79_MACH_EW_DORIN
bool "embedded wireless Dorin Platform support"
select SOC_AR933X
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
index 455af762e3..bde1b75308 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
@@ -115,6 +115,7 @@ obj-$(CONFIG_ATH79_MACH_ENS202EXT) +=
mach-ens202ext.o
obj-$(CONFIG_ATH79_MACH_EPG5000) += mach-epg5000.o
obj-$(CONFIG_ATH79_MACH_ESR1750) += mach-esr1750.o
obj-$(CONFIG_ATH79_MACH_ESR900) += mach-esr900.o
+obj-$(CONFIG_ATH79_MACH_EW_BALIN) += mach-ew-balin.o
obj-$(CONFIG_ATH79_MACH_EW_DORIN) += mach-ew-dorin.o
obj-$(CONFIG_ATH79_MACH_F9K1115V2)+= mach-f9k1115v2.o
obj-$(CONFIG_ATH79_MACH_FRITZ300E)+= mach-fritz300e.o
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-balin.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-balin.c
new file mode 100644
index 00..7d7f38c1d2
--- /dev/null
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ew-balin.c
@@ -0,0 +1,112 @@
+/*
+ * EW Balin board support
+ * (based on Atheros DB120 reference board support)
+ *
+ * Copyright (c) 2011 Qualcomm Atheros
+ * Copyright (c) 2011-2012 Gabor Juhos
+ * Copyright (C) 2017 Embedded Wireless GmbHwww.80211.de
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+any
+ * purpose with or without fee is hereby granted, provided that the
+above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
+FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "common.h"
+#include "dev-ap9x-pci.h"
+#include "dev-eth.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-m25p80.h"
+#include "dev-spi.h"
+#include "dev-usb.h"
+#include "dev-wmac.h"
+#include "machtypes.h"
+#include "pci.h"
+
+#define BALIN_GPIO_LED_STATUS 14
+
+#define BALIN_GPIO_BTN_WPS 18
+
+#define BALIN_KEYS_POLL_INTERVAL 20 /* msecs */
+#define BALIN_KEYS_DEBOUNCE_INTERVAL (3 * BALIN_KEYS_POLL_INTERVAL)
+
+#define BALIN_CALDATA_OFFSET 0x1000
+#define BALIN_WMAC_MAC_OFFSET (BALIN_CALDATA_OFFSET + 0x02)
+
+static struct gpio_led balin_leds_gpio[] __initdata = {
+ {
+ .name = "balin:green:status",
+ .gpio = BALIN_GPIO_LED_STATUS,
+ .active_low = 1,
+ },
+};
+
+static struct gpio_keys_button balin_gpio_keys[] __initdata = {
+ {
+ .desc = "WPS button",
+ .type = EV_KEY,
+ .code = KEY_WPS_BUTTON,
+
Re: [LEDE-DEV] Collecting issues on github
On 12/01/18 20:03, Ted Hess wrote: Hi folks, I would like to propose we close the issues tab on the github/openwrt/openwrt source repository as we did for the lede-project/source repo. We can continue to re-direct people to our bug-tracker for the mainline sources. The packages repo remains as it is now. /ted Hi Ted, We agreed on closing the issue tracker during the meeting at the owrt summit. feel free to close the issue tracker. John ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 1/1] at91: update kernel 4.9.73 to 4.14.11
On 08/01/18 23:21, Sandeep Sheriker Mallikarjun wrote:
update at91 kernel 4.9.73 to 4.14.11
Signed-off-by: Sandeep Sheriker Mallikarjun
---
target/linux/at91/Makefile | 2 +-
target/linux/at91/{config-4.9 => config-4.14} | 6 ++
.../100-ARM-at91-build-dtb-for-LMU5000.patch | 0
.../101-ARM-at91-build-dtb-for-q5xr5.patch | 0
.../102-ARM-at91-build-dtb-for-wb45n.patch | 0
.../103-ARM-at91-build-dtb-for-wb50n.patch | 0
target/linux/at91/sama5/config-default | 7 +++
Hi,
the patch to target/linux/at91/sama5/config-default does not apply.
please fix and resend the patch
John
7 files changed, 14 insertions(+), 1 deletion(-)
rename target/linux/at91/{config-4.9 => config-4.14} (97%)
rename target/linux/at91/{patches-4.9 =>
patches-4.14}/100-ARM-at91-build-dtb-for-LMU5000.patch (100%)
rename target/linux/at91/{patches-4.9 =>
patches-4.14}/101-ARM-at91-build-dtb-for-q5xr5.patch (100%)
rename target/linux/at91/{patches-4.9 =>
patches-4.14}/102-ARM-at91-build-dtb-for-wb45n.patch (100%)
rename target/linux/at91/{patches-4.9 =>
patches-4.14}/103-ARM-at91-build-dtb-for-wb50n.patch (100%)
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index cae3c62..4dc70eb 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -13,7 +13,7 @@ BOARDNAME:=Microchip (Atmel AT91)
FEATURES:=ext4 squashfs targz usb usbgadget ubifs
SUBTARGETS:=sama5 legacy
-KERNEL_PATCHVER:=4.9
+KERNEL_PATCHVER:=4.14
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/at91/config-4.9 b/target/linux/at91/config-4.14
similarity index 97%
rename from target/linux/at91/config-4.9
rename to target/linux/at91/config-4.14
index c0151a5..4fdaccd 100644
--- a/target/linux/at91/config-4.9
+++ b/target/linux/at91/config-4.14
@@ -271,3 +271,9 @@ CONFIG_ZBOOT_ROM_BSS=0
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_ALIGN_RODATA=y
+CONFIG_AT91_SOC_ID=y
+# CONFIG_TEE is not set
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_MACB_USE_HWSTAMP=y
diff --git
a/target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch
b/target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch
similarity index 100%
rename from
target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch
rename to
target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch
diff --git
a/target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch
b/target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch
similarity index 100%
rename from target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch
rename to target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch
diff --git
a/target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch
b/target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch
similarity index 100%
rename from target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch
rename to target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch
diff --git
a/target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch
b/target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch
similarity index 100%
rename from target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch
rename to target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch
diff --git a/target/linux/at91/sama5/config-default
b/target/linux/at91/sama5/config-default
index 736f76b..b720363 100644
--- a/target/linux/at91/sama5/config-default
+++ b/target/linux/at91/sama5/config-default
@@ -8,7 +8,10 @@ CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_ARM_PATCH_IDIV=y
# CONFIG_ARM_THUMBEE is not set
CONFIG_ARM_VIRT_EXT=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
CONFIG_ATMEL_AIC5_IRQ=y
+CONFIG_ARM_THUMB=y
+# CONFIG_ARM_THUMBEE is not set
CONFIG_CACHE_L2X0=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_32v7=y
@@ -83,6 +86,10 @@ CONFIG_DRM_GEM_CMA_HELPER=y
CONFIG_DRM_KMS_CMA_HELPER=y
ONFIG_DST_CACHE=y
CONFIG_DCACHE_WORD_ACCESS=y
+
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+
#
# At least one emulation must be selected
#
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] imx6: add support for the intel gbit driver on GW5520
On 12/01/18 11:44, Koen Vandeputte wrote: The Gateworks GW5520 board uses 2x intel gigabit phy's, instead of the internal i.MX6 FEC phy. Hi, e100e is a MAC and not a PHY. please fix up the description. John Add support for these. Signed-off-by: Scott V. Kamp Signed-off-by: Koen Vandeputte --- target/linux/imx6/config-4.9 | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/imx6/config-4.9 b/target/linux/imx6/config-4.9 index e4f262b38183..12ba56687747 100644 --- a/target/linux/imx6/config-4.9 +++ b/target/linux/imx6/config-4.9 @@ -160,6 +160,7 @@ CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_DTC=y +CONFIG_E1000E=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y # CONFIG_ENABLE_DEFAULT_TRACERS is not set ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v3] ar71xx: add ew-balin platform from Embedded Wireless
Hi,
few small comments inline.
On 11/01/18 11:27, Catrinel Catrinescu wrote:
Add the Embedded Wireless "Balin" platform, based on AR9344:
http://www.embeddedwireless.de/uploads/Balin_data_2016_10.pdf
Can you please write the HW spec into the commit message ? the PDF link
might be gone one day.
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/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|\
no need to add switch migration for new boards. please drop this part of
the patch.
John
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
CONFIG_ATH79_MACH_F9K1115V2=y
CONFIG_ATH79_MACH_FRITZ300E=y
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index 1198fcb74b..a94c5a3a2e 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -702,6 +702,17 @@ config ATH79_MACH_ESR900
select ATH79_DEV_WMAC
select ATH79_NVRAM
+config ATH79_MACH_EW_BALIN
+ bool "embedded wireless Balin Platform support"
+ select SOC_AR934X
+ select ATH79_DEV_M25P80
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
+ select ATH79_DEV_WMAC
+ select ATH79_DEV_ETH
+ select ATH79_DEV_USB
+ select ATH79_DEV_AP9X_PCI if PCI
+
config ATH79_MACH_EW_DORIN
bool "embedded wireless Dorin Platform support"
select SOC_AR933X
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
index 455af762e3..bde1b75308 100644
--- a/target/linux/ar
Re: [LEDE-DEV] [OpenWrt-Devel] owrt landing page
On 10/01/18 22:56, Thomas Endt wrote: Hi John, First results on a private demowiki, see: https://lede-project.org/_media/wiki/ledewiki-owrtstyling.jpg looking pretty cool !! thanks for the effort. 1) red marking: What are we going to do with the sidebar (raw, untouched styling; could be beautified)? Keep or remove? no idea 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? we had a few proposals but nothing final. lets use the existing logo for now until we have a new one ? 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. Ok, your call really. John 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
