From john at phrozen.org Fri Apr 1 02:59:20 2016 From: john at phrozen.org (John Crispin) Date: Fri, 1 Apr 2016 08:59:20 +0200 Subject: [OpenWrt-Devel] [PATCH] ramips: rt3352 usbphy fix in dts-file In-Reply-To: <56F432CD.7040900@yandex.ru> References: <56F432CD.7040900@yandex.ru> Message-ID: <56FE1C48.9060707@phrozen.org> Hi, does not apply, please fix and resend John On 24/03/2016 19:32, serge wrote: > Add missing rt3352 usb phy. Need to backport into CC. > > > Signed-Off-By: Serge Vasilugin > > diff --git a/target/linux/ramips/dts/rt3352.dtsi > b/target/linux/ramips/dts/rt3352.dtsi > index cfa0db6..0932b52 100644 > --- a/target/linux/ramips/dts/rt3352.dtsi > +++ b/target/linux/ramips/dts/rt3352.dtsi > @@ -252,8 +252,9 @@ > interrupts = <17>; > }; > > - usbphy { > + usbphy: usbphy { > compatible = "ralink,rt3352-usbphy"; > + #phy-cells = <1>; > > resets = <&rstctrl 22 &rstctrl 25>; > reset-names = "host", "device"; > @@ -273,6 +274,9 @@ > compatible = "generic-ehci"; > reg = <0x101c0000 0x1000>; > > + phys = <&usbphy 1>; > + phy-names = "usb"; > + > interrupt-parent = <&intc>; > interrupts = <18>; > > @@ -283,6 +287,9 @@ > compatible = "generic-ohci"; > reg = <0x101c1000 0x1000>; > > + phys = <&usbphy 1>; > + phy-names = "usb"; > + > interrupt-parent = <&intc>; > interrupts = <18>; > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From noltari at gmail.com Fri Apr 1 06:18:12 2016 From: noltari at gmail.com (=?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?=) Date: Fri, 1 Apr 2016 12:18:12 +0200 Subject: [OpenWrt-Devel] [PATCH 1/2] download: add @GITHUB download facility Message-ID: <1459505893-22035-1-git-send-email-noltari@gmail.com> Define a new alias (@GITHUB) for downloading raw github repository files Signed-off-by: ?lvaro Fern?ndez Rojas --- include/download.mk | 2 +- scripts/download.pl | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/download.mk b/include/download.mk index 63af908..a359514 100644 --- a/include/download.mk +++ b/include/download.mk @@ -13,7 +13,7 @@ DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED) define dl_method $(strip \ $(if $(2),$(2), \ - $(if $(filter @APACHE/% @GNOME/% @GNU/% @KERNEL/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \ + $(if $(filter @APACHE/% @GITHUB/% @GNOME/% @GNU/% @KERNEL/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \ $(if $(filter git://%,$(1)),git, \ $(if $(filter svn://%,$(1)),svn, \ $(if $(filter cvs://%,$(1)),cvs, \ diff --git a/scripts/download.pl b/scripts/download.pl index 20f38f1..a1bd013 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -182,6 +182,11 @@ foreach my $mirror (@ARGV) { push @mirrors, "http://mirrors.ocf.berkeley.edu/apache/$1"; push @mirrors, "http://mirror.cc.columbia.edu/pub/software/apache/$1"; push @mirrors, "http://ftp.jaist.ac.jp/pub/apache/$1"; + } elsif ($mirror =~ /^\@GITHUB\/(.+)$/) { + # give github a few more tries (different mirrors) + for (1 .. 5) { + push @mirrors, "https://raw.githubusercontent.com/$1"; + } } elsif ($mirror =~ /^\@GNU\/(.+)$/) { push @mirrors, "http://ftpmirror.gnu.org/$1"; push @mirrors, "http://ftp.gnu.org/pub/gnu/$1"; -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From noltari at gmail.com Fri Apr 1 06:18:13 2016 From: noltari at gmail.com (=?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?=) Date: Fri, 1 Apr 2016 12:18:13 +0200 Subject: [OpenWrt-Devel] [PATCH 2/2] brcmfmac43430-firmware: switch to @GITHUB download alias In-Reply-To: <1459505893-22035-1-git-send-email-noltari@gmail.com> References: <1459505893-22035-1-git-send-email-noltari@gmail.com> Message-ID: <1459505893-22035-2-git-send-email-noltari@gmail.com> Signed-off-by: ?lvaro Fern?ndez Rojas --- package/firmware/brcmfmac43430-firmware/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/firmware/brcmfmac43430-firmware/Makefile b/package/firmware/brcmfmac43430-firmware/Makefile index 6e78e9d..e4a1152 100644 --- a/package/firmware/brcmfmac43430-firmware/Makefile +++ b/package/firmware/brcmfmac43430-firmware/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk BRCMFMAC43430_SDIO_REV:=54bab3d6a6d43239c71d26464e6e10e5067ffea7 -BRCMFMAC43430_SDIO_URL:=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/$(BRCMFMAC43430_SDIO_REV)/brcm80211/brcm/ +BRCMFMAC43430_SDIO_URL:=@GITHUB/RPi-Distro/firmware-nonfree/$(BRCMFMAC43430_SDIO_REV)/brcm80211/brcm/ BRCMFMAC43430_SDIO_FILE:=brcmfmac43430-sdio-$(BRCMFMAC43430_SDIO_REV) define Download/brcmfmac43430_sdio_bin -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From kaloz at openwrt.org Fri Apr 1 08:25:10 2016 From: kaloz at openwrt.org (Imre Kaloz) Date: Fri, 01 Apr 2016 14:25:10 +0200 Subject: [OpenWrt-Devel] [PATCH 0/8] [ipq806x] Add basic support for Linksys EA8500 In-Reply-To: References: Message-ID: Hi Adrian, On Fri, 01 Apr 2016 02:35:20 +0200, Adrian Panella wrote: > From: Adrian Panella > > > > This patchset adds support for the Linksys AC2600 EA8500 router. Does networking work for you? I have a patchset for the ea8500 I didn't push because of that. Thanks, Imre _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From kaloz at openwrt.org Fri Apr 1 08:35:56 2016 From: kaloz at openwrt.org (Imre Kaloz) Date: Fri, 01 Apr 2016 14:35:56 +0200 Subject: [OpenWrt-Devel] [RFC 1/2] Add support for the apm821xx Device Target In-Reply-To: <1459475170-1628-2-git-send-email-chrisrblake93@gmail.com> References: <1459475170-1628-1-git-send-email-chrisrblake93@gmail.com> <1459475170-1628-2-git-send-email-chrisrblake93@gmail.com> Message-ID: Hi Chris, On Fri, 01 Apr 2016 03:46:09 +0200, Chris Blake wrote: > This adds a new target for PowerPC APM821xx (464-based) boards, as well > as adds support for the booke-wdt watchdog package. > > Signed-off-by: Chris Blake Not bad at all for first try :) > diff --git a/include/target.mk b/include/target.mk > index 76fbd99..6d036a0 100644 > --- a/include/target.mk > +++ b/include/target.mk > @@ -253,6 +253,7 @@ ifeq ($(DUMP),1) > CPU_CFLAGS_8540:=-mcpu=8540 > CPU_CFLAGS_405:=-mcpu=405 > CPU_CFLAGS_440:=-mcpu=440 > + CPU_CFLAGS_464:=-mcpu=464 > endif > ifeq ($(ARCH),sparc) > CPU_TYPE = sparc These guys do have an FPU, so please go with CPU_CFLAGS_464fp:=-mcpu=464fp > --- /dev/null > +++ b/target/linux/apm821xx/Makefile > @@ -0,0 +1,30 @@ > +# > +# Copyright (C) 2016 OpenWrt.org > +# > +# This is free software, licensed under the GNU General Public License > v2. > +# See /LICENSE for more information. > +# > +include $(TOPDIR)/rules.mk > + > +ARCH:=powerpc > +BOARD:=apm821xx > +BOARDNAME:=AppliedMicro APM821xx > +CPU_TYPE:=464 464fp > +FEATURES:=squashfs nand rtc ramdisk fpu > +CONFIG_BLUESTONE=y I doubt we support that here. > +CONFIG_BOOKE=y > +CONFIG_BOUNCE=y > +CONFIG_CANYONLANDS=n "is not set". Please refresh the config file using the buildsystem. > --- /dev/null > +++ b/target/linux/apm821xx/generic/target.mk > @@ -0,0 +1,12 @@ > +# > +# Copyright (C) 2016 OpenWrt.org > +# > +# This is free software, licensed under the GNU General Public License > v2. > +# See /LICENSE for more information. > +# > + > +BOARDNAME:=Generic > + > +define Target/Description > + Build firmware images for generic APM821xx based boards. > +endef There's not reason to create any subtargets for now. Imre _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From kaloz at openwrt.org Fri Apr 1 08:39:50 2016 From: kaloz at openwrt.org (Imre Kaloz) Date: Fri, 01 Apr 2016 14:39:50 +0200 Subject: [OpenWrt-Devel] [RFC 2/2] Add support for the Meraki MR24 In-Reply-To: <1459475170-1628-3-git-send-email-chrisrblake93@gmail.com> References: <1459475170-1628-1-git-send-email-chrisrblake93@gmail.com> <1459475170-1628-3-git-send-email-chrisrblake93@gmail.com> Message-ID: On Fri, 01 Apr 2016 03:46:10 +0200, Chris Blake wrote: > This patch adds support for the Meraki MR24 Access point to the apm821xx > target. More info on the device can be found at > https://wiki.openwrt.org/toh/meraki/mr24 > > Signed-off-by: Chris Blake > --- /dev/null > +++ b/target/linux/apm821xx/dts/MR24.dts > @@ -0,0 +1,433 @@ > +/* > + * Device Tree Source for Meraki MR24 (Ikarem) > + * > + * Copyright (C) 2016 Chris Blake > + * > + * Based on Cisco Meraki GPL Release r23-20150601 MR24 DTS > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without > + * any warranty of any kind, whether express or implied. > + */ > + > +/dts-v1/; > + > +/ { > + #address-cells = <2>; > + #size-cells = <1>; > + model = "Meraki MR24 Access Point"; > + compatible = "apm,bluestone"; This should be "meraki,ikarem" if that's the codename for the box. > diff --git > a/target/linux/apm821xx/patches-4.4/700-powerpc_ibm_phy_add_ar8035.patch > b/target/linux/apm821xx/patches-4.4/700-powerpc_ibm_phy_add_ar8035.patch > diff --git > a/target/linux/apm821xx/patches-4.4/800-ppc4xx-rng-fix-crash-during-init.patch > b/target/linux/apm821xx/patches-4.4/800-ppc4xx-rng-fix-crash-during-init.patch These should be part of "1/2". Thanks, Imre _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Fri Apr 1 08:41:47 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Fri, 1 Apr 2016 14:41:47 +0200 Subject: [OpenWrt-Devel] [RFC] ar71xx: Reset QCA955x SGMII link on speed change Message-ID: <1459514507-20044-1-git-send-email-sven@open-mesh.com> From: Sven Eckelmann The SGMII link of the QCA955x seems to be unstable when the PHY changes the link speed. Reseting the SGMII and the PHY management control seems to resolve this problem. This was observed with an AR8033 and QCA9558 The code of this RFC is not meant to be an actual patch. It should show what the u-boot for QCA955x does and what seemed to work(tm) in my limited tests. It would be interesting to know whether this was also noticed by other people and how they fixed it (when they fixed it). If it is already known than it would maybe good to find a better way to integrate it with ag71xx. Right now it just uses the set_speed callback to start the reset. Signed-off-by: Sven Eckelmann --- .../linux/ar71xx/files/arch/mips/ath79/dev-eth.c | 110 +++++++++++++++++++++ .../601-MIPS-ath79-add-more-register-defines.patch | 2 +- .../601-MIPS-ath79-add-more-register-defines.patch | 2 +- 3 files changed, 112 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c index b43c80a..01c25b2 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c @@ -373,6 +373,20 @@ static void ar934x_set_speed_ge0(int speed) iounmap(base); } +#define QCA955X_GMAC_REG_SGMII_RESET 0x14 +#define QCA955X_GMAC_REG_MR_AN_CONTROL 0x1C +#define QCA955X_GMAC_REG_SGMII_DEBUG 0x58 +#define SGMII_LINK_WAR_MAX_TRY 20 + +#define QCA955X_GMAC_REG_MR_AN_CONTROL_AN_ENABLE BIT(12) +#define QCA955X_GMAC_REG_MR_AN_CONTROL_PHY_RESET BIT(15) + +#define QCA955X_GMAC_REG_SGMII_RESET_HW_RX_125M_N BIT(4) +#define QCA955X_GMAC_REG_SGMII_RESET_TX_125M_N BIT(3) +#define QCA955X_GMAC_REG_SGMII_RESET_RX_125M_N BIT(2) +#define QCA955X_GMAC_REG_SGMII_RESET_TX_CLK_N BIT(1) +#define QCA955X_GMAC_REG_SGMII_RESET_RX_CLK_N BIT(0) + static void qca955x_set_speed_xmii(int speed) { void __iomem *base; @@ -381,6 +395,100 @@ static void qca955x_set_speed_xmii(int speed) base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE); __raw_writel(val, base + QCA955X_PLL_ETH_XMII_CONTROL_REG); iounmap(base); + + // TODO: find out if something like qca955x_reset_xmii(); is needed +} + +static void qca955x_reset_sgmii(void) +{ + void __iomem *base; + int count = 0; + u32 status; + u32 t; + + base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE); + + /* WARNING ugly PoC code ahead */ + printk("Resetting SGMII link\n"); + + t = QCA955X_GMAC_REG_MR_AN_CONTROL_AN_ENABLE | + QCA955X_GMAC_REG_MR_AN_CONTROL_PHY_RESET; + __raw_writel(t, base + QCA955X_GMAC_REG_MR_AN_CONTROL); + udelay(10); + + t = QCA955X_GMAC_REG_MR_AN_CONTROL_AN_ENABLE; + __raw_writel(t, base + QCA955X_GMAC_REG_MR_AN_CONTROL); + + t = 0; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + udelay(10); + + t = QCA955X_GMAC_REG_SGMII_RESET_HW_RX_125M_N; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + udelay(10); + + t = QCA955X_GMAC_REG_SGMII_RESET_HW_RX_125M_N | + QCA955X_GMAC_REG_SGMII_RESET_RX_125M_N; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + udelay(10); + + t = QCA955X_GMAC_REG_SGMII_RESET_HW_RX_125M_N | + QCA955X_GMAC_REG_SGMII_RESET_TX_125M_N | + QCA955X_GMAC_REG_SGMII_RESET_RX_125M_N; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + udelay(10); + + t = QCA955X_GMAC_REG_SGMII_RESET_HW_RX_125M_N | + QCA955X_GMAC_REG_SGMII_RESET_TX_125M_N | + QCA955X_GMAC_REG_SGMII_RESET_RX_125M_N | + QCA955X_GMAC_REG_SGMII_RESET_RX_CLK_N; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + udelay(10); + + t = QCA955X_GMAC_REG_SGMII_RESET_HW_RX_125M_N | + QCA955X_GMAC_REG_SGMII_RESET_TX_125M_N | + QCA955X_GMAC_REG_SGMII_RESET_RX_125M_N | + QCA955X_GMAC_REG_SGMII_RESET_RX_CLK_N | + QCA955X_GMAC_REG_SGMII_RESET_TX_CLK_N; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + udelay(10); + + /* TODO this should be an rmw */ + t = __raw_readl(base + QCA955X_GMAC_REG_MR_AN_CONTROL); + t &= ~QCA955X_GMAC_REG_MR_AN_CONTROL_PHY_RESET; + __raw_writel(t, base + QCA955X_GMAC_REG_MR_AN_CONTROL); + udelay(100); + + status = __raw_readl(base + QCA955X_GMAC_REG_SGMII_DEBUG); + status &= 0xff; + while (status != 0xf && status != 0x10) { + printk("state %#02x\n", status); + /* TODO this should be an rmw */ + t = __raw_readl(base + QCA955X_GMAC_REG_MR_AN_CONTROL); + t |= QCA955X_GMAC_REG_MR_AN_CONTROL_PHY_RESET; + __raw_writel(t, base + QCA955X_GMAC_REG_MR_AN_CONTROL); + + udelay(100); + + /* TODO this should be an rmw */ + t = __raw_readl(base + QCA955X_GMAC_REG_MR_AN_CONTROL); + t &= ~QCA955X_GMAC_REG_MR_AN_CONTROL_PHY_RESET; + __raw_writel(t, base + QCA955X_GMAC_REG_MR_AN_CONTROL); + + if (count++ >= SGMII_LINK_WAR_MAX_TRY) { + printk("Max resets limit reached exiting...\n"); + break; + } + + mdelay(10); + + status = __raw_readl(base + QCA955X_GMAC_REG_SGMII_DEBUG); + status &= 0xff; + } + + printk("Reached count %d\n", count); + + iounmap(base); } static void qca955x_set_speed_sgmii(int speed) @@ -401,6 +509,8 @@ static void qca956x_set_speed_sgmii(int speed) base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE); __raw_writel(val, base + QCA955X_PLL_ETH_SGMII_CONTROL_REG); iounmap(base); + + qca955x_reset_sgmii(); } static void ath79_set_speed_dummy(int speed) diff --git a/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch b/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch index 0126f6a..2da1048 100644 --- a/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch +++ b/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch @@ -47,7 +47,7 @@ #define QCA955X_PCI_CTRL_SIZE 0x100 +#define QCA955X_GMAC_BASE (AR71XX_APB_BASE + 0x00070000) -+#define QCA955X_GMAC_SIZE 0x40 ++#define QCA955X_GMAC_SIZE 0x64 #define QCA955X_WMAC_BASE (AR71XX_APB_BASE + 0x00100000) #define QCA955X_WMAC_SIZE 0x20000 #define QCA955X_EHCI0_BASE 0x1b000000 diff --git a/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch b/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch index 0126f6a..2da1048 100644 --- a/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch +++ b/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch @@ -47,7 +47,7 @@ #define QCA955X_PCI_CTRL_SIZE 0x100 +#define QCA955X_GMAC_BASE (AR71XX_APB_BASE + 0x00070000) -+#define QCA955X_GMAC_SIZE 0x40 ++#define QCA955X_GMAC_SIZE 0x64 #define QCA955X_WMAC_BASE (AR71XX_APB_BASE + 0x00100000) #define QCA955X_WMAC_SIZE 0x20000 #define QCA955X_EHCI0_BASE 0x1b000000 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chrisrblake93 at gmail.com Fri Apr 1 09:26:46 2016 From: chrisrblake93 at gmail.com (Chris Blake) Date: Fri, 1 Apr 2016 08:26:46 -0500 Subject: [OpenWrt-Devel] [RFC 1/2] Add support for the apm821xx Device Target In-Reply-To: References: <1459475170-1628-1-git-send-email-chrisrblake93@gmail.com> <1459475170-1628-2-git-send-email-chrisrblake93@gmail.com> Message-ID: Hey Imre, On Fri, Apr 1, 2016 at 7:35 AM, Imre Kaloz wrote: > Hi Chris, > > On Fri, 01 Apr 2016 03:46:09 +0200, Chris Blake > >> +CONFIG_BLUESTONE=y > > > I doubt we support that here. > From my understanding, Bluestone is the dev board for the apm821xx, so for dependencies shouldn't this be selected? > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From kaloz at openwrt.org Fri Apr 1 09:32:11 2016 From: kaloz at openwrt.org (Imre Kaloz) Date: Fri, 01 Apr 2016 15:32:11 +0200 Subject: [OpenWrt-Devel] [RFC 1/2] Add support for the apm821xx Device Target In-Reply-To: References: <1459475170-1628-1-git-send-email-chrisrblake93@gmail.com> <1459475170-1628-2-git-send-email-chrisrblake93@gmail.com> Message-ID: On Fri, 01 Apr 2016 15:26:46 +0200, Chris Blake wrote: > Hey Imre, > > On Fri, Apr 1, 2016 at 7:35 AM, Imre Kaloz wrote: >> Hi Chris, >> >> On Fri, 01 Apr 2016 03:46:09 +0200, Chris Blake >> >> >>> +CONFIG_BLUESTONE=y >> >> >> I doubt we support that here. >> > > From my understanding, Bluestone is the dev board for the apm821xx, so > for dependencies shouldn't this be selected? Nope, as we don't support it. Imre _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From vasilugin at yandex.ru Fri Apr 1 10:24:12 2016 From: vasilugin at yandex.ru (serge) Date: Fri, 01 Apr 2016 20:24:12 +0600 Subject: [OpenWrt-Devel] [PATCH v2] ramips: rt3352 usbphy fix in dts-file Message-ID: <56FE848C.1050408@yandex.ru> Add missing rt3352 usb phy. Fix ticket #20499. Need backport into CC Signed-Off-By:Serge Vasilugin diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index cfa0db6..0932b52 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -252,8 +252,9 @@ interrupts = <17>; }; - usbphy { + usbphy: usbphy { compatible = "ralink,rt3352-usbphy"; + #phy-cells = <1>; resets = <&rstctrl 22 &rstctrl 25>; reset-names = "host", "device"; @@ -273,6 +274,9 @@ compatible = "generic-ehci"; reg = <0x101c0000 0x1000>; + phys = <&usbphy 1>; + phy-names = "usb"; + interrupt-parent = <&intc>; interrupts = <18>; @@ -283,6 +287,9 @@ compatible = "generic-ohci"; reg = <0x101c1000 0x1000>; + phys = <&usbphy 1>; + phy-names = "usb"; + interrupt-parent = <&intc>; interrupts = <18>; --- serge _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From Alexey.Brodkin at synopsys.com Fri Apr 1 10:39:02 2016 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Fri, 1 Apr 2016 17:39:02 +0300 Subject: [OpenWrt-Devel] [PATCH] arc770: build kmod-ath9k-htc wpad-mini by default Message-ID: <1459521542-2111-1-git-send-email-abrodkin@synopsys.com> AXS101 beind a development board lacks built-in wireles inerfaces. So we have to use external USB dongles to turn the board into wireless router. The best USB Wi-Fi dongles to work in AP-mode seem to be based on ath9k-htc chipset. And so with that change we add support of mentioned dongles in default and axs101 builds. Signed-off-by: Alexey Brodkin --- target/linux/arc770/generic/profiles/00-default.mk | 2 +- target/linux/arc770/generic/profiles/02-axs101.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/arc770/generic/profiles/00-default.mk b/target/linux/arc770/generic/profiles/00-default.mk index b12ceb1..c30317a 100644 --- a/target/linux/arc770/generic/profiles/00-default.mk +++ b/target/linux/arc770/generic/profiles/00-default.mk @@ -7,7 +7,7 @@ define Profile/Default NAME:=Default Profile (all drivers) - PACKAGES:= kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-mmc kmod-sdhci + PACKAGES:= kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-mmc kmod-sdhci kmod-ath9k-htc wpad-mini endef define Profile/Default/Description diff --git a/target/linux/arc770/generic/profiles/02-axs101.mk b/target/linux/arc770/generic/profiles/02-axs101.mk index 60cf0fc..56a97e5 100644 --- a/target/linux/arc770/generic/profiles/02-axs101.mk +++ b/target/linux/arc770/generic/profiles/02-axs101.mk @@ -7,7 +7,7 @@ define Profile/axs101 NAME:=Synopsys DesignWare AXS101 - PACKAGES:= kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-mmc kmod-sdhci + PACKAGES:= kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-mmc kmod-sdhci kmod-ath9k-htc wpad-mini endef define Profile/axs101/Description -- 2.5.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From Alexey.Brodkin at synopsys.com Fri Apr 1 10:43:25 2016 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Fri, 1 Apr 2016 17:43:25 +0300 Subject: [OpenWrt-Devel] [PATCH] arc770: enable unaligned access handling simulation in software Message-ID: <1459521805-16197-1-git-send-email-abrodkin@synopsys.com> This enables misaligned access handling by software in Linux kernel. With some wireless drivers (ath9k-htc and mt7601u for example) we see misaligned accesses here and there and to cope with that without fixing stuff in the drivers we're just gracefully handling it on ARC. Signed-off-by: Alexey Brodkin --- target/linux/arc770/config-4.4 | 5 ++-- ...rc-enable-unaligned-access-in-kernel-mode.patch | 31 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 target/linux/generic/patches-4.4/333-arc-enable-unaligned-access-in-kernel-mode.patch diff --git a/target/linux/arc770/config-4.4 b/target/linux/arc770/config-4.4 index c8f021d..87fd7e3 100644 --- a/target/linux/arc770/config-4.4 +++ b/target/linux/arc770/config-4.4 @@ -19,7 +19,7 @@ CONFIG_ARC_DBG=y # CONFIG_ARC_DBG_TLB_MISS_COUNT is not set # CONFIG_ARC_DBG_TLB_PARANOIA is not set CONFIG_ARC_DW2_UNWIND=y -# CONFIG_ARC_EMUL_UNALIGNED is not set +CONFIG_ARC_EMUL_UNALIGNED=y # CONFIG_ARC_FPU_SAVE_RESTORE is not set CONFIG_ARC_HAS_DCACHE=y # CONFIG_ARC_HAS_DCCM is not set @@ -162,7 +162,8 @@ CONFIG_SRCU=y CONFIG_STACKTRACE=y CONFIG_STMMAC_ETH=y CONFIG_STMMAC_PLATFORM=y -# CONFIG_SUNXI_SRAM is not set +CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW=y +CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_USB_SUPPORT=y diff --git a/target/linux/generic/patches-4.4/333-arc-enable-unaligned-access-in-kernel-mode.patch b/target/linux/generic/patches-4.4/333-arc-enable-unaligned-access-in-kernel-mode.patch new file mode 100644 index 0000000..76a9ce8 --- /dev/null +++ b/target/linux/generic/patches-4.4/333-arc-enable-unaligned-access-in-kernel-mode.patch @@ -0,0 +1,31 @@ +From af737b55fc7c61f17da9ae89fba536e0a9338e98 Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Mon, 14 Mar 2016 17:26:34 +0300 +Subject: [PATCH] arc: enable unaligned access in kernel mode + +This enables misaligned access handling even in kernel mode. +Some wireless drivers (ath9k-htc and mt7601u) use misaligned accesses +here and there and to cope with that without fixing stuff in the drivers +we're just gracefully handling it on ARC. + +Signed-off-by: Alexey Brodkin +--- + arch/arc/kernel/unaligned.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arc/kernel/unaligned.c b/arch/arc/kernel/unaligned.c +index abd961f..0b0cc97 100644 +--- a/arch/arc/kernel/unaligned.c ++++ b/arch/arc/kernel/unaligned.c +@@ -206,7 +206,7 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs, + char buf[TASK_COMM_LEN]; + + /* handle user mode only and only if enabled by sysadmin */ +- if (!user_mode(regs) || !unaligned_enabled) ++ if (!unaligned_enabled) + return 1; + + if (no_unaligned_warning) { +-- +2.5.0 + -- 2.5.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chrisrblake93 at gmail.com Fri Apr 1 11:17:27 2016 From: chrisrblake93 at gmail.com (Chris Blake) Date: Fri, 1 Apr 2016 10:17:27 -0500 Subject: [OpenWrt-Devel] [RFC 2/2] Add support for the Meraki MR24 In-Reply-To: References: <1459475170-1628-1-git-send-email-chrisrblake93@gmail.com> <1459475170-1628-3-git-send-email-chrisrblake93@gmail.com> Message-ID: Hey Imre, On Fri, Apr 1, 2016 at 7:39 AM, Imre Kaloz wrote: > On Fri, 01 Apr 2016 03:46:10 +0200, Chris Blake > wrote: > >> This patch adds support for the Meraki MR24 Access point to the apm821xx >> target. More info on the device can be found at >> https://wiki.openwrt.org/toh/meraki/mr24 >> >> Signed-off-by: Chris Blake > > >> --- /dev/null >> +++ b/target/linux/apm821xx/dts/MR24.dts >> @@ -0,0 +1,433 @@ >> +/* >> + * Device Tree Source for Meraki MR24 (Ikarem) >> + * >> + * Copyright (C) 2016 Chris Blake >> + * >> + * Based on Cisco Meraki GPL Release r23-20150601 MR24 DTS >> + * >> + * This file is licensed under the terms of the GNU General Public >> + * License version 2. This program is licensed "as is" without >> + * any warranty of any kind, whether express or implied. >> + */ >> + >> +/dts-v1/; >> + >> +/ { >> + #address-cells = <2>; >> + #size-cells = <1>; >> + model = "Meraki MR24 Access Point"; >> + compatible = "apm,bluestone"; > > > This should be "meraki,ikarem" if that's the codename for the box. > From my understanding this should stay as "apm,bluestone" as this is what the dts was based on, and needs to stay set for the platform code to work: http://lxr.free-electrons.com/source/arch/powerpc/platforms/44x/ppc44x_simple.c#L43 So not sure why setting this to "meraki,ikarem" would be the best plan of action, as then patches would be needed for the above code, and possibly more drivers. (still new to the ppc arch and dts files, so please correct me if I am wrong here). > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From psidhu at gateworks.com Fri Apr 1 14:56:32 2016 From: psidhu at gateworks.com (Pushpal Sidhu) Date: Fri, 1 Apr 2016 11:56:32 -0700 Subject: [OpenWrt-Devel] [PATCH 4/8] caldata-utils: new package to manipulate ath10k In-Reply-To: References:

Message-ID: Hi, On Thu, Mar 31, 2016 at 6:48 PM, Adrian Panella wrote: > > > From df9a676bb3ba225f0fd6621dbaeec945baf3153d Mon Sep 17 00:00:00 2001 > From: Adrian Panella > Date: Wed, 30 Mar 2016 23:31:06 -0600 > Subject: [PATCH 12/15] caldata-utils: new package to manipulate ath10k > calibration data > > Signed-off-by: Adrian Panella > --- > package/utils/caldata-utils/Makefile | 60 +++++++++ > package/utils/caldata-utils/src/Makefile | 8 ++ > package/utils/caldata-utils/src/caldata.c | 213 ++++++++++++++++++++++++++++++ > package/utils/caldata-utils/src/caldata.h | 42 ++++++ > package/utils/caldata-utils/src/utils.c | 72 ++++++++++ > 5 files changed, 395 insertions(+) > create mode 100644 package/utils/caldata-utils/Makefile > create mode 100644 package/utils/caldata-utils/src/Makefile > create mode 100644 package/utils/caldata-utils/src/caldata.c > create mode 100644 package/utils/caldata-utils/src/caldata.h > create mode 100644 package/utils/caldata-utils/src/utils.c > > diff --git a/package/utils/caldata-utils/Makefile b/package/utils/caldata-utils/Makefile > new file mode 100644 > index 0000000..eff7761 > --- /dev/null > +++ b/package/utils/caldata-utils/Makefile > @@ -0,0 +1,60 @@ > +# > +# Copyright (C) 2006-2010 OpenWrt.org > +# Copyright (C) 2016 Adrian Panella > +# > +# This is free software, licensed under the GNU General Public License v2. > +# See /LICENSE for more information. > +# > + > +include $(TOPDIR)/rules.mk > + > +PKG_NAME:=caldata-utils > +PKG_RELEASE:=1 > + > +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) > +PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone > + > +include $(INCLUDE_DIR)/package.mk > + > +ifdef CONFIG_USE_UCLIBC > + LIBARGP="-largp" > +endif > + > +ifdef CONFIG_USE_MUSL > + LIBARGP="-largp" > +endif > + > + > +define Package/caldata-utils > + SECTION:=utils > + CATEGORY:=Utilities > + TITLE:=Utility to manipulate calibration data for ath10k > + MAINTAINER:=Adrian Panella > +endef > + > +define Package/caldata-utils/description > + This package contains an utility to manipulate calibration data for ath10k drivers. > + It enables to extract from MTD partition or file and to patch MAC address fixing the checksum. > +endef > + > +define Build/Prepare > + mkdir -p $(PKG_BUILD_DIR) > + $(CP) ./src/* $(PKG_BUILD_DIR)/ > +endef > + > +define Build/Configure > +endef > + > +define Build/Compile > + $(MAKE) -C $(PKG_BUILD_DIR) \ > + CC="$(TARGET_CC)" \ > + CFLAGS="$(TARGET_CFLAGS) -Wall" \ > + LDFLAGS="$(TARGET_LDFLAGS) $(LIBARGP)" > +endef > + > +define Package/caldata-utils/install > + $(INSTALL_DIR) $(1)/usr/sbin > + $(INSTALL_BIN) $(PKG_BUILD_DIR)/caldata $(1)/usr/sbin/ > +endef > + > +$(eval $(call BuildPackage,caldata-utils)) > diff --git a/package/utils/caldata-utils/src/Makefile b/package/utils/caldata-utils/src/Makefile > new file mode 100644 > index 0000000..57ab936 > --- /dev/null > +++ b/package/utils/caldata-utils/src/Makefile > @@ -0,0 +1,8 @@ > + > +all: caldata > + > +caldata: caldata.c utils.c > + $(CC) $(CFLAGS) -o $@ caldata.c utils.c $(LDFLAGS) > + > +clean: > + rm caldata > diff --git a/package/utils/caldata-utils/src/caldata.c b/package/utils/caldata-utils/src/caldata.c > new file mode 100644 > index 0000000..d5391d5 > --- /dev/null > +++ b/package/utils/caldata-utils/src/caldata.c > @@ -0,0 +1,213 @@ > +/* > + * > + * Copyright (C) 2016 Adrian Panella > + * > + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + */ > + > +/* > + * > + * caldata > + * > + * Utility to manipulate calibration data for ath10k drivers. > + * It enables to extract from MTD partition or file and to patch MAC address fixing the checksum. > + * > + */ > + > + > +#include > +#include > +#include > + > +#include "caldata.h" > + > + > +/* Parse a single option. */ > +static error_t parse_opt (int key, char *arg, struct argp_state *state) > +{ > + struct arguments *arguments = state->input; > + > + switch (key) > + { > + case 'i': > + arguments->input_file = arg; > + break; > + > + case 'f': > + arguments->output_file = arg; > + break; > + > + case 'o': > + sscanf(arg,"%li", &arguments->offset); > + break; > + > + case 's': > + sscanf(arg,"%li", &arguments->size); > + break; > + > + case 'a': > + > + if(!isMAC(arg)) > + argp_error(state,"address is not a valid MAC address"); > + > + arguments->macaddr = arg; > + break; > + > + case 'v': > + arguments->verify = 1; > + break; > + > + case ARGP_KEY_END: //all options processed, verify consistency > + > + if(!arguments->input_file) > + argp_error(state,"No input file or partition specified."); > + > + if(!arguments->verify && !arguments->output_file) > + argp_error(state, "Must specify either -f FILE or -v."); > + > + break; > + > + default: > + return ARGP_ERR_UNKNOWN; > + } > + return 0; > +} > + > + > +int loadfile(char *file, void **data, int offset, int size) { > + *data=NULL; > + char *source = NULL; > + > + > + char mtdpath[32]; > + FILE *fp=NULL; > + > + //try input as partition > + int mtdnr = getMTD(file); > + if(mtdnr>=0) { > + sprintf(mtdpath, "/dev/mtdblock%d", mtdnr); > + fp = fopen(mtdpath, "rb"); > + } > + //try as file > + if(!fp) > + fp = fopen(file, "rb"); > + > + if (fp != NULL) { > + /* Go to the end of the file. */ > + if (fseek(fp, 0L, SEEK_END) == 0) { > + /* Get the size of the file. */ > + long filesize = ftell(fp); > + if (filesize == -1) { > + fclose(fp); > + return -1; } > + > + size= size ? size : (filesize - offset); > + if(size + offset > filesize) { > + fputs("Offset + size gets past EOF", stderr); > + fclose(fp); > + exit(1);} > + > + source = malloc(size + 1); > + > + /* offset from the start of the file. */ > + if (fseek(fp, offset, SEEK_SET) != 0) { > + free(source); > + fclose(fp); > + return -1;} > + > + /* Read file into memory. */ > + size_t newLen = fread(source, sizeof(char), size, fp); > + if (newLen == 0) { > + free(source); > + fclose(fp); > + return -1; > + } > + else { > + fclose(fp); > + *data=source; > + return size; > + } > + } > + } > + return -1; > +} > + > +int main (int argc, char **argv) > +{ > + struct arguments arguments; > + unsigned short ret=0; > + > + /* Default values. */ > + arguments.input_file = NULL; > + arguments.output_file = NULL; > + arguments.offset = 0; > + arguments.size = 0; > + arguments.macaddr = NULL; > + arguments.verify = 0; > + > + /* Parse arguments and validate*/ > + argp_parse (&argp, argc, argv, 0, 0, &arguments); > + > + > + // read input data > + unsigned short *data; > + int data_len=loadfile(arguments.input_file,(void **)&data, arguments.offset, arguments.size); > + > + if(data_len<0) { > + fputs("Error reading input file/partition.\n", stderr); > + exit(1); > + } > + > + unsigned char *mac=(unsigned char *)data+6; > + > + if(arguments.verify) { > + > + printf("Size: %d\n", data[0]); > + printf("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); > + ret=checksum(data, data[0]) ? 1 : 0; > + printf("Checksum: 0x%04x (%s)\n", data[1], ret ? "ERROR" : "OK"); > + if(ret) > + fputs("Calibration data checksum error\n", stderr); > + > + free(data); > + exit(ret); > + } > + > + if(arguments.macaddr) { > + sscanf(arguments.macaddr,"%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); > + data[1]=0; > + data[1]=checksum(data, data[0]); > + } > + > + FILE *fp=fopen(arguments.output_file,"wb"); > + > + if(!fp) { > + fputs("Error opening output file\n", stderr); > + free(data); > + exit(1); > + } > + > + if(fwrite(data, data_len, 1, fp)!=1) { > + fputs("Error writing output file\n", stderr); > + free(data); > + fclose(fp); > + exit(1); > + } > + > + > + fclose(fp); > + free(data); > + exit(0); > +} > diff --git a/package/utils/caldata-utils/src/caldata.h b/package/utils/caldata-utils/src/caldata.h > new file mode 100644 > index 0000000..27c8175 > --- /dev/null > +++ b/package/utils/caldata-utils/src/caldata.h > @@ -0,0 +1,42 @@ > + > +/* Documentation */ > +const char *argp_program_version = "caldata utils 1.0"; > +static char doc[] = "caldata - Utility to manipulate calibration data for ath10k"; > +static char args_doc[] = "ARG1 ARG2"; > + > +/* Options */ > +static struct argp_option options[] = { > + {"input", 'i', "PARTITION/FILE", 0, "Read from PARTITION or FILE" }, > + {"output", 'f', "FILE", 0, "Output to FILE." }, > + {"offset", 'o', "BYTES", 0, "Skip first BYTES" }, > + {"size", 's', "BYTES", 0, "Size of data to read"}, > + {"maddress", 'a', "ADDRESS", 0, "new MAC address to assign"}, > + {"verify", 'v', 0, 0, "Only verify input, no output"}, > + { 0 } > +}; > + > +/* Used by main to communicate with parse_opt. */ > +struct arguments > +{ > + char *input_file; > + char *output_file; > + > + long int offset; > + long int size; > + char *macaddr; > + int newmac[6]; > + > + int verify; > +}; > + > +static error_t parse_opt (int key, char *arg, struct argp_state *state); > + > +static struct argp argp = { options, parse_opt, args_doc, doc }; > + > + > +// Utils > + > +int isMAC(char *s); > +int getMTD(char *name); > +unsigned short checksum(void *caldata, int size); > + > diff --git a/package/utils/caldata-utils/src/utils.c b/package/utils/caldata-utils/src/utils.c > new file mode 100644 > index 0000000..d8bda63 > --- /dev/null > +++ b/package/utils/caldata-utils/src/utils.c > @@ -0,0 +1,72 @@ > +/* > + * > + * Copyright (C) 2016 Adrian Panella > + * > + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + */ > + > +#include > +#include > +#include > +#include > + > +int isMAC(char *s) { > + int i; > + for(i = 0; i < 17; i++) { > + if(i % 3 != 2 && !isxdigit(s[i])) > + return 0; > + if(i % 3 == 2 && s[i] != ':') > + return 0; > + } > + if(s[17] != '\0') > + return 0; > + return 1; > +} > + > + > +int getMTD(char *name) > +{ > + int device = -1; > + int dev; > + char part[32]; > + FILE *fp = fopen("/proc/mtd", "rb"); > + if (!fp) > + return -1; > + while (!feof(fp) && fscanf(fp, "%*[^0-9]%d: %*s %*s \"%[^\"]\"", &dev, part) == 2) { > + if (!strcmp(part, name)) { > + device = dev; > + break; > + } > + } > + fclose(fp); > + return device; > +} > + > + > +unsigned short checksum(void *caldata, int size) > +{ > + unsigned short *ptr = (unsigned short *)caldata; > + unsigned short crc = 0; > + int i; > + > + for (i = 0; i < size; i += 2) { > + crc ^= *ptr; > + ptr++; > + } > + crc = ~crc; > + return crc; > +} > + > + > -- > 1.9.1 > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel I'm not convinced this should go into the core packages, but instead to https://github.com/openwrt/packages. - Pushpal _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ianchi74 at outlook.com Fri Apr 1 16:01:50 2016 From: ianchi74 at outlook.com (Adrian Panella) Date: Fri, 1 Apr 2016 14:01:50 -0600 Subject: [OpenWrt-Devel] [PATCH 4/8] caldata-utils: new package to manipulate ath10k In-Reply-To: References:

Message-ID: So far I find it essential to make ath10k work on EA8500 with the right mac address (and perhaps on other routers using QCA99x0), and so a prerequisite for that profile. That was why I proposed it in the core packages. More or less like the uboot-env utilities, which are also a prerequisite for this profile. Or perhaps like the "oseama" or "rbcfg" packages in other platforms. Most of the functionality could be covered easily with a script and was my first attempt, but I couldn't find a way to code in a sh script the checksum calculation function to be able to patch the calibration data; and so ended writing it as a C helper utility. Basically the essential part is the small checksum function in utils.c. If you help me with some ideas, I can try to refactor it into a script. -----Original Message----- From: Pushpal Sidhu [mailto:psidhu at gateworks.com] Sent: viernes, 01 de abril de 2016 12:57 p.m. To: Adrian Panella Cc: OpenWrt Development List; John Crispin Subject: Re: [OpenWrt-Devel] [PATCH 4/8] caldata-utils: new package to manipulate ath10k Hi, On Thu, Mar 31, 2016 at 6:48 PM, Adrian Panella wrote: > > > From df9a676bb3ba225f0fd6621dbaeec945baf3153d Mon Sep 17 00:00:00 2001 > From: Adrian Panella > Date: Wed, 30 Mar 2016 23:31:06 -0600 > Subject: [PATCH 12/15] caldata-utils: new package to manipulate ath10k > calibration data > > Signed-off-by: Adrian Panella > --- > package/utils/caldata-utils/Makefile | 60 +++++++++ > package/utils/caldata-utils/src/Makefile | 8 ++ > package/utils/caldata-utils/src/caldata.c | 213 > ++++++++++++++++++++++++++++++ package/utils/caldata-utils/src/caldata.h | 42 ++++++ > package/utils/caldata-utils/src/utils.c | 72 ++++++++++ > 5 files changed, 395 insertions(+) > create mode 100644 package/utils/caldata-utils/Makefile > create mode 100644 package/utils/caldata-utils/src/Makefile > create mode 100644 package/utils/caldata-utils/src/caldata.c > create mode 100644 package/utils/caldata-utils/src/caldata.h > create mode 100644 package/utils/caldata-utils/src/utils.c > > diff --git a/package/utils/caldata-utils/Makefile > b/package/utils/caldata-utils/Makefile > new file mode 100644 > index 0000000..eff7761 > --- /dev/null > +++ b/package/utils/caldata-utils/Makefile > @@ -0,0 +1,60 @@ > +# > +# Copyright (C) 2006-2010 OpenWrt.org # Copyright (C) 2016 Adrian > +Panella # # This is free software, licensed under the GNU General > +Public License v2. > +# See /LICENSE for more information. > +# > + > +include $(TOPDIR)/rules.mk > + > +PKG_NAME:=caldata-utils > +PKG_RELEASE:=1 > + > +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) > +PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone > +USE_MUSL:argp-standalone > + > +include $(INCLUDE_DIR)/package.mk > + > +ifdef CONFIG_USE_UCLIBC > + LIBARGP="-largp" > +endif > + > +ifdef CONFIG_USE_MUSL > + LIBARGP="-largp" > +endif > + > + > +define Package/caldata-utils > + SECTION:=utils > + CATEGORY:=Utilities > + TITLE:=Utility to manipulate calibration data for ath10k > + MAINTAINER:=Adrian Panella endef > + > +define Package/caldata-utils/description This package contains an > +utility to manipulate calibration data for ath10k drivers. > + It enables to extract from MTD partition or file and to patch MAC address fixing the checksum. > +endef > + > +define Build/Prepare > + mkdir -p $(PKG_BUILD_DIR) > + $(CP) ./src/* $(PKG_BUILD_DIR)/ > +endef > + > +define Build/Configure > +endef > + > +define Build/Compile > + $(MAKE) -C $(PKG_BUILD_DIR) \ > + CC="$(TARGET_CC)" \ > + CFLAGS="$(TARGET_CFLAGS) -Wall" \ > + LDFLAGS="$(TARGET_LDFLAGS) $(LIBARGP)" > +endef > + > +define Package/caldata-utils/install > + $(INSTALL_DIR) $(1)/usr/sbin > + $(INSTALL_BIN) $(PKG_BUILD_DIR)/caldata $(1)/usr/sbin/ endef > + > +$(eval $(call BuildPackage,caldata-utils)) > diff --git a/package/utils/caldata-utils/src/Makefile > b/package/utils/caldata-utils/src/Makefile > new file mode 100644 > index 0000000..57ab936 > --- /dev/null > +++ b/package/utils/caldata-utils/src/Makefile > @@ -0,0 +1,8 @@ > + > +all: caldata > + > +caldata: caldata.c utils.c > + $(CC) $(CFLAGS) -o $@ caldata.c utils.c $(LDFLAGS) > + > +clean: > + rm caldata > diff --git a/package/utils/caldata-utils/src/caldata.c > b/package/utils/caldata-utils/src/caldata.c > new file mode 100644 > index 0000000..d5391d5 > --- /dev/null > +++ b/package/utils/caldata-utils/src/caldata.c > @@ -0,0 +1,213 @@ > +/* > + * > + * Copyright (C) 2016 Adrian Panella > + * > + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + */ > + > +/* > + * > + * caldata > + * > + * Utility to manipulate calibration data for ath10k drivers. > + * It enables to extract from MTD partition or file and to patch MAC address fixing the checksum. > + * > + */ > + > + > +#include > +#include > +#include > + > +#include "caldata.h" > + > + > +/* Parse a single option. */ > +static error_t parse_opt (int key, char *arg, struct argp_state > +*state) { > + struct arguments *arguments = state->input; > + > + switch (key) > + { > + case 'i': > + arguments->input_file = arg; > + break; > + > + case 'f': > + arguments->output_file = arg; > + break; > + > + case 'o': > + sscanf(arg,"%li", &arguments->offset); > + break; > + > + case 's': > + sscanf(arg,"%li", &arguments->size); > + break; > + > + case 'a': > + > + if(!isMAC(arg)) > + argp_error(state,"address is not a valid MAC address"); > + > + arguments->macaddr = arg; > + break; > + > + case 'v': > + arguments->verify = 1; > + break; > + > + case ARGP_KEY_END: //all options processed, verify consistency > + > + if(!arguments->input_file) > + argp_error(state,"No input file or partition > + specified."); > + > + if(!arguments->verify && !arguments->output_file) > + argp_error(state, "Must specify either -f FILE or -v."); > + > + break; > + > + default: > + return ARGP_ERR_UNKNOWN; > + } > + return 0; > +} > + > + > +int loadfile(char *file, void **data, int offset, int size) { > + *data=NULL; > + char *source = NULL; > + > + > + char mtdpath[32]; > + FILE *fp=NULL; > + > + //try input as partition > + int mtdnr = getMTD(file); > + if(mtdnr>=0) { > + sprintf(mtdpath, "/dev/mtdblock%d", mtdnr); > + fp = fopen(mtdpath, "rb"); > + } > + //try as file > + if(!fp) > + fp = fopen(file, "rb"); > + > + if (fp != NULL) { > + /* Go to the end of the file. */ > + if (fseek(fp, 0L, SEEK_END) == 0) { > + /* Get the size of the file. */ > + long filesize = ftell(fp); > + if (filesize == -1) { > + fclose(fp); > + return -1; } > + > + size= size ? size : (filesize - offset); > + if(size + offset > filesize) { > + fputs("Offset + size gets past EOF", stderr); > + fclose(fp); > + exit(1);} > + > + source = malloc(size + 1); > + > + /* offset from the start of the file. */ > + if (fseek(fp, offset, SEEK_SET) != 0) { > + free(source); > + fclose(fp); > + return -1;} > + > + /* Read file into memory. */ > + size_t newLen = fread(source, sizeof(char), size, fp); > + if (newLen == 0) { > + free(source); > + fclose(fp); > + return -1; > + } > + else { > + fclose(fp); > + *data=source; > + return size; > + } > + } > + } > + return -1; > +} > + > +int main (int argc, char **argv) > +{ > + struct arguments arguments; > + unsigned short ret=0; > + > + /* Default values. */ > + arguments.input_file = NULL; > + arguments.output_file = NULL; > + arguments.offset = 0; > + arguments.size = 0; > + arguments.macaddr = NULL; > + arguments.verify = 0; > + > + /* Parse arguments and validate*/ > + argp_parse (&argp, argc, argv, 0, 0, &arguments); > + > + > + // read input data > + unsigned short *data; > + int data_len=loadfile(arguments.input_file,(void **)&data, > + arguments.offset, arguments.size); > + > + if(data_len<0) { > + fputs("Error reading input file/partition.\n", stderr); > + exit(1); > + } > + > + unsigned char *mac=(unsigned char *)data+6; > + > + if(arguments.verify) { > + > + printf("Size: %d\n", data[0]); > + printf("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); > + ret=checksum(data, data[0]) ? 1 : 0; > + printf("Checksum: 0x%04x (%s)\n", data[1], ret ? "ERROR" : "OK"); > + if(ret) > + fputs("Calibration data checksum error\n", stderr); > + > + free(data); > + exit(ret); > + } > + > + if(arguments.macaddr) { > + sscanf(arguments.macaddr,"%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); > + data[1]=0; > + data[1]=checksum(data, data[0]); > + } > + > + FILE *fp=fopen(arguments.output_file,"wb"); > + > + if(!fp) { > + fputs("Error opening output file\n", stderr); > + free(data); > + exit(1); > + } > + > + if(fwrite(data, data_len, 1, fp)!=1) { > + fputs("Error writing output file\n", stderr); > + free(data); > + fclose(fp); > + exit(1); > + } > + > + > + fclose(fp); > + free(data); > + exit(0); > +} > diff --git a/package/utils/caldata-utils/src/caldata.h > b/package/utils/caldata-utils/src/caldata.h > new file mode 100644 > index 0000000..27c8175 > --- /dev/null > +++ b/package/utils/caldata-utils/src/caldata.h > @@ -0,0 +1,42 @@ > + > +/* Documentation */ > +const char *argp_program_version = "caldata utils 1.0"; static char > +doc[] = "caldata - Utility to manipulate calibration data for > +ath10k"; static char args_doc[] = "ARG1 ARG2"; > + > +/* Options */ > +static struct argp_option options[] = { > + {"input", 'i', "PARTITION/FILE", 0, "Read from PARTITION or FILE" }, > + {"output", 'f', "FILE", 0, "Output to FILE." }, > + {"offset", 'o', "BYTES", 0, "Skip first BYTES" }, > + {"size", 's', "BYTES", 0, "Size of data to read"}, > + {"maddress", 'a', "ADDRESS", 0, "new MAC address to assign"}, > + {"verify", 'v', 0, 0, "Only verify input, no output"}, > + { 0 } > +}; > + > +/* Used by main to communicate with parse_opt. */ struct arguments { > + char *input_file; > + char *output_file; > + > + long int offset; > + long int size; > + char *macaddr; > + int newmac[6]; > + > + int verify; > +}; > + > +static error_t parse_opt (int key, char *arg, struct argp_state > +*state); > + > +static struct argp argp = { options, parse_opt, args_doc, doc }; > + > + > +// Utils > + > +int isMAC(char *s); > +int getMTD(char *name); > +unsigned short checksum(void *caldata, int size); > + > diff --git a/package/utils/caldata-utils/src/utils.c > b/package/utils/caldata-utils/src/utils.c > new file mode 100644 > index 0000000..d8bda63 > --- /dev/null > +++ b/package/utils/caldata-utils/src/utils.c > @@ -0,0 +1,72 @@ > +/* > + * > + * Copyright (C) 2016 Adrian Panella > + * > + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + */ > + > +#include > +#include > +#include > +#include > + > +int isMAC(char *s) { > + int i; > + for(i = 0; i < 17; i++) { > + if(i % 3 != 2 && !isxdigit(s[i])) > + return 0; > + if(i % 3 == 2 && s[i] != ':') > + return 0; > + } > + if(s[17] != '\0') > + return 0; > + return 1; > +} > + > + > +int getMTD(char *name) > +{ > + int device = -1; > + int dev; > + char part[32]; > + FILE *fp = fopen("/proc/mtd", "rb"); > + if (!fp) > + return -1; > + while (!feof(fp) && fscanf(fp, "%*[^0-9]%d: %*s %*s \"%[^\"]\"", &dev, part) == 2) { > + if (!strcmp(part, name)) { > + device = dev; > + break; > + } > + } > + fclose(fp); > + return device; > +} > + > + > +unsigned short checksum(void *caldata, int size) { > + unsigned short *ptr = (unsigned short *)caldata; > + unsigned short crc = 0; > + int i; > + > + for (i = 0; i < size; i += 2) { > + crc ^= *ptr; > + ptr++; > + } > + crc = ~crc; > + return crc; > +} > + > + > -- > 1.9.1 > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel I'm not convinced this should go into the core packages, but instead to https://github.com/openwrt/packages. - Pushpal _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ianchi74 at outlook.com Fri Apr 1 19:48:22 2016 From: ianchi74 at outlook.com (Adrian Panella) Date: Fri, 1 Apr 2016 17:48:22 -0600 Subject: [OpenWrt-Devel] [PATCH 0/8] [ipq806x] Add basic support for Linksys EA8500 In-Reply-To: References: Message-ID: Hi Imre, networking seems to be working for me. So far I have done only basic testing. Can access the router from lan and wlan. No permormance test done, though. If you have a repo you can share with your patchset, I could gladly compare to take advantage of both works. Krgds Adrian > From: Imre Kaloz > > Hi Adrian, > > On Fri, 01 Apr 2016 02:35:20 +0200, Adrian Panella outlook.com> > wrote: > > > From: Adrian Panella > > > > > > > > This patchset adds support for the Linksys AC2600 EA8500 router. > > Does networking work for you? I have a patchset for the ea8500 I didn't > push because of that. > > > Thanks, > > Imre > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From hauke at hauke-m.de Sat Apr 2 08:36:10 2016 From: hauke at hauke-m.de (Hauke Mehrtens) Date: Sat, 2 Apr 2016 14:36:10 +0200 Subject: [OpenWrt-Devel] [PATCH] kernel: remove full cache flush in fuse_copy_do() for MIPS Message-ID: <1459600570-8496-1-git-send-email-hauke@hauke-m.de> This patch was introduced in commit r16412 for the brcm47xx target only and then moved to generic in commit r32395. It was initially added because of ticket #5186 and should fix some problems with fuse file systems and MIPS caches. The commit comment in r32395 says that this a generic problem in MIPS CPUs, but does not name any specifics about that. There was a fix added to kernel 2.6.21 in commit commit 7575a49f20 "[MIPS] Implement flush_anon_page()." that should fix this problem, but that was already available before both commits were done to OpenWrt. I just tested fuse with ntfs.3g without this patch on a BCM4704 (BMIPS3300 V0.6) SoC and haven't seen any problems. Someone reported that removing this patch improves some fuse operations by 5 times on some modern MIPS cores. My test was only a simple "dd if=/dev/zero of=/mnt/zero bs=5000" to an USB stick. This patch removes the patch to OpenWrt, because I assume that it is not needed any more. If someone knows more about a better test scenario or sees problem with removing this patch, please report back. Signed-off-by: Hauke Mehrtens --- .../patches-3.18/309-mips_fuse_workaround.patch | 32 ---------------------- .../patches-4.1/309-mips_fuse_workaround.patch | 32 ---------------------- .../patches-4.4/309-mips_fuse_workaround.patch | 32 ---------------------- 3 files changed, 96 deletions(-) delete mode 100644 target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch delete mode 100644 target/linux/generic/patches-4.1/309-mips_fuse_workaround.patch delete mode 100644 target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch diff --git a/target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch b/target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch deleted file mode 100644 index 934b119..0000000 --- a/target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/mips/mm/cache.c -+++ b/arch/mips/mm/cache.c -@@ -38,6 +38,7 @@ void (*__flush_cache_vunmap)(void); - - void (*__flush_kernel_vmap_range)(unsigned long vaddr, int size); - EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range); -+EXPORT_SYMBOL(__flush_cache_all); - void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size); - - /* MIPS specific cache operations */ ---- a/fs/fuse/dev.c -+++ b/fs/fuse/dev.c -@@ -20,6 +20,9 @@ - #include - #include - #include -+#ifdef CONFIG_MIPS -+#include -+#endif - - MODULE_ALIAS_MISCDEV(FUSE_MINOR); - MODULE_ALIAS("devname:fuse"); -@@ -749,6 +752,9 @@ static int fuse_copy_fill(struct fuse_co - static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size) - { - unsigned ncpy = min(*size, cs->len); -+#ifdef CONFIG_MIPS -+ __flush_cache_all(); -+#endif - if (val) { - void *pgaddr = kmap_atomic(cs->pg); - void *buf = pgaddr + cs->offset; diff --git a/target/linux/generic/patches-4.1/309-mips_fuse_workaround.patch b/target/linux/generic/patches-4.1/309-mips_fuse_workaround.patch deleted file mode 100644 index 7a3aa34..0000000 --- a/target/linux/generic/patches-4.1/309-mips_fuse_workaround.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/mips/mm/cache.c -+++ b/arch/mips/mm/cache.c -@@ -38,6 +38,7 @@ void (*__flush_cache_vunmap)(void); - - void (*__flush_kernel_vmap_range)(unsigned long vaddr, int size); - EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range); -+EXPORT_SYMBOL(__flush_cache_all); - void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size); - - /* MIPS specific cache operations */ ---- a/fs/fuse/dev.c -+++ b/fs/fuse/dev.c -@@ -19,6 +19,9 @@ - #include - #include - #include -+#ifdef CONFIG_MIPS -+#include -+#endif - - MODULE_ALIAS_MISCDEV(FUSE_MINOR); - MODULE_ALIAS("devname:fuse"); -@@ -816,6 +819,9 @@ static int fuse_copy_fill(struct fuse_co - static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size) - { - unsigned ncpy = min(*size, cs->len); -+#ifdef CONFIG_MIPS -+ __flush_cache_all(); -+#endif - if (val) { - void *pgaddr = kmap_atomic(cs->pg); - void *buf = pgaddr + cs->offset; diff --git a/target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch b/target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch deleted file mode 100644 index 14d7962..0000000 --- a/target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/mips/mm/cache.c -+++ b/arch/mips/mm/cache.c -@@ -39,6 +39,7 @@ void (*__flush_cache_vunmap)(void); - - void (*__flush_kernel_vmap_range)(unsigned long vaddr, int size); - EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range); -+EXPORT_SYMBOL(__flush_cache_all); - void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size); - - /* MIPS specific cache operations */ ---- a/fs/fuse/dev.c -+++ b/fs/fuse/dev.c -@@ -19,6 +19,9 @@ - #include - #include - #include -+#ifdef CONFIG_MIPS -+#include -+#endif - - MODULE_ALIAS_MISCDEV(FUSE_MINOR); - MODULE_ALIAS("devname:fuse"); -@@ -802,6 +805,9 @@ static int fuse_copy_fill(struct fuse_co - static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size) - { - unsigned ncpy = min(*size, cs->len); -+#ifdef CONFIG_MIPS -+ __flush_cache_all(); -+#endif - if (val) { - void *pgaddr = kmap_atomic(cs->pg); - void *buf = pgaddr + cs->offset; -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From knaack.h at gmx.de Sat Apr 2 18:28:07 2016 From: knaack.h at gmx.de (Hartmut Knaack) Date: Sun, 3 Apr 2016 00:28:07 +0200 Subject: [OpenWrt-Devel] [PATCH] CC:ar71xx: backport support for Netgear WPN824N Message-ID: <57004777.2010408@gmx.de> Add support for Netgear WPN824N. Hardware specs: * AR7240, 4 LAN ports, 1 WAN port * AR9285 WLAN * 32 MB RAM * 4 MB Flash * 16 LEDs (LAN, WAN and Power/Status contain two LEDs for dual color effect) * 3 Buttons (not supported) Signed-off-by: Hartmut Knaack --- Development Thread: https://forum.openwrt.org/viewtopic.php?id=30388 Test result: https://forum.openwrt.org/viewtopic.php?pid=313815#p313815 Wiki Page: https://wiki.openwrt.org/toh/netgear/wpn824n --- target/linux/ar71xx/base-files/etc/diag.sh | 3 +- .../ar71xx/base-files/etc/uci-defaults/01_leds | 20 +++- .../ar71xx/base-files/etc/uci-defaults/02_network | 3 +- target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 + .../lib/preinit/05_set_preinit_iface_ar71xx | 1 + .../ar71xx/base-files/lib/upgrade/platform.sh | 3 +- .../ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c | 124 ++++++++++++++++++++- target/linux/ar71xx/generic/profiles/netgear.mk | 10 ++ target/linux/ar71xx/image/Makefile | 1 + .../patches-3.18/907-MIPS-ath79-add-WPN824N.patch | 21 ++++ .../files/drivers/mtd/mtdsplit/mtdsplit_uimage.c | 2 + 11 files changed, 185 insertions(+), 6 deletions(-) create mode 100644 target/linux/ar71xx/patches-3.18/907-MIPS-ath79-add-WPN824N.patch diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 89fe53c..178825a 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -324,7 +324,8 @@ get_status_led() { wnr2000 | \ wnr2200 |\ wnr612-v2 |\ - wnr1000-v2) + wnr1000-v2 |\ + wpn824n) status_led="netgear:green:power" ;; wp543) diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds index 5241db2..3b43011 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -563,7 +563,25 @@ wnr2000-v4) ucidef_set_led_switch "lan3" "LAN3" "netgear:amber:lan3" "switch0" "0x08" ucidef_set_led_switch "lan4" "LAN4" "netgear:amber:lan4" "switch0" "0x10" ucidef_set_led_usbdev "usb" "USB" "netgear:amber:status" "1-1" - ;; + ;; + +wpn824n) + ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0" + ucidef_set_led_wlan "wlan" "WLAN" "netgear:blue:wlan" "phy0tpt" + ucidef_set_led_switch "lan1amber" "LAN1 (amber)" "netgear:amber:lan1" "switch0" "0x02" + ucidef_set_led_switch "lan2amber" "LAN2 (amber)" "netgear:amber:lan2" "switch0" "0x04" + ucidef_set_led_switch "lan3amber" "LAN3 (amber)" "netgear:amber:lan3" "switch0" "0x08" + ucidef_set_led_switch "lan4amber" "LAN4 (amber)" "netgear:amber:lan4" "switch0" "0x10" + ucidef_set_led_default "lan1green" "LAN1 (green)" "netgear:green:lan1" "0" + ucidef_set_led_default "lan2green" "LAN2 (green)" "netgear:green:lan2" "0" + ucidef_set_led_default "lan3green" "LAN3 (green)" "netgear:green:lan3" "0" + ucidef_set_led_default "lan4green" "LAN4 (green)" "netgear:green:lan4" "0" + ucidef_set_led_default "wan-green" "WAN (green)" "netgear:green:wan" "0" + ucidef_set_led_default "wps1" "WPS1" "netgear:blue:wps1" "0" + ucidef_set_led_default "wps2" "WPS2" "netgear:blue:wps2" "0" + ucidef_set_led_default "status" "STATUS" "netgear:amber:status" "0" + ucidef_set_led_default "test" "TEST" "netgear:amber:test" "0" + ;; wzr-hp-ag300h) ucidef_set_led_default "diag" "DIAG" "buffalo:red:diag" "0" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network index 8143d2d..9a7e01e 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -230,7 +230,8 @@ wnr2000-v3 |\ wnr2000-v4 |\ wnr2200 |\ wnr612-v2 |\ -wnr1000-v2) +wnr1000-v2 |\ +wpn824n) ucidef_set_interfaces_lan_wan "eth1" "eth0" ucidef_add_switch "switch0" "1" "1" ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4" diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 0b2857d..c8b9893 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -896,6 +896,9 @@ ar71xx_board_detect() { *"WNR1000 V2") name="wnr1000-v2" ;; + *WPN824N) + name="wpn824n" + ;; *WRT160NL) name="wrt160nl" ;; diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx index f11ea8c..113af58 100644 --- a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx +++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx @@ -39,6 +39,7 @@ set_preinit_iface() { wnr2200 |\ wnr612-v2 |\ wnr1000-v2 |\ + wpn824n |\ wpe72) ifname=eth1 ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 8dea48f..ea7ee27 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -401,7 +401,8 @@ platform_check_image() { wndr3700 | \ wnr2000-v3 | \ wnr612-v2 | \ - wnr1000-v2) + wnr1000-v2 | \ + wpn824n) local hw_magic hw_magic="$(ar71xx_get_mtd_part_magic firmware)" diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c index 2e14782..205c2e7 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c @@ -1,7 +1,8 @@ /* - * NETGEAR WNR2000v3/WNR612v2/WNR1000v2 board support + * NETGEAR WNR2000v3/WNR612v2/WNR1000v2/WPN824N board support * - * Copytight (C) 2013 Mathieu Olivari + * Copyright (C) 2015 Hartmut Knaack + * Copyright (C) 2013 Mathieu Olivari * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * Copyright (C) 2008-2009 Andy Boyett @@ -15,6 +16,8 @@ #include #include +#include /* needed to disable switch LEDs */ +#include "common.h" /* needed to disable switch LEDs */ #include "dev-ap9x-pci.h" #include "dev-eth.h" @@ -34,6 +37,29 @@ #define WNR1000V2_GPIO_LED_PWR_AMBER 1 #define WNR1000V2_GPIO_LED_PWR_GREEN 11 +/* Connected through AR7240 */ +#define WPN824N_GPIO_LED_WAN_AMBER 0 +#define WPN824N_GPIO_LED_STATUS_AMBER 1 +#define WPN824N_GPIO_LED_LAN1_AMBER 6 /* AR724X_GPIO_FUNC_JTAG_DISABLE */ +#define WPN824N_GPIO_LED_LAN2_AMBER 7 /* AR724X_GPIO_FUNC_JTAG_DISABLE */ +#define WPN824N_GPIO_LED_LAN3_AMBER 8 /* AR724X_GPIO_FUNC_JTAG_DISABLE */ +#define WPN824N_GPIO_LED_LAN4_AMBER 12 +#define WPN824N_GPIO_LED_LAN1_GREEN 13 +#define WPN824N_GPIO_LED_LAN2_GREEN 14 +#define WPN824N_GPIO_LED_LAN3_GREEN 15 /* AR724X_GPIO_FUNC_CLK_OBS3_EN */ +#define WPN824N_GPIO_LED_LAN4_GREEN 16 +#define WPN824N_GPIO_LED_WAN_GREEN 17 + +/* Connected through AR9285 */ +#define WPN824N_WGPIO_LED_PWR_GREEN 0 +#define WPN824N_WGPIO_LED_WLAN_BLUE 1 +#define WPN824N_WGPIO_LED_WPS1_BLUE 5 +#define WPN824N_WGPIO_LED_WPS2_BLUE 9 +#define WPN824N_WGPIO_LED_TEST_AMBER 10 +#define WPN824N_WGPIO_BTN_PUSH 6 /* currently unused */ +#define WPN824N_WGPIO_BTN_RESET 7 /* currently unused */ +#define WPN824N_WGPIO_BTN_WLAN 8 /* currently unused */ + #define WNR2000V3_KEYS_POLL_INTERVAL 20 /* msecs */ #define WNR2000V3_KEYS_DEBOUNCE_INTERVAL (3 * WNR2000V3_KEYS_POLL_INTERVAL) @@ -73,6 +99,78 @@ static struct gpio_led wnr1000v2_leds_gpio[] __initdata = { } }; +static struct gpio_led wpn824n_leds_gpio[] __initdata = { + { + .name = "netgear:amber:wan", + .gpio = WPN824N_GPIO_LED_WAN_AMBER, + .active_low = 1, + }, { + .name = "netgear:amber:status", + .gpio = WPN824N_GPIO_LED_STATUS_AMBER, + .active_low = 1, + }, { + .name = "netgear:amber:lan1", + .gpio = WPN824N_GPIO_LED_LAN1_AMBER, + .active_low = 1, + }, { + .name = "netgear:amber:lan2", + .gpio = WPN824N_GPIO_LED_LAN2_AMBER, + .active_low = 1, + }, { + .name = "netgear:amber:lan3", + .gpio = WPN824N_GPIO_LED_LAN3_AMBER, + .active_low = 1, + }, { + .name = "netgear:amber:lan4", + .gpio = WPN824N_GPIO_LED_LAN4_AMBER, + .active_low = 1, + }, { + .name = "netgear:green:lan1", + .gpio = WPN824N_GPIO_LED_LAN1_GREEN, + .active_low = 1, + }, { + .name = "netgear:green:lan2", + .gpio = WPN824N_GPIO_LED_LAN2_GREEN, + .active_low = 1, + }, { + .name = "netgear:green:lan3", + .gpio = WPN824N_GPIO_LED_LAN3_GREEN, + .active_low = 1, + }, { + .name = "netgear:green:lan4", + .gpio = WPN824N_GPIO_LED_LAN4_GREEN, + .active_low = 1, + }, { + .name = "netgear:green:wan", + .gpio = WPN824N_GPIO_LED_WAN_GREEN, + .active_low = 1, + } +}; + +static struct gpio_led wpn824n_wmac_leds_gpio[] = { + { + .name = "netgear:green:power", + .gpio = WPN824N_WGPIO_LED_PWR_GREEN, + .active_low = 1, + }, { + .name = "netgear:blue:wlan", + .gpio = WPN824N_WGPIO_LED_WLAN_BLUE, + .active_low = 1, + }, { + .name = "netgear:blue:wps1", + .gpio = WPN824N_WGPIO_LED_WPS1_BLUE, + .active_low = 1, + }, { + .name = "netgear:blue:wps2", + .gpio = WPN824N_WGPIO_LED_WPS2_BLUE, + .active_low = 1, + }, { + .name = "netgear:amber:test", + .gpio = WPN824N_WGPIO_LED_TEST_AMBER, + .active_low = 1, + } +}; + static struct gpio_keys_button wnr2000v3_gpio_keys[] __initdata = { { .desc = "wps", @@ -138,3 +236,25 @@ static void __init wnr1000v2_setup(void) } MIPS_MACHINE(ATH79_MACH_WNR1000_V2, "WNR1000V2", "NETGEAR WNR1000 V2", wnr1000v2_setup); + +static void __init wpn824n_setup(void) +{ + ath79_gpio_function_setup(AR724X_GPIO_FUNC_JTAG_DISABLE, + AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN | + AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN | + AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN | + AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN | + AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN | + AR724X_GPIO_FUNC_CLK_OBS3_EN); + + wnr_common_setup(); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(wpn824n_leds_gpio), + wpn824n_leds_gpio); + + ap9x_pci_setup_wmac_led_pin(0, WPN824N_WGPIO_LED_WLAN_BLUE); + ap9x_pci_setup_wmac_leds(0, wpn824n_wmac_leds_gpio, + ARRAY_SIZE(wpn824n_wmac_leds_gpio)); +} + +MIPS_MACHINE(ATH79_MACH_WPN824N, "WPN824N", "NETGEAR WPN824N", wpn824n_setup); diff --git a/target/linux/ar71xx/generic/profiles/netgear.mk b/target/linux/ar71xx/generic/profiles/netgear.mk index 16b1087..ca22a18 100644 --- a/target/linux/ar71xx/generic/profiles/netgear.mk +++ b/target/linux/ar71xx/generic/profiles/netgear.mk @@ -82,3 +82,13 @@ define Profile/WNR2200/Description endef $(eval $(call Profile,WNR2200)) + +define Profile/WPN824N + NAME:=NETGEAR WPN824N +endef + +define Profile/WPN824N/Description + Package set optimized for the NETGEAR WPN824N +endef + +$(eval $(call Profile,WPN824N)) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 4336697..07ec8dc 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -1958,6 +1958,7 @@ $(eval $(call SingleProfile,Netgear,64kraw,REALWNR612V2,wnr612v2,WNR612V2,ttyS0, $(eval $(call SingleProfile,Netgear,64kraw,N150R,n150r,WNR612V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303631,N150R,"",)) $(eval $(call SingleProfile,Netgear,64kraw,REALWNR1000V2,wnr1000v2,WNR1000V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x31303031,WNR1000V2,"",)) $(eval $(call SingleProfile,Netgear,64kraw,WNR1000V2_VC,wnr1000v2-vc,WNR1000V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x31303030,WNR1000V2-VC,"",)) +$(eval $(call SingleProfile,Netgear,64kraw,WPN824N,wpn824n,WPN824N,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x31313030,WPN824N,"" NA,)) $(eval $(call SingleProfile,OpenMesh,squashfs-only,OM2P,om2p,,,,OM2P)) $(eval $(call SingleProfile,OpenMesh,squashfs-only,OM5P,om5p,,,,OM5P)) diff --git a/target/linux/ar71xx/patches-3.18/907-MIPS-ath79-add-WPN824N.patch b/target/linux/ar71xx/patches-3.18/907-MIPS-ath79-add-WPN824N.patch new file mode 100644 index 0000000..2f0c964 --- /dev/null +++ b/target/linux/ar71xx/patches-3.18/907-MIPS-ath79-add-WPN824N.patch @@ -0,0 +1,21 @@ +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig +@@ -741,7 +741,7 @@ config ATH79_MACH_WNR2000 + select ATH79_DEV_WMAC + + config ATH79_MACH_WNR2000_V3 +- bool "NETGEAR WNR2000 V3/WNR612 v2/WNR1000 v2 board support" ++ bool "NETGEAR WNR2000 V3/WNR612 v2/WNR1000 v2/WPN824N board support" + select SOC_AR724X + select ATH79_DEV_AP9X_PCI if PCI + select ATH79_DEV_ETH +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h +@@ -204,6 +204,7 @@ enum ath79_mach_type { + ATH79_MACH_WNR2200, /* NETGEAR WNR2200 */ + ATH79_MACH_WNR612_V2, /* NETGEAR WNR612 v2 */ + ATH79_MACH_WNR1000_V2, /* NETGEAR WNR1000 v2 */ ++ ATH79_MACH_WPN824N, /* NETGEAR WPN824N */ + ATH79_MACH_WP543, /* Compex WP543 */ + ATH79_MACH_WPE72, /* Compex WPE72 */ + ATH79_MACH_WPJ344, /* Compex WPJ344 */ diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c index 2602f98..b815869 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_uimage.c @@ -252,6 +252,7 @@ static struct mtd_part_parser uimage_generic_parser = { #define FW_MAGIC_WNR1000V2_VC 0x31303030 #define FW_MAGIC_WNDR3700 0x33373030 #define FW_MAGIC_WNDR3700V2 0x33373031 +#define FW_MAGIC_WPN824N 0x31313030 static ssize_t uimage_verify_wndr3700(u_char *buf, size_t len) { @@ -266,6 +267,7 @@ static ssize_t uimage_verify_wndr3700(u_char *buf, size_t len) case FW_MAGIC_WNR2200: case FW_MAGIC_WNDR3700: case FW_MAGIC_WNDR3700V2: + case FW_MAGIC_WPN824N: break; case FW_MAGIC_WNR2000V4: expected_type = IH_TYPE_KERNEL; -- 2.7.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From kaloz at openwrt.org Sun Apr 3 07:05:16 2016 From: kaloz at openwrt.org (Imre Kaloz) Date: Sun, 03 Apr 2016 13:05:16 +0200 Subject: [OpenWrt-Devel] [PATCH 0/8] [ipq806x] Add basic support for Linksys EA8500 In-Reply-To: References:

Message-ID: Hi Adrian, On Sat, 02 Apr 2016 01:48:22 +0200, Adrian Panella wrote: > Hi Imre, > > networking seems to be working for me. > So far I have done only basic testing. Can access the router from lan > and wlan. > No permormance test done, though. > > If you have a repo you can share with your patchset, I could gladly > compare to take advantage of both works. I'll have time for this today, but the weird part is that comparing the dts I made and the one you submitted I see no difference when it comes to ethernet configuration. Could you post your dmesg and the contents of the devinfo partition? Thanks, Imre _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chrisrblake93 at gmail.com Sun Apr 3 10:16:49 2016 From: chrisrblake93 at gmail.com (Chris Blake) Date: Sun, 3 Apr 2016 09:16:49 -0500 Subject: [OpenWrt-Devel] Fwd: [RFC 1/2] Add support for the apm821xx Device Target In-Reply-To: References: <1459475170-1628-1-git-send-email-chrisrblake93@gmail.com> <1459475170-1628-2-git-send-email-chrisrblake93@gmail.com> Message-ID: Hello Imre, On Fri, Apr 1, 2016 at 8:32 AM, Imre Kaloz wrote: > On Fri, 01 Apr 2016 15:26:46 +0200, Chris Blake > wrote: > >> Hey Imre, >> >> On Fri, Apr 1, 2016 at 7:35 AM, Imre Kaloz wrote: >>> >>> Hi Chris, >>> >>> On Fri, 01 Apr 2016 03:46:09 +0200, Chris Blake >>> >>>> +CONFIG_BLUESTONE=y >>> >>> >>> >>> I doubt we support that here. >>> >> >> From my understanding, Bluestone is the dev board for the apm821xx, so >> for dependencies shouldn't this be selected? > > > Nope, as we don't support it. > > > Imre > I did some testing, and it seems that images fail to boot without this set in the kernel config, with the following error: [ 0.979336] Freeing unused kernel memory: 140K (c03b1000 - c03d4000) [ 0.986659] Bad trap at PC: b7e0f60c, SR: 2d000, vector=2010 [ 0.992337] init[1]: unhandled signal 5 at 00000000 nip b7e0f60c lr b7e0f5c8 code 0 [ 1.000192] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000005 [ 1.000192] [ 1.009293] ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000005 [ 1.009293] It's interesting, as we select all of the same configs that are set by CONFIG_BLUESTONE [0], except for APM821xx, even though we already enable the settings set by APM821xx [1], but PPC_FPU needs to be selected by a config to be enabled [2]. Because of this, I believe for the apm821xx target we will need to leave this selected unless you have any ideas. We could do a kernel patch to add a new CONFIG_IKAREM target, but then this would need to be done for every device added to this target, which is why I think just leaving CONFIG_BLUESTONE enabled would be the best plan of action. [0]: https://github.com/torvalds/linux/blob/v4.4/arch/powerpc/platforms/44x/Kconfig#L20 [1]: https://github.com/torvalds/linux/blob/v4.4/arch/powerpc/platforms/44x/Kconfig#L346 [2]: https://github.com/torvalds/linux/blob/v4.4/arch/powerpc/platforms/Kconfig.cputype#L169 Thanks, Chris Blake _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From tochiro.srchack at gmail.com Sun Apr 3 10:31:17 2016 From: tochiro.srchack at gmail.com (YuheiOKAWA) Date: Sun, 3 Apr 2016 23:31:17 +0900 Subject: [OpenWrt-Devel] [PATCH] ramips: fix for Planex MZK-WDPR (lcd control gpio). Message-ID: <1459693877-12098-1-git-send-email-tochiro.srchack@gmail.com> add lcd control gpio pin for Planex MZK-WDPR. LCD board initial timming is GPIO control. Signed-off-by: YuheiOKAWA --- target/linux/ramips/dts/MZK-WDPR.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/target/linux/ramips/dts/MZK-WDPR.dts b/target/linux/ramips/dts/MZK-WDPR.dts index ba9ae85..1746949 100644 --- a/target/linux/ramips/dts/MZK-WDPR.dts +++ b/target/linux/ramips/dts/MZK-WDPR.dts @@ -73,4 +73,14 @@ otg at 101c0000 { status = "okay"; }; + + gpio-export { + compatible = "gpio-export"; + + lcd_ctrl1 { + gpio-export,name = "lcd_ctrl1"; + gpio-export,output = <0>; + gpios = <&gpio0 1 0>; + }; + }; }; -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From damian.kaczkowski at gmail.com Sun Apr 3 10:44:41 2016 From: damian.kaczkowski at gmail.com (Damian Kaczkowski) Date: Sun, 3 Apr 2016 16:44:41 +0200 Subject: [OpenWrt-Devel] syn_flood v/s synflood_protect in firewall default config In-Reply-To: <003401d18b10$8e7e8950$ab7b9bf0$@codeaurora.org> References: <003401d18b10$8e7e8950$ab7b9bf0$@codeaurora.org> Message-ID: On 31 March 2016 at 07:45, Naresh Kumar Mehta wrote: > From https://wiki.openwrt.org/doc/uci/firewall, syn_flood is obsoleted by > synflood_protect but I still see syn_flood in > https://dev.openwrt.org/browser/trunk/package/network/config/firewall/files/firewall.config. > Does it mean we missed to update default value in firewall.config or > documentation is going faster than code. > +1 I spot that too a while ago. This should be clarified by devs. -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From mschiffer at universe-factory.net Sun Apr 3 13:01:28 2016 From: mschiffer at universe-factory.net (Matthias Schiffer) Date: Sun, 3 Apr 2016 19:01:28 +0200 Subject: [OpenWrt-Devel] [PATCH] ar71xx: fix nondeterministic hangs during bootconsole/console handover Message-ID: <14a3dd3be7ac46153d18908fe73cdbdf4b12e67c.1459702794.git.mschiffer@universe-factory.net> Reconfiguring the UART when the FIFO is not empty may cause the boot to hang. This hang is extremely suspectible to timing differences; recompiling the kernel with the same configuration, but different UTS_VERSION timestamps can yield images that hang more or less often. Sometimes images are produced that hang reproducibly. This patch should also make it into one of the next linux-stable releases, but it's better to get this fixed as soon as possible. Fixes #21773, #21857. Signed-off-by: Matthias Schiffer --- CC is affected as well (and the patch applies cleanly to 3.18.x). ...make-bootconsole-wait-for-both-THRE-and-T.patch | 54 ++++++++++++++++++++++ ...make-bootconsole-wait-for-both-THRE-and-T.patch | 54 ++++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 target/linux/ar71xx/patches-4.1/003-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch create mode 100644 target/linux/ar71xx/patches-4.4/003-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch diff --git a/target/linux/ar71xx/patches-4.1/003-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch b/target/linux/ar71xx/patches-4.1/003-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch new file mode 100644 index 0000000..7be14ab --- /dev/null +++ b/target/linux/ar71xx/patches-4.1/003-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch @@ -0,0 +1,54 @@ +From f1ba020af5076172c9d29006a747ccf40027fedc Mon Sep 17 00:00:00 2001 +Message-Id: +From: Matthias Schiffer +Date: Thu, 24 Mar 2016 15:34:05 +0100 +Subject: [PATCH] MIPS: ath79: make bootconsole wait for both THRE and TEMT + +This makes the ath79 bootconsole behave the same way as the generic 8250 +bootconsole. + +Also waiting for TEMT (transmit buffer is empty) instead of just THRE +(transmit buffer is not full) ensures that all characters have been +transmitted before the real serial driver starts reconfiguring the serial +controller (which would sometimes result in garbage being transmitted.) +This change does not cause a visible performance loss. + +In addition, this seems to fix a hang observed in certain configurations on +many AR7xxx/AR9xxx SoCs during autoconfig of the real serial driver. + +A more complete follow-up patch will disable 8250 autoconfig for ath79 +altogether (the serial controller is detected as a 16550A, which is not +fully compatible with the ath79 serial, and the autoconfig may lead to +undefined behavior on ath79.) + +Cc: +Signed-off-by: Matthias Schiffer +--- + arch/mips/ath79/early_printk.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/mips/ath79/early_printk.c b/arch/mips/ath79/early_printk.c +index b955faf..d1adc59 100644 +--- a/arch/mips/ath79/early_printk.c ++++ b/arch/mips/ath79/early_printk.c +@@ -31,13 +31,15 @@ static inline void prom_putchar_wait(void __iomem *reg, u32 mask, u32 val) + } while (1); + } + ++#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) ++ + static void prom_putchar_ar71xx(unsigned char ch) + { + void __iomem *base = (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE)); + +- prom_putchar_wait(base + UART_LSR * 4, UART_LSR_THRE, UART_LSR_THRE); ++ prom_putchar_wait(base + UART_LSR * 4, BOTH_EMPTY, BOTH_EMPTY); + __raw_writel(ch, base + UART_TX * 4); +- prom_putchar_wait(base + UART_LSR * 4, UART_LSR_THRE, UART_LSR_THRE); ++ prom_putchar_wait(base + UART_LSR * 4, BOTH_EMPTY, BOTH_EMPTY); + } + + static void prom_putchar_ar933x(unsigned char ch) +-- +2.7.4 + diff --git a/target/linux/ar71xx/patches-4.4/003-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch b/target/linux/ar71xx/patches-4.4/003-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch new file mode 100644 index 0000000..7be14ab --- /dev/null +++ b/target/linux/ar71xx/patches-4.4/003-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch @@ -0,0 +1,54 @@ +From f1ba020af5076172c9d29006a747ccf40027fedc Mon Sep 17 00:00:00 2001 +Message-Id: +From: Matthias Schiffer +Date: Thu, 24 Mar 2016 15:34:05 +0100 +Subject: [PATCH] MIPS: ath79: make bootconsole wait for both THRE and TEMT + +This makes the ath79 bootconsole behave the same way as the generic 8250 +bootconsole. + +Also waiting for TEMT (transmit buffer is empty) instead of just THRE +(transmit buffer is not full) ensures that all characters have been +transmitted before the real serial driver starts reconfiguring the serial +controller (which would sometimes result in garbage being transmitted.) +This change does not cause a visible performance loss. + +In addition, this seems to fix a hang observed in certain configurations on +many AR7xxx/AR9xxx SoCs during autoconfig of the real serial driver. + +A more complete follow-up patch will disable 8250 autoconfig for ath79 +altogether (the serial controller is detected as a 16550A, which is not +fully compatible with the ath79 serial, and the autoconfig may lead to +undefined behavior on ath79.) + +Cc: +Signed-off-by: Matthias Schiffer +--- + arch/mips/ath79/early_printk.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/mips/ath79/early_printk.c b/arch/mips/ath79/early_printk.c +index b955faf..d1adc59 100644 +--- a/arch/mips/ath79/early_printk.c ++++ b/arch/mips/ath79/early_printk.c +@@ -31,13 +31,15 @@ static inline void prom_putchar_wait(void __iomem *reg, u32 mask, u32 val) + } while (1); + } + ++#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) ++ + static void prom_putchar_ar71xx(unsigned char ch) + { + void __iomem *base = (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE)); + +- prom_putchar_wait(base + UART_LSR * 4, UART_LSR_THRE, UART_LSR_THRE); ++ prom_putchar_wait(base + UART_LSR * 4, BOTH_EMPTY, BOTH_EMPTY); + __raw_writel(ch, base + UART_TX * 4); +- prom_putchar_wait(base + UART_LSR * 4, UART_LSR_THRE, UART_LSR_THRE); ++ prom_putchar_wait(base + UART_LSR * 4, BOTH_EMPTY, BOTH_EMPTY); + } + + static void prom_putchar_ar933x(unsigned char ch) +-- +2.7.4 + -- 2.8.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ianchi74 at outlook.com Sun Apr 3 13:12:14 2016 From: ianchi74 at outlook.com (Adrian Panella) Date: Sun, 3 Apr 2016 12:12:14 -0500 Subject: [OpenWrt-Devel] [PATCH 0/8] [ipq806x] Add basic support for Linksys EA8500 In-Reply-To: References:

Message-ID: Hi Imre, here I attach devinfo and dmseg. I also copy kernel log, as I do have a warning with pcie2 there. Its unrelated to ethernet, but I'm still trying to fix it: DEVINFO: root at OpenWrt:/# cat /dev/mtd12 cert_region=US default_passphrase=8mh3mb6wyq default_ssid=Linksys05820 deviceType=urn:home-linksys-com:device:Router:1 devinfo_version=20140721.1 hw_mac_addr=C0:56:27:27:1F:D9 hw_revision=1 hw_version=XB manufacturer=Linksys, LLC manufacturerURL=http://www.linksys.com manufacturer_date=2015/09/19 mfg_data_version=1 modelDescription=Simultaneous Dual-Band Wireless-AC Gigabit Router modelNumber=EA8500 serial_number=16T10C69505820 sw_version=v0.0.6 tc_passphrase=8mH3Mb6wYQCZYH2EkRLtUYwKu0OvMP6TCMWWxbTT1d0Xs2kbR5UvdODVNZQjzVA tc_ssid=15c8lkbrZDC7wyifIUHDJrSyBFjnGDfF uuid_key=0246C456-1DD3-11B2-8B16-C05627271FD9 wps_device_pin=61700710 DMSEG: Thu Mar 31 06:35:08 2016 kern.info kernel: [ 4.986273] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver Thu Mar 31 06:35:08 2016 kern.info kernel: [ 4.989103] ohci-platform: OHCI generic platform driver Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.491133] xhci-hcd xhci-hcd.0.auto: xHCI Host Controller Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.491180] xhci-hcd xhci-hcd.0.auto: new USB bus registered, assigned bus number 1 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.495790] xhci-hcd xhci-hcd.0.auto: irq 142, io mem 0x11000000 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.503686] hub 1-0:1.0: USB hub found Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.509340] hub 1-0:1.0: 1 port detected Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.513180] xhci-hcd xhci-hcd.0.auto: xHCI Host Controller Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.516955] xhci-hcd xhci-hcd.0.auto: new USB bus registered, assigned bus number 2 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.522807] hub 2-0:1.0: USB hub found Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.529815] hub 2-0:1.0: 1 port detected Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.533956] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.537710] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 3 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.543244] xhci-hcd xhci-hcd.1.auto: irq 237, io mem 0x10000000 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.550992] hub 3-0:1.0: USB hub found Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.556861] hub 3-0:1.0: 1 port detected Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.560562] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.564502] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 4 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.570216] hub 4-0:1.0: USB hub found Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.577354] hub 4-0:1.0: 1 port detected Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 5.581928] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/wps[0]' - status (0) Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 5.581941] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/power[0]' - status (0) Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 5.581952] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/wifi[0]' - status (0) Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 5.581965] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/wps[0]' - status (0) Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 5.582061] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/power[0]' - status (0) Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 5.582134] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/wifi[0]' - status (0) Thu Mar 31 06:35:08 2016 kern.info kernel: [ 5.583619] usbcore: registered new interface driver usb-storage Thu Mar 31 06:35:08 2016 user.info kernel: [ 5.743345] init: - preinit - Thu Mar 31 06:35:08 2016 kern.notice kernel: [ 9.218507] UBIFS: background thread "ubifs_bgt0_1" started, PID 81 Thu Mar 31 06:35:08 2016 kern.notice kernel: [ 9.352817] UBIFS: recovery needed Thu Mar 31 06:35:08 2016 kern.notice kernel: [ 9.543046] UBIFS: recovery completed Thu Mar 31 06:35:08 2016 kern.notice kernel: [ 9.543158] UBIFS: mounted UBI device 0, volume 1, name "rootfs_data" Thu Mar 31 06:35:08 2016 kern.notice kernel: [ 9.545828] UBIFS: LEB size: 126976 bytes (124 KiB), min./max. I/O unit sizes: 2048 bytes/2048 bytes Thu Mar 31 06:35:08 2016 kern.notice kernel: [ 9.552169] UBIFS: FS size: 12951552 bytes (12 MiB, 102 LEBs), journal size 1015809 bytes (0 MiB, 6 LEBs) Thu Mar 31 06:35:08 2016 kern.notice kernel: [ 9.561425] UBIFS: reserved for root: 611733 bytes (597 KiB) Thu Mar 31 06:35:08 2016 kern.notice kernel: [ 9.570876] UBIFS: media format: w4/r0 (latest is w4/r0), UUID 04F095CF-14F0-454E-ABCB-3C9ABB91DB4F, small LPT model Thu Mar 31 06:35:08 2016 user.info kernel: [ 9.583292] mount_root: switching to jffs2 overlay Thu Mar 31 06:35:08 2016 user.info kernel: [ 9.951259] procd: - early - Thu Mar 31 06:35:08 2016 user.info kernel: [ 9.951321] procd: - watchdog - Thu Mar 31 06:35:08 2016 user.info kernel: [ 10.605817] procd: - ubus - Thu Mar 31 06:35:08 2016 user.info kernel: [ 11.645716] procd: - init - Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.150493] ntfs: driver 2.1.31 [Flags: R/O MODULE]. Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.153531] tun: Universal TUN/TAP device driver, 1.6 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.154518] tun: (C) 1999-2004 Max Krasnyansky Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.163300] ip6_tables: (C) 2000-2006 Netfilter Core Team Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.171856] Loading modules backported from Linux version v4.4-rc5-1913-gc8fdf68 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.171882] Backport generated by backports.git backports-20151218-0-g2f58d9d Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.194478] ath10k_pci 0000:01:00.0: enabling device (0140 -> 0142) Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.195227] ath10k_pci 0000:01:00.0: pci irq msi interrupts 1 irq_mode 0 reset_mode 0 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.496257] ath10k_pci 0000:01:00.0: qca99x0 hw2.0 target 0x01000000 chip_id 0x003b01ff sub 168c:0002 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.496295] ath10k_pci 0000:01:00.0: kconfig debug 1 debugfs 1 tracing 0 dfs 1 testmode 1 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 12.505943] ath10k_pci 0000:01:00.0: firmware ver 10.4.1.00030-1 api 5 features no-p2p crc32 d2901e01 Thu Mar 31 06:35:08 2016 kern.warn kernel: [ 14.552433] ath10k_pci 0000:01:00.0: unable to read from the device Thu Mar 31 06:35:08 2016 kern.err kernel: [ 14.552460] ath10k_pci 0000:01:00.0: could not execute otp for board id check: -110 Thu Mar 31 06:35:08 2016 kern.err kernel: [ 14.557502] ath10k_pci 0000:01:00.0: failed to get board id from otp: -110 Thu Mar 31 06:35:08 2016 kern.err kernel: [ 14.557502] , ignored Thu Mar 31 06:35:08 2016 kern.err kernel: [ 14.565674] ath10k_pci 0000:01:00.0: failed to fetch board data for bus=pci,vendor=168c,device=0040,subsystem-vendor=168c,subsystem-device=0002 from ath10k/QCA99X0/hw2.0/board-2.bin Thu Mar 31 06:35:08 2016 kern.info kernel: [ 14.584024] ath10k_pci 0000:01:00.0: board_file api 1 bmi_id N/A crc32 7e56fd07 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 15.978250] ath10k_pci 0000:01:00.0: htt-ver 2.2 wmi-op 6 htt-op 4 cal file max-sta 512 raw 0 hwcrypto 1 Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 16.035623] ath: EEPROM regdomain: 0x0 Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 16.035630] ath: EEPROM indicates default country code should be used Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 16.035636] ath: doing EEPROM country->regdmn map search Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 16.035644] ath: country maps to regdmn code: 0x3a Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 16.035651] ath: Country alpha2 being used: US Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 16.035657] ath: Regpair used: 0x3a Thu Mar 31 06:35:08 2016 kern.info kernel: [ 16.039332] ath10k_pci 0001:01:00.0: enabling device (0140 -> 0142) Thu Mar 31 06:35:08 2016 kern.info kernel: [ 16.040106] ath10k_pci 0001:01:00.0: pci irq msi interrupts 1 irq_mode 0 reset_mode 0 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 16.175838] ath10k_pci 0001:01:00.0: qca99x0 hw2.0 target 0x01000000 chip_id 0x003b01ff sub 168c:0002 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 16.175874] ath10k_pci 0001:01:00.0: kconfig debug 1 debugfs 1 tracing 0 dfs 1 testmode 1 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 16.185739] ath10k_pci 0001:01:00.0: firmware ver 10.4.1.00030-1 api 5 features no-p2p crc32 d2901e01 Thu Mar 31 06:35:08 2016 kern.warn kernel: [ 18.232442] ath10k_pci 0001:01:00.0: unable to read from the device Thu Mar 31 06:35:08 2016 kern.err kernel: [ 18.232468] ath10k_pci 0001:01:00.0: could not execute otp for board id check: -110 Thu Mar 31 06:35:08 2016 kern.err kernel: [ 18.237510] ath10k_pci 0001:01:00.0: failed to get board id from otp: -110 Thu Mar 31 06:35:08 2016 kern.err kernel: [ 18.237510] , ignored Thu Mar 31 06:35:08 2016 kern.err kernel: [ 18.245347] ath10k_pci 0001:01:00.0: failed to fetch board data for bus=pci,vendor=168c,device=0040,subsystem-vendor=168c,subsystem-device=0002 from ath10k/QCA99X0/hw2.0/board-2.bin Thu Mar 31 06:35:08 2016 kern.info kernel: [ 18.254712] ath10k_pci 0001:01:00.0: board_file api 1 bmi_id N/A crc32 7e56fd07 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.653687] ath10k_pci 0001:01:00.0: htt-ver 2.2 wmi-op 6 htt-op 4 cal file max-sta 512 raw 0 hwcrypto 1 Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 19.716178] ath: EEPROM regdomain: 0x0 Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 19.716186] ath: EEPROM indicates default country code should be used Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 19.716193] ath: doing EEPROM country->regdmn map search Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 19.716202] ath: country maps to regdmn code: 0x3a Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 19.716209] ath: Country alpha2 being used: US Thu Mar 31 06:35:08 2016 kern.debug kernel: [ 19.716215] ath: Regpair used: 0x3a Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.724461] u32 classifier Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.724481] input device check on Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.726054] Actions configured Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.730701] Mirror/redirect action on Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.736119] nf_conntrack version 0.5.0 (7523 buckets, 30092 max) Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.739611] ip_tables: (C) 2000-2006 Netfilter Core Team Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.824663] usbcore: registered new interface driver ums-alauda Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.825346] usbcore: registered new interface driver ums-cypress Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.830068] usbcore: registered new interface driver ums-datafab Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.836357] usbcore: registered new interface driver ums-freecom Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.842383] usbcore: registered new interface driver ums-isd200 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.848303] usbcore: registered new interface driver ums-jumpshot Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.853992] usbcore: registered new interface driver ums-karma Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.860325] usbcore: registered new interface driver ums-sddr09 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.866016] usbcore: registered new interface driver ums-sddr55 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.871818] usbcore: registered new interface driver ums-usbat Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.889070] xt_time: kernel timezone is -0000 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.893315] PPP generic driver version 2.4.2 Thu Mar 31 06:35:08 2016 kern.info kernel: [ 19.894029] NET: Registered protocol family 24 Thu Mar 31 06:35:09 2016 user.notice : 'radio0' is disabled Thu Mar 31 06:35:09 2016 user.notice : 'radio1' is disabled Thu Mar 31 06:35:09 2016 user.notice : 'radio0' is disabled Thu Mar 31 06:35:09 2016 user.notice : 'radio1' is disabled Thu Mar 31 06:35:09 2016 authpriv.info dropbear[542]: Not backgrounding Thu Mar 31 06:35:09 2016 kern.info kernel: [ 22.945241] eth0: device MAC address 00:06:3b:01:41:00 Thu Mar 31 06:35:09 2016 kern.info kernel: [ 22.960202] device eth0.1 entered promiscuous mode Thu Mar 31 06:35:09 2016 kern.info kernel: [ 22.960226] device eth0 entered promiscuous mode Thu Mar 31 06:35:09 2016 kern.info kernel: [ 22.967086] br-lan: port 1(eth0.1) entered forwarding state Thu Mar 31 06:35:09 2016 kern.info kernel: [ 22.968679] br-lan: port 1(eth0.1) entered forwarding state Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'lan' is enabled Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'lan' is setting up now Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'lan' is now up Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'loopback' is enabled Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'loopback' is setting up now Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'loopback' is now up Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'wan' is enabled Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'wan6' is enabled Thu Mar 31 06:35:09 2016 daemon.notice netifd: Bridge 'br-lan' link is up Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'lan' has link connectivity Thu Mar 31 06:35:09 2016 daemon.notice netifd: Network device 'eth0' link is up Thu Mar 31 06:35:09 2016 daemon.notice netifd: VLAN 'eth0.1' link is up Thu Mar 31 06:35:09 2016 daemon.notice netifd: Network device 'lo' link is up Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'loopback' has link connectivity Thu Mar 31 06:35:09 2016 daemon.notice netifd: VLAN 'eth0.2' link is up Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'wan' has link connectivity Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'wan' is setting up now Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'wan6' has link connectivity Thu Mar 31 06:35:09 2016 daemon.notice netifd: Interface 'wan6' is setting up now Thu Mar 31 06:35:10 2016 daemon.notice netifd: wan (677): udhcpc (v1.24.1) started Thu Mar 31 06:35:10 2016 daemon.notice netifd: wan (677): Sending discover... Thu Mar 31 06:35:10 2016 daemon.err insmod: module is already loaded - xt_multiport Thu Mar 31 06:35:10 2016 daemon.err insmod: module is already loaded - xt_comment Thu Mar 31 06:35:10 2016 daemon.err insmod: module is already loaded - xt_length Thu Mar 31 06:35:10 2016 user.notice firewall: Reloading firewall due to ifup of lan (br-lan) Thu Mar 31 06:35:11 2016 daemon.err insmod: module is already loaded - xt_multiport Thu Mar 31 06:35:11 2016 daemon.err insmod: module is already loaded - xt_comment Thu Mar 31 06:35:11 2016 daemon.err insmod: module is already loaded - xt_length Thu Mar 31 06:35:11 2016 kern.info kernel: [ 24.942486] ipq806x-gmac-dwmac 37200000.ethernet eth0: Link is Up - 1Gbps/Full - flow control off Thu Mar 31 06:35:11 2016 kern.info kernel: [ 24.962260] br-lan: port 1(eth0.1) entered forwarding state Thu Mar 31 06:35:12 2016 user.notice : mv: can't rename '/etc/collectd.conf': Invalid argument Thu Mar 31 06:35:12 2016 user.notice : ln: /etc/collectd.conf: File exists Thu Mar 31 06:35:13 2016 daemon.info procd: - init complete - Thu Mar 31 06:35:13 2016 daemon.notice netifd: wan (677): Sending discover... Thu Mar 31 06:35:13 2016 daemon.warn odhcpd[500]: DHCPV6 SOLICIT IA_NA from 000476e1971449c37edcc8e5bdb7340357e9 on br-lan: ok fd7e:151:2a7f::eec/128 Thu Mar 31 06:35:14 2016 daemon.warn odhcpd[500]: DHCPV6 REQUEST IA_NA from 000476e1971449c37edcc8e5bdb7340357e9 on br-lan: ok fd7e:151:2a7f::eec/128 Thu Mar 31 06:35:16 2016 daemon.notice netifd: wan (677): Sending discover... Thu Mar 31 06:35:23 2016 daemon.warn odhcpd[500]: DHCPV6 SOLICIT IA_NA from 000100011c3ca12c6451069fdb33 on br-lan: ok fd7e:151:2a7f::78c/128 Thu Mar 31 06:35:33 2016 daemon.info dnsmasq[1168]: started, version 2.75 cachesize 150 Thu Mar 31 06:35:33 2016 daemon.info dnsmasq[1168]: compile time options: IPv6 GNU-getopt no-DBus no-i18n no-IDN DHCP no-DHCPv6 no-Lua TFTP no-conntrack no-ipset no-auth no-DNSSEC loop-detect inotify Thu Mar 31 06:35:33 2016 daemon.info dnsmasq[1168]: DNS service limited to local subnets Thu Mar 31 06:35:33 2016 daemon.info dnsmasq-dhcp[1168]: DHCP, IP range 192.168.1.100 -- 192.168.1.249, lease time 12h Thu Mar 31 06:35:33 2016 daemon.info dnsmasq[1168]: using nameserver 10.190.2.50#53 Thu Mar 31 06:35:33 2016 daemon.info dnsmasq[1168]: using local addresses only for domain lan Thu Mar 31 06:35:33 2016 daemon.warn dnsmasq[1168]: no servers found in /tmp/resolv.conf.auto, will retry Thu Mar 31 06:35:33 2016 daemon.info dnsmasq[1168]: read /etc/hosts - 4 addresses Thu Mar 31 06:35:33 2016 daemon.info dnsmasq[1168]: read /tmp/hosts/dhcp - 1 addresses Thu Mar 31 06:35:33 2016 daemon.info dnsmasq-dhcp[1168]: read /etc/ethers - 0 addresses Thu Mar 31 06:35:41 2016 daemon.info dnsmasq-dhcp[1168]: DHCPDISCOVER(br-lan) 10.0.2.15 08:00:27:da:9d:50 Thu Mar 31 06:35:41 2016 daemon.info dnsmasq-dhcp[1168]: DHCPOFFER(br-lan) 192.168.1.148 08:00:27:da:9d:50 Thu Mar 31 06:35:41 2016 daemon.info dnsmasq-dhcp[1168]: DHCPREQUEST(br-lan) 192.168.1.148 08:00:27:da:9d:50 Thu Mar 31 06:35:41 2016 daemon.info dnsmasq-dhcp[1168]: DHCPACK(br-lan) 192.168.1.148 08:00:27:da:9d:50 adrian-VirtualBox Thu Mar 31 06:35:55 2016 daemon.info dnsmasq-dhcp[1168]: DHCPDISCOVER(br-lan) 64:51:06:9f:db:33 Thu Mar 31 06:35:55 2016 daemon.info dnsmasq-dhcp[1168]: DHCPOFFER(br-lan) 192.168.1.159 64:51:06:9f:db:33 Thu Mar 31 06:35:55 2016 daemon.info dnsmasq-dhcp[1168]: DHCPREQUEST(br-lan) 192.168.1.159 64:51:06:9f:db:33 Thu Mar 31 06:35:55 2016 daemon.warn dnsmasq-dhcp[1168]: Ignoring domain ternium.techint.net for DHCP host name ternp309711 Thu Mar 31 06:35:55 2016 daemon.info dnsmasq-dhcp[1168]: DHCPACK(br-lan) 192.168.1.159 64:51:06:9f:db:33 ternp309711 Thu Mar 31 06:35:55 2016 daemon.warn odhcpd[500]: DHCPV6 SOLICIT IA_NA from 000100011c3ca12c6451069fdb33 on br-lan: ok fd7e:151:2a7f::78c/128 Thu Mar 31 06:35:55 2016 daemon.warn odhcpd[500]: DHCPV6 REQUEST IA_NA from 000100011c3ca12c6451069fdb33 on br-lan: ok fd7e:151:2a7f::78c/128 Thu Mar 31 06:35:55 2016 daemon.info dnsmasq[1168]: read /etc/hosts - 4 addresses Thu Mar 31 06:35:55 2016 daemon.info dnsmasq[1168]: read /tmp/hosts/odhcpd - 2 addresses Thu Mar 31 06:35:55 2016 daemon.info dnsmasq[1168]: read /tmp/hosts/dhcp - 1 addresses Thu Mar 31 06:35:55 2016 daemon.info dnsmasq-dhcp[1168]: read /etc/ethers - 0 addresses Thu Mar 31 06:35:55 2016 daemon.info dnsmasq[1168]: read /etc/hosts - 4 addresses Thu Mar 31 06:35:55 2016 daemon.info dnsmasq[1168]: read /tmp/hosts/odhcpd - 2 addresses Thu Mar 31 06:35:55 2016 daemon.info dnsmasq[1168]: read /tmp/hosts/dhcp - 1 addresses Thu Mar 31 06:35:55 2016 daemon.info dnsmasq-dhcp[1168]: read /etc/ethers - 0 addresses Thu Mar 31 06:35:58 2016 daemon.info dnsmasq-dhcp[1168]: DHCPINFORM(br-lan) 192.168.1.159 64:51:06:9f:db:33 Thu Mar 31 06:35:58 2016 daemon.info dnsmasq-dhcp[1168]: DHCPACK(br-lan) 192.168.1.159 64:51:06:9f:db:33 ternp309711 KLOG [ 0.000000] Booting Linux on physical CPU 0x0 [ 0.000000] Linux version 3.18.26 (adrian at adrian-VirtualBox) (gcc version 5.2.0 (OpenWrt GCC 5.2.0 r48754) ) #5 SMP PREEMPT Thu Mar 31 19:26:30 UTC 2016 [ 0.000000] CPU: ARMv7 Processor [512f04d0] revision 0 (ARMv7), cr=10c5787d [ 0.000000] CPU: PIPT / VIPT nonaliasing data cache, PIPT instruction cache [ 0.000000] Machine model: Linksys EA8500 WiFi Router [ 0.000000] Ignoring memory range 0x41500000 - 0x42000000 [ 0.000000] Memory policy: Data cache writealloc [ 0.000000] On node 0 totalpages: 122880 [ 0.000000] free_area_init_node: node 0, pgdat c0729d80, node_mem_map ddc39000 [ 0.000000] Normal zone: 960 pages used for memmap [ 0.000000] Normal zone: 0 pages reserved [ 0.000000] Normal zone: 122880 pages, LIFO batch:31 [ 0.000000] PERCPU: Embedded 9 pages/cpu @ddc16000 s7360 r8192 d21312 u36864 [ 0.000000] pcpu-alloc: s7360 r8192 d21312 u36864 alloc=9*4096 [ 0.000000] pcpu-alloc: [0] 0 [0] 1 [ 0.000000] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 121920 [ 0.000000] Kernel command line: console=ttyMSM0,115200n8 mangled_rootblock=16 [ 0.000000] PID hash table entries: 2048 (order: 1, 8192 bytes) [ 0.000000] Dentry cache hash table entries: 65536 (order: 6, 262144 bytes) [ 0.000000] Inode-cache hash table entries: 32768 (order: 5, 131072 bytes) [ 0.000000] Memory: 481332K/491520K available (3566K kernel code, 258K rwdata, 1448K rodata, 192K init, 290K bss, 10188K reserved, 0K highmem) [ 0.000000] Virtual kernel memory layout: [ 0.000000] vector : 0xffff0000 - 0xffff1000 ( 4 kB) [ 0.000000] fixmap : 0xffc00000 - 0xffe00000 (2048 kB) [ 0.000000] vmalloc : 0xde800000 - 0xff000000 ( 520 MB) [ 0.000000] lowmem : 0xc0000000 - 0xde000000 ( 480 MB) [ 0.000000] pkmap : 0xbfe00000 - 0xc0000000 ( 2 MB) [ 0.000000] modules : 0xbf000000 - 0xbfe00000 ( 14 MB) [ 0.000000] .text : 0xc0208000 - 0xc06eddf0 (5016 kB) [ 0.000000] .init : 0xc06ee000 - 0xc071e000 ( 192 kB) [ 0.000000] .data : 0xc071e000 - 0xc075e8d0 ( 259 kB) [ 0.000000] .bss : 0xc075e8d0 - 0xc07a7110 ( 291 kB) [ 0.000000] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=2, Nodes=1 [ 0.000000] Preemptible hierarchical RCU implementation. [ 0.000000] RCU restricting CPUs from NR_CPUS=4 to nr_cpu_ids=2. [ 0.000000] RCU: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=2 [ 0.000000] NR_IRQS:16 nr_irqs:16 16 [ 0.000009] sched_clock: 32 bits at 6MHz, resolution 160ns, wraps every 687194767200ns [ 0.000025] Switching to timer-based delay loop, resolution 160ns [ 0.000179] Calibrating delay loop (skipped), value calculated using timer frequency.. 12.50 BogoMIPS (lpj=62500) [ 0.000202] pid_max: default: 32768 minimum: 301 [ 0.000361] Mount-cache hash table entries: 1024 (order: 0, 4096 bytes) [ 0.000379] Mountpoint-cache hash table entries: 1024 (order: 0, 4096 bytes) [ 0.000987] CPU: Testing write buffer coherency: ok [ 0.001274] CPU0: thread -1, cpu 0, socket 0, mpidr 80000000 [ 0.001788] Setting up static identity map for 0x422129c8 - 0x42212a20 [ 0.084119] CPU1: Booted secondary processor [ 0.084245] CPU1: thread -1, cpu 1, socket 0, mpidr 80000001 [ 0.084363] Brought up 2 CPUs [ 0.084386] SMP: Total of 2 processors activated (25.00 BogoMIPS). [ 0.084396] CPU: All CPU(s) started in SVC mode. [ 0.098321] VFP support v0.3: implementor 51 architecture 0 part 4d variant 2 rev 0 [ 0.098843] pinctrl core: initialized pinctrl subsystem [ 0.099309] regulator-dummy: no parameters [ 0.107261] NET: Registered protocol family 16 [ 0.107538] DMA: preallocated 256 KiB pool for atomic coherent allocations [ 0.134566] cpuidle: using governor ladder [ 0.165583] cpuidle: using governor menu [ 0.179486] gpiochip_add: registered GPIOs 0 to 68 on device: 800000.pinmux [ 0.179508] GPIO chip 800000.pinmux: created GPIO range 0->68 ==> 800000.pinmux PIN 0->68 [ 0.181128] qcom_rpm 108000.rpm: RPM firmware 3.0.16777342 [ 0.181198] qcom_rpm 108000.rpm: failed to mark ack irq as wakeup [ 0.181263] qcom_rpm 108000.rpm: failed to mark wakeup irq as wakeup [ 0.208949] smb208-s1a: 1050 <--> 1150 mV [ 0.209315] smb208-s1b: 1050 <--> 1150 mV [ 0.209658] smb208-s2a: 800 <--> 1250 mV [ 0.210027] smb208-s2b: 800 <--> 1250 mV [ 0.210549] pps_core: LinuxPPS API ver. 1 registered [ 0.210564] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti [ 0.210611] PTP clock support registered [ 0.212055] Switched to clocksource dg_timer [ 0.213658] NET: Registered protocol family 2 [ 0.214464] TCP established hash table entries: 4096 (order: 2, 16384 bytes) [ 0.214506] TCP bind hash table entries: 4096 (order: 3, 32768 bytes) [ 0.214561] TCP: Hash tables configured (established 4096 bind 4096) [ 0.214610] TCP: reno registered [ 0.214634] UDP hash table entries: 256 (order: 1, 8192 bytes) [ 0.214657] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes) [ 0.214907] NET: Registered protocol family 1 [ 0.214986] PCI: CLS 0 bytes, default 64 [ 0.216467] futex hash table entries: 512 (order: 3, 32768 bytes) [ 0.225580] squashfs: version 4.0 (2009/01/31) Phillip Lougher [ 0.225612] jffs2: version 2.2 (NAND) (SUMMARY) (LZMA) (RTIME) (CMODE_PRIORITY) (c) 2001-2006 Red Hat, Inc. [ 0.226614] msgmni has been set to 940 [ 0.228289] io scheduler noop registered [ 0.228314] io scheduler deadline registered (default) [ 0.229745] qcom-pcie 1b500000.pci: GPIO lookup for consumer perst [ 0.229764] qcom-pcie 1b500000.pci: using device tree for GPIO lookup [ 0.229785] of_get_named_gpiod_flags: can't parse 'perst-gpios' property of node '/soc/pci at 1b500000[0]' [ 0.229812] of_get_named_gpiod_flags: parsed 'perst-gpio' property of node '/soc/pci at 1b500000[0]' - status (0) [ 0.229883] 1b500000.pci supply vdda not found, using dummy regulator [ 0.229983] 1b500000.pci supply vdda_phy not found, using dummy regulator [ 0.230072] 1b500000.pci supply vdda_refclk not found, using dummy regulator [ 0.260175] qcom-pcie 1b500000.pci: PCI host bridge to bus 0000:00 [ 0.260200] pci_bus 0000:00: root bus resource [io 0xfe00000-0xfffff] (bus address [0x1fc00000-0xfefffff]) [ 0.260217] pci_bus 0000:00: root bus resource [mem 0x08000000-0x0fdfffff] [ 0.260236] pci_bus 0000:00: root bus resource [bus 00-ff] [ 0.260294] pci 0000:00:00.0: [17cb:0101] type 01 class 0x060400 [ 0.260452] pci 0000:00:00.0: supports D1 [ 0.260468] pci 0000:00:00.0: PME# supported from D0 D1 D3hot [ 0.260836] PCI: bus0: Fast back to back transfers disabled [ 0.261215] pci 0000:01:00.0: [168c:0040] type 00 class 0x028000 [ 0.261428] pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x001fffff 64bit] [ 0.262498] pci 0000:01:00.0: PME# supported from D0 D3hot D3cold [ 0.262955] PCI: bus1: Fast back to back transfers disabled [ 0.262979] pci_bus 0000:01: busn_res: [bus 01-ff] end is updated to 01 [ 0.263156] pci 0000:00:00.0: BAR 8: assigned [mem 0x08000000-0x081fffff] [ 0.263183] pci 0000:01:00.0: BAR 0: assigned [mem 0x08000000-0x081fffff 64bit] [ 0.263300] pci 0000:00:00.0: PCI bridge to [bus 01] [ 0.263326] pci 0000:00:00.0: bridge window [mem 0x08000000-0x081fffff] [ 0.263871] aer 0000:00:00.0:pcie02: service driver aer loaded [ 0.264186] qcom-pcie 1b700000.pci: GPIO lookup for consumer perst [ 0.264203] qcom-pcie 1b700000.pci: using device tree for GPIO lookup [ 0.264220] of_get_named_gpiod_flags: can't parse 'perst-gpios' property of node '/soc/pci at 1b700000[0]' [ 0.264242] of_get_named_gpiod_flags: parsed 'perst-gpio' property of node '/soc/pci at 1b700000[0]' - status (0) [ 0.264312] 1b700000.pci supply vdda not found, using dummy regulator [ 0.264409] 1b700000.pci supply vdda_phy not found, using dummy regulator [ 0.264501] 1b700000.pci supply vdda_refclk not found, using dummy regulator [ 0.294614] qcom-pcie 1b700000.pci: PCI host bridge to bus 0001:00 [ 0.294638] pci_bus 0001:00: root bus resource [io 0x31e10000-0xfffff] (bus address [0x63c00000-0x31eeffff]) [ 0.294654] pci_bus 0001:00: root bus resource [mem 0x2e000000-0x31dfffff] [ 0.294671] pci_bus 0001:00: root bus resource [bus 00-ff] [ 0.294724] pci 0001:00:00.0: [17cb:0101] type 01 class 0x060400 [ 0.294858] pci 0001:00:00.0: supports D1 [ 0.294873] pci 0001:00:00.0: PME# supported from D0 D1 D3hot [ 0.295216] PCI: bus0: Fast back to back transfers disabled [ 0.295574] pci 0001:01:00.0: [168c:0040] type 00 class 0x028000 [ 0.295781] pci 0001:01:00.0: reg 0x10: [mem 0x00000000-0x001fffff 64bit] [ 0.296759] pci 0001:01:00.0: PME# supported from D0 D3hot D3cold [ 0.297212] PCI: bus1: Fast back to back transfers disabled [ 0.297232] pci_bus 0001:01: busn_res: [bus 01-ff] end is updated to 01 [ 0.297474] pci 0001:00:00.0: BAR 8: assigned [mem 0x2e000000-0x2e1fffff] [ 0.297498] pci 0001:01:00.0: BAR 0: assigned [mem 0x2e000000-0x2e1fffff 64bit] [ 0.297610] pci 0001:00:00.0: PCI bridge to [bus 01] [ 0.297631] pci 0001:00:00.0: bridge window [mem 0x2e000000-0x2e1fffff] [ 0.298077] aer 0001:00:00.0:pcie02: service driver aer loaded [ 0.298384] qcom-pcie 1b900000.pci: GPIO lookup for consumer perst [ 0.298402] qcom-pcie 1b900000.pci: using device tree for GPIO lookup [ 0.298420] of_get_named_gpiod_flags: can't parse 'perst-gpios' property of node '/soc/pci at 1b900000[0]' [ 0.298441] of_get_named_gpiod_flags: parsed 'perst-gpio' property of node '/soc/pci at 1b900000[0]' - status (0) [ 0.298513] 1b900000.pci supply vdda not found, using dummy regulator [ 0.298606] 1b900000.pci supply vdda_phy not found, using dummy regulator [ 0.298690] 1b900000.pci supply vdda_refclk not found, using dummy regulator [ 0.432115] qcom-pcie 1b900000.pci: link initialization failed [ 0.433942] ------------[ cut here ]------------ [ 0.433973] WARNING: CPU: 0 PID: 1 at drivers/clk/qcom/clk-branch.c:97 clk_branch_toggle+0x130/0x13c() [ 0.433984] pcie2_phy_clk status stuck at 'on' [ 0.433994] Modules linked in: [ 0.434024] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.18.26 #5 [ 0.434065] [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [ 0.434093] [] (show_stack) from [] (dump_stack+0x84/0xc4) [ 0.434122] [] (dump_stack) from [] (warn_slowpath_common+0x6c/0x88) [ 0.434142] [] (warn_slowpath_common) from [] (warn_slowpath_fmt+0x30/0x40) [ 0.434166] [] (warn_slowpath_fmt) from [] (clk_branch_toggle+0x130/0x13c) [ 0.434200] [] (clk_branch_toggle) from [] (__clk_disable+0x4c/0x64) [ 0.434228] [] (__clk_disable) from [] (clk_disable.part.1+0x18/0x24) [ 0.434250] [] (clk_disable.part.1) from [] (qcom_pcie_disable_resources_v0+0x6c/0xb8) [ 0.434270] [] (qcom_pcie_disable_resources_v0) from [] (dw_pcie_host_init+0x5e0/0x680) [ 0.434288] [] (dw_pcie_host_init) from [] (qcom_pcie_probe+0x404/0x48c) [ 0.434308] [] (qcom_pcie_probe) from [] (platform_drv_probe+0x44/0xac) [ 0.434339] [] (platform_drv_probe) from [] (really_probe+0xd4/0x214) [ 0.434361] [] (really_probe) from [] (__driver_attach+0x74/0x98) [ 0.434382] [] (__driver_attach) from [] (bus_for_each_dev+0x4c/0xa0) [ 0.434404] [] (bus_for_each_dev) from [] (bus_add_driver+0xd8/0x1f0) [ 0.434426] [] (bus_add_driver) from [] (driver_register+0xa8/0xec) [ 0.434458] [] (driver_register) from [] (do_one_initcall+0x118/0x1f0) [ 0.434483] [] (do_one_initcall) from [] (kernel_init_freeable+0x130/0x1dc) [ 0.434513] [] (kernel_init_freeable) from [] (kernel_init+0x8/0xfc) [ 0.434535] [] (kernel_init) from [] (ret_from_fork+0x14/0x34) [ 0.434568] ---[ end trace fbd97ed824810f3a ]--- [ 0.434879] qcom-pcie 1b900000.pci: PCI host bridge to bus 0002:00 [ 0.434902] pci_bus 0002:00: root bus resource [io 0x35e20000-0xfffff] (bus address [0x6bc00000-0x35edffff]) [ 0.434918] pci_bus 0002:00: root bus resource [mem 0x32000000-0x35dfffff] [ 0.434937] pci_bus 0002:00: root bus resource [bus 00-ff] [ 0.434996] PCI: bus0: Fast back to back transfers enabled [ 0.437821] gsbi 16300000.gsbi: GSBI port protocol: 6 crci: 0 [ 0.439316] Serial: 8250/16550 driver, 2 ports, IRQ sharing disabled [ 0.440402] msm_serial 16340000.serial: msm_serial: detected port #0 [ 0.440513] msm_serial 16340000.serial: uartclk = 1843200 [ 0.440593] 16340000.serial: ttyMSM0 at MMIO 0x16340000 (irq = 184, base_baud = 115200) is a MSM [ 0.440655] msm_serial: console setup on port #0 [ 1.345164] console [ttyMSM0] enabled [ 1.349974] msm_serial: driver initialized [ 1.356078] nand: device found, Manufacturer ID: 0x01, Chip ID: 0xa1 [ 1.357210] nand: AMD/Spansion S34MS01G2 [ 1.363817] nand: 128MiB, SLC, page size: 2048, OOB size: 64 [ 1.367630] Scanning device for bad blocks [ 1.814132] random: nonblocking pool is initialized [ 2.131491] 18 ofpart partitions found on MTD device qcom-nandc [ 2.131526] Creating 18 MTD partitions on "qcom-nandc": [ 2.136332] 0x000000000000-0x000000040000 : "SBL1" [ 2.142573] 0x000000040000-0x000000180000 : "MIBIB" [ 2.147199] 0x000000180000-0x0000002c0000 : "SBL2" [ 2.151981] 0x0000002c0000-0x000000540000 : "SBL3" [ 2.156922] 0x000000540000-0x000000660000 : "DDRCONFIG" [ 2.161609] 0x000000660000-0x000000780000 : "SSD" [ 2.166790] 0x000000780000-0x000000a00000 : "TZ" [ 2.171631] 0x000000a00000-0x000000c80000 : "RPM" [ 2.176356] 0x000000c80000-0x000000dc0000 : "art" [ 2.180871] 0x000000dc0000-0x000000ec0000 : "APPSBL" [ 2.185656] 0x000000ec0000-0x000000f00000 : "u_env" [ 2.190588] 0x000000f00000-0x000000f40000 : "s_env" [ 2.195266] 0x000000f40000-0x000000f80000 : "devinfo" [ 2.200064] 0x000000f80000-0x000003780000 : "kernel1" [ 2.205409] 0x000001280000-0x000003780000 : "rootfs1" [ 2.210361] 0x000003780000-0x000005f80000 : "kernel2" [ 2.215464] 0x000003a80000-0x000005f80000 : "ubi" [ 2.220387] 0x000005f80000-0x000008000000 : "syscfg" [ 2.226162] libphy: Fixed MDIO Bus: probed [ 2.229491] of_get_named_gpiod_flags: parsed 'gpios' property of node '/soc/mdio[0]' - status (0) [ 2.229517] of_get_named_gpiod_flags: parsed 'gpios' property of node '/soc/mdio[1]' - status (0) [ 2.229538] of_get_named_gpiod_flags: can't parse 'gpios' property of node '/soc/mdio[2]' [ 2.229683] libphy: GPIO Bitbanged MDIO: probed [ 2.254349] switch0: Atheros AR8337 rev. 2 switch registered on gpio-0 [ 2.472118] stmmac - user ID: 0x10, Synopsys ID: 0x37 [ 2.472146] Ring mode enabled [ 2.476251] DMA HW capability register supported [ 2.479098] Enhanced/Alternate descriptors [ 2.483871] Enabled extended descriptors [ 2.487865] RX Checksum Offload Engine supported (type 2) [ 2.492032] TX Checksum insertion supported [ 2.497480] Wake-Up On Lan supported [ 2.501921] Enable RX Mitigation via HW Watchdog Timer [ 2.507060] stmmac - user ID: 0x10, Synopsys ID: 0x37 [ 2.510436] Ring mode enabled [ 2.515741] DMA HW capability register supported [ 2.518593] Enhanced/Alternate descriptors [ 2.523367] Enabled extended descriptors [ 2.527360] RX Checksum Offload Engine supported (type 2) [ 2.531529] TX Checksum insertion supported [ 2.536999] Wake-Up On Lan supported [ 2.541403] Enable RX Mitigation via HW Watchdog Timer [ 2.545763] i2c /dev entries driver [ 2.551188] Speed bin: 0 [ 2.553496] PVS bin: 1 [ 2.556652] platform cpufreq-krait.0: Driver cpufreq-krait requests probe deferral [ 2.560418] L2 @ QSB rate. Forcing new rate. [ 2.566244] L2 @ 387500 KHz [ 2.570471] CPU0 @ 800000 KHz [ 2.572930] CPU1 @ QSB rate. Forcing new rate. [ 2.576062] CPU1 @ 384000 KHz [ 2.580752] TCP: cubic registered [ 2.584370] NET: Registered protocol family 10 [ 2.588186] NET: Registered protocol family 17 [ 2.591073] bridge: automatic filtering via arp/ip/ip6tables has been deprecated. Update your scripts to load br_netfilter if you need this. [ 2.595560] 8021q: 802.1Q VLAN Support v1.8 [ 2.608361] Registering SWP/SWPB emulation handler [ 2.621139] UBI: auto-attach mtd16 [ 2.621160] UBI: attaching mtd16 to ubi0 [ 2.996860] UBI: scanning is finished [ 3.011916] UBI: attached mtd16 (name "ubi", size 37 MiB) to ubi0 [ 3.011941] UBI: PEB size: 131072 bytes (128 KiB), LEB size: 126976 bytes [ 3.017063] UBI: min./max. I/O unit sizes: 2048/2048, sub-page size 2048 [ 3.023806] UBI: VID header offset: 2048 (aligned 2048), data offset: 4096 [ 3.030523] UBI: good PEBs: 296, bad PEBs: 0, corrupted PEBs: 0 [ 3.037272] UBI: user volume: 2, internal volumes: 1, max. volumes count: 128 [ 3.043081] UBI: max/mean erase counter: 3/2, WL threshold: 4096, image sequence number: 1517402195 [ 3.050319] UBI: available PEBs: 0, total reserved PEBs: 296, PEBs reserved for bad PEB handling: 20 [ 3.059389] UBI: background thread "ubi_bgt0d" started, PID 44 [ 3.060304] UBI: ubiblock0_0 created from ubi0:0(rootfs) [ 3.060308] ubiblock: device ubiblock0_0 (rootfs) set to be root filesystem [ 3.060322] drivers/rtc/hctosys.c: unable to open rtc device (rtc0) [ 3.061079] device-tree: Duplicate name in testcase-data, renamed to "duplicate-name#1" [ 3.061924] ### dt-test ### start of selftest - you will see error messages [ 3.062326] /testcase-data/phandle-tests/consumer-a: could not get #phandle-cells-missing for /testcase-data/phandle-tests/provider1 [ 3.062330] /testcase-data/phandle-tests/consumer-a: could not get #phandle-cells-missing for /testcase-data/phandle-tests/provider1 [ 3.062338] /testcase-data/phandle-tests/consumer-a: could not find phandle [ 3.062346] /testcase-data/phandle-tests/consumer-a: could not find phandle [ 3.062351] /testcase-data/phandle-tests/consumer-a: arguments longer than property [ 3.062357] /testcase-data/phandle-tests/consumer-a: arguments longer than property [ 3.062945] irq: no irq domain found for /testcase-data/interrupts/intc0 ! [ 3.063991] ### dt-test ### end of selftest - 115 passed, 0 failed [ 3.171063] VFS: Mounted root (squashfs filesystem) readonly on device 254:0. [ 3.173811] Freeing unused kernel memory: 192K (c06ee000 - c071e000) [ 3.721234] init: Console is alive [ 3.721360] init: - watchdog - [ 4.541365] usbcore: registered new interface driver usbfs [ 4.541436] usbcore: registered new interface driver hub [ 4.545909] usbcore: registered new device driver usb [ 4.557716] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-keys/wifi[0]' - status (0) [ 4.557736] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-keys/reset[0]' - status (0) [ 4.557751] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-keys/wps[0]' - status (0) [ 4.557898] genirq: Threaded irq requested with handler=NULL and !ONESHOT for irq 355 [ 4.557987] gpio-keys gpio-keys: failed to request irq:355 for gpio:67 [ 4.564841] genirq: Threaded irq requested with handler=NULL and !ONESHOT for irq 356 [ 4.571159] gpio-keys gpio-keys: failed to request irq:356 for gpio:68 [ 4.579170] genirq: Threaded irq requested with handler=NULL and !ONESHOT for irq 353 [ 4.585575] gpio-keys gpio-keys: failed to request irq:353 for gpio:65 [ 4.595938] SCSI subsystem initialized [ 4.602500] libata version 3.00 loaded. [ 4.604735] ahci 29000000.sata: forcing PORTS_IMPL to 0x1 [ 4.604788] ahci 29000000.sata: AHCI 0001.0300 32 slots 1 ports 6 Gbps 0x1 impl platform mode [ 4.609114] ahci 29000000.sata: flags: ncq sntf pm led clo only pmp pio slum part ccc apst [ 4.618365] scsi host0: ahci_platform [ 4.626075] ata1: SATA max UDMA/133 mmio [mem 0x29000000-0x2900017f] port 0x100 irq 241 [ 4.972723] ata1: SATA link down (SStatus 0 SControl 300) [ 4.974512] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver [ 4.977533] ehci-platform: EHCI generic platform driver [ 4.986273] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver [ 4.989103] ohci-platform: OHCI generic platform driver [ 5.491133] xhci-hcd xhci-hcd.0.auto: xHCI Host Controller [ 5.491180] xhci-hcd xhci-hcd.0.auto: new USB bus registered, assigned bus number 1 [ 5.495790] xhci-hcd xhci-hcd.0.auto: irq 142, io mem 0x11000000 [ 5.503686] hub 1-0:1.0: USB hub found [ 5.509340] hub 1-0:1.0: 1 port detected [ 5.513180] xhci-hcd xhci-hcd.0.auto: xHCI Host Controller [ 5.516955] xhci-hcd xhci-hcd.0.auto: new USB bus registered, assigned bus number 2 [ 5.522807] hub 2-0:1.0: USB hub found [ 5.529815] hub 2-0:1.0: 1 port detected [ 5.533956] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 5.537710] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 3 [ 5.543244] xhci-hcd xhci-hcd.1.auto: irq 237, io mem 0x10000000 [ 5.550992] hub 3-0:1.0: USB hub found [ 5.556861] hub 3-0:1.0: 1 port detected [ 5.560562] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller [ 5.564502] xhci-hcd xhci-hcd.1.auto: new USB bus registered, assigned bus number 4 [ 5.570216] hub 4-0:1.0: USB hub found [ 5.577354] hub 4-0:1.0: 1 port detected [ 5.581928] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/wps[0]' - status (0) [ 5.581941] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/power[0]' - status (0) [ 5.581952] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/wifi[0]' - status (0) [ 5.581965] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/wps[0]' - status (0) [ 5.582061] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/power[0]' - status (0) [ 5.582134] of_get_named_gpiod_flags: parsed 'gpios' property of node '/gpio-leds/wifi[0]' - status (0) [ 5.583619] usbcore: registered new interface driver usb-storage [ 5.743345] init: - preinit - [ 9.218507] UBIFS: background thread "ubifs_bgt0_1" started, PID 81 [ 9.352817] UBIFS: recovery needed [ 9.543046] UBIFS: recovery completed [ 9.543158] UBIFS: mounted UBI device 0, volume 1, name "rootfs_data" [ 9.545828] UBIFS: LEB size: 126976 bytes (124 KiB), min./max. I/O unit sizes: 2048 bytes/2048 bytes [ 9.552169] UBIFS: FS size: 12951552 bytes (12 MiB, 102 LEBs), journal size 1015809 bytes (0 MiB, 6 LEBs) [ 9.561425] UBIFS: reserved for root: 611733 bytes (597 KiB) [ 9.570876] UBIFS: media format: w4/r0 (latest is w4/r0), UUID 04F095CF-14F0-454E-ABCB-3C9ABB91DB4F, small LPT model [ 9.583292] mount_root: switching to jffs2 overlay [ 9.951259] procd: - early - [ 9.951321] procd: - watchdog - [ 10.605817] procd: - ubus - [ 11.645716] procd: - init - [ 12.150493] ntfs: driver 2.1.31 [Flags: R/O MODULE]. [ 12.153531] tun: Universal TUN/TAP device driver, 1.6 [ 12.154518] tun: (C) 1999-2004 Max Krasnyansky [ 12.163300] ip6_tables: (C) 2000-2006 Netfilter Core Team [ 12.171856] Loading modules backported from Linux version v4.4-rc5-1913-gc8fdf68 [ 12.171882] Backport generated by backports.git backports-20151218-0-g2f58d9d [ 12.194478] ath10k_pci 0000:01:00.0: enabling device (0140 -> 0142) [ 12.195227] ath10k_pci 0000:01:00.0: pci irq msi interrupts 1 irq_mode 0 reset_mode 0 [ 12.496257] ath10k_pci 0000:01:00.0: qca99x0 hw2.0 target 0x01000000 chip_id 0x003b01ff sub 168c:0002 [ 12.496295] ath10k_pci 0000:01:00.0: kconfig debug 1 debugfs 1 tracing 0 dfs 1 testmode 1 [ 12.505943] ath10k_pci 0000:01:00.0: firmware ver 10.4.1.00030-1 api 5 features no-p2p crc32 d2901e01 [ 14.552433] ath10k_pci 0000:01:00.0: unable to read from the device [ 14.552460] ath10k_pci 0000:01:00.0: could not execute otp for board id check: -110 [ 14.557502] ath10k_pci 0000:01:00.0: failed to get board id from otp: -110 [ 14.557502] , ignored [ 14.565674] ath10k_pci 0000:01:00.0: failed to fetch board data for bus=pci,vendor=168c,device=0040,subsystem-vendor=168c,subsystem-device=0002 from ath10k/QCA99X0/hw2.0/board-2.bin [ 14.584024] ath10k_pci 0000:01:00.0: board_file api 1 bmi_id N/A crc32 7e56fd07 [ 15.978250] ath10k_pci 0000:01:00.0: htt-ver 2.2 wmi-op 6 htt-op 4 cal file max-sta 512 raw 0 hwcrypto 1 [ 16.035623] ath: EEPROM regdomain: 0x0 [ 16.035630] ath: EEPROM indicates default country code should be used [ 16.035636] ath: doing EEPROM country->regdmn map search [ 16.035644] ath: country maps to regdmn code: 0x3a [ 16.035651] ath: Country alpha2 being used: US [ 16.035657] ath: Regpair used: 0x3a [ 16.039332] ath10k_pci 0001:01:00.0: enabling device (0140 -> 0142) [ 16.040106] ath10k_pci 0001:01:00.0: pci irq msi interrupts 1 irq_mode 0 reset_mode 0 [ 16.175838] ath10k_pci 0001:01:00.0: qca99x0 hw2.0 target 0x01000000 chip_id 0x003b01ff sub 168c:0002 [ 16.175874] ath10k_pci 0001:01:00.0: kconfig debug 1 debugfs 1 tracing 0 dfs 1 testmode 1 [ 16.185739] ath10k_pci 0001:01:00.0: firmware ver 10.4.1.00030-1 api 5 features no-p2p crc32 d2901e01 [ 18.232442] ath10k_pci 0001:01:00.0: unable to read from the device [ 18.232468] ath10k_pci 0001:01:00.0: could not execute otp for board id check: -110 [ 18.237510] ath10k_pci 0001:01:00.0: failed to get board id from otp: -110 [ 18.237510] , ignored [ 18.245347] ath10k_pci 0001:01:00.0: failed to fetch board data for bus=pci,vendor=168c,device=0040,subsystem-vendor=168c,subsystem-device=0002 from ath10k/QCA99X0/hw2.0/board-2.bin [ 18.254712] ath10k_pci 0001:01:00.0: board_file api 1 bmi_id N/A crc32 7e56fd07 [ 19.653687] ath10k_pci 0001:01:00.0: htt-ver 2.2 wmi-op 6 htt-op 4 cal file max-sta 512 raw 0 hwcrypto 1 [ 19.716178] ath: EEPROM regdomain: 0x0 [ 19.716186] ath: EEPROM indicates default country code should be used [ 19.716193] ath: doing EEPROM country->regdmn map search [ 19.716202] ath: country maps to regdmn code: 0x3a [ 19.716209] ath: Country alpha2 being used: US [ 19.716215] ath: Regpair used: 0x3a [ 19.724461] u32 classifier [ 19.724481] input device check on [ 19.726054] Actions configured [ 19.730701] Mirror/redirect action on [ 19.736119] nf_conntrack version 0.5.0 (7523 buckets, 30092 max) [ 19.739611] ip_tables: (C) 2000-2006 Netfilter Core Team [ 19.824663] usbcore: registered new interface driver ums-alauda [ 19.825346] usbcore: registered new interface driver ums-cypress [ 19.830068] usbcore: registered new interface driver ums-datafab [ 19.836357] usbcore: registered new interface driver ums-freecom [ 19.842383] usbcore: registered new interface driver ums-isd200 [ 19.848303] usbcore: registered new interface driver ums-jumpshot [ 19.853992] usbcore: registered new interface driver ums-karma [ 19.860325] usbcore: registered new interface driver ums-sddr09 [ 19.866016] usbcore: registered new interface driver ums-sddr55 [ 19.871818] usbcore: registered new interface driver ums-usbat [ 19.889070] xt_time: kernel timezone is -0000 [ 19.893315] PPP generic driver version 2.4.2 [ 19.894029] NET: Registered protocol family 24 [ 22.945241] eth0: device MAC address 00:06:3b:01:41:00 [ 22.960202] device eth0.1 entered promiscuous mode [ 22.960226] device eth0 entered promiscuous mode [ 22.967086] br-lan: port 1(eth0.1) entered forwarding state [ 22.968679] br-lan: port 1(eth0.1) entered forwarding state [ 24.942486] ipq806x-gmac-dwmac 37200000.ethernet eth0: Link is Up - 1Gbps/Full - flow control off [ 24.962260] br-lan: port 1(eth0.1) entered forwarding state On 03/04/16 06:05, Imre Kaloz wrote: > Hi Adrian, > > On Sat, 02 Apr 2016 01:48:22 +0200, Adrian Panella > wrote: > >> Hi Imre, >> >> networking seems to be working for me. >> So far I have done only basic testing. Can access the router from lan >> and wlan. >> No permormance test done, though. >> >> If you have a repo you can share with your patchset, I could gladly >> compare to take advantage of both works. > > I'll have time for this today, but the weird part is that comparing > the dts I made and the one you submitted I see no difference when it > comes to ethernet configuration. > > Could you post your dmesg and the contents of the devinfo partition? > > > Thanks, > > Imre > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From leroi.lists at gmail.com Sun Apr 3 14:45:59 2016 From: leroi.lists at gmail.com (Roman Yeryomin) Date: Sun, 3 Apr 2016 21:45:59 +0300 Subject: [OpenWrt-Devel] [PATCH 1/5] ramips: mt7621: fix initramfs image for ubnt-erx Message-ID: <1459709159-25524-1-git-send-email-roman@advem.lv> Signed-off-by: Roman Yeryomin --- target/linux/ramips/image/mt7621.mk | 66 +++++++++++-------------------------- 1 file changed, 20 insertions(+), 46 deletions(-) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 745611f..76b4e48 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -11,51 +11,28 @@ define Build/seama-seal $(call Build/seama,-s $@.seama $(1)) endef -define Build/ubnt-erx-factory-compat - echo '21001:6' > $@.compat - $(TAR) -cf $@ --transform='s/^.*/compat/' $@.compat - $(RM) $@.compat -endef - -define Build/ubnt-erx-factory-kernel +define Build/ubnt-erx-factory-image if [ -e $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) ]; then \ - $(TAR) -rf $@ --transform='s/^.*/vmlinux.tmp/' $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE); \ + echo '21001:6' > $(1).compat; \ + $(TAR) -cf $(1) --transform='s/^.*/compat/' $(1).compat; \ + \ + $(TAR) -rf $(1) --transform='s/^.*/vmlinux.tmp/' $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE); \ + md5sum --binary $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) | awk '{print $$1}'> $(1).md5; \ + $(TAR) -rf $(1) --transform='s/^.*/vmlinux.tmp.md5/' $(1).md5; \ + \ + echo "dummy" > $(1).rootfs; \ + $(TAR) -rf $(1) --transform='s/^.*/squashfs.tmp/' $(1).rootfs; \ \ - md5sum --binary $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) | awk '{print $$1}'> $@.md5; \ - $(TAR) -rf $@ --transform='s/^.*/vmlinux.tmp.md5/' $@.md5; \ - $(RM) $@.md5; \ + md5sum --binary $(1).rootfs | awk '{print $$1}'> $(1).md5; \ + $(TAR) -rf $(1) --transform='s/^.*/squashfs.tmp.md5/' $(1).md5; \ + \ + echo '$(BOARD) $(VERSION_CODE) $(VERSION_NUMBER)' > $(1).version; \ + $(TAR) -rf $(1) --transform='s/^.*/version.tmp/' $(1).version; \ + \ + $(CP) $(1) $(BIN_DIR)/; \ fi endef -define Build/ubnt-erx-factory-rootfs - echo "dummy" > $@.rootfs - $(TAR) -rf $@ --transform='s/^.*/squashfs.tmp/' $@.rootfs - - md5sum --binary $@.rootfs | awk '{print $$1}'> $@.md5 - $(TAR) -rf $@ --transform='s/^.*/squashfs.tmp.md5/' $@.md5 - $(RM) $@.md5 - $(RM) $@.rootfs -endef - -define Build/ubnt-erx-factory-version - echo '$(BOARD) $(VERSION_CODE) $(VERSION_NUMBER)' > $@.version - $(TAR) -rf $@ --transform='s/^.*/version.tmp/' $@.version - $(RM) $@.version -endef - -# We need kernel+initrams fit into kernel partition -define Build/ubnt-erx-factory-check-size - @[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$($(TAR) -xf $@ vmlinux.tmp -O | wc -c)" ] || { \ - echo "WARNING: Initramfs kernel for image $@ is too big (kernel size: $$($(TAR) -xf $@ vmlinux.tmp -O | wc -c), max size $(1))" >&2; \ - $(RM) -f $@; \ - } - - @[ "$$($(TAR) -xf $@ vmlinux.tmp -O | wc -c)" -gt 0 ] || { \ - echo "WARNING: Kernel for image $@ not found" >&2; \ - $(RM) -f $@; \ - } -endef - ifeq ($(SUBTARGET),mt7621) TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 sap-g3200u3 ubnt-erx witi wf-2881 zbt-wg2626 endif @@ -134,12 +111,9 @@ define Device/ubnt-erx FILESYSTEMS := squashfs KERNEL_SIZE := 3145728 KERNEL := $(KERNEL_DTB) | uImage lzma - IMAGES := sysupgrade.tar $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),factory-initramfs.tar) - IMAGE/factory-initramfs.tar := ubnt-erx-factory-compat | \ - ubnt-erx-factory-kernel | \ - ubnt-erx-factory-rootfs | \ - ubnt-erx-factory-version | \ - ubnt-erx-factory-check-size $$(KERNEL_SIZE) + IMAGES := sysupgrade.tar + KERNEL_INITRAMFS := $$(KERNEL) | check-size $$(KERNEL_SIZE) | \ + ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar IMAGE/sysupgrade.tar := sysupgrade-nand endef -- 2.5.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From leroi.lists at gmail.com Sun Apr 3 14:46:51 2016 From: leroi.lists at gmail.com (Roman Yeryomin) Date: Sun, 3 Apr 2016 21:46:51 +0300 Subject: [OpenWrt-Devel] [PATCH 2/5] ramips: mt7621: add a device to TARGET_DEVICES after it's definition Message-ID: <1459709211-25570-1-git-send-email-roman@advem.lv> Signed-off-by: Roman Yeryomin --- target/linux/ramips/image/mt7621.mk | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 76b4e48..628954f 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -33,29 +33,29 @@ define Build/ubnt-erx-factory-image fi endef -ifeq ($(SUBTARGET),mt7621) - TARGET_DEVICES += mt7621 wsr-600 wsr-1166 dir-860l-b1 firewrt pbr-m1 re6500 sap-g3200u3 ubnt-erx witi wf-2881 zbt-wg2626 -endif - define Device/mt7621 DTS := MT7621 IMAGE_SIZE := $(ralink_default_fw_size_4M) endef +TARGET_DEVICES += mt7621 define Device/wsr-600 DTS := WSR-600 IMAGE_SIZE := $(ralink_default_fw_size_16M) endef +TARGET_DEVICES += wsr-600 define Device/re6500 DTS := RE6500 endef +TARGET_DEVICES += re6500 define Device/wsr-1166 DTS := WSR-1166 IMAGE/sysupgrade.bin := trx | pad-rootfs IMAGE_SIZE := $(ralink_default_fw_size_16M) endef +TARGET_DEVICES += wsr-1166 define Device/dir-860l-b1 DTS := DIR-860L-B1 @@ -71,30 +71,36 @@ define Device/dir-860l-b1 seama-seal -m "signature=wrgac13_dlink.2013gui_dir860lb" | \ check-size $$$$(IMAGE_SIZE) endef +TARGET_DEVICES += dir-860l-b1 define Device/firewrt DTS := FIREWRT IMAGE_SIZE := $(ralink_default_fw_size_16M) endef +TARGET_DEVICES += firewrt define Device/pbr-m1 DTS := PBR-M1 IMAGE_SIZE := $(ralink_default_fw_size_16M) endef +TARGET_DEVICES += pbr-m1 define Device/sap-g3200u3 DTS := SAP-G3200U3 endef +TARGET_DEVICES += sap-g3200u3 define Device/witi DTS := WITI IMAGE_SIZE := $(ralink_default_fw_size_16M) endef +TARGET_DEVICES += witi define Device/zbt-wg2626 DTS := ZBT-WG2626 IMAGE_SIZE := $(ralink_default_fw_size_16M) endef +TARGET_DEVICES += zbt-wg2626 define Device/wf-2881 DTS := WF-2881 @@ -105,6 +111,7 @@ define Device/wf-2881 KERNEL := $(KERNEL_DTB) | pad-offset 131072 64 | uImage lzma IMAGE/sysupgrade.bin := append-kernel | append-ubi | check-size $$$$(IMAGE_SIZE) endef +TARGET_DEVICES += wf-2881 define Device/ubnt-erx DTS := UBNT-ERX @@ -116,6 +123,7 @@ define Device/ubnt-erx ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar IMAGE/sysupgrade.tar := sysupgrade-nand endef +TARGET_DEVICES += ubnt-erx # FIXME: is this still needed? define Image/Prepare -- 2.5.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From leroi.lists at gmail.com Sun Apr 3 14:47:18 2016 From: leroi.lists at gmail.com (Roman Yeryomin) Date: Sun, 3 Apr 2016 21:47:18 +0300 Subject: [OpenWrt-Devel] [PATCH 3/5] ramips: enable device profiling by dts Message-ID: <1459709238-25616-1-git-send-email-roman@advem.lv> Signed-off-by: Roman Yeryomin --- target/linux/ramips/image/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index ddd67a2..6e0349f 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -32,6 +32,7 @@ KERNEL_LOADADDR := $(loadaddr-y) KERNEL_DTB = kernel-bin | patch-dtb | lzma define Device/Default + PROFILES = Default $$(DTS) KERNEL_DEPENDS = $$(wildcard ../dts/$$(DTS).dts) KERNEL := $(KERNEL_DTB) | uImage lzma IMAGES := sysupgrade.bin -- 2.5.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From leroi.lists at gmail.com Sun Apr 3 14:47:35 2016 From: leroi.lists at gmail.com (Roman Yeryomin) Date: Sun, 3 Apr 2016 21:47:35 +0300 Subject: [OpenWrt-Devel] [PATCH 4/5] ramips: mt7621: sync MQmaker WiTi profile name to dts name Message-ID: <1459709255-25662-1-git-send-email-roman@advem.lv> Signed-off-by: Roman Yeryomin --- target/linux/ramips/mt7621/profiles/mqmaker.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/ramips/mt7621/profiles/mqmaker.mk b/target/linux/ramips/mt7621/profiles/mqmaker.mk index ae35e7d..a9c79df 100644 --- a/target/linux/ramips/mt7621/profiles/mqmaker.mk +++ b/target/linux/ramips/mt7621/profiles/mqmaker.mk @@ -5,7 +5,7 @@ # See /LICENSE for more information. # -define Profile/witi +define Profile/WITI NAME:=MQmaker WiTi FEATURES+=rtc PACKAGES:=\ @@ -14,7 +14,7 @@ define Profile/witi kmod-rtc-pcf8563 kmod-i2c-mt7621 endef -define Profile/witi/Description +define Profile/WITI/Description Package set compatible with MQmaker WiTi board. endef -$(eval $(call Profile,witi)) +$(eval $(call Profile,WITI)) -- 2.5.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From leroi.lists at gmail.com Sun Apr 3 14:47:53 2016 From: leroi.lists at gmail.com (Roman Yeryomin) Date: Sun, 3 Apr 2016 21:47:53 +0300 Subject: [OpenWrt-Devel] [PATCH 5/5] ramips: mt7621: fix Ubiquiti EdgeRouter X profile Message-ID: <1459709273-25708-1-git-send-email-roman@advem.lv> Remove unnecessary packages to reduce image size so it fits in initramfs (to enable upgrading from factory firmware). Signed-off-by: Roman Yeryomin --- target/linux/ramips/mt7621/profiles/ubnt.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/ramips/mt7621/profiles/ubnt.mk b/target/linux/ramips/mt7621/profiles/ubnt.mk index b66b206..3f1af02 100644 --- a/target/linux/ramips/mt7621/profiles/ubnt.mk +++ b/target/linux/ramips/mt7621/profiles/ubnt.mk @@ -8,7 +8,8 @@ define Profile/UBNT-ERX NAME:=Ubiquiti EdgeRouter X FEATURES+=nand -usb - PACKAGES:=-kmod-mt76 -wpad-mini -kmod-cfg80211 + PACKAGES:=-kmod-mt76 -kmod-rt2800-pci -kmod-cfg80211 \ + -wpad-mini -iwinfo endef define Profile/UBNT-ERX/Description -- 2.5.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chrisrblake93 at gmail.com Sun Apr 3 20:56:25 2016 From: chrisrblake93 at gmail.com (Chris Blake) Date: Sun, 3 Apr 2016 20:56:25 -0400 Subject: [OpenWrt-Devel] [PATCH 0/2] Add support for a apm821xx target & the Cisco Meraki MR24 Message-ID: <1459731387-16624-1-git-send-email-chrisrblake93@gmail.com> These RFC patches were recommended by Imre Kaloz [0] to add support for the apm821xx SoC to support a subset of devices. Original discussion for these patches can be found at [1], and the previous RFC can be found at [2]. [0]: https://lists.openwrt.org/pipermail/openwrt-devel/2016-March/040626.html [1]: https://lists.openwrt.org/pipermail/openwrt-devel/2016-March/040615.html [2]: https://lists.openwrt.org/pipermail/openwrt-devel/2016-April/040641.html Chris Blake (2): Add support for the apm821xx Device Target Add support for the Cisco Meraki MR24 include/target.mk | 1 + package/kernel/linux/modules/other.mk | 2 +- target/linux/apm821xx/Makefile | 29 ++ .../linux/apm821xx/base-files/etc/board.d/01_leds | 25 ++ .../apm821xx/base-files/etc/board.d/02_network | 25 ++ target/linux/apm821xx/base-files/etc/diag.sh | 37 ++ target/linux/apm821xx/base-files/lib/apm821xx.sh | 39 ++ .../lib/preinit/03_preinit_do_apm821xx.sh | 12 + .../lib/preinit/05_set_iface_mac_apm821xx | 17 + .../lib/preinit/05_set_preinit_iface_apm821xx | 12 + .../apm821xx/base-files/lib/upgrade/merakinand.sh | 65 ++++ .../apm821xx/base-files/lib/upgrade/platform.sh | 55 +++ target/linux/apm821xx/config-4.4 | 305 +++++++++++++++ target/linux/apm821xx/dts/MR24.dts | 433 +++++++++++++++++++++ target/linux/apm821xx/image/Makefile | 81 ++++ .../200-add-meraki-mr24-ikarem-support.patch | 31 ++ .../700-powerpc_ibm_phy_add_ar8035.patch | 41 ++ .../800-ppc4xx-rng-fix-crash-during-init.patch | 117 ++++++ target/linux/apm821xx/profiles/00-default.mk | 16 + target/linux/apm821xx/profiles/meraki.mk | 17 + tools/firmware-utils/src/mkmerakifw.c | 10 + 21 files changed, 1369 insertions(+), 1 deletion(-) create mode 100644 target/linux/apm821xx/Makefile create mode 100755 target/linux/apm821xx/base-files/etc/board.d/01_leds create mode 100755 target/linux/apm821xx/base-files/etc/board.d/02_network create mode 100755 target/linux/apm821xx/base-files/etc/diag.sh create mode 100755 target/linux/apm821xx/base-files/lib/apm821xx.sh create mode 100644 target/linux/apm821xx/base-files/lib/preinit/03_preinit_do_apm821xx.sh create mode 100644 target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx create mode 100644 target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx create mode 100755 target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh create mode 100755 target/linux/apm821xx/base-files/lib/upgrade/platform.sh create mode 100644 target/linux/apm821xx/config-4.4 create mode 100644 target/linux/apm821xx/dts/MR24.dts create mode 100644 target/linux/apm821xx/image/Makefile create mode 100644 target/linux/apm821xx/patches-4.4/200-add-meraki-mr24-ikarem-support.patch create mode 100644 target/linux/apm821xx/patches-4.4/700-powerpc_ibm_phy_add_ar8035.patch create mode 100644 target/linux/apm821xx/patches-4.4/800-ppc4xx-rng-fix-crash-during-init.patch create mode 100644 target/linux/apm821xx/profiles/00-default.mk create mode 100644 target/linux/apm821xx/profiles/meraki.mk -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chrisrblake93 at gmail.com Sun Apr 3 20:56:26 2016 From: chrisrblake93 at gmail.com (Chris Blake) Date: Sun, 3 Apr 2016 20:56:26 -0400 Subject: [OpenWrt-Devel] [PATCH 1/2] Add support for the apm821xx Device Target In-Reply-To: <1459731387-16624-1-git-send-email-chrisrblake93@gmail.com> References: <1459731387-16624-1-git-send-email-chrisrblake93@gmail.com> Message-ID: <1459731387-16624-2-git-send-email-chrisrblake93@gmail.com> This adds a new target for PowerPC APM821xx (464-based) boards, as well as adds support for the booke-wdt watchdog package. Signed-off-by: Chris Blake --- include/target.mk | 1 + package/kernel/linux/modules/other.mk | 2 +- target/linux/apm821xx/Makefile | 29 ++ .../apm821xx/base-files/etc/board.d/02_network | 22 ++ .../lib/preinit/03_preinit_do_apm821xx.sh | 12 + .../lib/preinit/05_set_preinit_iface_apm821xx | 12 + target/linux/apm821xx/config-4.4 | 298 +++++++++++++++++++++ target/linux/apm821xx/image/Makefile | 24 ++ .../700-powerpc_ibm_phy_add_ar8035.patch | 41 +++ .../800-ppc4xx-rng-fix-crash-during-init.patch | 117 ++++++++ target/linux/apm821xx/profiles/00-default.mk | 16 ++ 11 files changed, 573 insertions(+), 1 deletion(-) create mode 100644 target/linux/apm821xx/Makefile create mode 100755 target/linux/apm821xx/base-files/etc/board.d/02_network create mode 100644 target/linux/apm821xx/base-files/lib/preinit/03_preinit_do_apm821xx.sh create mode 100644 target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx create mode 100644 target/linux/apm821xx/config-4.4 create mode 100644 target/linux/apm821xx/image/Makefile create mode 100644 target/linux/apm821xx/patches-4.4/700-powerpc_ibm_phy_add_ar8035.patch create mode 100644 target/linux/apm821xx/patches-4.4/800-ppc4xx-rng-fix-crash-during-init.patch create mode 100644 target/linux/apm821xx/profiles/00-default.mk diff --git a/include/target.mk b/include/target.mk index 76fbd99..5bdb7bf 100644 --- a/include/target.mk +++ b/include/target.mk @@ -253,6 +253,7 @@ ifeq ($(DUMP),1) CPU_CFLAGS_8540:=-mcpu=8540 CPU_CFLAGS_405:=-mcpu=405 CPU_CFLAGS_440:=-mcpu=440 + CPU_CFLAGS_464fp:=-mcpu=464fp endif ifeq ($(ARCH),sparc) CPU_TYPE = sparc diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 528d32f..6624353 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -517,7 +517,7 @@ $(eval $(call KernelPackage,wdt-orion)) define KernelPackage/booke-wdt SUBMENU:=$(OTHER_MENU) TITLE:=PowerPC Book-E Watchdog Timer - DEPENDS:=@(TARGET_mpc85xx||TARGET_ppc40x||TARGET_ppc44x) + DEPENDS:=@(TARGET_apm821xx||TARGET_mpc85xx||TARGET_ppc40x||TARGET_ppc44x) KCONFIG:=CONFIG_BOOKE_WDT FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/booke_wdt.ko AUTOLOAD:=$(call AutoLoad,50,booke_wdt,1) diff --git a/target/linux/apm821xx/Makefile b/target/linux/apm821xx/Makefile new file mode 100644 index 0000000..d48dab0 --- /dev/null +++ b/target/linux/apm821xx/Makefile @@ -0,0 +1,29 @@ +# +# Copyright (C) 2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +ARCH:=powerpc +BOARD:=apm821xx +BOARDNAME:=AppliedMicro APM821xx +CPU_TYPE:=464fp +FEATURES:=squashfs nand rtc fpu ramdisk +MAINTAINER:=Imre Kaloz + +KERNEL_PATCHVER:=4.4 + +include $(INCLUDE_DIR)/target.mk + +KERNELNAME:=uImage + +DEFAULT_PACKAGES += \ + kmod-leds-gpio kmod-booke-wdt wpad-mini + +define Target/Description + Build images for AppliedMicro APM821xx based boards. +endef + +$(eval $(call BuildTarget)) diff --git a/target/linux/apm821xx/base-files/etc/board.d/02_network b/target/linux/apm821xx/base-files/etc/board.d/02_network new file mode 100755 index 0000000..c7d067b --- /dev/null +++ b/target/linux/apm821xx/base-files/etc/board.d/02_network @@ -0,0 +1,22 @@ +#!/bin/sh +# +# Copyright (C) 2016 OpenWrt.org +# + +. /lib/functions/system.sh +. /lib/functions/uci-defaults.sh +. /lib/apm821xx.sh + +board_config_update + +board=$(apm821xx_board_name) + +case "$board" in +*) + ucidef_set_interfaces_lan_wan "eth0" "eth1" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/apm821xx/base-files/lib/preinit/03_preinit_do_apm821xx.sh b/target/linux/apm821xx/base-files/lib/preinit/03_preinit_do_apm821xx.sh new file mode 100644 index 0000000..53ca2f5 --- /dev/null +++ b/target/linux/apm821xx/base-files/lib/preinit/03_preinit_do_apm821xx.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# +# Copyright (C) 2016 OpenWrt.org +# + +do_apm821xx() { + . /lib/apm821xx.sh + + apm821xx_board_detect +} + +boot_hook_add preinit_main do_apm821xx diff --git a/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx b/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx new file mode 100644 index 0000000..5ccd8b6 --- /dev/null +++ b/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx @@ -0,0 +1,12 @@ +#!/bin/sh +# +# Copyright (C) 2016 OpenWrt.org +# + +. /lib/apm821xx.sh + +apm821xx_set_preinit_iface() { + ifname=eth0 +} + +boot_hook_add preinit_main apm821xx_set_preinit_iface diff --git a/target/linux/apm821xx/config-4.4 b/target/linux/apm821xx/config-4.4 new file mode 100644 index 0000000..0c1657b --- /dev/null +++ b/target/linux/apm821xx/config-4.4 @@ -0,0 +1,298 @@ +# CONFIG_40x is not set +CONFIG_44x=y +CONFIG_4xx=y +CONFIG_4xx_SOC=y +# CONFIG_ADVANCED_OPTIONS is not set +# CONFIG_ARCHES is not set +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +# CONFIG_ARCH_RANDOM is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_AT803X_PHY=y +CONFIG_AUDIT_ARCH=y +# CONFIG_BAMBOO is not set +CONFIG_BCH=y +# CONFIG_BLUESTONE is not set +CONFIG_BOOKE=y +CONFIG_BOUNCE=y +# CONFIG_CANYONLANDS is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_CMDLINE="rootfstype=squashfs noinitrd" +CONFIG_CMDLINE_BOOL=y +CONFIG_CONSISTENT_SIZE=0x00200000 +CONFIG_CPU_BIG_ENDIAN=y +CONFIG_CRC16=y +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_DEV_PPC4XX=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_MD5_PPC=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_SHA1_PPC=y +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_XZ=y +CONFIG_DECOMPRESS_GZIP=y +# CONFIG_DEFAULT_UIMAGE is not set +CONFIG_DTC=y +# CONFIG_E200 is not set +CONFIG_EARLY_PRINTK=y +# CONFIG_EBONY is not set +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +# CONFIG_EIGER is not set +# CONFIG_EPAPR_BOOT is not set +CONFIG_EXTRA_TARGETS="uImage" +# CONFIG_FSL_ULI1575 is not set +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CMOS_UPDATE=y +# CONFIG_GENERIC_CSUM is not set +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_NVRAM=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +# CONFIG_GENERIC_TBSYNC is not set +CONFIG_GENERIC_TIME_VSYSCALL_OLD=y +# CONFIG_GEN_RTC is not set +# CONFIG_GE_FPGA is not set +# CONFIG_GLACIER is not set +CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +# CONFIG_HAS_RAPIDIO is not set +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_BPF_JIT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_HAVE_GENERIC_RCU_GUP=y +CONFIG_HAVE_IDE=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_PPC4XX=y +CONFIG_HZ=1000 +# CONFIG_HZ_100 is not set +CONFIG_HZ_1000=y +CONFIG_HZ_PERIODIC=y +CONFIG_IBM_EMAC=y +CONFIG_IBM_EMAC_POLL_WEIGHT=32 +CONFIG_IBM_EMAC_RXB=128 +CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256 +CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0 +CONFIG_IBM_EMAC_TXB=128 +# CONFIG_ICON is not set +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_IOMMU_HELPER is not set +# CONFIG_IPIC is not set +CONFIG_IRQCHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_IRQ_WORK=y +CONFIG_ISA_DMA_API=y +# CONFIG_KATMAI is not set +CONFIG_KERNEL_START=0xc0000000 +CONFIG_LIBFDT=y +CONFIG_LOWMEM_SIZE=0x30000000 +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +# CONFIG_MATH_EMULATION is not set +CONFIG_MDIO_BOARDINFO=y +# CONFIG_MMIO_NVRAM is not set +CONFIG_MODULES_USE_ELF_RELA=y +# CONFIG_MPIC is not set +# CONFIG_MPIC_U3_HT_IRQS is not set +# CONFIG_MPIC_WEIRD is not set +CONFIG_MTD_CFI_ADV_OPTIONS=y +# CONFIG_MTD_CFI_GEOMETRY is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_BCH=y +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_ECC_BCH=y +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND_NDFC=y +CONFIG_MTD_SPLIT_FIRMWARE=y +CONFIG_MTD_SPLIT_UIMAGE_FW=y +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_BEB_LIMIT=20 +CONFIG_MTD_UBI_BLOCK=y +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_NEED_DMA_MAP_STATE=y +# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set +CONFIG_NEED_PER_CPU_KM=y +CONFIG_NEED_SG_DMA_LENGTH=y +# CONFIG_NONSTATIC_KERNEL is not set +CONFIG_NOT_COHERENT_CACHE=y +CONFIG_NO_BOOTMEM=y +CONFIG_NR_IRQS=512 +CONFIG_OF=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_ADDRESS_PCI=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_FLATTREE=y +CONFIG_OF_GPIO=y +CONFIG_OF_IRQ=y +CONFIG_OF_MDIO=y +CONFIG_OF_MTD=y +CONFIG_OF_NET=y +CONFIG_OF_PCI=y +CONFIG_OF_PCI_IRQ=y +CONFIG_OF_RESERVED_MEM=y +CONFIG_OLD_SIGACTION=y +CONFIG_OLD_SIGSUSPEND=y +CONFIG_PAGE_OFFSET=0xc0000000 +CONFIG_PCI=y +CONFIG_PCIEAER=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCI_BUS_ADDR_T_64BIT=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_MSI=y +CONFIG_PGTABLE_LEVELS=2 +CONFIG_PHYLIB=y +CONFIG_PHYSICAL_START=0x00000000 +CONFIG_PHYS_64BIT=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_PPC=y +CONFIG_PPC32=y +CONFIG_PPC44x_SIMPLE=y +CONFIG_PPC4xx_GPIO=y +# CONFIG_PPC4xx_HSTA_MSI is not set +# CONFIG_PPC4xx_MSI is not set +CONFIG_PPC4xx_OCM=y +# CONFIG_PPC4xx_PCI_EXPRESS is not set +# CONFIG_PPC64 is not set +# CONFIG_PPC_47x is not set +# CONFIG_PPC_85xx is not set +# CONFIG_PPC_8xx is not set +# CONFIG_PPC_970_NAP is not set +CONFIG_PPC_ADV_DEBUG_DACS=2 +CONFIG_PPC_ADV_DEBUG_DAC_RANGE=y +CONFIG_PPC_ADV_DEBUG_DVCS=2 +CONFIG_PPC_ADV_DEBUG_IACS=4 +CONFIG_PPC_ADV_DEBUG_REGS=y +# CONFIG_PPC_BOOK3S_32 is not set +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PPC_COPRO_BASE is not set +CONFIG_PPC_DCR=y +# CONFIG_PPC_DCR_MMIO is not set +CONFIG_PPC_DCR_NATIVE=y +# CONFIG_PPC_DOORBELL is not set +# CONFIG_PPC_EARLY_DEBUG is not set +# CONFIG_PPC_EPAPR_HV_PIC is not set +# CONFIG_PPC_I8259 is not set +# CONFIG_PPC_ICP_HV is not set +# CONFIG_PPC_ICP_NATIVE is not set +# CONFIG_PPC_ICS_RTAS is not set +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_PPC_LIB_RHEAP=y +CONFIG_PPC_MMU_NOHASH=y +# CONFIG_PPC_MM_SLICES is not set +# CONFIG_PPC_MPC106 is not set +# CONFIG_PPC_P7_NAP is not set +CONFIG_PPC_PCI_CHOICE=y +# CONFIG_PPC_RTAS is not set +CONFIG_PPC_UDBG_16550=y +CONFIG_PPC_WERROR=y +# CONFIG_PPC_XICS is not set +# CONFIG_PQ2ADS is not set +CONFIG_PTE_64BIT=y +# CONFIG_RAINIER is not set +CONFIG_RAS=y +# CONFIG_RCU_STALL_COMMON is not set +CONFIG_RD_GZIP=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_SAM440EP is not set +CONFIG_SCHED_HRTICK=y +# CONFIG_SCHED_INFO is not set +# CONFIG_SCSI_DMA is not set +# CONFIG_SEQUOIA is not set +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_FSL=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SIMPLE_GPIO=y +CONFIG_SPARSE_IRQ=y +CONFIG_SRCU=y +# CONFIG_STRICT_MM_TYPECHECKS is not set +# CONFIG_SWIOTLB is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y +# CONFIG_TAISHAN is not set +CONFIG_TASK_SIZE=0xc0000000 +CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_UBIFS_FS=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_XZ=y +CONFIG_UBIFS_FS_ZLIB=y +CONFIG_USB_SUPPORT=y +CONFIG_VDSO32=y +# CONFIG_WARP is not set +CONFIG_WORD_SIZE=32 +# CONFIG_XILINX_SYSACE is not set +# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set +CONFIG_XZ_DEC_BCJ=y +CONFIG_XZ_DEC_POWERPC=y +# CONFIG_YOSEMITE is not set +CONFIG_ZLIB_DEFLATE=y +CONFIG_ZLIB_INFLATE=y diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile new file mode 100644 index 0000000..a9608e7 --- /dev/null +++ b/target/linux/apm821xx/image/Makefile @@ -0,0 +1,24 @@ +# +# Copyright (C) 2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/image.mk + +IMAGE_PROFILE:=$(if $(PROFILE),$(PROFILE),Default) + +DEVICE_VARS += DTS IMAGE_SIZE + +define Device/Default + BOARDNAME := + DEVICE_PROFILE = $$(BOARDNAME) + PROFILES = Default $$(DEVICE_PROFILE) + KERNEL_DEPENDS = $$(wildcard ../dts/$$(DTS).dts) + KERNEL := kernel-bin | lzma | uImage lzma + KERNEL_INITRAMFS := kernel-bin | lzma | uImage lzma +endef +TARGET_DEVICES += Default + +$(eval $(call BuildImage)) diff --git a/target/linux/apm821xx/patches-4.4/700-powerpc_ibm_phy_add_ar8035.patch b/target/linux/apm821xx/patches-4.4/700-powerpc_ibm_phy_add_ar8035.patch new file mode 100644 index 0000000..b0c1eeb --- /dev/null +++ b/target/linux/apm821xx/patches-4.4/700-powerpc_ibm_phy_add_ar8035.patch @@ -0,0 +1,41 @@ +--- a/drivers/net/ethernet/ibm/emac/phy.c ++++ b/drivers/net/ethernet/ibm/emac/phy.c +@@ -470,12 +470,38 @@ static struct mii_phy_def m88e1112_phy_d + .ops = &m88e1112_phy_ops, + }; + ++static int ar8035_init(struct mii_phy *phy) ++{ ++ phy_write(phy, 0x1d, 0x5); /* Address debug register 5 */ ++ phy_write(phy, 0x1e, 0x2d47); /* ?? Value copied from u-boot */ ++ phy_write(phy, 0x1d, 0xb); /* Address hib ctrl */ ++ phy_write(phy, 0x1e, 0xbc20); /* Another poorly documented register */ ++ ++ return 0; ++} ++ ++static struct mii_phy_ops ar8035_phy_ops = { ++ .init = ar8035_init, ++ .setup_aneg = genmii_setup_aneg, ++ .setup_forced = genmii_setup_forced, ++ .poll_link = genmii_poll_link, ++ .read_link = genmii_read_link, ++}; ++ ++static struct mii_phy_def ar8035_phy_def = { ++ .phy_id = 0x004dd070, ++ .phy_id_mask = 0xfffffff0, ++ .name = "Atheros 8035 Gigabit Ethernet", ++ .ops = &ar8035_phy_ops, ++}; ++ + static struct mii_phy_def *mii_phy_table[] = { + &et1011c_phy_def, + &cis8201_phy_def, + &bcm5248_phy_def, + &m88e1111_phy_def, + &m88e1112_phy_def, ++ &ar8035_phy_def, + &genmii_phy_def, + NULL + }; diff --git a/target/linux/apm821xx/patches-4.4/800-ppc4xx-rng-fix-crash-during-init.patch b/target/linux/apm821xx/patches-4.4/800-ppc4xx-rng-fix-crash-during-init.patch new file mode 100644 index 0000000..6eed32f --- /dev/null +++ b/target/linux/apm821xx/patches-4.4/800-ppc4xx-rng-fix-crash-during-init.patch @@ -0,0 +1,117 @@ +From 2159e200fcb68f88a94b1d5570d6000c100133a8 Mon Sep 17 00:00:00 2001 +From: Christian Lamparter +Date: Fri, 25 Mar 2016 19:00:05 +0100 +Subject: [PATCH] ppc4xx-rng: fix crash during init + +This patch fixes a crash that happens in the ppc4xx-rng driver +when accessing the main crypto core to enable the true random +number generator. + +Signed-off-by: Christian Lamparter +--- + drivers/char/hw_random/ppc4xx-rng.c | 42 --------------------------------- + drivers/crypto/amcc/crypto4xx_core.c | 1 + + drivers/crypto/amcc/crypto4xx_reg_def.h | 1 + + 3 files changed, 2 insertions(+), 42 deletions(-) + +diff --git a/drivers/char/hw_random/ppc4xx-rng.c b/drivers/char/hw_random/ppc4xx-rng.c +index c0db438..a9a8a29 100644 +--- a/drivers/char/hw_random/ppc4xx-rng.c ++++ b/drivers/char/hw_random/ppc4xx-rng.c +@@ -17,9 +17,6 @@ + #include + #include + +-#define PPC4XX_TRNG_DEV_CTRL 0x60080 +- +-#define PPC4XX_TRNGE 0x00020000 + #define PPC4XX_TRNG_CTRL 0x0008 + #define PPC4XX_TRNG_CTRL_DALM 0x20 + #define PPC4XX_TRNG_STAT 0x0004 +@@ -51,40 +48,6 @@ static int ppc4xx_rng_data_read(struct hwrng *rng, u32 *data) + return 4; + } + +-static int ppc4xx_rng_enable(int enable) +-{ +- struct device_node *ctrl; +- void __iomem *ctrl_reg; +- int err = 0; +- u32 val; +- +- /* Find the main crypto device node and map it to turn the TRNG on */ +- ctrl = of_find_compatible_node(NULL, NULL, "amcc,ppc4xx-crypto"); +- if (!ctrl) +- return -ENODEV; +- +- ctrl_reg = of_iomap(ctrl, 0); +- if (!ctrl_reg) { +- err = -ENODEV; +- goto out; +- } +- +- val = in_le32(ctrl_reg + PPC4XX_TRNG_DEV_CTRL); +- +- if (enable) +- val |= PPC4XX_TRNGE; +- else +- val = val & ~PPC4XX_TRNGE; +- +- out_le32(ctrl_reg + PPC4XX_TRNG_DEV_CTRL, val); +- iounmap(ctrl_reg); +- +-out: +- of_node_put(ctrl); +- +- return err; +-} +- + static struct hwrng ppc4xx_rng = { + .name = MODULE_NAME, + .data_present = ppc4xx_rng_data_present, +@@ -100,10 +63,6 @@ static int ppc4xx_rng_probe(struct platform_device *dev) + if (!rng_regs) + return -ENODEV; + +- err = ppc4xx_rng_enable(1); +- if (err) +- return err; +- + out_le32(rng_regs + PPC4XX_TRNG_CTRL, PPC4XX_TRNG_CTRL_DALM); + ppc4xx_rng.priv = (unsigned long) rng_regs; + +@@ -117,7 +76,6 @@ static int ppc4xx_rng_remove(struct platform_device *dev) + void __iomem *rng_regs = (void __iomem *) ppc4xx_rng.priv; + + hwrng_unregister(&ppc4xx_rng); +- ppc4xx_rng_enable(0); + iounmap(rng_regs); + + return 0; +diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c +index 62134c8..cb0b262 100644 +--- a/drivers/crypto/amcc/crypto4xx_core.c ++++ b/drivers/crypto/amcc/crypto4xx_core.c +@@ -90,6 +90,7 @@ static void crypto4xx_hw_init(struct crypto4xx_device *dev) + writel(ring_ctrl.w, dev->ce_base + CRYPTO4XX_RING_CTRL); + device_ctrl = readl(dev->ce_base + CRYPTO4XX_DEVICE_CTRL); + device_ctrl |= PPC4XX_DC_3DES_EN; ++ device_ctrl |= PPC4XX_TRNGE; + writel(device_ctrl, dev->ce_base + CRYPTO4XX_DEVICE_CTRL); + writel(dev->gdr_pa, dev->ce_base + CRYPTO4XX_GATH_RING_BASE); + writel(dev->sdr_pa, dev->ce_base + CRYPTO4XX_SCAT_RING_BASE); +diff --git a/drivers/crypto/amcc/crypto4xx_reg_def.h b/drivers/crypto/amcc/crypto4xx_reg_def.h +index 5f5fbc0..914efc6 100644 +--- a/drivers/crypto/amcc/crypto4xx_reg_def.h ++++ b/drivers/crypto/amcc/crypto4xx_reg_def.h +@@ -124,6 +124,7 @@ + #define PPC4XX_BYTE_ORDER 0x22222 + #define PPC4XX_INTERRUPT_CLR 0x3ffff + #define PPC4XX_PRNG_CTRL_AUTO_EN 0x3 ++#define PPC4XX_TRNGE 0x00020000 + #define PPC4XX_DC_3DES_EN 1 + #define PPC4XX_INT_DESCR_CNT 4 + #define PPC4XX_INT_TIMEOUT_CNT 0 +-- +2.8.0.rc3 + diff --git a/target/linux/apm821xx/profiles/00-default.mk b/target/linux/apm821xx/profiles/00-default.mk new file mode 100644 index 0000000..acd1fdf --- /dev/null +++ b/target/linux/apm821xx/profiles/00-default.mk @@ -0,0 +1,16 @@ +# +# Copyright (C) 2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Default + NAME:=Default Profile (all drivers) + PACKAGES:=kmod-usb-core kmod-usb2 kmod-usb2-fsl +endef + +define Profile/Default/Description + Default package set compatible with most boards. +endef +$(eval $(call Profile,Default)) -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chrisrblake93 at gmail.com Sun Apr 3 20:56:27 2016 From: chrisrblake93 at gmail.com (Chris Blake) Date: Sun, 3 Apr 2016 20:56:27 -0400 Subject: [OpenWrt-Devel] [PATCH 2/2] Add support for the Cisco Meraki MR24 In-Reply-To: <1459731387-16624-1-git-send-email-chrisrblake93@gmail.com> References: <1459731387-16624-1-git-send-email-chrisrblake93@gmail.com> Message-ID: <1459731387-16624-3-git-send-email-chrisrblake93@gmail.com> This patch adds support for the Cisco Meraki MR24 Access point to the apm821xx target. More info on the device can be found at https://wiki.openwrt.org/toh/meraki/mr24 Signed-off-by: Chris Blake --- .../linux/apm821xx/base-files/etc/board.d/01_leds | 25 ++ .../apm821xx/base-files/etc/board.d/02_network | 3 + target/linux/apm821xx/base-files/etc/diag.sh | 37 ++ target/linux/apm821xx/base-files/lib/apm821xx.sh | 39 ++ .../lib/preinit/05_set_iface_mac_apm821xx | 17 + .../apm821xx/base-files/lib/upgrade/merakinand.sh | 65 ++++ .../apm821xx/base-files/lib/upgrade/platform.sh | 55 +++ target/linux/apm821xx/config-4.4 | 11 +- target/linux/apm821xx/dts/MR24.dts | 433 +++++++++++++++++++++ target/linux/apm821xx/image/Makefile | 57 +++ .../200-add-meraki-mr24-ikarem-support.patch | 31 ++ target/linux/apm821xx/profiles/meraki.mk | 17 + tools/firmware-utils/src/mkmerakifw.c | 10 + 13 files changed, 798 insertions(+), 2 deletions(-) create mode 100755 target/linux/apm821xx/base-files/etc/board.d/01_leds create mode 100755 target/linux/apm821xx/base-files/etc/diag.sh create mode 100755 target/linux/apm821xx/base-files/lib/apm821xx.sh create mode 100644 target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx create mode 100755 target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh create mode 100755 target/linux/apm821xx/base-files/lib/upgrade/platform.sh create mode 100644 target/linux/apm821xx/dts/MR24.dts create mode 100644 target/linux/apm821xx/patches-4.4/200-add-meraki-mr24-ikarem-support.patch create mode 100644 target/linux/apm821xx/profiles/meraki.mk diff --git a/target/linux/apm821xx/base-files/etc/board.d/01_leds b/target/linux/apm821xx/base-files/etc/board.d/01_leds new file mode 100755 index 0000000..a94871f --- /dev/null +++ b/target/linux/apm821xx/base-files/etc/board.d/01_leds @@ -0,0 +1,25 @@ +#!/bin/sh +# +# Copyright (C) 2016 OpenWrt.org +# + +. /lib/functions/uci-defaults.sh +. /lib/apm821xx.sh + +board_config_update + +board=$(apm821xx_board_name) + +case "$board" in +mr24) + ucidef_set_led_netdev "wan" "WAN" "mr24:green:wan" "eth0" + ucidef_set_led_wlan "wlan1" "WLAN1" "mr24:green:wifi1" "phy0assoc" + ucidef_set_led_wlan "wlan2" "WLAN2" "mr24:green:wifi2" "phy0assoc" + ucidef_set_led_wlan "wlan3" "WLAN3" "mr24:green:wifi3" "phy0assoc" + ucidef_set_led_wlan "wlan4" "WLAN4" "mr24:green:wifi4" "phy0tpt" + ;; +esac + +board_config_flush + +exit 0 diff --git a/target/linux/apm821xx/base-files/etc/board.d/02_network b/target/linux/apm821xx/base-files/etc/board.d/02_network index c7d067b..9738b4e 100755 --- a/target/linux/apm821xx/base-files/etc/board.d/02_network +++ b/target/linux/apm821xx/base-files/etc/board.d/02_network @@ -12,6 +12,9 @@ board_config_update board=$(apm821xx_board_name) case "$board" in +mr24) + ucidef_set_interface_lan "eth0" + ;; *) ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; diff --git a/target/linux/apm821xx/base-files/etc/diag.sh b/target/linux/apm821xx/base-files/etc/diag.sh new file mode 100755 index 0000000..787d0e1 --- /dev/null +++ b/target/linux/apm821xx/base-files/etc/diag.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# +# Copyright (C) 2016 OpenWrt.org +# + +. /lib/functions/leds.sh +. /lib/apm821xx.sh + +get_status_led() { + case $(apm821xx_board_name) in + mr24) + status_led="mr24:green:power" + ;; + esac +} + +set_state() { + get_status_led + + case "$1" in + preinit) + status_led_blink_preinit + ;; + + failsafe) + status_led_blink_failsafe + ;; + + preinit_regular) + status_led_blink_preinit_regular + ;; + + done) + status_led_on + ;; + esac +} diff --git a/target/linux/apm821xx/base-files/lib/apm821xx.sh b/target/linux/apm821xx/base-files/lib/apm821xx.sh new file mode 100755 index 0000000..cfb1536 --- /dev/null +++ b/target/linux/apm821xx/base-files/lib/apm821xx.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# +# Copyright (C) 2016 OpenWrt.org +# + +APM821XX_BOARD_NAME= +APM821XX_MODEL= + +apm821xx_board_detect() { + local model + local name + + model=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /model/ {print $2}' /proc/cpuinfo) + + case "$model" in + *"Meraki MR24 Access Point") + name="mr24" + ;; + esac + + [ -z "$name" ] && name="unknown" + + [ -z "$APM821XX_BOARD_NAME" ] && APM821XX_BOARD_NAME="$name" + [ -z "$APM821XX_MODEL" ] && APM821XX_MODEL="$model" + + [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" + + echo "$APM821XX_BOARD_NAME" > /tmp/sysinfo/board_name + echo "$APM821XX_MODEL" > /tmp/sysinfo/model +} + +apm821xx_board_name() { + local name + + [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name) + [ -z "$name" ] && name="unknown" + + echo "$name" +} diff --git a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx new file mode 100644 index 0000000..773a761 --- /dev/null +++ b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Copyright (C) 2016 OpenWrt.org +# + +. /lib/apm821xx.sh + +preinit_set_mac_address() { + case $(apm821xx_board_name) in + mr24) + mac_lan=$(mtd_get_mac_binary_ubi board-config 102) + [ -n "$mac_lan" ] && ifconfig eth0 hw ether "$mac_lan" + ;; + esac +} + +boot_hook_add preinit_main preinit_set_mac_address diff --git a/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh b/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh new file mode 100755 index 0000000..5861d97 --- /dev/null +++ b/target/linux/apm821xx/base-files/lib/upgrade/merakinand.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# +# Copyright (C) 2016 Chris Blake +# +# Custom upgrade script for Meraki NAND devices (ex. MR24) +# Based on merakinand.sh from the ar71xx target +# +. /lib/apm821xx.sh +. /lib/functions.sh + +merakinand_do_kernel_check() { + local board_name="$1" + local tar_file="$2" + local image_magic_word=`(tar xf $tar_file sysupgrade-$board_name/kernel -O 2>/dev/null | dd bs=1 count=4 skip=0 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"')` + + # What is our kernel magic string? + case "$board_name" in + "mr24") + [ "$image_magic_word" == "8e73ed8a" ] && { + echo "pass" && return 0 + } + ;; + esac + + exit 1 +} + +merakinand_do_platform_check() { + local board_name="$1" + local tar_file="$2" + local control_length=`(tar xf $tar_file sysupgrade-$board_name/CONTROL -O | wc -c) 2> /dev/null` + local file_type="$(identify_tar $2 sysupgrade-$board_name/root)" + local kernel_magic="$(merakinand_do_kernel_check $1 $2)" + + case "$board_name" in + "mr24") + [ "$control_length" = 0 -o "$file_type" != "squashfs" -o "$kernel_magic" != "pass" ] && { + echo "Invalid sysupgrade file for $board_name" + return 1 + } + ;; + *) + echo "Unsupported device $board_name"; + return 1 + ;; + esac + + return 0 +} + +merakinand_do_upgrade() { + local tar_file="$1" + local board_name="$(cat /tmp/sysinfo/board_name)" + + # Do we need to do any platform tweaks? + case "$board_name" in + "mr24") + nand_do_upgrade $1 + ;; + *) + echo "Unsupported device $board_name"; + exit 1 + ;; + esac +} diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh new file mode 100755 index 0000000..f927a79 --- /dev/null +++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh @@ -0,0 +1,55 @@ +# +# Copyright (C) 2016 OpenWrt.org +# + +. /lib/apm821xx.sh + +PART_NAME=firmware +RAMFS_COPY_DATA=/lib/apm821xx.sh + +platform_check_image() { + local board=$(apm821xx_board_name) + + [ "$#" -gt 1 ] && return 1 + + case "$board" in + mr24) + merakinand_do_platform_check $board $1 + return $?; + ;; + + esac + + echo "Sysupgrade is not yet supported on $board." + return 1 +} + +platform_pre_upgrade() { + local board=$(apm821xx_board_name) + + case "$board" in + mr24) + merakinand_do_upgrade "$1" + ;; + esac +} + +platform_do_upgrade() { + local board=$(apm821xx_board_name) + + case "$board" in + *) + default_do_upgrade "$ARGV" + ;; + esac +} + +disable_watchdog() { + killall watchdog + ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { + echo 'Could not disable watchdog' + return 1 + } +} + +append sysupgrade_pre_upgrade disable_watchdog diff --git a/target/linux/apm821xx/config-4.4 b/target/linux/apm821xx/config-4.4 index 0c1657b..dffb84a 100644 --- a/target/linux/apm821xx/config-4.4 +++ b/target/linux/apm821xx/config-4.4 @@ -3,6 +3,7 @@ CONFIG_44x=y CONFIG_4xx=y CONFIG_4xx_SOC=y # CONFIG_ADVANCED_OPTIONS is not set +CONFIG_APM821xx=y # CONFIG_ARCHES is not set CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -133,12 +134,16 @@ CONFIG_HZ=1000 CONFIG_HZ_1000=y CONFIG_HZ_PERIODIC=y CONFIG_IBM_EMAC=y +CONFIG_IBM_EMAC_EMAC4=y CONFIG_IBM_EMAC_POLL_WEIGHT=32 +CONFIG_IBM_EMAC_RGMII=y CONFIG_IBM_EMAC_RXB=128 CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256 CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0 +CONFIG_IBM_EMAC_TAH=y CONFIG_IBM_EMAC_TXB=128 # CONFIG_ICON is not set +CONFIG_IKAREM=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_IOMMU_HELPER is not set # CONFIG_IPIC is not set @@ -217,9 +222,9 @@ CONFIG_PPC32=y CONFIG_PPC44x_SIMPLE=y CONFIG_PPC4xx_GPIO=y # CONFIG_PPC4xx_HSTA_MSI is not set -# CONFIG_PPC4xx_MSI is not set +CONFIG_PPC4xx_MSI=y CONFIG_PPC4xx_OCM=y -# CONFIG_PPC4xx_PCI_EXPRESS is not set +CONFIG_PPC4xx_PCI_EXPRESS=y # CONFIG_PPC64 is not set # CONFIG_PPC_47x is not set # CONFIG_PPC_85xx is not set @@ -240,6 +245,7 @@ CONFIG_PPC_DCR_NATIVE=y # CONFIG_PPC_DOORBELL is not set # CONFIG_PPC_EARLY_DEBUG is not set # CONFIG_PPC_EPAPR_HV_PIC is not set +CONFIG_PPC_FPU=y # CONFIG_PPC_I8259 is not set # CONFIG_PPC_ICP_HV is not set # CONFIG_PPC_ICP_NATIVE is not set @@ -249,6 +255,7 @@ CONFIG_PPC_LIB_RHEAP=y CONFIG_PPC_MMU_NOHASH=y # CONFIG_PPC_MM_SLICES is not set # CONFIG_PPC_MPC106 is not set +CONFIG_PPC_MSI_BITMAP=y # CONFIG_PPC_P7_NAP is not set CONFIG_PPC_PCI_CHOICE=y # CONFIG_PPC_RTAS is not set diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/MR24.dts new file mode 100644 index 0000000..1e186e6 --- /dev/null +++ b/target/linux/apm821xx/dts/MR24.dts @@ -0,0 +1,433 @@ +/* + * Device Tree Source for Meraki MR24 (Ikarem) + * + * Copyright (C) 2016 Chris Blake + * + * Based on Cisco Meraki GPL Release r23-20150601 MR24 DTS + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without + * any warranty of any kind, whether express or implied. + */ + +/dts-v1/; + +/ { + #address-cells = <2>; + #size-cells = <1>; + model = "Meraki MR24 Access Point"; + compatible = "meraki,ikarem"; + dcr-parent = <&{/cpus/cpu at 0}>; + + aliases { + ethernet0 = &EMAC0; + serial0 = &UART0; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu at 0 { + device_type = "cpu"; + model = "PowerPC,apm821xx"; + reg = <0x00000000>; + clock-frequency = <0>; /* Filled in by U-Boot */ + timebase-frequency = <0>; /* Filled in by U-Boot */ + i-cache-line-size = <32>; + d-cache-line-size = <32>; + i-cache-size = <32768>; + d-cache-size = <32768>; + dcr-controller; + dcr-access-method = "native"; + next-level-cache = <&L2C0>; + }; + }; + + memory { + device_type = "memory"; + reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by U-Boot */ + }; + + UIC0: interrupt-controller0 { + compatible = "ibm,uic"; + interrupt-controller; + cell-index = <0>; + dcr-reg = <0x0c0 0x009>; + #address-cells = <0>; + #size-cells = <0>; + #interrupt-cells = <2>; + }; + + UIC1: interrupt-controller1 { + compatible = "ibm,uic"; + interrupt-controller; + cell-index = <1>; + dcr-reg = <0x0d0 0x009>; + #address-cells = <0>; + #size-cells = <0>; + #interrupt-cells = <2>; + interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ + interrupt-parent = <&UIC0>; + }; + + UIC2: interrupt-controller2 { + compatible = "ibm,uic"; + interrupt-controller; + cell-index = <2>; + dcr-reg = <0x0e0 0x009>; + #address-cells = <0>; + #size-cells = <0>; + #interrupt-cells = <2>; + interrupts = <0xa 0x4 0xb 0x4>; /* cascade */ + interrupt-parent = <&UIC0>; + }; + + UIC3: interrupt-controller3 { + compatible = "ibm,uic"; + interrupt-controller; + cell-index = <3>; + dcr-reg = <0x0f0 0x009>; + #address-cells = <0>; + #size-cells = <0>; + #interrupt-cells = <2>; + interrupts = <0x10 0x4 0x11 0x4>; /* cascade */ + interrupt-parent = <&UIC0>; + }; + + /* KPH check the following */ + OCM: ocm at 400040000 { + compatible = "ibm,ocm"; + status = "okay"; + cell-index = <1>; + /* configured in U-Boot */ + reg = <4 0x00040000 0x8000>; /* 32K */ + }; + + SDR0: sdr { + compatible = "ibm,sdr-apm821xx"; + dcr-reg = <0x00e 0x002>; + }; + + CPR0: cpr { + compatible = "ibm,cpr-apm821xx"; + dcr-reg = <0x00c 0x002>; + }; + + L2C0: l2c { + compatible = "ibm,l2-cache-apm82181", "ibm,l2-cache"; + dcr-reg = <0x020 0x008 + 0x030 0x008>; + cache-line-size = <32>; + cache-size = <262144>; + interrupt-parent = <&UIC1>; + interrupts = <11 1>; + }; + + /* kph check the below */ + CPM0: cpm { + compatible = "ibm,cpm-apm821xx", "ibm,cpm"; + cell-index = <0>; + dcr-reg = <0x160 0x003>; + pm-cpu = <0x02000000>; + pm-doze = <0x302570F0>; + pm-nap = <0x302570F0>; + pm-deepsleep = <0x302570F0>; + pm-iic-device = <&IIC0>; + pm-emac-device = <&EMAC0>; + }; + + plb { + compatible = "ibm,plb4"; + #address-cells = <2>; + #size-cells = <1>; + ranges; + clock-frequency = <0>; /* Filled in by U-Boot */ + + SDRAM0: sdram { + compatible = "ibm,sdram-apm821xx"; + dcr-reg = <0x010 0x002>; + }; + + /* kph check the below */ + CRYPTO: crypto at 180000 { + compatible = "amcc,ppc460ex-crypto", "amcc,ppc4xx-crypto"; + reg = <4 0x00180000 0x80400>; + interrupt-parent = <&UIC0>; + interrupts = <0x1d 0x4>; + }; + + /* kph check the below */ + PKA: pka at 114000 { + device_type = "pka"; + compatible = "ppc4xx-pka", "amcc,ppc4xx-pka"; + reg = <4 0x00114000 0x4000>; + interrupt-parent = <&UIC0>; + interrupts = <0x14 0x2>; + }; + + /* kph check the below */ + TRNG: trng at 110000 { + compatible = "ppc4xx-trng", "amcc,ppc460ex-rng"; + reg = <4 0x00110000 0x50>; + interrupt-parent = <&UIC1>; + interrupts = <0x3 0x2>; + }; + + MAL0: mcmal { + compatible = "ibm,mcmal2"; + descriptor-memory = "ocm"; + dcr-reg = <0x180 0x062>; + num-tx-chans = <1>; + num-rx-chans = <1>; + #address-cells = <0>; + #size-cells = <0>; + interrupt-parent = <&UIC2>; + interrupts = < /*TXEOB*/ 0x6 0x4 + /*RXEOB*/ 0x7 0x4 + /*SERR*/ 0x3 0x4 + /*TXDE*/ 0x4 0x4 + /*RXDE*/ 0x5 0x4>; + }; + + POB0: opb { + compatible = "ibm,opb"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0xb0000000 0x00000004 0xb0000000 0x50000000>; + clock-frequency = <0>; /* Filled in by U-Boot */ + + EBC0: ebc { + compatible = "ibm,ebc"; + dcr-reg = <0x012 0x002>; + #address-cells = <2>; + #size-cells = <1>; + clock-frequency = <0>; /* Filled in by U-Boot */ + /* ranges property is supplied by U-Boot */ + ranges = < 0x00000003 0x00000000 0xe0000000 0x8000000>; + interrupts = <0x6 0x4>; + interrupt-parent = <&UIC1>; + + /* Ikarem has 32MB of NAND */ + ndfc at 1,0 { + compatible = "ibm,ndfc"; + reg = <00000003 00000000 00000400>; + ccr = <0x00001000>; + bank-settings = <0x80002222>; + #address-cells = <1>; + #size-cells = <1>; + /* 32 MiB NAND Flash */ + nand { + #address-cells = <1>; + #size-cells = <1>; + partition at 0 { + label = "u-boot"; + reg = <0x00000000 0x00170000>; + read-only; + }; + partition at 170000 { + label = "oops"; + reg = <0x00170000 0x00010000>; + }; + partition at 180000 { + label = "ubi"; + reg = <0x00180000 0x01e80000>; + }; + }; + }; + }; + + UART0: serial at ef600400 { + device_type = "serial"; + compatible = "ns16550"; + reg = <0xef600400 0x00000008>; + virtual-reg = <0xef600400>; + clock-frequency = <0>; /* Filled in by U-Boot */ + current-speed = <0>; /* Filled in by U-Boot */ + interrupt-parent = <&UIC0>; + interrupts = <0x1 0x4>; + }; + + GPIO0: gpio at ef600b00 { + compatible = "ibm,ppc4xx-gpio"; + reg = <0xef600b00 0x00000048>; + #gpio-cells = <2>; + gpio-controller; + }; + + gpio-leds { + compatible = "gpio-leds"; + power-green { + label = "mr24:green:power"; + gpios = <&GPIO0 18 1>; + }; + power-orange { + label = "mr24:orange:power"; + gpios = <&GPIO0 19 1>; + }; + lan { + label = "mr24:green:wan"; + gpios = <&GPIO0 17 1>; + }; + ssi-0 { + label = "mr24:green:wifi1"; + gpios = <&GPIO0 23 1>; + }; + ssi-1 { + label = "mr24:green:wifi2"; + gpios = <&GPIO0 22 1>; + }; + ssi-2 { + label = "mr24:green:wifi3"; + gpios = <&GPIO0 21 1>; + }; + ssi-3 { + label = "mr24:green:wifi4"; + gpios = <&GPIO0 20 1>; + }; + }; + + gpio_keys_polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <60>; /* 3 * 20 = 60ms */ + autorepeat; + button at 1 { + label = "Reset button"; + linux,code = <0x198>; /* KEY_RESTART */ + gpios = <&GPIO0 16 1>; + }; + }; + + IIC0: i2c at ef600700 { + compatible = "ibm,iic"; + reg = <0xef600700 0x00000014>; + interrupt-parent = <&UIC0>; + interrupts = <0x2 0x4>; + #address-cells = <1>; + #size-cells = <0>; + /* Boot ROM is at 0x52-0x53, do not touch */ + /* Unknown chip at 0x6e, not sure what it is */ + }; + + IIC1: i2c at ef600800 { + compatible = "ibm,iic"; + reg = <0xef600800 0x00000014>; + interrupt-parent = <&UIC0>; + interrupts = <0x3 0x4>; + }; + + RGMII0: emac-rgmii at ef601500 { + compatible = "ibm,rgmii"; + reg = <0xef601500 0x00000008>; + has-mdio; + }; + + TAH0: emac-tah at ef601350 { + compatible = "ibm,tah"; + reg = <0xef601350 0x00000030>; + }; + + EMAC0: ethernet at ef600c00 { + device_type = "network"; + compatible = "ibm,emac-apm821xx", "ibm,emac4sync"; + interrupt-parent = <&EMAC0>; + interrupts = <0x0 0x1>; + #interrupt-cells = <1>; + #address-cells = <0>; + #size-cells = <0>; + interrupt-map = ; + reg = <0xef600c00 0x000000c4>; + local-mac-address = [000000000000]; /* Filled in by U-Boot */ + mal-device = <&MAL0>; + mal-tx-channel = <0>; + mal-rx-channel = <0>; + cell-index = <0>; + max-frame-size = <9000>; + rx-fifo-size = <16384>; + tx-fifo-size = <2048>; + phy-mode = "rgmii"; + phy-map = <0x00000000>; + rgmii-device = <&RGMII0>; + rgmii-channel = <0>; + tah-device = <&TAH0>; + tah-channel = <0>; + has-inverted-stacr-oc; + has-new-stacr-staopc; + }; + }; + + PCIE0: pciex at d00000000 { + device_type = "pci"; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + compatible = "ibm,plb-pciex-apm821xx", "ibm,plb-pciex"; + primary; + port = <0x0>; /* port number */ + reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */ + 0x0000000c 0x08010000 0x00001000>; /* Registers */ + dcr-reg = <0x100 0x020>; + sdr-base = <0x300>; + + /* Outbound ranges, one memory and one IO, + * later cannot be changed + */ + ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000 + 0x02000000 0x00000000 0x00000000 0x0000000f 0x00000000 0x00000000 0x00100000 + 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; + + /* Inbound 2GB range starting at 0 */ + dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; + + /* This drives busses 40 to 0x7f */ + bus-range = <0x40 0x7f>; + + /* Legacy interrupts (note the weird polarity, the bridge seems + * to invert PCIe legacy interrupts). + * We are de-swizzling here because the numbers are actually for + * port of the root complex virtual P2P bridge. But I want + * to avoid putting a node for it in the tree, so the numbers + * below are basically de-swizzled numbers. + * The real slot is on idsel 0, so the swizzling is 1:1 + */ + interrupt-map-mask = <0x0 0x0 0x0 0x7>; + interrupt-map = < + 0x0 0x0 0x0 0x1 &UIC3 0xc 0x4 /* swizzled int A */ + 0x0 0x0 0x0 0x2 &UIC3 0xd 0x4 /* swizzled int B */ + 0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C */ + 0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>; + }; + + MSI: ppc4xx-msi at C10000000 { + compatible = "amcc,ppc4xx-msi", "ppc4xx-msi"; + reg = < 0xC 0x10000000 0x100 + 0xC 0x10000000 0x100>; + sdr-base = <0x36C>; + msi-data = <0x00004440>; + msi-mask = <0x0000ffe0>; + interrupts =<0 1 2 3 4 5 6 7>; + interrupt-parent = <&MSI>; + #interrupt-cells = <1>; + #address-cells = <0>; + #size-cells = <0>; + msi-available-ranges = <0x0 0x100>; + interrupt-map = < + 0 &UIC3 0x18 1 + 1 &UIC3 0x19 1 + 2 &UIC3 0x1A 1 + 3 &UIC3 0x1B 1 + 4 &UIC3 0x1C 1 + 5 &UIC3 0x1D 1 + 6 &UIC3 0x1E 1 + 7 &UIC3 0x1F 1 + >; + }; + }; + + chosen { + linux,stdout-path = "/plb/opb/serial at ef600400"; + }; +}; diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index a9608e7..69f9fb7 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -11,6 +11,46 @@ IMAGE_PROFILE:=$(if $(PROFILE),$(PROFILE),Default) DEVICE_VARS += DTS IMAGE_SIZE +define Image/cpiogz + ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9n >$(KDIR_TMP)/$(IMG_PREFIX)-rootfs.cpio.gz ) +endef + +define Build/copy-file + cat "$(1)" > "$@" +endef + +define Build/MerakiAdd-dtb + $(call Image/BuildDTB,../dts/$(DTS).dts,$@.dtb) + ( \ + dd if=$@.dtb bs=$(DTB_SIZE) conv=sync; \ + dd if=$@ bs=$(BLOCKSIZE) conv=sync; \ + ) > $@.new + @mv $@.new $@ +endef + +define Build/MerakiAdd-initramfs + $(call Image/cpiogz) + + -$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) -O linux -T ramdisk \ + -C gzip -n "$(PROFILE) OpenWRT rootfs" \ + -d $(KDIR_TMP)/$(IMG_PREFIX)-rootfs.cpio.gz \ + $(KDIR_TMP)/$(IMG_PREFIX)-uramdisk.image.gz + + ( \ + dd if=$@ bs=1k conv=sync; \ + dd if=$(KDIR_TMP)/$(IMG_PREFIX)-uramdisk.image.gz bs=$(BLOCKSIZE) conv=sync; \ + ) > $@.new + @mv $@.new $@ +endef + +define Build/MerakiNAND + -$(STAGING_DIR_HOST)/bin/mkmerakifw \ + -B $(BOARDNAME) -s \ + -i $@ \ + -o $@.new + @cp $@.new $@ +endef + define Device/Default BOARDNAME := DEVICE_PROFILE = $$(BOARDNAME) @@ -21,4 +61,21 @@ define Device/Default endef TARGET_DEVICES += Default +define Device/mr24 + BOARDNAME = MR24 + BLOCKSIZE := 64k + IMAGES := sysupgrade.tar + DTS := MR24 + DTB_SIZE := 63k + KERNEL_SIZE := 2048k + IMAGE_SIZE := 8191k + KERNEL_ENTRY := 0x00000000 + KERNEL_LOADADDR := 0x00000000 + KERNEL := kernel-bin | gzip | uImage gzip | MerakiAdd-dtb | MerakiNAND + KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux | gzip | uImage gzip | MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | MerakiNAND + IMAGE/sysupgrade.tar := sysupgrade-nand + +endef +TARGET_DEVICES += mr24 + $(eval $(call BuildImage)) diff --git a/target/linux/apm821xx/patches-4.4/200-add-meraki-mr24-ikarem-support.patch b/target/linux/apm821xx/patches-4.4/200-add-meraki-mr24-ikarem-support.patch new file mode 100644 index 0000000..45892f2 --- /dev/null +++ b/target/linux/apm821xx/patches-4.4/200-add-meraki-mr24-ikarem-support.patch @@ -0,0 +1,31 @@ +--- a/arch/powerpc/platforms/44x/Kconfig ++++ b/arch/powerpc/platforms/44x/Kconfig +@@ -40,6 +40,19 @@ config EBONY + help + This option enables support for the IBM PPC440GP evaluation board. + ++config IKAREM ++ bool "Ikarem" ++ depends on 44x ++ default n ++ select PPC44x_SIMPLE ++ select APM821xx ++ select PCI_MSI ++ select PPC4xx_MSI ++ select PPC4xx_PCI_EXPRESS ++ select IBM_EMAC_RGMII ++ help ++ This option enables support for the Cisco Meraki MR24 (Ikarem) Access Point. ++ + config SAM440EP + bool "Sam440ep" + depends on 44x +--- a/arch/powerpc/platforms/44x/ppc44x_simple.c ++++ b/arch/powerpc/platforms/44x/ppc44x_simple.c +@@ -62,6 +62,7 @@ static char *board[] __initdata = { + "amcc,sequoia", + "amcc,taishan", + "amcc,yosemite", ++ "meraki,ikarem", + "mosaixtech,icon" + }; diff --git a/target/linux/apm821xx/profiles/meraki.mk b/target/linux/apm821xx/profiles/meraki.mk new file mode 100644 index 0000000..c22a485 --- /dev/null +++ b/target/linux/apm821xx/profiles/meraki.mk @@ -0,0 +1,17 @@ +# +# Copyright (C) 2016 Chris Blake (chrisrblake93 at gmail.com) +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/MR24 + NAME:=Meraki MR24 + PACKAGES:=kmod-spi-gpio kmod-gpio-button-hotplug swconfig kmod-ath9k +endef + +define Profile/MR24/description + Package set optimized for the Cisco Meraki MR24 Access Point. +endef + +$(eval $(call Profile,MR24)) diff --git a/tools/firmware-utils/src/mkmerakifw.c b/tools/firmware-utils/src/mkmerakifw.c index 241bb33..61b81c6 100644 --- a/tools/firmware-utils/src/mkmerakifw.c +++ b/tools/firmware-utils/src/mkmerakifw.c @@ -62,6 +62,16 @@ static const struct board_info boards[] = { 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09}, }, { + .id = "mr24", + .description = "Meraki MR24 Access Point", + .magic = 0x8e73ed8a, + .imagelen = 0x00800000, + .statichash = {0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff}, + }, { + /* terminating entry */ } }; -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From zajec5 at gmail.com Mon Apr 4 02:50:10 2016 From: zajec5 at gmail.com (=?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?=) Date: Mon, 4 Apr 2016 08:50:10 +0200 Subject: [OpenWrt-Devel] [PATCH 0/8] [ipq806x] Add basic support for Linksys EA8500 In-Reply-To: References: Message-ID: Hi Adrian, First of all, please DON'T send your e-mails as HTML ones (text/html). On 1 April 2016 at 02:35, Adrian Panella wrote: > This patchset adds support for the Linksys AC2600 EA8500 router. You should use a proper prefix for all your patches. E.g. bootargs: Add mangled bootargs for ATAG to DTB should be: ipq806x: bootargs: Add mangled bootargs for ATAG to DTB _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Mon Apr 4 05:09:23 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Mon, 04 Apr 2016 11:09:23 +0200 Subject: [OpenWrt-Devel] [RFC] ar71xx: Reset QCA955x SGMII link on speed change In-Reply-To: <1459514507-20044-1-git-send-email-sven@open-mesh.com> References: <1459514507-20044-1-git-send-email-sven@open-mesh.com> Message-ID: <2346013.fkrCfbxBLS@bentobox> On Friday 01 April 2016 14:41:47 Sven Eckelmann wrote: [...] > static void qca955x_set_speed_xmii(int speed) > { > void __iomem *base; > @@ -381,6 +395,100 @@ static void qca955x_set_speed_xmii(int speed) > base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE); > __raw_writel(val, base + QCA955X_PLL_ETH_XMII_CONTROL_REG); > iounmap(base); > + > + // TODO: find out if something like qca955x_reset_xmii(); is needed > +} I was told that the GMAC0 also needs some special bits set to fix some problems when switching between different half/full duplex speeds. The only thing I was told is that qca955x_soc_gmac_set_link requires athr_reg_rmw_set(0xb900023c, 0x68000001); Of course, it is not for QCAs current driver (which is a heavily modified driver from OpenWrt) but their old one https://github.com/Existed/ethernet_driver/blob/3bde1bb60d31d78fee14cce0d8ea9539d8227a0d/qca955x.c#L587 I know that this register is IG_ACL_CSR for GMAC0 and BIT(0) is IG_ACL_DISABLE and should only disable the ingress ACL. But I have absolutely no idea what BIT(27), BIT(29) and BIT(30) are. Does anyone know what these bits are? I personally don't have yet feedback if this change really helps. But a equally bad hack as the earlier one (sgmii) would be: --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c @@ -387,6 +387,15 @@ static void ar934x_set_speed_ge0(int speed) #define QCA955X_GMAC_REG_SGMII_RESET_TX_CLK_N BIT(1) #define QCA955X_GMAC_REG_SGMII_RESET_RX_CLK_N BIT(0) +#define QCA955X_GE0_BASE 0x19000000 +#define QCA955X_GE0_SIZE 0x2F0 + +#define QCA955X_GE0_IG_ACL_CSR 0x23C +#define QCA955X_GE0_IG_ACL_DISABLE BIT(0) +#define QCA955X_GE0_IG_ACL_MAGIC0 BIT(27) +#define QCA955X_GE0_IG_ACL_MAGIC1 BIT(29) +#define QCA955X_GE0_IG_ACL_MAGIC2 BIT(30) + static void qca955x_set_speed_xmii(int speed) { void __iomem *base; @@ -396,7 +405,14 @@ static void qca955x_set_speed_xmii(int speed) __raw_writel(val, base + QCA955X_PLL_ETH_XMII_CONTROL_REG); iounmap(base); - // TODO: find out if something like qca955x_reset_xmii(); is needed + /* WARNING ugly PoC code ahead */ + base = ioremap_nocache(QCA955X_GE0_BASE, QCA955X_GE0_SIZE); + val = QCA955X_GE0_IG_ACL_DISABLE | + QCA955X_GE0_IG_ACL_MAGIC0 | + QCA955X_GE0_IG_ACL_MAGIC1 | + QCA955X_GE0_IG_ACL_MAGIC2; + __raw_writel(val, base + QCA955X_GE0_IG_ACL_CSR); + iounmap(base); } static void qca955x_reset_sgmii(void) -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: This is a digitally signed message part. URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From daniel.engberg.lists at pyret.net Mon Apr 4 06:08:56 2016 From: daniel.engberg.lists at pyret.net (Daniel Engberg) Date: Mon, 4 Apr 2016 12:08:56 +0200 Subject: [OpenWrt-Devel] ramips: Disable the SD driver by default on MT7621 Message-ID: <57023D38.9080107@pyret.net> The SD driver has been a long and dragging issue on the MT7621 platforms as it hasn't worked for months resulting in unbootable devices. Until it's fixed, disable it in the default profiles. Reports / Discussed here: https://dev.openwrt.org/ticket/21392 https://dev.openwrt.org/ticket/21834 https://dev.openwrt.org/ticket/21995 https://forum.openwrt.org/viewtopic.php?id=59092 Signed-off-by: Daniel Engberg --- diff --git a/target/linux/ramips/mt7621/profiles/firefly.mk b/target/linux/ramips/mt7621/profiles/firefly.mk index bc50ab4..9797527 100644 --- a/target/linux/ramips/mt7621/profiles/firefly.mk +++ b/target/linux/ramips/mt7621/profiles/firefly.mk @@ -8,7 +8,7 @@ define Profile/FIREWRT NAME:=Firefly FireWRT PACKAGES:=\ - kmod-usb-core kmod-usb3 kmod-usb-hid kmod-sdhci-mt7620 \ + kmod-usb-core kmod-usb3 kmod-usb-hid \ kmod-ledtrig-usbdev endef diff --git a/target/linux/ramips/mt7621/profiles/misc.mk b/target/linux/ramips/mt7621/profiles/misc.mk index ee25b95..06a9d44 100644 --- a/target/linux/ramips/mt7621/profiles/misc.mk +++ b/target/linux/ramips/mt7621/profiles/misc.mk @@ -9,7 +9,7 @@ define Profile/PBR-M1 NAME:=PBR-M1 Device FEATURES+=rtc PACKAGES:=\ - kmod-usb-core kmod-usb3 kmod-usb-hid kmod-sdhci-mt7620 \ + kmod-usb-core kmod-usb3 kmod-usb-hid \ kmod-ledtrig-usbdev kmod-ata-core kmod-ata-ahci \ kmod-rtc-pcf8563 endef diff --git a/target/linux/ramips/mt7621/profiles/mqmaker.mk b/target/linux/ramips/mt7621/profiles/mqmaker.mk index ae35e7d..8acc116 100644 --- a/target/linux/ramips/mt7621/profiles/mqmaker.mk +++ b/target/linux/ramips/mt7621/profiles/mqmaker.mk @@ -9,7 +9,7 @@ define Profile/witi NAME:=MQmaker WiTi FEATURES+=rtc PACKAGES:=\ - kmod-usb-core kmod-usb3 kmod-usb-hid kmod-sdhci-mt7620 \ + kmod-usb-core kmod-usb3 kmod-usb-hid \ kmod-ledtrig-usbdev kmod-ata-core kmod-ata-ahci \ kmod-rtc-pcf8563 kmod-i2c-mt7621 endef diff --git a/target/linux/ramips/mt7621/profiles/zbt.mk b/target/linux/ramips/mt7621/profiles/zbt.mk index 07131d1..0073645 100644 --- a/target/linux/ramips/mt7621/profiles/zbt.mk +++ b/target/linux/ramips/mt7621/profiles/zbt.mk @@ -8,7 +8,7 @@ define Profile/ZBT-WG2626 NAME:=ZBT-WG2626 Device PACKAGES:=\ - kmod-usb-core kmod-usb3 kmod-sdhci-mt7620 \ + kmod-usb-core kmod-usb3 \ kmod-ledtrig-usbdev kmod-ata-core kmod-ata-ahci endef _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Mon Apr 4 12:24:38 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Mon, 04 Apr 2016 18:24:38 +0200 Subject: [OpenWrt-Devel] [RFC] ar71xx: Reset QCA955x SGMII link on speed change In-Reply-To: <1459514507-20044-1-git-send-email-sven@open-mesh.com> References: <1459514507-20044-1-git-send-email-sven@open-mesh.com> Message-ID: <2320020.yht3Hohr09@bentobox> On Friday 01 April 2016 14:41:47 Sven Eckelmann wrote: > From: Sven Eckelmann > > The SGMII link of the QCA955x seems to be unstable when the PHY changes the > link speed. Reseting the SGMII and the PHY management control seems to > resolve this problem. > > This was observed with an AR8033 and QCA9558 > > The code of this RFC is not meant to be an actual patch. It should show > what the u-boot for QCA955x does and what seemed to work(tm) in my limited > tests. It would be interesting to know whether this was also noticed by > other people and how they fixed it (when they fixed it). > > If it is already known than it would maybe good to find a better way to > integrate it with ag71xx. Right now it just uses the set_speed callback to > start the reset. > > Signed-off-by: Sven Eckelmann > --- Just did a search in the codeaurora repository. I found at least some extra information: * SGMII reset code (like in this "RFC"/u-boot): https://us.codeaurora.org/cgit/quic/qsdk/oss/system/openwrt/commit/?id=38de68c74bac2147250ce21879a6f1a7adda5d49 * The IG_ACL_CSR (AG71XX_REG_IG_ACL) change from my second hack: https://us.codeaurora.org/cgit/quic/qsdk/oss/system/openwrt/commit/?id=7e0e30d4a5e40927a9fa005a0c9ee9c7e16dc020 (the information about the chip family is not that easily available in the original OpenWrt driver. so it is not that easy to implement without adding more stuff to pdata - but easy when the pdata can also be modified at the same time) * The "description" of the SGMII_DEBUG register can be found in the u-boot sources (955x.h) https://us.codeaurora.org/cgit/quic/qsdk/oss/system/openwrt/commit/?id=96779a2ee2470c15135dc1a7aa80d20eced4dc89 Kind regards, Sven _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From zioproto at gmail.com Mon Apr 4 16:34:23 2016 From: zioproto at gmail.com (Saverio Proto) Date: Mon, 4 Apr 2016 22:34:23 +0200 Subject: [OpenWrt-Devel] 15.05.1 - Chaos Calmer In-Reply-To: <56E9A88C.5060409@einfach.org> References: <56E94C5D.1030302@openwrt.org> <56E9A88C.5060409@einfach.org> Message-ID: > Great! Thanks for your good work! > Could you please add a tag for 15.05.1 in the git repo? That would be great. I am trying to git bisect a bug and I have no idea on top of what commit is 15.05.1 built. thank you :) Saverio _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From br1 at einfach.org Mon Apr 4 16:38:39 2016 From: br1 at einfach.org (Bruno Randolf) Date: Mon, 4 Apr 2016 21:38:39 +0100 Subject: [OpenWrt-Devel] 15.05.1 - Chaos Calmer In-Reply-To: References: <56E94C5D.1030302@openwrt.org> <56E9A88C.5060409@einfach.org> Message-ID: <5702D0CF.5010107@einfach.org> On 04/04/2016 09:34 PM, Saverio Proto wrote: >> Great! Thanks for your good work! >> Could you please add a tag for 15.05.1 in the git repo? > > That would be great. I am trying to git bisect a bug and I have no > idea on top of what commit is 15.05.1 built. There is a tag for it already: https://github.com/openwrt/openwrt/tags bruno _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From psidhu at gateworks.com Mon Apr 4 17:43:11 2016 From: psidhu at gateworks.com (Pushpal Sidhu) Date: Mon, 4 Apr 2016 14:43:11 -0700 Subject: [OpenWrt-Devel] [PATCH 0/2] Fix PCI for cns3xxx platform Message-ID: <1459806193-16454-1-git-send-email-psidhu@gateworks.com> Currently, PCI does not work on the cns3xxx platform due to several bugs. Krzysztof Ha?asa has authored two patches which fix some regressions. Links to the discussion can be found here: * http://www.spinics.net/lists/arm-kernel/msg490185.html (in the next/fixes-non-critical for ARM) * http://www.spinics.net/lists/linux-pci/msg49796.html (currently pending) Note that I executed 'make target/linux/refresh' to put the patches into the proper 'OpenWrt' format. Pushpal Sidhu (2): cns3xxx: backport pci fix for cns3xxx_write_config cns3xxx: set both MPS 'and' MRSS to 128 target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch | 19 +++++++++++++++++++ .../cns3xxx/patches-4.4/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch | 23 +++++++++++++++++++++++ 2 files changed, 42 insertions(+) - Pushpal _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From psidhu at gateworks.com Mon Apr 4 17:43:12 2016 From: psidhu at gateworks.com (Pushpal Sidhu) Date: Mon, 4 Apr 2016 14:43:12 -0700 Subject: [OpenWrt-Devel] [PATCH 1/2] cns3xxx: backport pci fix for cns3xxx_write_config In-Reply-To: <1459806193-16454-1-git-send-email-psidhu@gateworks.com> References: <1459806193-16454-1-git-send-email-psidhu@gateworks.com> Message-ID: <1459806193-16454-2-git-send-email-psidhu@gateworks.com> Fix is required to properly set pci config bits. Original Patch: https://patchwork.ozlabs.org/patch/596170/ Signed-off-by: Pushpal Sidhu --- .../033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch diff --git a/target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch b/target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch new file mode 100644 index 0000000..3f5ab06 --- /dev/null +++ b/target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch @@ -0,0 +1,19 @@ +--- a/arch/arm/mach-cns3xxx/pcie.c ++++ b/arch/arm/mach-cns3xxx/pcie.c +@@ -220,13 +220,13 @@ static void cns3xxx_write_config(struct + u32 mask = (0x1ull << (size * 8)) - 1; + int shift = (where % 4) * 8; + +- v = readl_relaxed(base + (where & 0xffc)); ++ v = readl_relaxed(base); + + v &= ~(mask << shift); + v |= (val & mask) << shift; + +- writel_relaxed(v, base + (where & 0xffc)); +- readl_relaxed(base + (where & 0xffc)); ++ writel_relaxed(v, base); ++ readl_relaxed(base); + } + + static void __init cns3xxx_pcie_hw_init(struct cns3xxx_pcie *cnspci) -- 2.7.2 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From psidhu at gateworks.com Mon Apr 4 17:43:13 2016 From: psidhu at gateworks.com (Pushpal Sidhu) Date: Mon, 4 Apr 2016 14:43:13 -0700 Subject: [OpenWrt-Devel] [PATCH 2/2] cns3xxx: set both MPS 'and' MRSS to 128 In-Reply-To: <1459806193-16454-1-git-send-email-psidhu@gateworks.com> References: <1459806193-16454-1-git-send-email-psidhu@gateworks.com> Message-ID: <1459806193-16454-3-git-send-email-psidhu@gateworks.com> Fixes some DMA issues with this platform. Because this isn't currently accepted, and can potentially disrupt other platforms (as read in commit log), I will leave this cns3xxx specific. Original Patch: https://patchwork.ozlabs.org/patch/600024/ Signed-off-by: Pushpal Sidhu --- ...ER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 target/linux/cns3xxx/patches-4.4/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch diff --git a/target/linux/cns3xxx/patches-4.4/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch b/target/linux/cns3xxx/patches-4.4/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch new file mode 100644 index 0000000..208c80a --- /dev/null +++ b/target/linux/cns3xxx/patches-4.4/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch @@ -0,0 +1,23 @@ +--- a/drivers/pci/probe.c ++++ b/drivers/pci/probe.c +@@ -1924,7 +1924,8 @@ static void pcie_write_mrrs(struct pci_d + /* In the "safe" case, do not configure the MRRS. There appear to be + * issues with setting MRRS to 0 on a number of devices. + */ +- if (pcie_bus_config != PCIE_BUS_PERFORMANCE) ++ if (pcie_bus_config != PCIE_BUS_PERFORMANCE && ++ pcie_bus_config != PCIE_BUS_PEER2PEER) + return; + + /* For Max performance, the MRRS must be set to the largest supported +--- a/include/linux/pci.h ++++ b/include/linux/pci.h +@@ -756,7 +756,7 @@ enum pcie_bus_config_types { + PCIE_BUS_DEFAULT, /* ensure MPS matches upstream bridge */ + PCIE_BUS_SAFE, /* use largest MPS boot-time devices support */ + PCIE_BUS_PERFORMANCE, /* use MPS and MRRS for best performance */ +- PCIE_BUS_PEER2PEER, /* set MPS = 128 for all devices */ ++ PCIE_BUS_PEER2PEER, /* set MPS and MRSS to 128 for all devices */ + }; + + extern enum pcie_bus_config_types pcie_bus_config; -- 2.7.2 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From adam at semicircular.net Tue Apr 5 02:20:08 2016 From: adam at semicircular.net (Adam Kent) Date: Tue, 5 Apr 2016 06:20:08 +0000 Subject: [OpenWrt-Devel] [PATCH] Fixes for LinkIt 7688 Message-ID: <1459837208-5544-1-git-send-email-adam@semicircular.net> Misc fixes for LinkIt 7688 board: - Copy the right wireless firmware for the mt7688 - Add back '0065-mt7688-fixes.patch', left out after the move to Linux 4.4. - Remove SPI_DEV from linux config which otherwise causes a massive warning - Add wmac to LINKIT7688.dts so wireless works --- package/kernel/mt76/Makefile | 2 +- target/linux/ramips/dts/LINKIT7688.dts | 4 ++ target/linux/ramips/mt7688/config-4.4 | 2 +- .../ramips/patches-4.4/0065-mt7688-fixes.patch | 73 ++++++++++++++++++++++ 4 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 target/linux/ramips/patches-4.4/0065-mt7688-fixes.patch diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 8800b13..33f61cb 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -55,7 +55,7 @@ endef define KernelPackage/mt76/install $(INSTALL_DIR) $(1)/lib/firmware cp \ - $(if $(CONFIG_TARGET_ramips_mt7628), \ + $(if $(CONFIG_TARGET_ramips_mt7628) || $(CONFIG_TARGET_ramips_mt7688), \ $(PKG_BUILD_DIR)/firmware/mt7628_e1.bin \ $(PKG_BUILD_DIR)/firmware/mt7628_e2.bin \ ) \ diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts index 5ec29ac..2dfb98c 100644 --- a/target/linux/ramips/dts/LINKIT7688.dts +++ b/target/linux/ramips/dts/LINKIT7688.dts @@ -59,6 +59,10 @@ }; }; + wmac at 10300000 { + status = "okay"; + }; + palmbus at 10000000 { spi at b00 { status = "okay"; diff --git a/target/linux/ramips/mt7688/config-4.4 b/target/linux/ramips/mt7688/config-4.4 index c1e8df2..2bfd3f8 100644 --- a/target/linux/ramips/mt7688/config-4.4 +++ b/target/linux/ramips/mt7688/config-4.4 @@ -193,7 +193,7 @@ CONFIG_SPI=y CONFIG_SPI_MASTER=y CONFIG_SPI_MT7621=y # CONFIG_SPI_RT2880 is not set -CONFIG_SPI_SPIDEV=y +# CONFIG_SPI_SPIDEV is not set CONFIG_SRCU=y CONFIG_SWCONFIG=y CONFIG_SYSCTL_EXCEPTION_TRACE=y diff --git a/target/linux/ramips/patches-4.4/0065-mt7688-fixes.patch b/target/linux/ramips/patches-4.4/0065-mt7688-fixes.patch new file mode 100644 index 0000000..b96be91 --- /dev/null +++ b/target/linux/ramips/patches-4.4/0065-mt7688-fixes.patch @@ -0,0 +1,73 @@ +--- a/arch/mips/ralink/mt7620.c ++++ b/arch/mips/ralink/mt7620.c +@@ -107,31 +107,31 @@ static struct rt2880_pmx_group mt7620a_p + }; + + static struct rt2880_pmx_func pwm1_grp_mt7628[] = { +- FUNC("sdcx", 3, 19, 1), ++ FUNC("sdxc", 3, 19, 1), + FUNC("utif", 2, 19, 1), + FUNC("gpio", 1, 19, 1), + FUNC("pwm", 0, 19, 1), + }; + + static struct rt2880_pmx_func pwm0_grp_mt7628[] = { +- FUNC("sdcx", 3, 18, 1), ++ FUNC("sdxc", 3, 18, 1), + FUNC("utif", 2, 18, 1), + FUNC("gpio", 1, 18, 1), + FUNC("pwm", 0, 18, 1), + }; + + static struct rt2880_pmx_func uart2_grp_mt7628[] = { +- FUNC("sdcx", 3, 20, 2), ++ FUNC("sdxc", 3, 20, 2), + FUNC("pwm", 2, 20, 2), + FUNC("gpio", 1, 20, 2), +- FUNC("uart", 0, 20, 2), ++ FUNC("uart2", 0, 20, 2), + }; + + static struct rt2880_pmx_func uart1_grp_mt7628[] = { + FUNC("sdcx", 3, 45, 2), + FUNC("pwm", 2, 45, 2), + FUNC("gpio", 1, 45, 2), +- FUNC("uart", 0, 45, 2), ++ FUNC("uart1", 0, 45, 2), + }; + + static struct rt2880_pmx_func i2c_grp_mt7628[] = { +@@ -143,21 +143,21 @@ static struct rt2880_pmx_func i2c_grp_mt + + static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 36, 1) }; + static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 37, 1) }; +-static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 15, 38) }; ++static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 38, 1) }; + static struct rt2880_pmx_func spi_grp_mt7628[] = { FUNC("spi", 0, 7, 4) }; + + static struct rt2880_pmx_func sd_mode_grp_mt7628[] = { + FUNC("jtag", 3, 22, 8), + FUNC("utif", 2, 22, 8), + FUNC("gpio", 1, 22, 8), +- FUNC("sdcx", 0, 22, 8), ++ FUNC("sdxc", 0, 22, 8), + }; + + static struct rt2880_pmx_func uart0_grp_mt7628[] = { + FUNC("-", 3, 12, 2), + FUNC("-", 2, 12, 2), + FUNC("gpio", 1, 12, 2), +- FUNC("uart", 0, 12, 2), ++ FUNC("uart0", 0, 12, 2), + }; + + static struct rt2880_pmx_func i2s_grp_mt7628[] = { +@@ -438,6 +438,8 @@ void __init ralink_clk_init(void) + ralink_clk_add("10000b00.spi", sys_rate); + ralink_clk_add("10000b40.spi", sys_rate); + ralink_clk_add("10000c00.uartlite", periph_rate); ++ ralink_clk_add("10000d00.uart1", periph_rate); ++ ralink_clk_add("10000e00.uart2", periph_rate); + ralink_clk_add("10180000.wmac", xtal_rate); + + if (IS_ENABLED(CONFIG_USB) && is_mt76x8()) { -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From Wojciech.Dubowik at neratec.com Tue Apr 5 04:07:31 2016 From: Wojciech.Dubowik at neratec.com (Wojciech Dubowik) Date: Tue, 5 Apr 2016 10:07:31 +0200 Subject: [OpenWrt-Devel] [PATCH 0/3] kirkwood: Use new UBI image style for Iconnect Message-ID: <1459843654-1130-1-git-send-email-Wojciech.Dubowik@neratec.com> Adapt Iconnect to new UBI (kernel, squashfs, ubifs) image format. Wojciech Dubowik (3): uboot-kirkwood: New ubi flash format for Iconnect kirkwood: Migrate Iconnect to new ubi image format krikwood: Make Iconnect image use new ubi format style .../boot/uboot-kirkwood/patches/120-iconnect.patch | 20 ++++++++------------ .../kirkwood/base-files/lib/upgrade/platform.sh | 6 ++++-- target/linux/kirkwood/image/Makefile | 11 +++++++---- target/linux/kirkwood/patches-4.4/130-iconnect.patch | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From Wojciech.Dubowik at neratec.com Tue Apr 5 04:07:32 2016 From: Wojciech.Dubowik at neratec.com (Wojciech Dubowik) Date: Tue, 5 Apr 2016 10:07:32 +0200 Subject: [OpenWrt-Devel] [PATCH 1/3] uboot-kirkwood: New ubi flash format for Iconnect In-Reply-To: <1459843654-1130-1-git-send-email-Wojciech.Dubowik@neratec.com> References: <1459843654-1130-1-git-send-email-Wojciech.Dubowik@neratec.com> Message-ID: <1459843654-1130-2-git-send-email-Wojciech.Dubowik@neratec.com> Migrate Iconnect to new ubi image style like for dockstar. Signed-off-by: Wojciech Dubowik --- .../boot/uboot-kirkwood/patches/120-iconnect.patch | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch index e525ca0..cfc1403 100644 --- a/package/boot/uboot-kirkwood/patches/120-iconnect.patch +++ b/package/boot/uboot-kirkwood/patches/120-iconnect.patch @@ -1,6 +1,6 @@ --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h -@@ -66,30 +66,35 @@ +@@ -66,30 +66,29 @@ #define CONFIG_ENV_IS_NOWHERE #endif #define CONFIG_ENV_SIZE 0x20000 @@ -13,14 +13,12 @@ #define CONFIG_BOOTCOMMAND \ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ - "ubi part rootfs; " \ -+ "ubi part root; " \ - "ubifsmount ubi:rootfs; " \ - "ubifsload 0x800000 ${kernel}; " \ +- "ubifsmount ubi:rootfs; " \ +- "ubifsload 0x800000 ${kernel}; " \ - "bootm 0x800000" -+ "ubifsload 0x700000 ${fdt}; " \ -+ "ubifsumount; " \ -+ "fdt addr 0x700000; fdt resize; fdt chosen; " \ -+ "bootz 0x800000 - 0x700000" ++ "ubi part ubi; " \ ++ "ubi read 0x800000 kernel; " \ ++ "bootz 0x800000" #define CONFIG_MTDPARTS \ - "mtdparts=orion_nand:" \ @@ -31,7 +29,7 @@ + "0xe0000 at 0x0(uboot)," \ + "0x20000 at 0xe0000(uboot_env)," \ + "0x100000 at 0x100000(second_stage_uboot)," \ -+ "- at 0x200000(root)\0" ++ "- at 0x200000(ubi)\0" #define CONFIG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ @@ -39,9 +37,7 @@ "mtdparts="CONFIG_MTDPARTS \ - "kernel=/boot/uImage\0" \ - "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0" -+ "kernel=/boot/zImage\0" \ -+ "fdt=/boot/iconnect.dtb\0" \ -+ "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0" ++ "bootargs_root=\0" /* * Ethernet driver configuration -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From Wojciech.Dubowik at neratec.com Tue Apr 5 04:07:33 2016 From: Wojciech.Dubowik at neratec.com (Wojciech Dubowik) Date: Tue, 5 Apr 2016 10:07:33 +0200 Subject: [OpenWrt-Devel] [PATCH 2/3] kirkwood: Migrate Iconnect to new ubi image format In-Reply-To: <1459843654-1130-1-git-send-email-Wojciech.Dubowik@neratec.com> References: <1459843654-1130-1-git-send-email-Wojciech.Dubowik@neratec.com> Message-ID: <1459843654-1130-3-git-send-email-Wojciech.Dubowik@neratec.com> Default partition name is now ubi. Signed-off-by: Wojciech Dubowik --- target/linux/kirkwood/patches-4.4/130-iconnect.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/kirkwood/patches-4.4/130-iconnect.patch b/target/linux/kirkwood/patches-4.4/130-iconnect.patch index c95579d..2d0a376 100644 --- a/target/linux/kirkwood/patches-4.4/130-iconnect.patch +++ b/target/linux/kirkwood/patches-4.4/130-iconnect.patch @@ -34,7 +34,7 @@ - label = "boot"; - reg = <0x980000 0x1f400000>; + partition at 200000 { -+ label = "root"; ++ label = "ubi"; + reg = <0x200000 0x1fe00000>; }; }; -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From Wojciech.Dubowik at neratec.com Tue Apr 5 04:07:34 2016 From: Wojciech.Dubowik at neratec.com (Wojciech Dubowik) Date: Tue, 5 Apr 2016 10:07:34 +0200 Subject: [OpenWrt-Devel] [PATCH 3/3] krikwood: Make Iconnect image use new ubi format style In-Reply-To: <1459843654-1130-1-git-send-email-Wojciech.Dubowik@neratec.com> References: <1459843654-1130-1-git-send-email-Wojciech.Dubowik@neratec.com> Message-ID: <1459843654-1130-4-git-send-email-Wojciech.Dubowik@neratec.com> To flash first time follow instructions in commit: "kirkwood/dockstar: use ubi(kernel, squashfs, ubifs) images" Signed-off-by: Wojciech Dubowik --- target/linux/kirkwood/base-files/lib/upgrade/platform.sh | 6 ++++-- target/linux/kirkwood/image/Makefile | 11 +++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh index be5f101..af0ac7c 100644 --- a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh +++ b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh @@ -14,7 +14,8 @@ platform_check_image() { } return 0 ;; - "dockstar") + "dockstar"|\ + "iconnect") nand_do_platform_check $board $1 return $? ;; @@ -39,7 +40,8 @@ platform_pre_upgrade() { local board=$(kirkwood_board_name) case "$board" in - "dockstar") + "dockstar"|\ + "iconnect") nand_do_upgrade $1 ;; esac diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index d38ee71..071c700 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/image.mk DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE KERNEL_IN_UBI KERNEL_LOADADDR:=0x8000 -TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome +TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome iconnect define Device/Default KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) @@ -47,6 +47,12 @@ $(Device/dockstar) DEVICE_DTS := kirkwood-goflexhome endef +define Device/iconnect +$(Device/dockstar) + PROFILES := Generic ICONNECT + DEVICE_DTS := kirkwood-iconnect +endef + define Device/linksys-audi DEVICE_DTS := kirkwood-linksys-audi PAGESIZE := 512 @@ -176,9 +182,6 @@ Image/InstallKernel/Template/Generic=$(call Image/InstallKernel/Template) Image/BuildKernel/Template/IB62X0=$(call Image/BuildKernel/Template,ib62x0) Image/InstallKernel/Template/IB62X0=$(call Image/InstallKernel/Template,ib62x0) -Image/BuildKernel/Template/ICONNECT=$(call Image/BuildKernel/Template,iconnect) -Image/InstallKernel/Template/ICONNECT=$(call Image/InstallKernel/Template,iconnect) - Image/BuildKernel/Template/IOMEGA_IX2_200=$(call Image/BuildKernel/Template,iomega_ix2_200) Image/InstallKernel/Template/IOMEGA_IX2_200=$(call Image/InstallKernel/Template,iomega_ix2_200) -- 1.9.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From openwrt-devel-bounces at lists.openwrt.org Tue Apr 5 06:20:00 2016 From: openwrt-devel-bounces at lists.openwrt.org (openwrt-devel-bounces at lists.openwrt.org) Date: Tue, 5 Apr 2016 13:20:00 +0300 Subject: [OpenWrt-Devel] *****SPAM***** Fw: new important message Message-ID: <0000bae8e936$212dc1b2$8b9def59$@nop.com> Spam detection software, running on the system "arrakis.dune.hu", has identified this incoming email as possible spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Hello! New message, please read openwrt-devel-bounces at lists.openwrt.org [...] Content analysis details: (6.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 HTML_MESSAGE BODY: HTML included in message 3.9 NAME_EMAIL_DIFF Sender NAME is an unrelated email address 2.4 RDNS_NONE Delivered to internal network by a host with no rDNS The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor. -------------- next part -------------- An embedded message was scrubbed... From: openwrt-devel-bounces at lists.openwrt.org Subject: Fw: new important message Date: Tue, 5 Apr 2016 13:20:00 +0300 Size: 4353 URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 09:32:08 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 15:32:08 +0200 Subject: [OpenWrt-Devel] [RFC v2 1/6] ar71xx: Save in ag71xx_platform_data if SoC is qca955x Message-ID: <1459863133-26810-1-git-send-email-sven@open-mesh.com> From: Sven Eckelmann The ag71xx driver must know if a device is QCA955x to enable some special workarounds for this SoC family. Similar information are already stored in ag71xx_platform_data and ag71xx_mdio_platform_data to adjust the behavior of the driver. Signed-off-by: Sven Eckelmann --- v2: - Split into multiple patches and adjust slightly to look more like an OpenWrt patch target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c | 1 + .../ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h | 1 + 2 files changed, 2 insertions(+) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c index b43c80a..09201c9 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c @@ -1100,6 +1100,7 @@ void __init ath79_register_eth(unsigned int id) pdata->ddr_flush = ath79_ddr_no_flush; pdata->has_gbit = 1; pdata->is_ar724x = 1; + pdata->is_qca955x = 1; /* * Limit the maximum frame length to 4095 bytes. diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h index d46dc4e..4db2c65 100644 --- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h +++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h @@ -36,6 +36,7 @@ struct ag71xx_platform_data { u8 is_ar7240:1; u8 is_ar724x:1; u8 has_ar8216:1; + u8 is_qca955x:1; struct ag71xx_switch_platform_data *switch_data; -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 09:32:09 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 15:32:09 +0200 Subject: [OpenWrt-Devel] [RFC v2 2/6] ar71xx: Save GMAC id in ag71xx_platform_data In-Reply-To: <1459863133-26810-1-git-send-email-sven@open-mesh.com> References: <1459863133-26810-1-git-send-email-sven@open-mesh.com> Message-ID: <1459863133-26810-2-git-send-email-sven@open-mesh.com> From: Sven Eckelmann The ag71xx driver must know which GMAC is is currently handling to enable some special workarounds for this GMAC. GMAC0 has some registers on QCA9558 which GMAC1 doesn't have. Signed-off-by: Sven Eckelmann --- v2: - Split into multiple patches and adjust slightly to look more like an OpenWrt patch target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c | 1 + .../ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c index 09201c9..bfcc82f 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c @@ -871,6 +871,7 @@ void __init ath79_register_eth(unsigned int id) pdata->max_frame_len = 1540; pdata->desc_pktlen_mask = 0xfff; + pdata->gmac_num = id; err = ath79_setup_phy_if_mode(id, pdata); if (err) { diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h index 4db2c65..5e4edae 100644 --- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h +++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h @@ -38,6 +38,8 @@ struct ag71xx_platform_data { u8 has_ar8216:1; u8 is_qca955x:1; + unsigned int gmac_num; + struct ag71xx_switch_platform_data *switch_data; void (*ddr_flush)(void); -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 09:32:10 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 15:32:10 +0200 Subject: [OpenWrt-Devel] [RFC v2 3/6] ar71xx: Fix size of the QCA955x GMAC registers In-Reply-To: <1459863133-26810-1-git-send-email-sven@open-mesh.com> References: <1459863133-26810-1-git-send-email-sven@open-mesh.com> Message-ID: <1459863133-26810-3-git-send-email-sven@open-mesh.com> From: Sven Eckelmann The GMAC registers for QCA9558 are from 0x18070000-0x18070067. Some of the upper registers are required to correctly reset SGMII links on speed changes. Signed-off-by: Sven Eckelmann --- v2: - Split into multiple patches and adjust slightly to look more like an OpenWrt patch .../ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch | 2 +- .../ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch b/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch index 0126f6a..ae44285 100644 --- a/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch +++ b/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch @@ -47,7 +47,7 @@ #define QCA955X_PCI_CTRL_SIZE 0x100 +#define QCA955X_GMAC_BASE (AR71XX_APB_BASE + 0x00070000) -+#define QCA955X_GMAC_SIZE 0x40 ++#define QCA955X_GMAC_SIZE 0x68 #define QCA955X_WMAC_BASE (AR71XX_APB_BASE + 0x00100000) #define QCA955X_WMAC_SIZE 0x20000 #define QCA955X_EHCI0_BASE 0x1b000000 diff --git a/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch b/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch index 0126f6a..ae44285 100644 --- a/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch +++ b/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch @@ -47,7 +47,7 @@ #define QCA955X_PCI_CTRL_SIZE 0x100 +#define QCA955X_GMAC_BASE (AR71XX_APB_BASE + 0x00070000) -+#define QCA955X_GMAC_SIZE 0x40 ++#define QCA955X_GMAC_SIZE 0x68 #define QCA955X_WMAC_BASE (AR71XX_APB_BASE + 0x00100000) #define QCA955X_WMAC_SIZE 0x20000 #define QCA955X_EHCI0_BASE 0x1b000000 -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 09:32:11 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 15:32:11 +0200 Subject: [OpenWrt-Devel] [RFC v2 4/6] ar71xx: Add QCA955X SGMII related GMAC register definitions In-Reply-To: <1459863133-26810-1-git-send-email-sven@open-mesh.com> References: <1459863133-26810-1-git-send-email-sven@open-mesh.com> Message-ID: <1459863133-26810-4-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- v2: - Split into multiple patches and adjust slightly to look more like an OpenWrt patch .../601-MIPS-ath79-add-more-register-defines.patch | 32 +++++++++++++++++++++- .../601-MIPS-ath79-add-more-register-defines.patch | 32 +++++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch b/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch index ae44285..213195c 100644 --- a/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch +++ b/target/linux/ar71xx/patches-4.1/601-MIPS-ath79-add-more-register-defines.patch @@ -217,7 +217,7 @@ #define AR71XX_GPIO_COUNT 16 #define AR7240_GPIO_COUNT 18 #define AR7241_GPIO_COUNT 20 -@@ -560,4 +671,235 @@ +@@ -560,4 +671,265 @@ #define AR934X_SRIF_DPLL2_OUTDIV_SHIFT 13 #define AR934X_SRIF_DPLL2_OUTDIV_MASK 0x7 @@ -452,4 +452,34 @@ +#define QCA955X_ETH_CFG_TXE_DELAY_MASK 0x3 +#define QCA955X_ETH_CFG_TXE_DELAY_SHIFT 20 + ++#define QCA955X_GMAC_REG_SGMII_RESET 0x14 ++ ++#define QCA955X_SGMII_RESET_HW_RX_125M BIT(4) ++#define QCA955X_SGMII_RESET_TX_125M BIT(3) ++#define QCA955X_SGMII_RESET_RX_125M BIT(2) ++#define QCA955X_SGMII_RESET_TX_CLK BIT(1) ++#define QCA955X_SGMII_RESET_RX_CLK BIT(0) ++ ++#define QCA955X_GMAC_REG_MR_AN_CONTROL 0x1c ++ ++#define QCA955X_MR_AN_CONTROL_PHY_RESET BIT(15) ++#define QCA955X_MR_AN_CONTROL_LOOPBACK BIT(14) ++#define QCA955X_MR_AN_CONTROL_SPEED_SEL0 BIT(13) ++#define QCA955X_MR_AN_CONTROL_AN_ENABLE BIT(12) ++#define QCA955X_MR_AN_CONTROL_POWER_DOWN BIT(11) ++#define QCA955X_MR_AN_CONTROL_RESTART_AN BIT(9) ++#define QCA955X_MR_AN_CONTROL_DUPLEX_MODE BIT(8) ++#define QCA955X_MR_AN_CONTROL_SPEED_SEL1 BIT(6) ++ ++#define QCA955X_GMAC_REG_SGMII_DEBUG 0x58 ++ ++#define QCA955X_SGMII_DEBUG_ARB_STATE_MASK 0xf ++#define QCA955X_SGMII_DEBUG_ARB_STATE_SHIFT 24 ++#define QCA955X_SGMII_DEBUG_RX_SYNC_STATE_MASK 0xff ++#define QCA955X_SGMII_DEBUG_RX_SYNC_STATE_SHIFT 16 ++#define QCA955X_SGMII_DEBUG_RX_STATE_MASK 0xff ++#define QCA955X_SGMII_DEBUG_RX_STATE_SHIFT 8 ++#define QCA955X_SGMII_DEBUG_TX_STATE_MASK 0xff ++#define QCA955X_SGMII_DEBUG_TX_STATE_SHIFT 0 ++ #endif /* __ASM_MACH_AR71XX_REGS_H */ diff --git a/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch b/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch index ae44285..213195c 100644 --- a/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch +++ b/target/linux/ar71xx/patches-4.4/601-MIPS-ath79-add-more-register-defines.patch @@ -217,7 +217,7 @@ #define AR71XX_GPIO_COUNT 16 #define AR7240_GPIO_COUNT 18 #define AR7241_GPIO_COUNT 20 -@@ -560,4 +671,235 @@ +@@ -560,4 +671,265 @@ #define AR934X_SRIF_DPLL2_OUTDIV_SHIFT 13 #define AR934X_SRIF_DPLL2_OUTDIV_MASK 0x7 @@ -452,4 +452,34 @@ +#define QCA955X_ETH_CFG_TXE_DELAY_MASK 0x3 +#define QCA955X_ETH_CFG_TXE_DELAY_SHIFT 20 + ++#define QCA955X_GMAC_REG_SGMII_RESET 0x14 ++ ++#define QCA955X_SGMII_RESET_HW_RX_125M BIT(4) ++#define QCA955X_SGMII_RESET_TX_125M BIT(3) ++#define QCA955X_SGMII_RESET_RX_125M BIT(2) ++#define QCA955X_SGMII_RESET_TX_CLK BIT(1) ++#define QCA955X_SGMII_RESET_RX_CLK BIT(0) ++ ++#define QCA955X_GMAC_REG_MR_AN_CONTROL 0x1c ++ ++#define QCA955X_MR_AN_CONTROL_PHY_RESET BIT(15) ++#define QCA955X_MR_AN_CONTROL_LOOPBACK BIT(14) ++#define QCA955X_MR_AN_CONTROL_SPEED_SEL0 BIT(13) ++#define QCA955X_MR_AN_CONTROL_AN_ENABLE BIT(12) ++#define QCA955X_MR_AN_CONTROL_POWER_DOWN BIT(11) ++#define QCA955X_MR_AN_CONTROL_RESTART_AN BIT(9) ++#define QCA955X_MR_AN_CONTROL_DUPLEX_MODE BIT(8) ++#define QCA955X_MR_AN_CONTROL_SPEED_SEL1 BIT(6) ++ ++#define QCA955X_GMAC_REG_SGMII_DEBUG 0x58 ++ ++#define QCA955X_SGMII_DEBUG_ARB_STATE_MASK 0xf ++#define QCA955X_SGMII_DEBUG_ARB_STATE_SHIFT 24 ++#define QCA955X_SGMII_DEBUG_RX_SYNC_STATE_MASK 0xff ++#define QCA955X_SGMII_DEBUG_RX_SYNC_STATE_SHIFT 16 ++#define QCA955X_SGMII_DEBUG_RX_STATE_MASK 0xff ++#define QCA955X_SGMII_DEBUG_RX_STATE_SHIFT 8 ++#define QCA955X_SGMII_DEBUG_TX_STATE_MASK 0xff ++#define QCA955X_SGMII_DEBUG_TX_STATE_SHIFT 0 ++ #endif /* __ASM_MACH_AR71XX_REGS_H */ -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 09:32:12 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 15:32:12 +0200 Subject: [OpenWrt-Devel] [RFC v2 5/6] ag71xx: Disable classification of fragmented packets on QCA955x In-Reply-To: <1459863133-26810-1-git-send-email-sven@open-mesh.com> References: <1459863133-26810-1-git-send-email-sven@open-mesh.com> Message-ID: <1459863133-26810-5-git-send-email-sven@open-mesh.com> From: Sven Eckelmann The QCA955x SoC family tends to hang randomly on GMAC0 when the link speeds+duplex modes are changed. QCA recommended to disable the classification of fragmented packets for QCA to avoid this problem. Signed-off-by: Sven Eckelmann --- v2: - Split into multiple patches and adjust slightly to look more like an OpenWrt patch .../linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h | 5 +++++ .../ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h index 5d03dcf..454b4c2 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h @@ -259,6 +259,10 @@ ag71xx_ring_size_order(int size) #define AG71XX_REG_RX_SM 0x01b0 #define AG71XX_REG_TX_SM 0x01b4 +#define QCA955X_REG_IG_ACL 0x23c + +#define QCA955X_FRA_DISABLE 0x60000000 + #define MAC_CFG1_TXE BIT(0) /* Tx Enable */ #define MAC_CFG1_STX BIT(1) /* Synchronize Tx Enable */ #define MAC_CFG1_RXE BIT(2) /* Rx Enable */ @@ -376,6 +380,7 @@ static inline void ag71xx_check_reg_offset(struct ag71xx *ag, unsigned reg) case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL: case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_TX_SM: case AG71XX_REG_MII_CFG: + case QCA955X_REG_IG_ACL: break; default: 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 38226cf..0832059 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 @@ -474,6 +474,9 @@ static void ag71xx_hw_setup(struct ag71xx *ag) } ag71xx_wr(ag, AG71XX_REG_FIFO_CFG4, FIFO_CFG4_INIT); ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, FIFO_CFG5_INIT); + + if (pdata->is_qca955x && pdata->gmac_num == 0) + ag71xx_sb(ag, QCA955X_REG_IG_ACL, QCA955X_FRA_DISABLE); } static void ag71xx_hw_init(struct ag71xx *ag) -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 09:32:13 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 15:32:13 +0200 Subject: [OpenWrt-Devel] [RFC v2 6/6] ar71xx: Reset QCA955x SGMII link on speed change In-Reply-To: <1459863133-26810-1-git-send-email-sven@open-mesh.com> References: <1459863133-26810-1-git-send-email-sven@open-mesh.com> Message-ID: <1459863133-26810-6-git-send-email-sven@open-mesh.com> From: Sven Eckelmann The SGMII link of the QCA955x seems to be unstable when the PHY changes the link speed. Reseting the SGMII and the PHY management control seems to resolve this problem. This was observed with an AR8033 and QCA9558 Signed-off-by: Sven Eckelmann --- v2: - Split into multiple patches and adjust slightly to look more like an OpenWrt patch The code of this RFC is not meant to be an actual patch. It should show what the u-boot for QCA955x does and what seemed to work(tm) in my limited tests. It would be interesting to know whether this was also noticed by other people and how they fixed it (when they fixed it). If it is already known than it would maybe good to find a better way to integrate it with ag71xx. Right now it just uses the set_speed callback to start the reset. .../linux/ar71xx/files/arch/mips/ath79/dev-eth.c | 77 ++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c index bfcc82f..f2e88dd 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c @@ -383,6 +383,81 @@ static void qca955x_set_speed_xmii(int speed) iounmap(base); } +static void qca955x_reset_sgmii(void) +{ + void __iomem *base; + int count = 0; + u32 status; + u32 t; + + base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE); + + t = QCA955X_MR_AN_CONTROL_AN_ENABLE | + QCA955X_MR_AN_CONTROL_PHY_RESET; + __raw_writel(t, base + QCA955X_GMAC_REG_MR_AN_CONTROL); + udelay(10); + + t = QCA955X_MR_AN_CONTROL_AN_ENABLE; + __raw_writel(t, base + QCA955X_GMAC_REG_MR_AN_CONTROL); + + t = 0; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + + t = QCA955X_SGMII_RESET_HW_RX_125M; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + + t = QCA955X_SGMII_RESET_HW_RX_125M | + QCA955X_SGMII_RESET_RX_125M; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + + t = QCA955X_SGMII_RESET_HW_RX_125M | + QCA955X_SGMII_RESET_TX_125M | + QCA955X_SGMII_RESET_RX_125M; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + + t = QCA955X_SGMII_RESET_HW_RX_125M | + QCA955X_SGMII_RESET_TX_125M | + QCA955X_SGMII_RESET_RX_125M | + QCA955X_SGMII_RESET_RX_CLK; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + + t = QCA955X_SGMII_RESET_HW_RX_125M | + QCA955X_SGMII_RESET_TX_125M | + QCA955X_SGMII_RESET_RX_125M | + QCA955X_SGMII_RESET_RX_CLK | + QCA955X_SGMII_RESET_TX_CLK; + __raw_writel(t, base + QCA955X_GMAC_REG_SGMII_RESET); + + t = __raw_readl(base + QCA955X_GMAC_REG_MR_AN_CONTROL); + t &= ~QCA955X_MR_AN_CONTROL_PHY_RESET; + __raw_writel(t, base + QCA955X_GMAC_REG_MR_AN_CONTROL); + udelay(100); + + status = __raw_readl(base + QCA955X_GMAC_REG_SGMII_DEBUG); + status &= 0xff; + while (status != 0xf && status != 0x10) { + t = __raw_readl(base + QCA955X_GMAC_REG_MR_AN_CONTROL); + t |= QCA955X_MR_AN_CONTROL_PHY_RESET; + __raw_writel(t, base + QCA955X_GMAC_REG_MR_AN_CONTROL); + + udelay(100); + + t = __raw_readl(base + QCA955X_GMAC_REG_MR_AN_CONTROL); + t &= ~QCA955X_MR_AN_CONTROL_PHY_RESET; + __raw_writel(t, base + QCA955X_GMAC_REG_MR_AN_CONTROL); + + if (count++ >= 20) + break; + + mdelay(10); + + status = __raw_readl(base + QCA955X_GMAC_REG_SGMII_DEBUG); + status &= 0xff; + } + + iounmap(base); +} + static void qca955x_set_speed_sgmii(int speed) { void __iomem *base; @@ -391,6 +466,8 @@ static void qca955x_set_speed_sgmii(int speed) base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE); __raw_writel(val, base + QCA955X_PLL_ETH_SGMII_CONTROL_REG); iounmap(base); + + qca955x_reset_sgmii(); } static void qca956x_set_speed_sgmii(int speed) -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From zioproto at gmail.com Tue Apr 5 09:33:27 2016 From: zioproto at gmail.com (Saverio Proto) Date: Tue, 5 Apr 2016 15:33:27 +0200 Subject: [OpenWrt-Devel] 15.05.1 - Chaos Calmer In-Reply-To: <5702D0CF.5010107@einfach.org> References: <56E94C5D.1030302@openwrt.org> <56E9A88C.5060409@einfach.org> <5702D0CF.5010107@einfach.org> Message-ID: Thanks Bruno, I am sorry I am coming back to OpenWrt after a long break. I expected the tag also on the Release repo http://git.openwrt.org/?p=15.05/openwrt.git;a=summary Here I see only a 15.05 tag. I dont understand the logic. I expect the 15.05.1 to be release from the Release-repo ? thank you Saverio 2016-04-04 22:38 GMT+02:00 Bruno Randolf : > On 04/04/2016 09:34 PM, Saverio Proto wrote: >>> Great! Thanks for your good work! >>> Could you please add a tag for 15.05.1 in the git repo? >> >> That would be great. I am trying to git bisect a bug and I have no >> idea on top of what commit is 15.05.1 built. > > There is a tag for it already: > > https://github.com/openwrt/openwrt/tags > > bruno > _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From john at phrozen.org Tue Apr 5 09:42:56 2016 From: john at phrozen.org (John Crispin) Date: Tue, 5 Apr 2016 15:42:56 +0200 Subject: [OpenWrt-Devel] 15.05.1 - Chaos Calmer In-Reply-To: References: <56E94C5D.1030302@openwrt.org> <56E9A88C.5060409@einfach.org> <5702D0CF.5010107@einfach.org> Message-ID: <5703C0E0.1020601@phrozen.org> On 05/04/2016 15:33, Saverio Proto wrote: > Thanks Bruno, > > I am sorry I am coming back to OpenWrt after a long break. > > I expected the tag also on the Release repo > > http://git.openwrt.org/?p=15.05/openwrt.git;a=summary > > Here I see only a 15.05 tag. I dont understand the logic. I expect the > 15.05.1 to be release from the Release-repo ? > > thank you > > Saverio > the logic is that i can push a tag to one tree but not to the other and whoever can is not reading this thread John > > 2016-04-04 22:38 GMT+02:00 Bruno Randolf : >> On 04/04/2016 09:34 PM, Saverio Proto wrote: >>>> Great! Thanks for your good work! >>>> Could you please add a tag for 15.05.1 in the git repo? >>> >>> That would be great. I am trying to git bisect a bug and I have no >>> idea on top of what commit is 15.05.1 built. >> >> There is a tag for it already: >> >> https://github.com/openwrt/openwrt/tags >> >> bruno >> > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel > _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From br1 at einfach.org Tue Apr 5 09:43:20 2016 From: br1 at einfach.org (Bruno Randolf) Date: Tue, 5 Apr 2016 14:43:20 +0100 Subject: [OpenWrt-Devel] 15.05.1 - Chaos Calmer In-Reply-To: References: <56E94C5D.1030302@openwrt.org> <56E9A88C.5060409@einfach.org> <5702D0CF.5010107@einfach.org> Message-ID: <5703C0F8.5030307@einfach.org> On 04/05/2016 02:33 PM, Saverio Proto wrote: > Thanks Bruno, > > I am sorry I am coming back to OpenWrt after a long break. > > I expected the tag also on the Release repo > > http://git.openwrt.org/?p=15.05/openwrt.git;a=summary > > Here I see only a 15.05 tag. I dont understand the logic. I expect the > 15.05.1 to be release from the Release-repo ? Right, it should be tagged there too! As I'm now only using the other repo I didn't check there. bruno _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From cristian at samknows.com Tue Apr 5 10:22:04 2016 From: cristian at samknows.com (Cristian Morales Vega) Date: Tue, 5 Apr 2016 15:22:04 +0100 Subject: [OpenWrt-Devel] [PATCH] ramips: mt7621: add support for disabling flow control Message-ID: <1459866124-17771-1-git-send-email-cristian@samknows.com> Signed-off-by: Cristian Morales Vega --- ...diatek-add-swconfig-driver-for-gsw_mt762x.patch | 54 +++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/target/linux/ramips/patches-4.4/0513-net-mediatek-add-swconfig-driver-for-gsw_mt762x.patch b/target/linux/ramips/patches-4.4/0513-net-mediatek-add-swconfig-driver-for-gsw_mt762x.patch index bbad8cc..d056551 100644 --- a/target/linux/ramips/patches-4.4/0513-net-mediatek-add-swconfig-driver-for-gsw_mt762x.patch +++ b/target/linux/ramips/patches-4.4/0513-net-mediatek-add-swconfig-driver-for-gsw_mt762x.patch @@ -28,7 +28,7 @@ Signed-off-by: John Crispin obj-$(CONFIG_NET_MEDIATEK_SOC) += mtk-eth-soc.o --- /dev/null +++ b/drivers/net/ethernet/mediatek/mt7530.c -@@ -0,0 +1,804 @@ +@@ -0,0 +1,856 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License @@ -709,6 +709,50 @@ Signed-off-by: John Crispin + return 0; +} + ++static int mt7621_sw_get_port_fc(struct switch_dev *dev, ++ const struct switch_attr *attr, ++ struct switch_val *val) ++{ ++ u32 reg; ++ struct mt7530_priv *priv = container_of(dev, struct mt7530_priv, swdev); ++ ++ if (val->port_vlan >= MT7530_NUM_PORTS) ++ return -EINVAL; ++ ++ reg = mdiobus_read(priv->bus, val->port_vlan, 4); ++ reg &= BIT(10); ++ ++ val->value.i = reg ? 1 : 0; ++ ++ return 0; ++} ++ ++static int mt7621_sw_set_port_fc(struct switch_dev *dev, ++ const struct switch_attr *attr, ++ struct switch_val *val) ++{ ++ u32 reg; ++ struct mt7530_priv *priv = container_of(dev, struct mt7530_priv, swdev); ++ ++ if (val->port_vlan >= MT7530_NUM_PORTS) ++ return -EINVAL; ++ ++ reg = mdiobus_read(priv->bus, val->port_vlan, 4); ++ if(val->value.i) { ++ reg |= BIT(10); ++ } else { ++ reg &= ~BIT(10); ++ } ++ mdiobus_write(priv->bus, val->port_vlan, 4, reg); ++ ++ /* Restart auto-negotiation */ ++ reg = mdiobus_read(priv->bus, val->port_vlan, 0); ++ reg |= BIT(9); ++ mdiobus_write(priv->bus, val->port_vlan, 0, reg); ++ ++ return 0; ++} ++ +static const struct switch_attr mt7621_port[] = { + { + .type = SWITCH_TYPE_STRING, @@ -717,6 +761,14 @@ Signed-off-by: John Crispin + .get = mt7621_sw_get_port_mib, + .set = NULL, + }, ++ { ++ .type = SWITCH_TYPE_INT, ++ .name = "flow_ctl", ++ .description = "Flow Control", ++ .get = mt7621_sw_get_port_fc, ++ .set = mt7621_sw_set_port_fc, ++ .max = 1, ++ }, +}; + +static const struct switch_attr mt7530_port[] = { -- 2.6.3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:46 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:46 +0200 Subject: [OpenWrt-Devel] [PATCH 01/16] scripts/om-fwupgradecfg-gen.sh: Generate sha256sum for uboot verification Message-ID: <1459869481-29376-1-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Future Open Mesh u-boot versions are changing the check of the image files (vmlinux, rootfs) from md5 to sha256. Having both in them should be enough to ensure backward and forward compatibility. Signed-off-by: Sven Eckelmann --- scripts/om-fwupgradecfg-gen.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/om-fwupgradecfg-gen.sh b/scripts/om-fwupgradecfg-gen.sh index fab1582..e208e6d 100644 --- a/scripts/om-fwupgradecfg-gen.sh +++ b/scripts/om-fwupgradecfg-gen.sh @@ -42,6 +42,7 @@ CHECK_BS=65536 KERNEL_SIZE=$(stat -c%s "$KERNEL_PATH") KERNEL_MD5=$(md5=$(md5sum $KERNEL_PATH); echo ${md5%% *}) +KERNEL_SHA256=$(openssl dgst -sha256 $KERNEL_PATH | awk '{print $2}') KERNEL_PART_SIZE=$(size=$(($KERNEL_SIZE / $FLASH_BS)); [ $(($size * $FLASH_BS)) -lt $KERNEL_SIZE ] && size=$(($size + 1)); echo $(($size * $FLASH_BS / 1024))) ROOTFS_FLASH_ADDR=$(addr=$(($KERNEL_FLASH_ADDR + ($KERNEL_PART_SIZE * 1024))); printf "0x%x" $addr) @@ -49,6 +50,7 @@ ROOTFS_SIZE=$(stat -c%s "$ROOTFS_PATH") ROOTFS_CHECK_BLOCKS=$((($ROOTFS_SIZE / $CHECK_BS) - $MD5_SKIP_BLOCKS)) ROOTFS_MD5=$(md5=$(dd if=$ROOTFS_PATH bs=$CHECK_BS count=$ROOTFS_CHECK_BLOCKS 2>&- | md5sum); echo ${md5%% *}) ROOTFS_MD5_FULL=$(md5=$(md5sum $ROOTFS_PATH); echo ${md5%% *}) +ROOTFS_SHA256_FULL=$(openssl dgst -sha256 $ROOTFS_PATH | awk '{print $2}') ROOTFS_CHECK_SIZE=$(printf '0x%x' $(($ROOTFS_CHECK_BLOCKS * $CHECK_BS))) ROOTFS_PART_SIZE=$(($MAX_PART_SIZE - $KERNEL_PART_SIZE)) @@ -57,6 +59,7 @@ cat << EOF > $CFG_OUT filename=kernel md5sum=$KERNEL_MD5 filemd5sum=$KERNEL_MD5 +filesha256sum=$KERNEL_SHA256 flashaddr=$KERNEL_FLASH_ADDR checksize=0x0 cmd_success=setenv bootseq 1,2; setenv kernel_size_1 $KERNEL_PART_SIZE; saveenv @@ -66,6 +69,7 @@ cmd_fail=reset filename=rootfs md5sum=$ROOTFS_MD5 filemd5sum=$ROOTFS_MD5_FULL +filesha256sum=$ROOTFS_SHA256_FULL flashaddr=$ROOTFS_FLASH_ADDR checksize=$ROOTFS_CHECK_SIZE cmd_success=setenv bootseq 1,2; setenv kernel_size_1 $KERNEL_PART_SIZE; setenv rootfs_size_1 $ROOTFS_PART_SIZE; saveenv -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:47 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:47 +0200 Subject: [OpenWrt-Devel] [PATCH 02/16] ar71xx: add kernel support for the OpenMesh OM5P-AC board In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-2-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- target/linux/ar71xx/config-4.1 | 1 + target/linux/ar71xx/config-4.4 | 1 + .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 9 + target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 + .../ar71xx/files/arch/mips/ath79/mach-om5pac.c | 193 +++++++++++++++++++++ .../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 + 6 files changed, 206 insertions(+) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-om5pac.c diff --git a/target/linux/ar71xx/config-4.1 b/target/linux/ar71xx/config-4.1 index d6ad850..0ba1f53 100644 --- a/target/linux/ar71xx/config-4.1 +++ b/target/linux/ar71xx/config-4.1 @@ -109,6 +109,7 @@ CONFIG_ATH79_MACH_NBG460N=y CONFIG_ATH79_MACH_NBG6716=y CONFIG_ATH79_MACH_OM2P=y CONFIG_ATH79_MACH_OM5P=y +CONFIG_ATH79_MACH_OM5P_AC=y CONFIG_ATH79_MACH_OMY_X1=y CONFIG_ATH79_MACH_ONION_OMEGA=y CONFIG_ATH79_MACH_PB42=y diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 49cecc5..5117829 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -112,6 +112,7 @@ CONFIG_ATH79_MACH_NBG460N=y CONFIG_ATH79_MACH_NBG6716=y CONFIG_ATH79_MACH_OM2P=y CONFIG_ATH79_MACH_OM5P=y +CONFIG_ATH79_MACH_OM5P_AC=y CONFIG_ATH79_MACH_OMY_X1=y CONFIG_ATH79_MACH_ONION_OMEGA=y CONFIG_ATH79_MACH_PB42=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index f47f1b9..b12c42a 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -861,6 +861,15 @@ config ATH79_MACH_OM5P select ATH79_DEV_M25P80 select ATH79_DEV_WMAC +config ATH79_MACH_OM5P_AC + bool "OpenMesh OM5P-AC board support" + select SOC_QCA955X + select ATH79_DEV_AP9X_PCI if PCI + select ATH79_DEV_ETH + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 + select ATH79_DEV_WMAC + config ATH79_MACH_OMY_X1 bool "OMYlink OMY X1 support" select SOC_AR934X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 74376b2..484dda0 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_MZK_W300NH) += mach-mzk-w300nh.o obj-$(CONFIG_ATH79_MACH_NBG460N) += mach-nbg460n.o obj-$(CONFIG_ATH79_MACH_OM2P) += mach-om2p.o obj-$(CONFIG_ATH79_MACH_OM5P) += mach-om5p.o +obj-$(CONFIG_ATH79_MACH_OM5P_AC) += mach-om5pac.o obj-$(CONFIG_ATH79_MACH_OMY_X1) += mach-omy-x1.o obj-$(CONFIG_ATH79_MACH_ONION_OMEGA) += mach-onion-omega.o obj-$(CONFIG_ATH79_MACH_PB42) += mach-pb42.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pac.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pac.c new file mode 100644 index 0000000..f6974af --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pac.c @@ -0,0 +1,193 @@ +/* + * OpenMesh OM5P-AC support + * + * Copyright (C) 2013 Marek Lindner + * Copyright (C) 2014 Sven Eckelmann + * + * 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 + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "common.h" +#include "dev-ap9x-pci.h" +#include "dev-eth.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-wmac.h" +#include "machtypes.h" +#include "pci.h" + +#define OM5PAC_GPIO_LED_POWER 18 +#define OM5PAC_GPIO_LED_GREEN 21 +#define OM5PAC_GPIO_LED_RED 23 +#define OM5PAC_GPIO_LED_YELLOW 22 +#define OM5PAC_GPIO_LED_LAN 20 +#define OM5PAC_GPIO_LED_WAN 19 +#define OM5PAC_GPIO_I2C_SCL 12 +#define OM5PAC_GPIO_I2C_SDA 11 + +#define OM5PAC_KEYS_POLL_INTERVAL 20 /* msecs */ +#define OM5PAC_KEYS_DEBOUNCE_INTERVAL (3 * OM5PAC_KEYS_POLL_INTERVAL) + +#define OM5PAC_WMAC_CALDATA_OFFSET 0x1000 + +static struct gpio_led om5pac_leds_gpio[] __initdata = { + { + .name = "om5pac:blue:power", + .gpio = OM5PAC_GPIO_LED_POWER, + .active_low = 1, + }, { + .name = "om5pac:red:wifi", + .gpio = OM5PAC_GPIO_LED_RED, + .active_low = 1, + }, { + .name = "om5pac:yellow:wifi", + .gpio = OM5PAC_GPIO_LED_YELLOW, + .active_low = 1, + }, { + .name = "om5pac:green:wifi", + .gpio = OM5PAC_GPIO_LED_GREEN, + .active_low = 1, + }, { + .name = "om5pac:blue:lan", + .gpio = OM5PAC_GPIO_LED_LAN, + .active_low = 1, + }, { + .name = "om5pac:blue:wan", + .gpio = OM5PAC_GPIO_LED_WAN, + .active_low = 1, + } +}; + +static struct flash_platform_data om5pac_flash_data = { + .type = "mx25l12805d", +}; + +static struct i2c_gpio_platform_data om5pac_i2c_device_platdata = { + .sda_pin = OM5PAC_GPIO_I2C_SDA, + .scl_pin = OM5PAC_GPIO_I2C_SCL, + .udelay = 10, + .sda_is_open_drain = 1, + .scl_is_open_drain = 1, +}; + +static struct platform_device om5pac_i2c_device = { + .name = "i2c-gpio", + .id = 0, + .dev = { + .platform_data = &om5pac_i2c_device_platdata, + }, +}; + +static struct i2c_board_info om5pac_i2c_devs[] __initdata = { + { + I2C_BOARD_INFO("tmp423", 0x4c), + }, +}; + +static struct at803x_platform_data om5pac_at803x_data = { + .disable_smarteee = 1, + .enable_rgmii_rx_delay = 1, + .enable_rgmii_tx_delay = 1, +}; + +static struct mdio_board_info om5pac_mdio0_info[] = { + { + .bus_id = "ag71xx-mdio.0", + .phy_addr = 1, + .platform_data = &om5pac_at803x_data, + }, + { + .bus_id = "ag71xx-mdio.0", + .phy_addr = 2, + .platform_data = &om5pac_at803x_data, + }, +}; + +static void __init om5p_ac_setup_qca955x_eth_cfg(u32 mask, + unsigned int rxd, + unsigned int rxdv, + unsigned int txd, + unsigned int txe) +{ + void __iomem *base; + u32 t; + + base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE); + + t = mask; + t |= rxd << QCA955X_ETH_CFG_RXD_DELAY_SHIFT; + t |= rxdv << QCA955X_ETH_CFG_RDV_DELAY_SHIFT; + t |= txd << QCA955X_ETH_CFG_TXD_DELAY_SHIFT; + t |= txe << QCA955X_ETH_CFG_TXE_DELAY_SHIFT; + + __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG); + + iounmap(base); +} + +static void __init om5p_ac_setup(void) +{ + u8 *art = (u8 *)KSEG1ADDR(0x1fff0000); + u8 mac[6]; + + /* temperature sensor */ + platform_device_register(&om5pac_i2c_device); + i2c_register_board_info(0, om5pac_i2c_devs, + ARRAY_SIZE(om5pac_i2c_devs)); + + ath79_gpio_output_select(OM5PAC_GPIO_LED_WAN, QCA955X_GPIO_OUT_GPIO); + + ath79_register_m25p80(&om5pac_flash_data); + ath79_register_leds_gpio(-1, ARRAY_SIZE(om5pac_leds_gpio), + om5pac_leds_gpio); + + ath79_init_mac(mac, art, 0x02); + ath79_register_wmac(art + OM5PAC_WMAC_CALDATA_OFFSET, mac); + + om5p_ac_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN, 3, 3, 0, 0); + ath79_register_mdio(0, 0x0); + + mdiobus_register_board_info(om5pac_mdio0_info, + ARRAY_SIZE(om5pac_mdio0_info)); + + ath79_init_mac(ath79_eth0_data.mac_addr, art, 0x00); + ath79_init_mac(ath79_eth1_data.mac_addr, art, 0x01); + + /* GMAC0 is connected to the PHY1 */ + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; + ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; + ath79_eth0_data.phy_mask = BIT(1); + ath79_eth0_pll_data.pll_1000 = 0x82000101; + ath79_eth0_pll_data.pll_100 = 0x80000101; + ath79_eth0_pll_data.pll_10 = 0x80001313; + ath79_register_eth(0); + + /* GMAC1 is connected to MDIO1 in SGMII mode */ + ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII; + ath79_eth1_data.mii_bus_dev = &ath79_mdio0_device.dev; + ath79_eth1_data.phy_mask = BIT(2); + ath79_eth1_pll_data.pll_1000 = 0x03000101; + ath79_eth1_pll_data.pll_100 = 0x80000101; + ath79_eth1_pll_data.pll_10 = 0x80001313; + ath79_eth1_data.speed = SPEED_1000; + ath79_eth1_data.duplex = DUPLEX_FULL; + ath79_register_eth(1); + + ath79_register_pci(); +} + +MIPS_MACHINE(ATH79_MACH_OM5P_AC, "OM5P-AC", "OpenMesh OM5P AC", om5p_ac_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 307d2df..12e30c7 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -113,6 +113,7 @@ enum ath79_mach_type { ATH79_MACH_OM2P_LC, /* OpenMesh OM2P-LC */ ATH79_MACH_OM2Pv2, /* OpenMesh OM2Pv2 */ ATH79_MACH_OM2P, /* OpenMesh OM2P */ + ATH79_MACH_OM5P_AC, /* OpenMesh OM5P-AC */ ATH79_MACH_OM5P_AN, /* OpenMesh OM5P-AN */ ATH79_MACH_OM5P, /* OpenMesh OM5P */ ATH79_MACH_OMY_X1, /* OMYlink OMY-X1 */ -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:48 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:48 +0200 Subject: [OpenWrt-Devel] [PATCH 03/16] ar71xx: add user-space support for the OpenMesh OM5P-AC In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-3-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- target/linux/ar71xx/base-files/etc/board.d/01_leds | 5 +++++ target/linux/ar71xx/base-files/etc/diag.sh | 3 +++ target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 +++ 3 files changed, 11 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 708ebb9..ab19a61 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -394,6 +394,11 @@ om5p-an) ucidef_set_led_netdev "port2" "port2" "om5p:blue:lan" "eth1" ;; +om5p-ac) + ucidef_set_led_netdev "port1" "port1" "om5pac:blue:lan" "eth0" + ucidef_set_led_netdev "port2" "port2" "om5pac:blue:wan" "eth1" + ;; + omy-x1) ucidef_set_led_default "power" "POWER" "omy:green:power" "1" ucidef_set_led_default "wan" "WAN" "omy:green:wan" "eth0" diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index a2251d1..da976bd 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -214,6 +214,9 @@ get_status_led() { om5p-an) status_led="om5p:blue:power" ;; + om5p-ac) + status_led="om5pac:blue:power" + ;; omy-x1) status_led="omy:green:power" ;; diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 6b8550a..ded9e7e 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -646,6 +646,9 @@ ar71xx_board_detect() { *"OM5P AN") name="om5p-an" ;; + *"OM5P AC") + name="om5p-ac" + ;; *"OMY-X1") name="omy-x1" ;; -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:49 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:49 +0200 Subject: [OpenWrt-Devel] [PATCH 04/16] scripts/om-fwupgradecfg-gen.sh: add support for the OM5P-AC In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-4-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- scripts/om-fwupgradecfg-gen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/om-fwupgradecfg-gen.sh b/scripts/om-fwupgradecfg-gen.sh index e208e6d..6c3b74c 100644 --- a/scripts/om-fwupgradecfg-gen.sh +++ b/scripts/om-fwupgradecfg-gen.sh @@ -7,7 +7,7 @@ # usage() { - echo "Usage: $0 " + echo "Usage: $0 " rm -f $CFG_OUT exit 1 } @@ -26,7 +26,7 @@ case $CE_TYPE in FLASH_BS=262144 MD5_SKIP_BLOCKS=1 ;; - OM5P|MR600|MR900|MR1750) + OM5P|OM5PAC|MR600|MR900|MR1750) MAX_PART_SIZE=7808 KERNEL_FLASH_ADDR=0xb0000 FLASH_BS=65536 -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:50 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:50 +0200 Subject: [OpenWrt-Devel] [PATCH 05/16] ar71xx: enable sysupgrade for the OpenMesh OM5P-AC In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-5-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh | 7 ++++++- target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh index 9ca0f5b..1cfead9 100644 --- a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh @@ -72,6 +72,11 @@ platform_check_image_openmesh() echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform" return 1 ;; + OM5PAC) + [ "$board" = "om5p-ac" ] && break + echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform" + return 1 + ;; MR1750) [ "$board" = "mr1750" ] && break echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform" @@ -162,7 +167,7 @@ platform_do_upgrade_openmesh() kernel_start_addr1=0x9f1c0000 kernel_start_addr2=0x9f8c0000 ;; - OM5P|MR600|MR900|MR1750) + OM5P|OM5PAC|MR600|MR900|MR1750) block_size=$((64 * 1024)) total_size=7995392 kernel_start_addr1=0x9f0b0000 diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 923e02b..fee9d63 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -322,7 +322,8 @@ platform_check_image() { om2p-hsv2 | \ om2p-lc | \ om5p | \ - om5p-an) + om5p-an | \ + om5p-ac) platform_check_image_openmesh "$magic_long" "$1" && return 0 return 1 ;; @@ -575,7 +576,8 @@ platform_do_upgrade() { om2p-hsv2 | \ om2p-lc | \ om5p | \ - om5p-an) + om5p-an | \ + om5p-ac) platform_do_upgrade_openmesh "$ARGV" ;; unifi-outdoor-plus | \ -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:51 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:51 +0200 Subject: [OpenWrt-Devel] [PATCH 06/16] package/om-watchdog: add OpenMesh OM5P-AC support In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-6-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- package/kernel/om-watchdog/files/om-watchdog.init | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/kernel/om-watchdog/files/om-watchdog.init b/package/kernel/om-watchdog/files/om-watchdog.init index d68fb15..5c442c6 100644 --- a/package/kernel/om-watchdog/files/om-watchdog.init +++ b/package/kernel/om-watchdog/files/om-watchdog.init @@ -29,6 +29,9 @@ get_gpio() { "om5p-an") return 11 ;; + "om5p-ac") + return 17 + ;; "mr600v2") return 15 ;; -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:52 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:52 +0200 Subject: [OpenWrt-Devel] [PATCH 07/16] package/uboot-envtools: add OpenMesh OM5P-AC support In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-7-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- package/boot/uboot-envtools/files/ar71xx | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boot/uboot-envtools/files/ar71xx b/package/boot/uboot-envtools/files/ar71xx index c9031ac..91bd9a4 100644 --- a/package/boot/uboot-envtools/files/ar71xx +++ b/package/boot/uboot-envtools/files/ar71xx @@ -31,6 +31,7 @@ mr900 | \ mr900v2 | \ nbg6716 | \ om5p-an | \ +om5p-ac | \ om5p | \ tube2h | \ wndr3700) -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:53 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:53 +0200 Subject: [OpenWrt-Devel] [PATCH 08/16] ar71xx: extract ath10k wifi board.bin for the OpenMesh OM5P-AC board In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-8-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- .../linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index e6fcec8..1b6de1e 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -95,6 +95,10 @@ case "$FIRMWARE" in rb-911g-5hpacd) ath10kcal_from_file "/sys/firmware/routerboot/ext_wlan_data" 20480 2116 ;; + om5p-ac) + ath10kcal_extract "ART" 20480 2116 + ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) + ;; esac ;; *) -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:54 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:54 +0200 Subject: [OpenWrt-Devel] [PATCH 09/16] ar71xx: create profile and build image for the OpenMesh OM5P-AC board In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-9-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- target/linux/ar71xx/generic/profiles/openmesh.mk | 11 +++++++++++ target/linux/ar71xx/image/Makefile | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/target/linux/ar71xx/generic/profiles/openmesh.mk b/target/linux/ar71xx/generic/profiles/openmesh.mk index 1c51e93..0873ac5 100644 --- a/target/linux/ar71xx/generic/profiles/openmesh.mk +++ b/target/linux/ar71xx/generic/profiles/openmesh.mk @@ -27,6 +27,17 @@ endef $(eval $(call Profile,OM5P)) +define Profile/OM5PAC + NAME:=OpenMesh OM5P-AC + PACKAGES:=kmod-ath9k kmod-ath10k om-watchdog +endef + +define Profile/OM5PAC/Description + Package set optimized for the OpenMesh OM5P-AC. +endef + +$(eval $(call Profile,OM5PAC)) + define Profile/MR600 NAME:=OpenMesh MR600 PACKAGES:=kmod-ath9k om-watchdog diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 595fba2..eb7a7f0 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -2470,6 +2470,7 @@ $(eval $(call SingleProfile,Netgear,64kraw,WPN824N,wpn824n,WPN824N,ttyS0,115200, $(eval $(call SingleProfile,OpenMesh,squashfs-only,OM2P,om2p,,,,OM2P)) $(eval $(call SingleProfile,OpenMesh,squashfs-only,OM5P,om5p,,,,OM5P)) +$(eval $(call SingleProfile,OpenMesh,squashfs-only,OM5PAC,om5pac,,,,OM5PAC)) $(eval $(call SingleProfile,OpenMesh,squashfs-only,MR600,mr600,,,,MR600)) $(eval $(call SingleProfile,OpenMesh,squashfs-only,MR900,mr900,,,,MR900)) $(eval $(call SingleProfile,OpenMesh,squashfs-only,MR1750,mr1750,,,,MR1750)) @@ -2518,7 +2519,7 @@ $(eval $(call MultiProfile,AP147,AP147_010)) $(eval $(call MultiProfile,AP152,AP152_16M)) $(eval $(call MultiProfile,DIR615IX,DIR615I1 DIR615I3)) $(eval $(call MultiProfile,EWDORIN, EWDORINAP EWDORINRT EWDORIN16M)) -$(eval $(call MultiProfile,OPENMESH,OM2P OM5P MR600 MR900 MR1750)) +$(eval $(call MultiProfile,OPENMESH,OM2P OM5P OM5PAC MR600 MR900 MR1750)) $(eval $(call MultiProfile,TEW652BRP,TEW652BRP_FW TEW652BRP_RECOVERY)) $(eval $(call MultiProfile,TUBE2H,TUBE2H8M TUBE2H16M)) $(eval $(call MultiProfile,WNR612V2,REALWNR612V2 N150R)) -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:55 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:55 +0200 Subject: [OpenWrt-Devel] [PATCH 10/16] ar71xx: add kernel support for the OpenMesh OM5P-ACv2 board In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-10-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- target/linux/ar71xx/config-4.1 | 1 + target/linux/ar71xx/config-4.4 | 1 + .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 10 + target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 + .../ar71xx/files/arch/mips/ath79/mach-om5pacv2.c | 216 +++++++++++++++++++++ .../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 + 6 files changed, 230 insertions(+) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-om5pacv2.c diff --git a/target/linux/ar71xx/config-4.1 b/target/linux/ar71xx/config-4.1 index 0ba1f53..087f027 100644 --- a/target/linux/ar71xx/config-4.1 +++ b/target/linux/ar71xx/config-4.1 @@ -110,6 +110,7 @@ CONFIG_ATH79_MACH_NBG6716=y CONFIG_ATH79_MACH_OM2P=y CONFIG_ATH79_MACH_OM5P=y CONFIG_ATH79_MACH_OM5P_AC=y +CONFIG_ATH79_MACH_OM5P_ACv2=y CONFIG_ATH79_MACH_OMY_X1=y CONFIG_ATH79_MACH_ONION_OMEGA=y CONFIG_ATH79_MACH_PB42=y diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 5117829..b684292 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -113,6 +113,7 @@ CONFIG_ATH79_MACH_NBG6716=y CONFIG_ATH79_MACH_OM2P=y CONFIG_ATH79_MACH_OM5P=y CONFIG_ATH79_MACH_OM5P_AC=y +CONFIG_ATH79_MACH_OM5P_ACv2=y CONFIG_ATH79_MACH_OMY_X1=y CONFIG_ATH79_MACH_ONION_OMEGA=y CONFIG_ATH79_MACH_PB42=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index b12c42a..1d6c4d6 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -870,6 +870,16 @@ config ATH79_MACH_OM5P_AC select ATH79_DEV_M25P80 select ATH79_DEV_WMAC +config ATH79_MACH_OM5P_ACv2 + bool "OpenMesh OM5P-ACv2 board support" + select SOC_QCA955X + select ATH79_DEV_AP9X_PCI if PCI + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 + select ATH79_DEV_WMAC + config ATH79_MACH_OMY_X1 bool "OMYlink OMY X1 support" select SOC_AR934X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 484dda0..75f1670 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -116,6 +116,7 @@ obj-$(CONFIG_ATH79_MACH_NBG460N) += mach-nbg460n.o obj-$(CONFIG_ATH79_MACH_OM2P) += mach-om2p.o obj-$(CONFIG_ATH79_MACH_OM5P) += mach-om5p.o obj-$(CONFIG_ATH79_MACH_OM5P_AC) += mach-om5pac.o +obj-$(CONFIG_ATH79_MACH_OM5P_ACv2) += mach-om5pacv2.o obj-$(CONFIG_ATH79_MACH_OMY_X1) += mach-omy-x1.o obj-$(CONFIG_ATH79_MACH_ONION_OMEGA) += mach-onion-omega.o obj-$(CONFIG_ATH79_MACH_PB42) += mach-pb42.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pacv2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pacv2.c new file mode 100644 index 0000000..587ca32 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pacv2.c @@ -0,0 +1,216 @@ +/* + * OpenMesh OM5P-ACv2 support + * + * Copyright (C) 2013 Marek Lindner + * Copyright (C) 2014-2016 Sven Eckelmann + * Copyright (C) 2015 Open-Mesh - Jim Collar + * + * 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 + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#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-wmac.h" +#include "machtypes.h" +#include "pci.h" + +#define OM5PACV2_GPIO_LED_POWER 14 +#define OM5PACV2_GPIO_LED_GREEN 13 +#define OM5PACV2_GPIO_LED_RED 23 +#define OM5PACV2_GPIO_LED_YELLOW 15 +#define OM5PACV2_GPIO_BTN_RESET 1 +#define OM5PACV2_GPIO_I2C_SCL 18 +#define OM5PACV2_GPIO_I2C_SDA 19 +#define OM5PACV2_GPIO_PA_DCDC 2 +#define OM5PACV2_GPIO_PA_HIGH 16 + +#define OM5PACV2_KEYS_POLL_INTERVAL 20 /* msecs */ +#define OM5PACV2_KEYS_DEBOUNCE_INTERVAL (3 * OM5PACV2_KEYS_POLL_INTERVAL) + +#define OM5PACV2_WMAC_CALDATA_OFFSET 0x1000 + +static struct gpio_led om5pacv2_leds_gpio[] __initdata = { + { + .name = "om5pac:blue:power", + .gpio = OM5PACV2_GPIO_LED_POWER, + .active_low = 1, + }, { + .name = "om5pac:red:wifi", + .gpio = OM5PACV2_GPIO_LED_RED, + .active_low = 1, + }, { + .name = "om5pac:yellow:wifi", + .gpio = OM5PACV2_GPIO_LED_YELLOW, + .active_low = 1, + }, { + .name = "om5pac:green:wifi", + .gpio = OM5PACV2_GPIO_LED_GREEN, + .active_low = 1, + } +}; + +static struct gpio_keys_button om5pacv2_gpio_keys[] __initdata = { + { + .desc = "reset", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = OM5PACV2_KEYS_DEBOUNCE_INTERVAL, + .gpio = OM5PACV2_GPIO_BTN_RESET, + .active_low = 1, + } +}; + +static struct i2c_gpio_platform_data om5pacv2_i2c_device_platdata = { + .sda_pin = OM5PACV2_GPIO_I2C_SDA, + .scl_pin = OM5PACV2_GPIO_I2C_SCL, + .udelay = 10, + .sda_is_open_drain = 1, + .scl_is_open_drain = 1, +}; + +static struct platform_device om5pacv2_i2c_device = { + .name = "i2c-gpio", + .id = 0, + .dev = { + .platform_data = &om5pacv2_i2c_device_platdata, + }, +}; + +static struct i2c_board_info om5pacv2_i2c_devs[] __initdata = { + { + I2C_BOARD_INFO("tmp423", 0x4e), + }, +}; + +static struct flash_platform_data om5pacv2_flash_data = { + .type = "mx25l12805d", +}; + +static struct at803x_platform_data om5pacv2_an_at803x_data = { + .disable_smarteee = 1, + .enable_rgmii_rx_delay = 1, + .enable_rgmii_tx_delay = 1, +}; + +static struct at803x_platform_data om5pacv2_an_at8031_data = { + .disable_smarteee = 1, + .enable_rgmii_rx_delay = 1, + .enable_rgmii_tx_delay = 1, +}; + +static struct mdio_board_info om5pacv2_an_mdio0_info[] = { + { + .bus_id = "ag71xx-mdio.0", + .phy_addr = 4, + .platform_data = &om5pacv2_an_at803x_data, + }, + { + .bus_id = "ag71xx-mdio.1", + .phy_addr = 1, + .platform_data = &om5pacv2_an_at8031_data, + }, +}; + +static void __init om5p_acv2_setup_qca955x_eth_cfg(u32 mask, + unsigned int rxd, + unsigned int rxdv, + unsigned int txd, + unsigned int txe) +{ + void __iomem *base; + u32 t; + + base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE); + + t = mask; + t |= rxd << QCA955X_ETH_CFG_RXD_DELAY_SHIFT; + t |= rxdv << QCA955X_ETH_CFG_RDV_DELAY_SHIFT; + t |= txd << QCA955X_ETH_CFG_TXD_DELAY_SHIFT; + t |= txe << QCA955X_ETH_CFG_TXE_DELAY_SHIFT; + + __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG); + + iounmap(base); +} + +static void __init om5p_acv2_setup(void) +{ + u8 *art = (u8 *)KSEG1ADDR(0x1fff0000); + u8 mac[6]; + + /* power amplifier high power, 4.2V at RFFM4203/4503 instead of 3.3 */ + ath79_gpio_function_enable(QCA955X_GPIO_FUNC_JTAG_DISABLE); + ath79_gpio_output_select(OM5PACV2_GPIO_PA_DCDC, QCA955X_GPIO_OUT_GPIO); + ath79_gpio_output_select(OM5PACV2_GPIO_PA_HIGH, QCA955X_GPIO_OUT_GPIO); + gpio_request_one(OM5PACV2_GPIO_PA_DCDC, GPIOF_OUT_INIT_HIGH, + "PA DC/DC"); + gpio_request_one(OM5PACV2_GPIO_PA_HIGH, GPIOF_OUT_INIT_HIGH, "PA HIGH"); + + /* temperature sensor */ + platform_device_register(&om5pacv2_i2c_device); + i2c_register_board_info(0, om5pacv2_i2c_devs, + ARRAY_SIZE(om5pacv2_i2c_devs)); + + ath79_register_m25p80(&om5pacv2_flash_data); + ath79_register_leds_gpio(-1, ARRAY_SIZE(om5pacv2_leds_gpio), + om5pacv2_leds_gpio); + ath79_register_gpio_keys_polled(-1, OM5PACV2_KEYS_POLL_INTERVAL, + ARRAY_SIZE(om5pacv2_gpio_keys), + om5pacv2_gpio_keys); + + ath79_init_mac(mac, art, 0x02); + ath79_register_wmac(art + OM5PACV2_WMAC_CALDATA_OFFSET, mac); + + om5p_acv2_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN, 2, 2, 0, 0); + ath79_register_mdio(0, 0x0); + ath79_register_mdio(1, 0x0); + + mdiobus_register_board_info(om5pacv2_an_mdio0_info, + ARRAY_SIZE(om5pacv2_an_mdio0_info)); + + ath79_init_mac(ath79_eth0_data.mac_addr, art, 0x00); + ath79_init_mac(ath79_eth1_data.mac_addr, art, 0x01); + + /* GMAC0 is connected to the PHY4 */ + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; + ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; + ath79_eth0_data.phy_mask = BIT(4); + ath79_eth0_pll_data.pll_1000 = 0x82000101; + ath79_eth0_pll_data.pll_100 = 0x80000101; + ath79_eth0_pll_data.pll_10 = 0x80001313; + ath79_register_eth(0); + + /* GMAC1 is connected to MDIO1 in SGMII mode */ + ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII; + ath79_eth1_data.mii_bus_dev = &ath79_mdio1_device.dev; + ath79_eth1_data.phy_mask = BIT(1); + ath79_eth1_pll_data.pll_1000 = 0x03000101; + ath79_eth1_pll_data.pll_100 = 0x80000101; + ath79_eth1_pll_data.pll_10 = 0x80001313; + ath79_eth1_data.speed = SPEED_1000; + ath79_eth1_data.duplex = DUPLEX_FULL; + ath79_register_eth(1); + + ath79_register_pci(); +} + +MIPS_MACHINE(ATH79_MACH_OM5P_ACv2, "OM5P-ACv2", "OpenMesh OM5P ACv2", om5p_acv2_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 12e30c7..bcc13ec 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -114,6 +114,7 @@ enum ath79_mach_type { ATH79_MACH_OM2Pv2, /* OpenMesh OM2Pv2 */ ATH79_MACH_OM2P, /* OpenMesh OM2P */ ATH79_MACH_OM5P_AC, /* OpenMesh OM5P-AC */ + ATH79_MACH_OM5P_ACv2, /* OpenMesh OM5P-ACv2 */ ATH79_MACH_OM5P_AN, /* OpenMesh OM5P-AN */ ATH79_MACH_OM5P, /* OpenMesh OM5P */ ATH79_MACH_OMY_X1, /* OMYlink OMY-X1 */ -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:56 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:56 +0200 Subject: [OpenWrt-Devel] [PATCH 11/16] ar71xx: add user-space support for the OpenMesh OM5P-ACv2 In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-11-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- target/linux/ar71xx/base-files/etc/diag.sh | 3 ++- target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index da976bd..783a4e6 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -214,7 +214,8 @@ get_status_led() { om5p-an) status_led="om5p:blue:power" ;; - om5p-ac) + om5p-ac | \ + om5p-acv2) status_led="om5pac:blue:power" ;; omy-x1) diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index ded9e7e..9c19e23 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -649,6 +649,9 @@ ar71xx_board_detect() { *"OM5P AC") name="om5p-ac" ;; + *"OM5P ACv2") + name="om5p-acv2" + ;; *"OMY-X1") name="omy-x1" ;; -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:57 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:57 +0200 Subject: [OpenWrt-Devel] [PATCH 12/16] ar71xx: enable sysupgrade for the OpenMesh OM5P-ACv2 In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-12-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh | 1 + target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh index 1cfead9..209cdaa 100644 --- a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh @@ -74,6 +74,7 @@ platform_check_image_openmesh() ;; OM5PAC) [ "$board" = "om5p-ac" ] && break + [ "$board" = "om5p-acv2" ] && break echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform" return 1 ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index fee9d63..2d61638 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -323,7 +323,8 @@ platform_check_image() { om2p-lc | \ om5p | \ om5p-an | \ - om5p-ac) + om5p-ac | \ + om5p-acv2) platform_check_image_openmesh "$magic_long" "$1" && return 0 return 1 ;; @@ -577,7 +578,8 @@ platform_do_upgrade() { om2p-lc | \ om5p | \ om5p-an | \ - om5p-ac) + om5p-ac | \ + om5p-acv2) platform_do_upgrade_openmesh "$ARGV" ;; unifi-outdoor-plus | \ -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:58 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:58 +0200 Subject: [OpenWrt-Devel] [PATCH 13/16] package/om-watchdog: add OpenMesh OM5P-ACv2 support In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-13-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- package/kernel/om-watchdog/files/om-watchdog.init | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/kernel/om-watchdog/files/om-watchdog.init b/package/kernel/om-watchdog/files/om-watchdog.init index 5c442c6..79819ad 100644 --- a/package/kernel/om-watchdog/files/om-watchdog.init +++ b/package/kernel/om-watchdog/files/om-watchdog.init @@ -18,7 +18,8 @@ get_gpio() { case "$board" in "om2p" | \ "om2p-hs" | \ - "om2p-hsv2") + "om2p-hsv2" | \ + "om5p-acv2") return 12 ;; "om2pv2" | \ -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:17:59 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:17:59 +0200 Subject: [OpenWrt-Devel] [PATCH 14/16] package/uboot-envtools: add OpenMesh OM5P-ACv2 support In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-14-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- package/boot/uboot-envtools/files/ar71xx | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boot/uboot-envtools/files/ar71xx b/package/boot/uboot-envtools/files/ar71xx index 91bd9a4..32e7269 100644 --- a/package/boot/uboot-envtools/files/ar71xx +++ b/package/boot/uboot-envtools/files/ar71xx @@ -32,6 +32,7 @@ mr900v2 | \ nbg6716 | \ om5p-an | \ om5p-ac | \ +om5p-acv2 | \ om5p | \ tube2h | \ wndr3700) -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:18:00 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:18:00 +0200 Subject: [OpenWrt-Devel] [PATCH 15/16] ar71xx: extract ath10k wifi board.bin for the OpenMesh OM5P-ACv2 board In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-15-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- .../linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 1b6de1e..8fc3ab3 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -71,7 +71,8 @@ case "$FIRMWARE" in ath10kcal_extract "caldata" 20480 2116 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1) ;; - mr1750) + mr1750 | \ + om5p-acv2) ath10kcal_extract "ART" 20480 2116 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) ;; -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sven.eckelmann at open-mesh.com Tue Apr 5 11:18:01 2016 From: sven.eckelmann at open-mesh.com (Sven Eckelmann) Date: Tue, 5 Apr 2016 17:18:01 +0200 Subject: [OpenWrt-Devel] [PATCH 16/16] ar71xx: add OM5P-ACv2 to the OM5P-AC profile In-Reply-To: <1459869481-29376-1-git-send-email-sven@open-mesh.com> References: <1459869481-29376-1-git-send-email-sven@open-mesh.com> Message-ID: <1459869481-29376-16-git-send-email-sven@open-mesh.com> From: Sven Eckelmann Signed-off-by: Sven Eckelmann --- target/linux/ar71xx/generic/profiles/openmesh.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/generic/profiles/openmesh.mk b/target/linux/ar71xx/generic/profiles/openmesh.mk index 0873ac5..6817c59 100644 --- a/target/linux/ar71xx/generic/profiles/openmesh.mk +++ b/target/linux/ar71xx/generic/profiles/openmesh.mk @@ -28,12 +28,12 @@ endef $(eval $(call Profile,OM5P)) define Profile/OM5PAC - NAME:=OpenMesh OM5P-AC + NAME:=OpenMesh OM5P-AC/OM5P-ACv2 PACKAGES:=kmod-ath9k kmod-ath10k om-watchdog endef define Profile/OM5PAC/Description - Package set optimized for the OpenMesh OM5P-AC. + Package set optimized for the OpenMesh OM5P-AC/OM5P-ACv2. endef $(eval $(call Profile,OM5PAC)) -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From Alexey.Brodkin at synopsys.com Tue Apr 5 15:02:33 2016 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Tue, 5 Apr 2016 19:02:33 +0000 Subject: [OpenWrt-Devel] [PATCH] arc770: enable unaligned access handling simulation in software In-Reply-To: <1459521805-16197-1-git-send-email-abrodkin@synopsys.com> References: <1459521805-16197-1-git-send-email-abrodkin@synopsys.com> Message-ID: <4881796E12491D4BB15146FE0209CE646778125E@DE02WEMBXB.internal.synopsys.com> Hi John, > ________________________________________ > From: Alexey Brodkin [abrodkin at synopsys.com] > Sent: Friday, April 01, 2016 5:43 PM > To: John Crispin > Cc: openwrt-devel at lists.openwrt.org; Alexey Brodkin > Subject: [PATCH] arc770: enable unaligned access handling simulation in software > > This enables misaligned access handling by software in Linux kernel. > > With some wireless drivers (ath9k-htc and mt7601u for example) we see > misaligned accesses here and there and to cope with that without > fixing stuff in the drivers we're just gracefully handling it on ARC. > > Signed-off-by: Alexey Brodkin I'm wondering if there're any comments on this one or it could be applied? -Alexey _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From Alexey.Brodkin at synopsys.com Tue Apr 5 15:15:54 2016 From: Alexey.Brodkin at synopsys.com (Alexey Brodkin) Date: Tue, 5 Apr 2016 19:15:54 +0000 Subject: [OpenWrt-Devel] [PATCH] arc770: build kmod-ath9k-htc wpad-mini by default In-Reply-To: <1459521542-2111-1-git-send-email-abrodkin@synopsys.com> References: <1459521542-2111-1-git-send-email-abrodkin@synopsys.com> Message-ID: <4881796E12491D4BB15146FE0209CE6467781291@DE02WEMBXB.internal.synopsys.com> Hi John, > ________________________________________ > From: Alexey Brodkin [abrodkin at synopsys.com] > Sent: Friday, April 01, 2016 5:39 PM > To: John Crispin > Cc: openwrt-devel at lists.openwrt.org; Alexey Brodkin > Subject: [PATCH] arc770: build kmod-ath9k-htc wpad-mini by default > > AXS101 beind a development board lacks built-in wireles inerfaces. > So we have to use external USB dongles to turn the board into > wireless router. > > The best USB Wi-Fi dongles to work in AP-mode seem to be based on > ath9k-htc chipset. > > And so with that change we add support of mentioned dongles in > default and axs101 builds. > > Signed-off-by: Alexey Brodkin I'm wondering if there're any comments on this one or it could be applied? -Alexey _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From mschiffer at universe-factory.net Tue Apr 5 15:26:55 2016 From: mschiffer at universe-factory.net (Matthias Schiffer) Date: Tue, 5 Apr 2016 21:26:55 +0200 Subject: [OpenWrt-Devel] [PATCH] xtables-addons: build: fix configure compatiblity with POSIX shells Message-ID: Fixes build with /bin/sh pointing to certain versions of dash (for example on Void Linux). Signed-off-by: Matthias Schiffer --- ...-configure-compatiblity-with-POSIX-shells.patch | 51 ++++++++++++++++++++++ .../patches/002-fix-kernel-version-detection.patch | 12 ++--- 2 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch diff --git a/package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch b/package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch new file mode 100644 index 0000000..e0b11b5 --- /dev/null +++ b/package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch @@ -0,0 +1,51 @@ +From f07a0a5cb8b3c5e1aee8b30c7fa21ccfbf24a95a Mon Sep 17 00:00:00 2001 +Message-Id: +From: Matthias Schiffer +Date: Fri, 1 Apr 2016 22:24:00 +0200 +Subject: [PATCH] build: fix configure compatiblity with POSIX shells + +The kernel version detection code uses some bashisms, which makes the build +fail on Debian systems where /bin/sh links to dash. Replace with POSIX- +conforming commands at the cost of requiring awk. +--- + configure.ac | 24 +++++++++--------------- + 1 file changed, 9 insertions(+), 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 82a1355..5a5ea57 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -44,21 +44,15 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ + + if test -n "$kbuilddir"; then + AC_MSG_CHECKING([kernel version that we will build against]) +- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)"; +- kmajor="${krel%%[[^0-9]]*}"; +- kmajor="$(($kmajor+0))"; +- krel="${krel:${#kmajor}}"; +- krel="${krel#.}"; +- kminor="${krel%%[[^0-9]]*}"; +- kminor="$(($kminor+0))"; +- krel="${krel:${#kminor}}"; +- krel="${krel#.}"; +- kmicro="${krel%%[[^0-9]]*}"; +- kmicro="$(($kmicro+0))"; +- krel="${krel:${#kmicro}}"; +- krel="${krel#.}"; +- kstable="${krel%%[[^0-9]]*}"; +- kstable="$(($kstable+0))"; ++ krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"; ++ save_IFS=$IFS; ++ IFS='.'; ++ set x $krel; ++ IFS=$save_IFS; ++ kmajor="$(($2+0))"; ++ kminor="$(($3+0))"; ++ kmicro="$(($4+0))"; ++ kstable="$(($5+0))"; + if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then + echo "WARNING: Version detection did not succeed. Continue at own luck."; + else +-- +2.8.0 + diff --git a/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch b/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch index e4101ad..6a7a099 100644 --- a/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch +++ b/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch @@ -1,11 +1,11 @@ --- a/configure.ac +++ b/configure.ac -@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return +@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ if test -n "$kbuilddir"; then AC_MSG_CHECKING([kernel version that we will build against]) -- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)"; -+ krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)"; - kmajor="${krel%%[[^0-9]]*}"; - kmajor="$(($kmajor+0))"; - krel="${krel:${#kmajor}}"; +- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"; ++ krel="$(make -sC "$kbuilddir" M=$PWD kernelversion | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')"; + save_IFS=$IFS; + IFS='.'; + set x $krel; -- 2.8.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From hannu.nyman at iki.fi Tue Apr 5 16:35:31 2016 From: hannu.nyman at iki.fi (Hannu Nyman) Date: Tue, 5 Apr 2016 23:35:31 +0300 Subject: [OpenWrt-Devel] [PATCH] tools/cmake: update to 3.5.1 Message-ID: <1459888531-4690-1-git-send-email-hannu.nyman@iki.fi> Update cmake to 3.5.1 Signed-off-by: Hannu Nyman --- Release notes at https://cmake.org/cmake/help/v3.5/release/3.5.html tools/cmake/Makefile | 6 +++--- tools/cmake/patches/100-disable_qt_tests.patch | 4 ++-- tools/cmake/patches/110-freebsd-compat.patch | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index d7a68ea..3cbc09e 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake -PKG_VERSION:=3.4.3 +PKG_VERSION:=3.5.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://cmake.org/files/v3.4/ \ +PKG_SOURCE_URL:=https://cmake.org/files/v3.5/ \ https://fossies.org/linux/misc/ -PKG_MD5SUM:=4cb3ff35b2472aae70f542116d616e63 +PKG_MD5SUM:=ca051f4a66375c89d1a524e726da0296 HOST_BUILD_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1 diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch index 417e27a..9d2f641 100644 --- a/tools/cmake/patches/100-disable_qt_tests.patch +++ b/tools/cmake/patches/100-disable_qt_tests.patch @@ -1,6 +1,6 @@ --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt -@@ -216,15 +216,6 @@ +@@ -217,15 +217,6 @@ add_RunCMake_test(interface_library) add_RunCMake_test(no_install_prefix) add_RunCMake_test(configure_file) @@ -18,7 +18,7 @@ add_RunCMake_test(FindPkgConfig) --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt -@@ -390,10 +390,6 @@ +@@ -389,10 +389,6 @@ if(BUILD_TESTING) list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX}) diff --git a/tools/cmake/patches/110-freebsd-compat.patch b/tools/cmake/patches/110-freebsd-compat.patch index b549448..49c9b78 100644 --- a/tools/cmake/patches/110-freebsd-compat.patch +++ b/tools/cmake/patches/110-freebsd-compat.patch @@ -19,8 +19,6 @@ Change-Id: I3b91ed7ac0e6878035aee202b3336c536cc6d2ff Source/kwsys/SystemInformation.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx -index 7c31f3a..2672730 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -90,6 +90,15 @@ typedef int siginfo_t; @@ -39,4 +37,3 @@ index 7c31f3a..2672730 100644 #endif #if defined(__OpenBSD__) || defined(__NetBSD__) - -- 2.8.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From hannu.nyman at iki.fi Tue Apr 5 16:35:42 2016 From: hannu.nyman at iki.fi (Hannu Nyman) Date: Tue, 5 Apr 2016 23:35:42 +0300 Subject: [OpenWrt-Devel] [PATCH] tools/mpfr: update to 3.1.4 Message-ID: <1459888542-4741-1-git-send-email-hannu.nyman@iki.fi> Update mpfr to 3.1.4 Signed-off-by: Hannu Nyman --- Release notes at: http://www.mpfr.org/mpfr-current/ tools/mpfr/Makefile | 6 +++--- tools/mpfr/patches/001-only_src.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/mpfr/Makefile b/tools/mpfr/Makefile index 16624a7..3a2c339 100644 --- a/tools/mpfr/Makefile +++ b/tools/mpfr/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2015 OpenWrt.org +# Copyright (C) 2009-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpfr -PKG_VERSION:=3.1.3 +PKG_VERSION:=3.1.4 PKG_SOURCE_URL:=http://www.mpfr.org/mpfr-$(PKG_VERSION) \ @GNU/mpfr PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=5fdfa3cfa5c86514ee4a241a1affa138 +PKG_MD5SUM:=b8a2f6b0e68bef46e53da2ac439e1cf4 HOST_BUILD_PARALLEL:=1 HOST_FIXUP:=autoreconf diff --git a/tools/mpfr/patches/001-only_src.patch b/tools/mpfr/patches/001-only_src.patch index 4a07cb9..b983f87 100644 --- a/tools/mpfr/patches/001-only_src.patch +++ b/tools/mpfr/patches/001-only_src.patch @@ -1,6 +1,6 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -18,7 +18,7 @@ +@@ -18,7 +18,7 @@ AUTOMAKE_OPTIONS = gnu # old Automake version. ACLOCAL_AMFLAGS = -I m4 @@ -11,7 +11,7 @@ examples/ReadMe examples/divworst.c examples/rndo-add.c examples/sample.c \ --- a/Makefile.in +++ b/Makefile.in -@@ -377,7 +377,7 @@ top_builddir = @top_builddir@ +@@ -378,7 +378,7 @@ AUTOMAKE_OPTIONS = gnu # libtoolize and in case some developer needs to switch back to an # old Automake version. ACLOCAL_AMFLAGS = -I m4 -- 2.8.1 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From knaack.h at gmx.de Tue Apr 5 17:43:15 2016 From: knaack.h at gmx.de (Hartmut Knaack) Date: Tue, 5 Apr 2016 23:43:15 +0200 Subject: [OpenWrt-Devel] [PATCH 2/3] ar71xx: add WNR2200 16M version In-Reply-To: <1457385137-21434-1-git-send-email-dirkneukirchen@web.de> References: <1457385137-21434-1-git-send-email-dirkneukirchen@web.de> Message-ID: <57043173.50308@gmx.de> Hi Dirk, just for the records (I didn't spot this myself), there is a typo in the art partition config, which should be 64k but is just 64. Please check back with Silent Wanderer before resending, so he may give his tested-by tag. Thanks, Hartmut Dirk Neukirchen schrieb am 07.03.2016 um 22:12: > - change naming of old firmware to indicate 8M flash > > this change should support 16M international version > > totally untested, used > - input from IRC chat, > - ticket #14356 w. patch, > - verified against GPL tarball (WNR2200 russia version) > > Signed-off-by: Dirk Neukirchen > --- > target/linux/ar71xx/image/Makefile | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile > index ca4437b..d9168fd 100644 > --- a/target/linux/ar71xx/image/Makefile > +++ b/target/linux/ar71xx/image/Makefile > @@ -1594,7 +1594,8 @@ dr344_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1 > wpj531_mtdlayout_16M=mtdparts=spi0.0:192k(u-boot)ro,16128k(firmware),64k(art)ro > wpj558_mtdlayout_16M=mtdparts=spi0.0:192k(u-boot)ro,16128k(firmware),64k(art)ro > wndap360_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1728k(kernel),6016k(rootfs),64k(nvram)ro,64k(art)ro,7744k at 0x50000(firmware) > -wnr2200_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7808k(firmware),64k(art)ro > +wnr2200_mtdlayout_8M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7808k(firmware),64k(art)ro > +wnr2200_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14784k(firmware),64k(config)ro,1024k(language_table)ro,64k(pot)ro,64k(traffic_meter)ro,64(art)ro,1536k0x050000(kernel),13248k at 0x1d0000(rootfs) > wnr2000v3_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,3712k(firmware),64k(art)ro > wnr2000v4_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,3776k(firmware),64k(art)ro > r6100_mtdlayout=mtdparts=ar934x-nfc:128k(u-boot)ro,256k(caldata),256k(caldata-backup),512k(config),512k(pot),2048k(kernel),122240k(ubi),25600k at 0x1a0000(firmware),2048k(language),3072k(traffic_meter) > @@ -2450,7 +2451,8 @@ $(eval $(call SingleProfile,MyLoader,64k,WPE72_16M,wpe72,,ttyS0,115200,0x1000000 > > $(eval $(call SingleProfile,Netgear,64kraw,WNR2000V3,wnr2000v3,WNR2000V3,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303033,WNR2000V3,"" NA,-H 29763551+04+32)) > $(eval $(call SingleProfile,NetgearLzma,64kraw,WNR2000V4,wnr2000v4,WNR2000V4,ttyS0,115200,$$(wnr2000v4_mtdlayout),0x32303034,WNR2000V4,"" NA,)) > -$(eval $(call SingleProfile,Netgear,64kraw,WNR2200,wnr2200,WNR2200,ttyS0,115200,$$(wnr2200_mtdlayout),0x32323030,wnr2200,"" NA,)) > +$(eval $(call SingleProfile,Netgear,64kraw,WNR2200_8M,wnr2200-8m,WNR2200,ttyS0,115200,$$(wnr2200_mtdlayout_8M),0x32323030,wnr2200,"" NA,)) > +$(eval $(call SingleProfile,Netgear,64kraw,WNR2200_16M,wnr2200-16m,WNR2200,ttyS0,115200,$$(wnr2200_mtdlayout_16M),0x32323030,wnr2200,"" WW,)) > $(eval $(call SingleProfile,Netgear,64kraw,REALWNR612V2,wnr612v2,WNR612V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303631,WNR612V2,"",)) > $(eval $(call SingleProfile,Netgear,64kraw,N150R,n150r,WNR612V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303631,N150R,"",)) > $(eval $(call SingleProfile,Netgear,64kraw,REALWNR1000V2,wnr1000v2,WNR1000V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x31303031,WNR1000V2,"",)) > @@ -2514,6 +2516,7 @@ $(eval $(call MultiProfile,TEW652BRP,TEW652BRP_FW TEW652BRP_RECOVERY)) > $(eval $(call MultiProfile,TUBE2H,TUBE2H8M TUBE2H16M)) > $(eval $(call MultiProfile,WNR612V2,REALWNR612V2 N150R)) > $(eval $(call MultiProfile,WNR1000V2,REALWNR1000V2 WNR1000V2_VC)) > +$(eval $(call MultiProfile,WNR2200,WNR2200_8M WNR2200_16M)) > $(eval $(call MultiProfile,WP543,WP543_2M WP543_4M WP543_8M WP543_16M)) > $(eval $(call MultiProfile,WPE72,WPE72_4M WPE72_8M WPE72_16M)) > $(eval $(call MultiProfile,WPJ344,WPJ344_16M)) > _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From devel-sven at geroedel.de Tue Apr 5 18:04:06 2016 From: devel-sven at geroedel.de (Sven Roederer) Date: Wed, 06 Apr 2016 00:04:06 +0200 Subject: [OpenWrt-Devel] Cannot flash UBNT Loco M2 In-Reply-To: <56E2D619.3070003@universe-factory.net> References: <56BE547B.1080408@ayrstone.com> <1701680746.20447974.1457704012855.JavaMail.zimbra@saucontech.com> <56E2D619.3070003@universe-factory.net> Message-ID: <9241429.1xcYRVet3K@strike> Hi, for me it helped to go this way, to bring a NSM5 (xm) one member of our Freifunk-community bricked : - UBoot was "1.1.4.2-s956 (Jun 10 2015 - 10:54:50)" and did not accept snapshot-images - downgrading UBoot to "1.1.4.2-s594 (Dec 5 2012 - 15:23:07)" by flashing original xm5.5 image - on uboot start the rescure tftp-server wit option -f (urescue -f), this also overwrites the uboot-code -board boots up with AirOS5.5 and can be flashed to openWRT the normal way found this hint to the "-f" option at the guys of the AREDN-project (http:// bloodhound.aredn.org/products/AREDN/wiki/HowTo/Unbrick) I hope this help SVen Am Friday 11 March 2016, 15:28:41 schrieb Matthias Schiffer: > > Getting out of this state is not easy: you have a U-boot on your device > that doesn't accept correct images, and an OpenWrt version that doesn't > allow writing to the flash. > > Through a serial console, you can try fixing the settings in U-boot; when I > tried this the last time, I wasn't able to do so, but maybe I did something > wrong. The U-boot console has a few interesting settings (I forgot the > exact commands, but the "help" command should tell you everything you need > to know): > > * You can reset the MTD layout to the defaults. This makes the recovery > accept correct images again. Unfortunately, in my experiments, this setting > was not permanent even when I saves the environment after resetting the > layout. In the hindsight, I remember there being a setting to disable flash > protection, maybe that would made have the environment saving effective. > > In the end, I fixed this by creating a patched OpenWrt image that allowed > me to write to the uboot and uboot-env partitions; this allowed me to write > back backups I had made of the uboot and uboot-env before I broke the flash > layout by flashing OpenWrt. Obviously, this does not work if you don't have > backups... > > * If you don't plan to ever go back to AirOS again, it might be okay to > just ignore the broken MTD layout in the U-boot settings. Get into the > U-boot console, reset the MTD layout, start recovery, and flash an OpenWrt > version after trunk r48829 or CC r48849. > > > I hope this helps. I'd be interested if you find a way to parmanently reset > the MTD layout from the U-boot console; unfortunately, I don't have a test > device available at the moment. > > Regards, > Matthias > _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From tizbac2 at gmail.com Tue Apr 5 18:35:57 2016 From: tizbac2 at gmail.com (Tiziano Bacocco) Date: Wed, 6 Apr 2016 00:35:57 +0200 Subject: [OpenWrt-Devel] [PATCH] ar71xx: add TP-Link TL-WA901ND-v4 support Message-ID: <1459895757-5805-1-git-send-email-tizbac2@gmail.com> Signed-off-by: Tiziano Bacocco --- 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 | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 + .../ar71xx/base-files/lib/upgrade/platform.sh | 1 + target/linux/ar71xx/config-4.1 | 1 + .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 9 ++ target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 + .../files/arch/mips/ath79/mach-tl-wa901nd-v4.c | 112 +++++++++++++++++++++ .../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 + target/linux/ar71xx/image/Makefile | 10 +- tools/firmware-utils/src/mktplinkfw.c | 6 ++ 12 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v4.c 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 708ebb9..1958964 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -620,7 +620,10 @@ tl-wa901nd-v3) ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" ;; - +tl-wa901nd-v4) + ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0" + ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt" + ;; tl-wr941nd | \ tl-wr1041n-v2) ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "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 bd488a2..19893ee 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -364,6 +364,7 @@ tl-wa801nd-v2 |\ tl-wa901nd |\ tl-wa901nd-v2 |\ tl-wa901nd-v3 |\ +tl-wa901nd-v4 |\ tl-wr703n |\ tube2h |\ unifiac |\ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index a2251d1..0389f6e 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -301,6 +301,7 @@ get_status_led() { tl-wa901nd | \ tl-wa901nd-v2 | \ tl-wa901nd-v3 | \ + tl-wa901nd-v4 | \ tl-wdr3320-v2 | \ tl-wdr3500 | \ tl-wr1041n-v2 | \ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 6b8550a..1f7f45a 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -859,6 +859,9 @@ ar71xx_board_detect() { *"TL-WA901ND v3") name="tl-wa901nd-v3" ;; + *"TL-WA901ND v4") + name="tl-wa901nd-v4" + ;; *"TL-WDR3320 v2") name="tl-wdr3320-v2" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 923e02b..b214829 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -363,6 +363,7 @@ platform_check_image() { tl-wa901nd | \ tl-wa901nd-v2 | \ tl-wa901nd-v3 | \ + tl-wa901nd-v4 | \ tl-wdr3320-v2 | \ tl-wdr3500 | \ tl-wdr4300 | \ diff --git a/target/linux/ar71xx/config-4.1 b/target/linux/ar71xx/config-4.1 index d6ad850..4edb49e 100644 --- a/target/linux/ar71xx/config-4.1 +++ b/target/linux/ar71xx/config-4.1 @@ -141,6 +141,7 @@ CONFIG_ATH79_MACH_TL_WA801ND_V3=y CONFIG_ATH79_MACH_TL_WA830RE_V2=y CONFIG_ATH79_MACH_TL_WA901ND=y CONFIG_ATH79_MACH_TL_WA901ND_V2=y +CONFIG_ATH79_MACH_TL_WA901ND_V4=y CONFIG_ATH79_MACH_TL_WAX50RE=y CONFIG_ATH79_MACH_TL_WDR3320_V2=y CONFIG_ATH79_MACH_TL_WDR3500=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index f47f1b9..566b2a6 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -1153,6 +1153,15 @@ config ATH79_MACH_TL_WA901ND_V2 select ATH79_DEV_M25P80 select ATH79_DEV_WMAC +config ATH79_MACH_TL_WA901ND_V4 + bool "TP-LINK TL-WA901ND v4 support" + select SOC_QCA956X + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 + select ATH79_DEV_WMAC + config ATH79_MACH_TL_WDR3320_V2 bool "TP-LINK TL-WDR3320 v2 board support" select SOC_AR934X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 74376b2..2217e52 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -149,6 +149,7 @@ obj-$(CONFIG_ATH79_MACH_TL_WA830RE_V2) += mach-tl-wa830re-v2.o obj-$(CONFIG_ATH79_MACH_TL_WA801ND_V3) += mach-tl-wa801nd-v3.o obj-$(CONFIG_ATH79_MACH_TL_WA901ND) += mach-tl-wa901nd.o obj-$(CONFIG_ATH79_MACH_TL_WA901ND_V2) += mach-tl-wa901nd-v2.o +obj-$(CONFIG_ATH79_MACH_TL_WA901ND_V4) += mach-tl-wa901nd-v4.o obj-$(CONFIG_ATH79_MACH_TL_WDR3320_V2) += mach-tl-wdr3320-v2.o obj-$(CONFIG_ATH79_MACH_TL_WDR3500) += mach-tl-wdr3500.o obj-$(CONFIG_ATH79_MACH_TL_WDR4300) += mach-tl-wdr4300.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v4.c new file mode 100644 index 0000000..9c651bb --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa901nd-v4.c @@ -0,0 +1,112 @@ +/* + * TP-LINK TL-WA901ND v4 board + * + * Copyright (C) 2015 Matthias Schiffer + * Copyright (C) 2016 Tiziano Bacocco + * + * 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 + * by the Free Software Foundation. + */ + +#include +#include + +#include +#include + +#include "common.h" +#include "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-wmac.h" +#include "machtypes.h" + + +#define TL_WA901ND_V4_GPIO_LED_QSS 3 +#define TL_WA901ND_V4_GPIO_LED_LAN 7 +#define TL_WA901ND_V4_GPIO_LED_WLAN 8 +#define TL_WA901ND_V4_GPIO_LED_SYSTEM 18 + +#define TL_WA901ND_V4_GPIO_BTN_RESET 1 + +#define TL_WA901ND_V4_KEYS_POLL_INTERVAL 20 +#define TL_WA901ND_V4_KEYS_DEBOUNCE_INTERVAL (3 * TL_WA901ND_V4_KEYS_POLL_INTERVAL) + + +static struct gpio_led TL_WA901ND_V4_leds_gpio[] __initdata = { + { + .name = "tp-link:green:qss", + .gpio = TL_WA901ND_V4_GPIO_LED_QSS, + .active_low = 1, + }, + { + .name = "tp-link:green:lan", + .gpio = TL_WA901ND_V4_GPIO_LED_LAN, + .active_low = 1, + }, + { + .name = "tp-link:green:wlan", + .gpio = TL_WA901ND_V4_GPIO_LED_WLAN, + .active_low = 1, + }, + { + .name = "tp-link:green:system", + .gpio = TL_WA901ND_V4_GPIO_LED_SYSTEM, + .active_low = 1, + }, +}; + +static struct gpio_keys_button TL_WA901ND_V4_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = TL_WA901ND_V4_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_WA901ND_V4_GPIO_BTN_RESET, + .active_low = 1, + } +}; + + +static const char *tl_wa901nd_v4_part_probes[] = { + "tp-link", + NULL, +}; + +static struct flash_platform_data tl_wa901nd_v4_flash_data = { + .part_probes = tl_wa901nd_v4_part_probes, +}; + + +static void __init TL_WA901ND_V4_setup(void) +{ + u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); + u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); + + ath79_register_m25p80(&tl_wa901nd_v4_flash_data); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(TL_WA901ND_V4_leds_gpio), + TL_WA901ND_V4_leds_gpio); + + ath79_register_gpio_keys_polled(-1, TL_WA901ND_V4_KEYS_POLL_INTERVAL, + ARRAY_SIZE(TL_WA901ND_V4_gpio_keys), + TL_WA901ND_V4_gpio_keys); + + ath79_register_mdio(0, 0x0); + + ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1); + ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1); + + ath79_switch_data.phy4_mii_en = 1; + + ath79_register_eth(0); + ath79_register_eth(1); + + ath79_register_wmac(ee, mac); + +} + +MIPS_MACHINE(ATH79_MACH_TL_WA901ND_V4, "TL-WA901ND-v4", "TP-LINK TL-WA901ND v4", + TL_WA901ND_V4_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 307d2df..619072f 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -175,6 +175,7 @@ enum ath79_mach_type { ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */ ATH79_MACH_TL_WA901ND_V2, /* TP-LINK TL-WA901ND v2 */ ATH79_MACH_TL_WA901ND_V3, /* TP-LINK TL-WA901ND v3 */ + ATH79_MACH_TL_WA901ND_V4, /* TP-LINK TL-WA901ND v4 */ ATH79_MACH_TL_WDR3320_V2, /* TP-LINK TL-WDR3320 v2 */ ATH79_MACH_TL_WDR3500, /* TP-LINK TL-WDR3500 */ ATH79_MACH_TL_WDR4300, /* TP-LINK TL-WDR4300 */ diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 595fba2..030b1b4 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -1087,7 +1087,15 @@ define Device/tl-wa901nd-v3 DEVICE_PROFILE := TLWA901 TPLINK_HWID := 0x09010003 endef -TARGET_DEVICES += tl-wa901nd-v1 tl-wa901nd-v2 tl-wa901nd-v3 + +define Device/tl-wa901nd-v4 + $(Device/tplink-4mlzma) + BOARDNAME := TL-WA901ND-v4 + DEVICE_PROFILE := TLWA901 + TPLINK_HWID := 0x09010004 +endef + +TARGET_DEVICES += tl-wa901nd-v1 tl-wa901nd-v2 tl-wa901nd-v3 tl-wa901nd-v4 define Device/tl-wa7210n-v2 $(Device/tplink-4mlzma) diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c index 692e48b..bf7c619 100644 --- a/tools/firmware-utils/src/mktplinkfw.c +++ b/tools/firmware-utils/src/mktplinkfw.c @@ -55,6 +55,7 @@ #define HWID_TL_WA801ND_V3 0x08010003 #define HWID_TL_WA901ND_V1 0x09010001 #define HWID_TL_WA901ND_V2 0x09010002 +#define HWID_TL_WA901ND_V4 0x09010004 #define HWID_TL_WDR4300_V1_IL 0x43008001 #define HWID_TL_WDR4900_V1 0x49000001 #define HWID_TL_WR703N_V1 0x07030101 @@ -316,6 +317,11 @@ static struct board_info boards[] = { .hw_rev = 1, .layout_id = "4M", }, { + .id = "TL-WA901NDv4", + .hw_id = HWID_TL_WA901ND_V4, + .hw_rev = 1, + .layout_id = "4Mlzma", + }, { .id = "TL-WDR4300v1", .hw_id = HWID_TL_WDR4300_V1_IL, .hw_rev = 1, -- 2.8.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From ianchi74 at outlook.com Tue Apr 5 22:57:49 2016 From: ianchi74 at outlook.com (Adrian Panella) Date: Tue, 5 Apr 2016 21:57:49 -0500 Subject: [OpenWrt-Devel] [PATCH] [ipq806x] enable hard float Message-ID: Author: Adrian Panella Date: Tue Apr 5 21:45:14 2016 -0500 IPQ806X: enable hard float tested with Linksys EA8500 Signed-off-by: Adrian Panella diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index 97a40cf..689ba64 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=ipq806x BOARDNAME:=Qualcomm Atheros IPQ806X -FEATURES:=squashfs nand ubifs +FEATURES:=squashfs nand ubifs fpu CPU_TYPE:=cortex-a9 CPU_SUBTYPE:=neon-vfpv4 MAINTAINER:=John Crispin _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From martin.blumenstingl at googlemail.com Wed Apr 6 01:53:27 2016 From: martin.blumenstingl at googlemail.com (Martin Blumenstingl) Date: Wed, 6 Apr 2016 07:53:27 +0200 Subject: [OpenWrt-Devel] [PATCH] [ipq806x] enable hard float In-Reply-To: References: Message-ID: Hi Adrian, On Wed, Apr 6, 2016 at 4:57 AM, Adrian Panella wrote: > Author: Adrian Panella > > Date: Tue Apr 5 21:45:14 2016 -0500 > > IPQ806X: enable hard float > > tested with Linksys EA8500 > > Signed-off-by: Adrian Panella > > diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile > > index 97a40cf..689ba64 100644 > > --- a/target/linux/ipq806x/Makefile > > +++ b/target/linux/ipq806x/Makefile your patch seems to be whitespace-broken. I guess this is also the reason why it's not shown in patchwork: http://patchwork.ozlabs.org/project/openwrt/list/ Could you please re-send it? Regards, Martin _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From mschiffer at universe-factory.net Wed Apr 6 11:40:22 2016 From: mschiffer at universe-factory.net (Matthias Schiffer) Date: Wed, 6 Apr 2016 17:40:22 +0200 Subject: [OpenWrt-Devel] [PATCH libubox] blobmsg_json: simplify add_separator and fix thread-safety Message-ID: The hard-coded length limits are replaced with strlen to make the code more robust. Signed-off-by: Matthias Schiffer --- blobmsg_json.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/blobmsg_json.c b/blobmsg_json.c index 2d1d80d..5713948 100644 --- a/blobmsg_json.c +++ b/blobmsg_json.c @@ -135,21 +135,17 @@ static bool blobmsg_puts(struct strbuf *s, const char *c, int len) static void add_separator(struct strbuf *s) { - static char indent_chars[17] = "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; - int indent; - char *start; + const char *indent_chars = "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; + int len; if (!s->indent) return; - indent = s->indent_level; - if (indent > 16) - indent = 16; + len = s->indent_level + 1; + if (len > strlen(indent_chars)) + len = strlen(indent_chars); - start = &indent_chars[sizeof(indent_chars) - indent - 1]; - *start = '\n'; - blobmsg_puts(s, start, indent + 1); - *start = '\t'; + blobmsg_puts(s, indent_chars, len); } -- 2.8.0 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From daniel.engberg.lists at pyret.net Wed Apr 6 13:54:06 2016 From: daniel.engberg.lists at pyret.net (Daniel Engberg) Date: Wed, 6 Apr 2016 19:54:06 +0200 Subject: [OpenWrt-Devel] [PATCH] package/utils/usbutils: Update USB IDs list and drop gzip compression Message-ID: <57054D3E.4000104@pyret.net> Change mirror to Github (Gentoo repo) and drop the gzip compression. Worst case there's a 4kbyte increase in size but most images ends up beign somewhere between 4-100kbyte smaller due to the lzma compression. Tested on ar71xx Signed-off-by: Daniel Engberg --- diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile index 9b5470a..0457ded 100644 --- a/package/utils/usbutils/Makefile +++ b/package/utils/usbutils/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbutils PKG_VERSION:=007 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils PKG_MD5SUM:=a6bd63d5c44cebb717a960eae22a3ca9 -USB_IDS_VERSION:=2015-12-17 -USB_IDS_MD5SUM:=8c091fdcdbc4e8e60a518d0148b0dad3 -USB_IDS_FILE:=usb.ids.$(USB_IDS_VERSION).gz +USB_IDS_VERSION:=2016-03-03 +USB_IDS_MD5SUM:=273596b6ee101b1df454827cfa87dff8 +USB_IDS_FILE:=usb.ids PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 @@ -36,7 +36,7 @@ endef define Download/usb_ids FILE:=$(USB_IDS_FILE) - URL:=http://projects.pyret.net/dump/openwrt/distfiles + URL:=https://raw.githubusercontent.com/gentoo/hwids/d9e840aa3d5cedf5637d59ef0dc555c380a0e822/usb.ids MD5SUM:=$(USB_IDS_MD5SUM) endef $(eval $(call Download,usb_ids)) @@ -44,7 +44,7 @@ $(eval $(call Download,usb_ids)) define Build/Prepare $(Build/Prepare/Default) echo '#!/bin/sh' > $(PKG_BUILD_DIR)/update-usbids.sh.in - echo 'cp $(DL_DIR)/$(USB_IDS_FILE) usb.ids.gz' >> $(PKG_BUILD_DIR)/update-usbids.sh.in + echo 'gzip -9 -f -k $(DL_DIR)/$(USB_IDS_FILE)' >> $(PKG_BUILD_DIR)/update-usbids.sh.in endef define Package/usbutils/install _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From daniel.engberg.lists at pyret.net Wed Apr 6 14:00:08 2016 From: daniel.engberg.lists at pyret.net (Daniel Engberg) Date: Wed, 6 Apr 2016 20:00:08 +0200 Subject: [OpenWrt-Devel] [PATCH v2] package/utils/usbutils: Update USB IDs list and drop gzip compression Message-ID: <57054EA8.2000205@pyret.net> Change mirror to Github (Gentoo repo) and drop the gzip compression. Worst case there's a 4kbyte increase in size but most images ends up beign somewhere between 4-100kbyte smaller due to the lzma compression. Tested on ar71xx Now contains the correct patch, sorry! Signed-off-by: Daniel Engberg --- diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile index 9b5470a..7119a2a 100644 --- a/package/utils/usbutils/Makefile +++ b/package/utils/usbutils/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbutils PKG_VERSION:=007 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils PKG_MD5SUM:=a6bd63d5c44cebb717a960eae22a3ca9 -USB_IDS_VERSION:=2015-12-17 -USB_IDS_MD5SUM:=8c091fdcdbc4e8e60a518d0148b0dad3 -USB_IDS_FILE:=usb.ids.$(USB_IDS_VERSION).gz +USB_IDS_VERSION:=2016-03-03 +USB_IDS_MD5SUM:=273596b6ee101b1df454827cfa87dff8 +USB_IDS_FILE:=usb.ids PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 @@ -36,7 +36,7 @@ endef define Download/usb_ids FILE:=$(USB_IDS_FILE) - URL:=http://projects.pyret.net/dump/openwrt/distfiles + URL:=https://raw.githubusercontent.com/gentoo/hwids/d9e840aa3d5cedf5637d59ef0dc555c380a0e822 MD5SUM:=$(USB_IDS_MD5SUM) endef $(eval $(call Download,usb_ids)) @@ -44,14 +44,13 @@ $(eval $(call Download,usb_ids)) define Build/Prepare $(Build/Prepare/Default) echo '#!/bin/sh' > $(PKG_BUILD_DIR)/update-usbids.sh.in - echo 'cp $(DL_DIR)/$(USB_IDS_FILE) usb.ids.gz' >> $(PKG_BUILD_DIR)/update-usbids.sh.in endef define Package/usbutils/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsusb $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/share - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/usb.ids.gz $(1)/usr/share/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/usb.ids $(1)/usr/share/ endef $(eval $(call BuildPackage,usbutils)) _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From sknaumov at gmail.com Wed Apr 6 15:37:14 2016 From: sknaumov at gmail.com (Sergey Naumov) Date: Wed, 6 Apr 2016 22:37:14 +0300 Subject: [OpenWrt-Devel] cfg80211 wext-compat layer in OpenWRT Message-ID: Hi all. I'm trying to use cfg80211 wext compatibility layer in my program, and while on desktop (ubuntu 15.04) everything is OK, on OpenWRT barrier-breaker and some pre-release of chaos-calmer I see that only txpower wext ioctl works, while SSID and channel don't. I see that in config files CFG80211_WEXT is enabled in compat-wireless, but disabled in kernel itself. My OpenWRT router is TP-Link Archer C7 v2 and in both cases (my laptop and OpenWRT router) device driver is ath9k. Have someone experienced similar problems? Thanks, Sergey. _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From daniel.engberg.lists at pyret.net Thu Apr 7 02:50:38 2016 From: daniel.engberg.lists at pyret.net (Daniel Engberg) Date: Thu, 7 Apr 2016 08:50:38 +0200 Subject: [OpenWrt-Devel] [PATCH v3] package/utils/usbutils: Update USB IDs list and drop gzip compression Message-ID: <5706033E.6080601@pyret.net> Change mirror to Github (Gentoo repo) and drop the gzip compression. Worst case there's about 4kbyte increase in size but most images ends up beign somewhere between 4-100kbyte smaller due to the lzma compression. Tested on ar71xx v2 Now contains the correct patch, sorry! v3 Turns out that the update-usbids.sh.in isn't executed at all... Signed-off-by: Daniel Engberg --- diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile index 9b5470a..c1b82a9 100644 --- a/package/utils/usbutils/Makefile +++ b/package/utils/usbutils/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbutils PKG_VERSION:=007 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils PKG_MD5SUM:=a6bd63d5c44cebb717a960eae22a3ca9 -USB_IDS_VERSION:=2015-12-17 -USB_IDS_MD5SUM:=8c091fdcdbc4e8e60a518d0148b0dad3 -USB_IDS_FILE:=usb.ids.$(USB_IDS_VERSION).gz +USB_IDS_VERSION:=2016-03-03 +USB_IDS_MD5SUM:=273596b6ee101b1df454827cfa87dff8 +USB_IDS_FILE:=usb.ids PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 @@ -36,22 +36,24 @@ endef define Download/usb_ids FILE:=$(USB_IDS_FILE) - URL:=http://projects.pyret.net/dump/openwrt/distfiles + URL:=https://raw.githubusercontent.com/gentoo/hwids/d9e840aa3d5cedf5637d59ef0dc555c380a0e822 MD5SUM:=$(USB_IDS_MD5SUM) endef $(eval $(call Download,usb_ids)) define Build/Prepare $(Build/Prepare/Default) - echo '#!/bin/sh' > $(PKG_BUILD_DIR)/update-usbids.sh.in - echo 'cp $(DL_DIR)/$(USB_IDS_FILE) usb.ids.gz' >> $(PKG_BUILD_DIR)/update-usbids.sh.in + $(CP) $(DL_DIR)/$(USB_IDS_FILE) $(PKG_BUILD_DIR) endef +CONFIGURE_ARGS += \ + --disable-zlib + define Package/usbutils/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsusb $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/share - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/usb.ids.gz $(1)/usr/share/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/usb.ids $(1)/usr/share/ endef $(eval $(call BuildPackage,usbutils)) _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From dirk.feytons at gmail.com Thu Apr 7 04:21:48 2016 From: dirk.feytons at gmail.com (Dirk Feytons) Date: Thu, 7 Apr 2016 10:21:48 +0200 Subject: [OpenWrt-Devel] [PATCH 1/3] curl: upstep to latest version 7.48.0 Message-ID: <1460017310-14214-1-git-send-email-dirk.feytons@gmail.com> Signed-off-by: Dirk Feytons --- package/network/utils/curl/Makefile | 6 +++--- .../utils/curl/patches/200-no_docs_tests.patch | 4 ++-- .../curl/patches/300-fix-disable-crypto-auth.patch | 2 +- ...10-polarssl-disable-runtime-version-check.patch | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index bc85da3..eada1aa 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2015 OpenWrt.org +# Copyright (C) 2007-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.47.0 +PKG_VERSION:=7.48.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ ftp://ftp.planetmirror.com/pub/curl/ \ http://www.mirrormonster.com/curl/download/ \ http://curl.mirrors.cyberservers.net/download/ -PKG_MD5SUM:=85c58a00412476993050cb242a3f365d +PKG_MD5SUM:=d42e0fc34a5cace5739631cc040974fe PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING diff --git a/package/network/utils/curl/patches/200-no_docs_tests.patch b/package/network/utils/curl/patches/200-no_docs_tests.patch index 5db3925..4ac5bad 100644 --- a/package/network/utils/curl/patches/200-no_docs_tests.patch +++ b/package/network/utils/curl/patches/200-no_docs_tests.patch @@ -1,6 +1,6 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -141,7 +141,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) +@@ -150,7 +150,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config SUBDIRS = lib src include scripts @@ -11,7 +11,7 @@ pkgconfig_DATA = libcurl.pc --- a/Makefile.in +++ b/Makefile.in -@@ -601,7 +601,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) +@@ -611,7 +611,7 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) bin_SCRIPTS = curl-config SUBDIRS = lib src include scripts diff --git a/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch b/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch index abec7ad..5c0a37e 100644 --- a/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch +++ b/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch @@ -1,6 +1,6 @@ --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c -@@ -569,7 +569,7 @@ CURLcode Curl_sasl_create_ntlm_type3_mes +@@ -573,7 +573,7 @@ CURLcode Curl_sasl_create_ntlm_type3_mes else #endif diff --git a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch b/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch index 6f9cf2e..7f7937b 100644 --- a/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch +++ b/package/network/utils/curl/patches/310-polarssl-disable-runtime-version-check.patch @@ -11,7 +11,7 @@ version>>24, (version>>16)&0xff, (version>>8)&0xff); --- a/lib/vtls/mbedtls.c +++ b/lib/vtls/mbedtls.c -@@ -686,7 +686,7 @@ void Curl_mbedtls_session_free(void *ptr +@@ -712,7 +712,7 @@ void Curl_mbedtls_session_free(void *ptr size_t Curl_mbedtls_version(char *buffer, size_t size) { _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From dirk.feytons at gmail.com Thu Apr 7 04:21:49 2016 From: dirk.feytons at gmail.com (Dirk Feytons) Date: Thu, 7 Apr 2016 10:21:49 +0200 Subject: [OpenWrt-Devel] [PATCH 2/3] curl: add config option for NTLM support In-Reply-To: <1460017310-14214-1-git-send-email-dirk.feytons@gmail.com> References: <1460017310-14214-1-git-send-email-dirk.feytons@gmail.com> Message-ID: <1460017310-14214-2-git-send-email-dirk.feytons@gmail.com> Signed-off-by: Dirk Feytons --- package/network/utils/curl/Config.in | 5 +++++ package/network/utils/curl/Makefile | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/network/utils/curl/Config.in b/package/network/utils/curl/Config.in index f41307a..14d2047 100644 --- a/package/network/utils/curl/Config.in +++ b/package/network/utils/curl/Config.in @@ -154,4 +154,9 @@ config LIBCURL_VERBOSE bool "Enable verbose error strings" default n +config LIBCURL_NTLM + bool "Enable NTLM support" + depends LIBCURL_CRYPTO_AUTH && !LIBCURL_NOSSL + default n + endif diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index eada1aa..319c0b7 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -65,7 +65,8 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_LIBCURL_THREADED_RESOLVER \ CONFIG_LIBCURL_TLS_SRP \ CONFIG_LIBCURL_UNIX_SOCKETS \ - CONFIG_LIBCURL_VERBOSE + CONFIG_LIBCURL_VERBOSE \ + CONFIG_LIBCURL_NTLM include $(INCLUDE_DIR)/package.mk @@ -99,6 +100,7 @@ define Package/libcurl/config endef TARGET_CFLAGS += $(FPIC) +TARGET_CPPFLAGS += $(if $(CONFIG_LIBCURL_NTLM),,-DCURL_DISABLE_NTLM) CONFIGURE_ARGS += \ --disable-debug \ _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From dirk.feytons at gmail.com Thu Apr 7 04:21:50 2016 From: dirk.feytons at gmail.com (Dirk Feytons) Date: Thu, 7 Apr 2016 10:21:50 +0200 Subject: [OpenWrt-Devel] [PATCH 3/3] curl: add flags to allow gc-sections to strip out unused code In-Reply-To: <1460017310-14214-1-git-send-email-dirk.feytons@gmail.com> References: <1460017310-14214-1-git-send-email-dirk.feytons@gmail.com> Message-ID: <1460017310-14214-3-git-send-email-dirk.feytons@gmail.com> Signed-off-by: Dirk Feytons --- package/network/utils/curl/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile index 319c0b7..af38ed4 100644 --- a/package/network/utils/curl/Makefile +++ b/package/network/utils/curl/Makefile @@ -99,8 +99,9 @@ define Package/libcurl/config source "$(SOURCE)/Config.in" endef -TARGET_CFLAGS += $(FPIC) +TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections TARGET_CPPFLAGS += $(if $(CONFIG_LIBCURL_NTLM),,-DCURL_DISABLE_NTLM) +TARGET_LDFLAGS += -Wl,--gc-sections CONFIGURE_ARGS += \ --disable-debug \ _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From eckert.florian at googlemail.com Thu Apr 7 05:08:24 2016 From: eckert.florian at googlemail.com (Florian Eckert) Date: Thu, 7 Apr 2016 11:08:24 +0200 Subject: [OpenWrt-Devel] [PATCH 1/3] lantiq-dsl: bugfix db negative sign after comma Message-ID: <1460020107-9042-1-git-send-email-feckert@tdt.de> From: Florian Eckert If db is negative minus sign was shown after comma Signed-off-by: Florian Eckert --- target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh index aefefcd..adf245a 100755 --- a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh +++ b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh @@ -31,7 +31,7 @@ dsl_string() { dbt() { local a=$(expr $1 / 10) local b=$(expr $1 % 10) - echo "${a}.${b}" + echo "${a}.${b#-}" } # # Take a number and convert to k or meg -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From eckert.florian at googlemail.com Thu Apr 7 05:08:25 2016 From: eckert.florian at googlemail.com (Florian Eckert) Date: Thu, 7 Apr 2016 11:08:25 +0200 Subject: [OpenWrt-Devel] [PATCH 1/3] lantiq-dsl: bugfix db negative sign after comma In-Reply-To: <1460020107-9042-1-git-send-email-feckert@tdt.de> References: <1460020107-9042-1-git-send-email-feckert@tdt.de> Message-ID: <1460020107-9042-2-git-send-email-feckert@tdt.de> From: Florian Eckert If db is negative minus sign was shown after comma Signed-off-by: Florian Eckert --- target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh index aefefcd..adf245a 100755 --- a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh +++ b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh @@ -31,7 +31,7 @@ dsl_string() { dbt() { local a=$(expr $1 / 10) local b=$(expr $1 % 10) - echo "${a}.${b}" + echo "${a}.${b#-}" } # # Take a number and convert to k or meg -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From eckert.florian at googlemail.com Thu Apr 7 05:08:26 2016 From: eckert.florian at googlemail.com (Florian Eckert) Date: Thu, 7 Apr 2016 11:08:26 +0200 Subject: [OpenWrt-Devel] [PATCH 2/3] lantiq-dsl: bugfix latency values swapped for lucistat In-Reply-To: <1460020107-9042-1-git-send-email-feckert@tdt.de> References: <1460020107-9042-1-git-send-email-feckert@tdt.de> Message-ID: <1460020107-9042-3-git-send-email-feckert@tdt.de> From: Florian Eckert swapped wrong latency output Signed-off-by: Florian Eckert --- target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh index adf245a..8c6482f 100755 --- a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh +++ b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh @@ -430,8 +430,8 @@ latency_delay() { sidd=$(scale_latency $idd) if [ "$action" = "lucistat" ]; then - echo "dsl.latency_num_down=\"$sidu\"" - echo "dsl.latency_num_up=\"$sidd\"" + echo "dsl.latency_num_down=\"$sidd\"" + echo "dsl.latency_num_up=\"$sidu\"" echo "dsl.latency_s_down=\"$idd_s\"" echo "dsl.latency_s_up=\"$idu_s\"" else -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From eckert.florian at googlemail.com Thu Apr 7 05:08:27 2016 From: eckert.florian at googlemail.com (Florian Eckert) Date: Thu, 7 Apr 2016 11:08:27 +0200 Subject: [OpenWrt-Devel] [PATCH 3/3] lantiq-dsl: add missing blank in dsl output In-Reply-To: <1460020107-9042-1-git-send-email-feckert@tdt.de> References: <1460020107-9042-1-git-send-email-feckert@tdt.de> Message-ID: <1460020107-9042-4-git-send-email-feckert@tdt.de> From: Florian Eckert blank inserted before ACTATP Signed-off-by: Florian Eckert --- target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh index 8c6482f..41993f7 100755 --- a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh +++ b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh @@ -639,7 +639,7 @@ line_data() { echo "Line Attenuation (LATN): Down: ${latnd}dB / Up: ${latnu}dB" echo "Signal Attenuation (SATN): Down: ${satnd}dB / Up: ${satnu}dB" echo "Noise Margin (SNR): Down: ${snrd}dB / Up: ${snru}dB" - echo "Aggregate Transmit Power(ACTATP): Down: ${actatpd}dB / Up: ${actatpu}dB" + echo "Aggregate Transmit Power (ACTATP): Down: ${actatpd}dB / Up: ${actatpu}dB" echo "Max. Attainable Data Rate (ATTNDR): Down: ${sattndrd}/s / Up: ${sattndru}/s" fi } -- 2.1.4 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From zioproto at gmail.com Thu Apr 7 05:39:46 2016 From: zioproto at gmail.com (Saverio Proto) Date: Thu, 7 Apr 2016 11:39:46 +0200 Subject: [OpenWrt-Devel] 15.05.1 - Chaos Calmer In-Reply-To: <5703C0E0.1020601@phrozen.org> References: <56E94C5D.1030302@openwrt.org> <56E9A88C.5060409@einfach.org> <5702D0CF.5010107@einfach.org> <5703C0E0.1020601@phrozen.org> Message-ID: Who has commit rights on the other tree ? So we can send an email to have it fixed ? thank you :) Saverio 2016-04-05 15:42 GMT+02:00 John Crispin : > > > On 05/04/2016 15:33, Saverio Proto wrote: >> Thanks Bruno, >> >> I am sorry I am coming back to OpenWrt after a long break. >> >> I expected the tag also on the Release repo >> >> http://git.openwrt.org/?p=15.05/openwrt.git;a=summary >> >> Here I see only a 15.05 tag. I dont understand the logic. I expect the >> 15.05.1 to be release from the Release-repo ? >> >> thank you >> >> Saverio >> > > the logic is that i can push a tag to one tree but not to the other and > whoever can is not reading this thread > > John > > >> >> 2016-04-04 22:38 GMT+02:00 Bruno Randolf : >>> On 04/04/2016 09:34 PM, Saverio Proto wrote: >>>>> Great! Thanks for your good work! >>>>> Could you please add a tag for 15.05.1 in the git repo? >>>> >>>> That would be great. I am trying to git bisect a bug and I have no >>>> idea on top of what commit is 15.05.1 built. >>> >>> There is a tag for it already: >>> >>> https://github.com/openwrt/openwrt/tags >>> >>> bruno >>> >> _______________________________________________ >> openwrt-devel mailing list >> openwrt-devel at lists.openwrt.org >> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel >> > _______________________________________________ > openwrt-devel mailing list > openwrt-devel at lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chunkeey at googlemail.com Thu Apr 7 11:57:22 2016 From: chunkeey at googlemail.com (Christian Lamparter) Date: Thu, 7 Apr 2016 17:57:22 +0200 Subject: [OpenWrt-Devel] [PATCH] brcm2708: Implement sysupgrade image check Message-ID: <1460044642-7096-1-git-send-email-chunkeey@googlemail.com> Implement a crude but functioning sysupgrade image check for Raspberry Pi. The code only checks if the master boot record boot signature (0x55aa) is present in the first 512-bytes at the correct location. This can prevent the odd, accidental bricking of a system when flashing the wrong file. The platform check supports both gzipped and raw images. Signed-off-by: Christian Lamparter --- .../linux/brcm2708/base-files/lib/upgrade/platform.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh index 1d4b694..88c30cc 100644 --- a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh +++ b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh @@ -1,5 +1,20 @@ +get_magic_at() { + local file=$1 + local pos=$2 + ( gunzip -c $file 2>/dev/null || cat $file 2>/dev/null ) | dd bs=1 count=2 skip=$pos 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"' +} + platform_check_image() { - # i know no way to verify the image + local file=$1 + local magic + + magic=$(get_magic_at $file 510) + + [ "$magic" != "55aa" ] && { + echo "Failed to verify MBR boot signature." + return 1 + } + return 0; } -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From mschiffer at universe-factory.net Thu Apr 7 12:04:54 2016 From: mschiffer at universe-factory.net (Matthias Schiffer) Date: Thu, 7 Apr 2016 18:04:54 +0200 Subject: [OpenWrt-Devel] [PATCH] brcm2708: Implement sysupgrade image check In-Reply-To: <1460044642-7096-1-git-send-email-chunkeey@googlemail.com> References: <1460044642-7096-1-git-send-email-chunkeey@googlemail.com> Message-ID: <57068526.3060403@universe-factory.net> On 04/07/2016 05:57 PM, Christian Lamparter wrote: > Implement a crude but functioning sysupgrade image check for Raspberry Pi. > The code only checks if the master boot record boot signature (0x55aa) is > present in the first 512-bytes at the correct location. This can prevent > the odd, accidental bricking of a system when flashing the wrong file. > > The platform check supports both gzipped and raw images. > > Signed-off-by: Christian Lamparter > --- > .../linux/brcm2708/base-files/lib/upgrade/platform.sh | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh > index 1d4b694..88c30cc 100644 > --- a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh > +++ b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh > @@ -1,5 +1,20 @@ > +get_magic_at() { > + local file=$1 > + local pos=$2 > + ( gunzip -c $file 2>/dev/null || cat $file 2>/dev/null ) | dd bs=1 count=2 skip=$pos 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"' Instead of calling gunzip yourself, you should just use get_image (defined in package/base-files/files/lib/upgrade/common.sh ) as it is done on other targets, it will transparently deal with compressed and even remote files. Regards, Matthias > +} > + > platform_check_image() { > - # i know no way to verify the image > + local file=$1 > + local magic > + > + magic=$(get_magic_at $file 510) > + > + [ "$magic" != "55aa" ] && { > + echo "Failed to verify MBR boot signature." > + return 1 > + } > + > return 0; > } > > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: OpenPGP digital signature URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From kevin at koconnor.net Thu Apr 7 12:21:05 2016 From: kevin at koconnor.net (Kevin O'Connor) Date: Thu, 7 Apr 2016 12:21:05 -0400 Subject: [OpenWrt-Devel] [PATCH] hostapd.sh: Add support for "anonymous_identity" config field Message-ID: <1460046065-3754-1-git-send-email-kevin@koconnor.net> The wpa_supplicant supports an "anonymous_identity" field, which some EAP networks require. From the documentation: anonymous_identity: Anonymous identity string for EAP (to be used as the unencrypted identity with EAP types that support different tunnelled identity, e.g., EAP-TTLS). This change modifies the hostapd.sh script to propagate this field from the UCI config to the wpa_supplicant.conf file. Signed-off-by: Kevin O'Connor --- package/network/services/hostapd/files/netifd.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh index ad96b8b..005112d 100644 --- a/package/network/services/hostapd/files/netifd.sh +++ b/package/network/services/hostapd/files/netifd.sh @@ -139,7 +139,7 @@ hostapd_common_add_bss_config() { config_add_string nasid config_add_string ownip config_add_string iapp_interface - config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd + config_add_string eap_type ca_cert client_cert identity anonymous_identity auth priv_key priv_key_pwd config_add_int dynamic_vlan vlan_naming config_add_string vlan_tagged_interface vlan_bridge @@ -623,9 +623,10 @@ wpa_supplicant_add_network() { key_mgmt='WPA-EAP' [ "$ieee80211r" -gt 0 ] && key_mgmt="FT-EAP $key_mgmt" - json_get_vars eap_type identity ca_cert + json_get_vars eap_type identity anonymous_identity ca_cert [ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T" [ -n "$identity" ] && append network_data "identity=\"$identity\"" "$N$T" + [ -n "$anonymous_identity" ] && append network_data "anonymous_identity=\"$anonymous_identity\"" "$N$T" case "$eap_type" in tls) json_get_vars client_cert priv_key priv_key_pwd -- 2.5.5 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From kevin at koconnor.net Thu Apr 7 12:22:11 2016 From: kevin at koconnor.net (Kevin O'Connor) Date: Thu, 7 Apr 2016 12:22:11 -0400 Subject: [OpenWrt-Devel] [luci] [PATCH] luci-mod-admin-full: Add option to set anonymous_identity field Message-ID: <1460046131-3843-1-git-send-email-kevin@koconnor.net> Add support for setting the "anonymous_identity" field on EAP type networks. Signed-off-by: Kevin O'Connor --- I sent a similar request to the openwrt mailing list that adds support to the hostapd.sh script. --- .../luasrc/model/cbi/admin_network/wifi.lua | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua index 945512e..09763e8 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -967,6 +967,24 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"}) identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa"}) + anonymous_identity = s:taboption("encryption", Value, "anonymous_identity", translate("Anonymous Identity")) + anonymous_identity:depends({mode="sta", eap_type="fast", encryption="wpa2"}) + anonymous_identity:depends({mode="sta", eap_type="fast", encryption="wpa"}) + anonymous_identity:depends({mode="sta", eap_type="peap", encryption="wpa2"}) + anonymous_identity:depends({mode="sta", eap_type="peap", encryption="wpa"}) + anonymous_identity:depends({mode="sta", eap_type="ttls", encryption="wpa2"}) + anonymous_identity:depends({mode="sta", eap_type="ttls", encryption="wpa"}) + anonymous_identity:depends({mode="sta-wds", eap_type="fast", encryption="wpa2"}) + anonymous_identity:depends({mode="sta-wds", eap_type="fast", encryption="wpa"}) + anonymous_identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa2"}) + anonymous_identity:depends({mode="sta-wds", eap_type="peap", encryption="wpa"}) + anonymous_identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa2"}) + anonymous_identity:depends({mode="sta-wds", eap_type="ttls", encryption="wpa"}) + anonymous_identity:depends({mode="sta", eap_type="tls", encryption="wpa2"}) + anonymous_identity:depends({mode="sta", eap_type="tls", encryption="wpa"}) + anonymous_identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa2"}) + anonymous_identity:depends({mode="sta-wds", eap_type="tls", encryption="wpa"}) + password = s:taboption("encryption", Value, "password", translate("Password")) password:depends({mode="sta", eap_type="fast", encryption="wpa2"}) password:depends({mode="sta", eap_type="fast", encryption="wpa"}) -- 2.5.5 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From hauke at hauke-m.de Thu Apr 7 12:22:51 2016 From: hauke at hauke-m.de (Hauke Mehrtens) Date: Thu, 7 Apr 2016 18:22:51 +0200 Subject: [OpenWrt-Devel] [PATCH 3/3] curl: add flags to allow gc-sections to strip out unused code In-Reply-To: <1460017310-14214-3-git-send-email-dirk.feytons@gmail.com> References: <1460017310-14214-1-git-send-email-dirk.feytons@gmail.com> <1460017310-14214-3-git-send-email-dirk.feytons@gmail.com> Message-ID: <5706895B.7020106@hauke-m.de> On 04/07/2016 10:21 AM, Dirk Feytons wrote: > Signed-off-by: Dirk Feytons > --- > package/network/utils/curl/Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile > index 319c0b7..af38ed4 100644 > --- a/package/network/utils/curl/Makefile > +++ b/package/network/utils/curl/Makefile > @@ -99,8 +99,9 @@ define Package/libcurl/config > source "$(SOURCE)/Config.in" > endef > > -TARGET_CFLAGS += $(FPIC) > +TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections > TARGET_CPPFLAGS += $(if $(CONFIG_LIBCURL_NTLM),,-DCURL_DISABLE_NTLM) > +TARGET_LDFLAGS += -Wl,--gc-sections > > CONFIGURE_ARGS += \ > --disable-debug \ > Out of curiosity, have you checked how much memory this saves? Hauke _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chunkeey at googlemail.com Thu Apr 7 12:26:51 2016 From: chunkeey at googlemail.com (Christian Lamparter) Date: Thu, 7 Apr 2016 18:26:51 +0200 Subject: [OpenWrt-Devel] [PATCH v2] brcm2708: implement sysupgrade image check In-Reply-To: <57068526.3060403@universe-factory.net> References: <57068526.3060403@universe-factory.net> Message-ID: <1460046411-17102-1-git-send-email-chunkeey@googlemail.com> Implement a crude but functioning sysupgrade image check for the Raspberry Pi. The code only checks if the master boot record boot signature (0x55aa) is present in the first 512-bytes at the correct location. This can prevent the odd bricking of a system when flashing the wrong file. Signed-off-by: Christian Lamparter --- .../linux/brcm2708/base-files/lib/upgrade/platform.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh index 1d4b694..631aa69 100644 --- a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh +++ b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh @@ -1,5 +1,20 @@ +get_magic_at() { + local file="$1" + local pos="$2" + get_image "$file" | dd bs=1 count=2 skip="$pos" 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"' +} + platform_check_image() { - # i know no way to verify the image + local file="$1" + local magic + + magic=$(get_magic_at "$file" 510) + + [ "$magic" != "55aa" ] && { + echo "Failed to verify MBR boot signature." + return 1 + } + return 0; } -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From dirk.feytons at gmail.com Thu Apr 7 15:37:08 2016 From: dirk.feytons at gmail.com (Dirk Feytons) Date: Thu, 7 Apr 2016 21:37:08 +0200 Subject: [OpenWrt-Devel] [PATCH 3/3] curl: add flags to allow gc-sections to strip out unused code In-Reply-To: <5706895B.7020106@hauke-m.de> References: <1460017310-14214-1-git-send-email-dirk.feytons@gmail.com> <1460017310-14214-3-git-send-email-dirk.feytons@gmail.com> <5706895B.7020106@hauke-m.de> Message-ID: On 7 April 2016 at 18:22, Hauke Mehrtens wrote: > On 04/07/2016 10:21 AM, Dirk Feytons wrote: > > Signed-off-by: Dirk Feytons > > --- > > package/network/utils/curl/Makefile | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/package/network/utils/curl/Makefile > b/package/network/utils/curl/Makefile > > index 319c0b7..af38ed4 100644 > > --- a/package/network/utils/curl/Makefile > > +++ b/package/network/utils/curl/Makefile > > @@ -99,8 +99,9 @@ define Package/libcurl/config > > source "$(SOURCE)/Config.in" > > endef > > > > -TARGET_CFLAGS += $(FPIC) > > +TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections > > TARGET_CPPFLAGS += $(if $(CONFIG_LIBCURL_NTLM),,-DCURL_DISABLE_NTLM) > > +TARGET_LDFLAGS += -Wl,--gc-sections > > > > CONFIGURE_ARGS += \ > > --disable-debug \ > > > Out of curiosity, have you checked how much memory this saves? > I did :) A basic build of libcurl with only HTTP/HTTPS support (via OpenSSL) is 207828 bytes without --gc-sections and 195348 with. Not bad I would say. For the curl application itself the numbers are 87728 and 86864 bytes, so there the difference is less. Dirk F. -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chunkeey at googlemail.com Thu Apr 7 17:56:53 2016 From: chunkeey at googlemail.com (Christian Lamparter) Date: Thu, 7 Apr 2016 23:56:53 +0200 Subject: [OpenWrt-Devel] [PATCH 0/3] add support for Cisco Z1 Message-ID: This series adds support for Cisco Meraki's Z1 router [0]. It features: CPU: Atheros/Qualcomm AR9344 at 560MHz RAM: 128 MiB DDR2 NAND Flash: Hynix NAND 128MiB Wireless: SoC AR9340 (5 GHz) + 1x Atheros AR9280 (2.4Ghz) Ethernet: 5x Gigabit AR8236 (1x WAN, 4x LAN) Misc: 1x USB 2.0 Port For anyone interested, a working image [and information about how to flash the locked device] has been posted on the forum [1]. Pictures and bootlogs can be found in the wiki [2] too. [0] [1] [2] Chris Blake (1): ar71xx: add support for Cisco Meraki Z1 Cloud Managed Teleworker Gateway Christian Lamparter (2): firmware-utils mkmerakifw-old: firmware generator for Z1 kernel: owl-loader for delayed Atheros ath9k fixup package/kernel/owl-loader/Makefile | 59 ++++ package/kernel/owl-loader/src/Makefile | 1 + package/kernel/owl-loader/src/owl-loader.c | 212 ++++++++++++ target/linux/ar71xx/base-files/etc/board.d/01_leds | 4 + .../linux/ar71xx/base-files/etc/board.d/02_network | 6 + target/linux/ar71xx/base-files/etc/diag.sh | 3 + .../etc/hotplug.d/firmware/10-ath9k-eeprom | 20 ++ .../etc/uci-defaults/03_network-switchX-migration | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 + .../base-files/lib/preinit/05_set_iface_mac_ar71xx | 4 + .../ar71xx/base-files/lib/upgrade/merakinand.sh | 61 +++- .../ar71xx/base-files/lib/upgrade/platform.sh | 6 +- target/linux/ar71xx/config-4.1 | 1 + target/linux/ar71xx/config-4.4 | 1 + .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt | 12 + target/linux/ar71xx/files/arch/mips/ath79/Makefile | 1 + .../linux/ar71xx/files/arch/mips/ath79/mach-z1.c | 164 +++++++++ .../linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 + target/linux/ar71xx/image/Makefile | 20 ++ target/linux/ar71xx/nand/profiles/meraki.mk | 14 +- .../818-MIPS-ath79-add-nu801-led-driver.patch | 2 +- .../818-MIPS-ath79-add-nu801-led-driver.patch | 2 +- tools/firmware-utils/Makefile | 1 + tools/firmware-utils/src/mkmerakifw-old.c | 369 +++++++++++++++++++++ 24 files changed, 947 insertions(+), 21 deletions(-) create mode 100644 package/kernel/owl-loader/Makefile create mode 100644 package/kernel/owl-loader/src/Makefile create mode 100644 package/kernel/owl-loader/src/owl-loader.c create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-z1.c create mode 100644 tools/firmware-utils/src/mkmerakifw-old.c -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chunkeey at googlemail.com Thu Apr 7 17:56:54 2016 From: chunkeey at googlemail.com (Christian Lamparter) Date: Thu, 7 Apr 2016 23:56:54 +0200 Subject: [OpenWrt-Devel] [PATCH 1/3] firmware-utils mkmerakifw-old: firmware generator for Z1 In-Reply-To: References: Message-ID: <9806645faf6a7ac664734722899bc0360a45c24f.1460065129.git.chunkeey@googlemail.com> This patch adds firmware generation tool for Cisco's Z1 Signed-off-by: Christian Lamparter --- tools/firmware-utils/Makefile | 1 + tools/firmware-utils/src/mkmerakifw-old.c | 369 ++++++++++++++++++++++++++++++ 2 files changed, 370 insertions(+) create mode 100644 tools/firmware-utils/src/mkmerakifw-old.c diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile index ec814b0..9602846 100644 --- a/tools/firmware-utils/Makefile +++ b/tools/firmware-utils/Makefile @@ -75,6 +75,7 @@ define Host/Compile $(call cc,dgn3500sum) $(call cc,edimax_fw_header, -Wall) $(call cc,mkmerakifw sha1, -Wall) + $(call cc,mkmerakifw-old, -Wall) $(call cc,jcgimage, -lz -Wall) endef diff --git a/tools/firmware-utils/src/mkmerakifw-old.c b/tools/firmware-utils/src/mkmerakifw-old.c new file mode 100644 index 0000000..01b9b31 --- /dev/null +++ b/tools/firmware-utils/src/mkmerakifw-old.c @@ -0,0 +1,369 @@ +/* + * Copyright (C) 2015 Thomas Hebb + * Copyright (C) 2016 Christian Lamparter + * + * The format of the header this tool generates was first documented by + * Chris Blake in a shell script of the + * same purpose. I have created this reimplementation at his request. The + * original script can be found at: + * + * + * Support for the old header format, which is used by the Cisco Z1 AP + * has been reverse engineered from the nandloader's nand_load_bk function. + * The original code is part of Cisco's GPL code and can be found at: + * + * + * 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 + * by the Free Software Foundation. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PADDING_BYTE 0xff + +#define HDR_LENGTH 0x00000020 +#define HDR_OFF_MAGIC1 0 +#define HDR_OFF_LOAD_ADDR 4 +#define HDR_OFF_IMAGELEN 8 +#define HDR_OFF_ENTRY 12 +#define HDR_OFF_CHECKSUM 16 +#define HDR_OFF_FILLER0 20 +#define HDR_OFF_FILLER1 24 +#define HDR_OFF_FILLER2 28 + +struct board_info { + char *id; + char *description; + uint32_t magic; + uint32_t imagelen; + uint32_t load_addr; + uint32_t entry; +}; + +/* + * Globals + */ +static char *progname; +static bool strip_padding; + +static char *board_id; +static const struct board_info *board; + +static const struct board_info boards[] = { + { + .id = "z1", + .description = "Meraki Z1 Access Point", + .magic = 0x4d495053, + .imagelen = 0x007e0000, + .load_addr = 0x80060000, + .entry = 0x80060000 + }, { + /* terminating entry */ + } +}; + +/* + * Message macros + */ +#define ERR(fmt, ...) do { \ + fflush(0); \ + fprintf(stderr, "[%s] *** error: " fmt "\n", \ + progname, ## __VA_ARGS__); \ +} while (0) + +#define ERRS(fmt, ...) do { \ + int save = errno; \ + fflush(0); \ + fprintf(stderr, "[%s] *** error: " fmt "\n", \ + progname, ## __VA_ARGS__, strerror(save)); \ +} while (0) + +static const struct board_info *find_board(const char *id) +{ + const struct board_info *ret; + const struct board_info *board; + + ret = NULL; + for (board = boards; board->id != NULL; board++) { + if (strcasecmp(id, board->id) == 0) { + ret = board; + break; + } + } + + return ret; +} + +static void usage(int status) +{ + FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout; + const struct board_info *board; + + fprintf(stream, "Usage: %s [OPTIONS...]\n", progname); + fprintf(stream, +"\n" +"Options:\n" +" -B create image for the board specified with \n" +" -i read kernel image from the file \n" +" -o write output to the file \n" +" -s strip padding from the end of the image\n" +" -h show this screen\n" + ); + + fprintf(stream, "\nBoards:\n"); + for (board = boards; board->id != NULL; board++) + fprintf(stream, " %-16s%s\n", board->id, board->description); + + exit(status); +} + +static void writel(unsigned char *buf, size_t offset, uint32_t value) +{ + value = htobe32(value); + memcpy(buf + offset, &value, sizeof(uint32_t)); +} + +static const uint32_t crc32_table[] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, + 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, + 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, + 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, + 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, + 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, + 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, + 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, + 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, + 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, + 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f, + 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, + 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, + 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, + 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, + 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, + 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, + 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, + 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, + 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, + 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, + 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, + 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, + 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, + 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, + 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, + 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, + 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, + 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, + 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, + 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, + 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, + 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, + 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, + 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, + 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, + 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, + 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, + 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, + 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, + 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, + 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, + 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, + 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, + 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, + 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, + 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, + 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, + 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, +}; + +static inline uint32_t crc32_accumulate_8(const uint32_t crc, const uint8_t ch) +{ + return crc32_table[(crc ^ ch) & 0xff] ^ (crc >> 8); +} + +static void crc32_csum(uint8_t *buf, const size_t len) +{ + uint32_t crc; + size_t i; + + crc = ~0; + for (i = 0; i < len; i += 4) { + crc = crc32_accumulate_8(crc, buf[i + 3]); + crc = crc32_accumulate_8(crc, buf[i + 2]); + crc = crc32_accumulate_8(crc, buf[i + 1]); + crc = crc32_accumulate_8(crc, buf[i]); + } + crc = ~crc; + + writel(buf, HDR_OFF_CHECKSUM, crc); +} + + +static int meraki_build_hdr(const struct board_info *board, const size_t klen, + FILE *out, FILE *in) +{ + unsigned char *kernel; + unsigned char *buf; + size_t buflen; + size_t kspace; + + size_t rc; + buflen = board->imagelen; + kspace = buflen - HDR_LENGTH; + + if (klen > kspace) { + ERR("kernel file is too big - max size: 0x%08lX\n", kspace); + return EXIT_FAILURE; + } + + /* If requested, resize buffer to remove padding */ + if (strip_padding) + buflen = klen + HDR_LENGTH; + + /* Allocate and initialize buffer for final image */ + buf = malloc(buflen); + if (buf == NULL) { + ERRS("no memory for buffer: %s\n"); + return EXIT_FAILURE; + } + memset(buf, PADDING_BYTE, buflen); + + /* Load kernel */ + kernel = buf + HDR_LENGTH; + fread(kernel, klen, 1, in); + + /* Write magic values and filler */ + writel(buf, HDR_OFF_MAGIC1, board->magic); + writel(buf, HDR_OFF_FILLER0, 0); + writel(buf, HDR_OFF_FILLER1, 0); + writel(buf, HDR_OFF_FILLER2, 0); + + /* Write load and kernel entry point address */ + writel(buf, HDR_OFF_LOAD_ADDR, board->load_addr); + writel(buf, HDR_OFF_ENTRY, board->entry); + + /* Write header and image length */ + writel(buf, HDR_OFF_IMAGELEN, klen); + + /* this gets replaced later, after the checksum has been calculated */ + writel(buf, HDR_OFF_CHECKSUM, 0); + + /* Write checksum */ + crc32_csum(buf, klen + HDR_LENGTH); + + rc = fwrite(buf, buflen, 1, out); + + free(buf); + + return rc == 1 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +int main(int argc, char *argv[]) +{ + int ret = EXIT_FAILURE; + char *ofname = NULL, *ifname = NULL; + FILE *out, *in; + size_t klen; + + progname = basename(argv[0]); + + while (1) { + int c; + + c = getopt(argc, argv, "B:i:o:sh"); + if (c == -1) + break; + + switch (c) { + case 'B': + board_id = optarg; + break; + case 'i': + ifname = optarg; + break; + case 'o': + ofname = optarg; + break; + case 's': + strip_padding = true; + break; + case 'h': + usage(EXIT_SUCCESS); + break; + default: + usage(EXIT_FAILURE); + break; + } + } + + if (board_id == NULL) { + ERR("no board specified"); + goto err; + } + + board = find_board(board_id); + if (board == NULL) { + ERR("unknown board \"%s\"", board_id); + goto err; + } + + if (ifname == NULL) { + ERR("no input file specified"); + goto err; + } + + if (ofname == NULL) { + ERR("no output file specified"); + goto err; + } + + in = fopen(ifname, "r"); + if (in == NULL) { + ERRS("could not open \"%s\" for reading: %s", ifname); + goto err; + } + + /* Get kernel length */ + fseek(in, 0, SEEK_END); + klen = ftell(in); + rewind(in); + + out = fopen(ofname, "w"); + if (out == NULL) { + ERRS("could not open \"%s\" for writing: %s", ofname); + goto err_close_in; + } + + ret = meraki_build_hdr(board, klen, out, in); + fclose(out); + +err_close_in: + fclose(in); + +err: + return ret; +} -- 2.8.0.rc3 _______________________________________________ openwrt-devel mailing list openwrt-devel at lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel From chunkeey at googlemail.com Thu Apr 7 17:56:55 2016 From: chunkeey at googlemail.com (Christian Lamparter) Date: Thu, 7 Apr 2016 23:56:55 +0200 Subject: [OpenWrt-Devel] [PATCH 2/3] kernel: owl-loader for delayed Atheros ath9k fixup In-Reply-To: References: Message-ID: <12fa00a06366a921bf383678e6d405736dfb1ee5.1460065129.git.chunkeey@googlemail.com> Some devices (like the Cisco Meraki Z1 Cloud Managed Teleworker Gateway) need to be able to initialize the PCIe wifi device. Normally, this is done during the early stages of booting linux, because the necessary init code is read from the memory mapped SPI and passed to pci_enable_ath9k_fixup. However,this isn't possible for devices which have the init code for the Atheros chip stored on NAND in an UBI volume. Hence, this module can be used to initialze the chip when the user-space is ready to extract the init code. Signed-off-by: Christian Lamparter --- I included the ath9k mailing list too as this deals with bootstrapping ath9k cards and maybe someone there is interested as well? Anyway, the original post and the following discussion can be found here: Note: We tried several methods to get the AR9280 to work. Initially, we tried just a request_firmware_nowait from the device's init (z1_setup in mach-z1.c), but this wasn't working. The issue is that openwrt has no /sbin/hotplug helper [0] and procd doesn't scan the /sys/class/firmware directory for already open request once it started. We played around with different approaches, and also made a helper-script to fulfill the outstanding requests on boot [1]. however we found no good place for it in the start-up scripts. So that's why we developed this owl-loader module, since it won't have to deal with any procd/hotplug issues. The original submission was ar71xx specific, but this was fixed. This module should work on all architectures (lantiq?) and has no dependencies for anything outside ath9k_platform_data. [0] section: "A note about race conditions (or "why bother with netlink?"):" details on why it is a bad idea to have /sbin/hotplug [1] --- package/kernel/owl-loader/Makefile | 59 ++++++++ package/kernel/owl-loader/src/Makefile | 1 + package/kernel/owl-loader/src/owl-loader.c | 212 +++++++++++++++++++++++++++++ 3 files changed, 272 insertions(+) create mode 100644 package/kernel/owl-loader/Makefile create mode 100644 package/kernel/owl-loader/src/Makefile create mode 100644 package/kernel/owl-loader/src/owl-loader.c diff --git a/package/kernel/owl-loader/Makefile b/package/kernel/owl-loader/Makefile new file mode 100644 index 0000000..f5a95e2 --- /dev/null +++ b/package/kernel/owl-loader/Makefile @@ -0,0 +1,59 @@ +# +# Copyright (C) 2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=owl-loader +PKG_RELEASE:=1 + +include $(INCLUDE_DIR)/package.mk + +define KernelPackage/owl-loader + SUBMENU:=Network Support + TITLE:=Owl loader for initializing Atheros PCIe Wifi chips + DEPENDS:=@PCI_SUPPORT +kmod-ath9k + FILES:=$(PKG_BUILD_DIR)/owl-loader.ko + AUTOLOAD:=$(call AutoProbe,owl-loader) + KCONFIG:= +endef + +define KernelPackage/owl-loader/description + Kernel module that helps to initialize certain Qualcomm + Atheros' PCIe Wifi chips, which have the pcie init data + stored together with the calibration data in the file + system. + + This is necessary for devices like the Cisco Meraki Z1. +endef + +EXTRA_KCONFIG:= \ + CONFIG_OWL_LOADER=m + +EXTRA_CFLAGS:= \ + $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \ + $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \ + +MAKE_OPTS:= \ + ARCH="$(LINUX_KARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + SUBDIRS="$(PKG_BUILD_DIR)" \ + EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ + $(EXTRA_KCONFIG) + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(CP) ./src/* $(PKG_BUILD_DIR)/ +endef + +define Build/Compile + $(MAKE) -C "$(LINUX_DIR)" \ + $(MAKE_OPTS) \ + modules +endef + +$(eval $(call KernelPackage,owl-loader)) diff --git a/package/kernel/owl-loader/src/Makefile b/package/kernel/owl-loader/src/Makefile new file mode 100644 index 0000000..6b58276 --- /dev/null +++ b/package/kernel/owl-loader/src/Makefile @@ -0,0 +1 @@ +obj-${CONFIG_OWL_LOADER} += owl-loader.o diff --git a/package/kernel/owl-loader/src/owl-loader.c b/package/kernel/owl-loader/src/owl-loader.c new file mode 100644 index 0000000..81dc495 --- /dev/null +++ b/package/kernel/owl-loader/src/owl-loader.c @@ -0,0 +1,212 @@ +/* + * Initialize Owl Emulation Devices (PCIID: 168c:ff1c) + * + * Copyright (C) 2016 Christian Lamparter