[From nobody Thu Jun 25 05:55:23 2020 Received: from hosting.moc6.cz ([2a02:c60:c70:8900::1] helo=moc6.cz) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iADtS-0003nT-0Z for openwrt-devel@lists.openwrt.org; Tue, 17 Sep 2019 13:51:48 +0000 Received: by moc6.cz (Postfix, from userid 1025) id 6F1EA2320022; Tue, 17 Sep 2019 15:51:38 +0200 (CEST) Date: Tue, 17 Sep 2019 15:51:38 +0200 From: Filip Moc <lede@moc6.cz> To: Enrico Mioso <mrkiko.rs@gmail.com> Cc: Adrian Schmutzler <mail@adrianschmutzler.de>, openwrt-devel@lists.openwrt.org, Piotr Dymacz <pepe2k@gmail.com> Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for TP-Link TL-MR6400 Message-ID: <20190917135138.GA24389@moc6.cz> References: <20190917002048.1062539-1-mrkiko.rs@gmail.com> <003c01d56d3f$b216bee0$16443ca0$@adrianschmutzler.de> <alpine.LNX.2.21.99999.353.1909171243340.1098807@mStation.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <alpine.LNX.2.21.99999.353.1909171243340.1098807@mStation.localdomain> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190917_065146_367554_BAB34C93 X-CRM114-Status: GOOD ( 36.20 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record Hi, > Where - eth1 works correctly (e.g.: detects cable plugging / unplugging), eth0 does not. I faintly remember I had to tweak ethernet ports on MR6400 somehow. I think it had to be somehow put into swap mode or something to separate the WAN port, otherwise some other port (LAN1 I think) was separated. And I also remember I had to experiment a bit to group phys and miis right so that right port connection controls up status of the right ethernet interface. Check if you have this setup correctly. When you face MR6400's ethernet ports to you the port order is from left to right: - LAN1 (the one right next to power button) - LAN2 - LAN3 - LAN4/WAN (the one right next to reset button) I can check your code when I get near to my MR6400 which will be sometime in next week. Filip On Tue, Sep 17, 2019 at 12:48:55PM +0200, Enrico Mioso wrote: > thank you very very much Adrian!! I'll address all of the comments hopefully, and send a new version. In the meantime I am trying to configure the switch correctly, which is not the case. > My current snippet is: > &eth0 { > status = "okay"; > phy-handle = <&swphy0>; > > mtd-mac-address = <&uboot 0x1fc00>; > mtd-mac-address-increment = <1>; > }; > > &eth1 { > mtd-mac-address = <&uboot 0x1fc00>; > mtd-mac-address-increment = <(-1)>; > }; > > Where - eth1 works correctly (e.g.: detects cable plugging / unplugging), eth0 does not. > Can you help me translate the C code in the mach- file to the DTS equivalent? > The most similar device is TP-Link 942N but it seems not supported. > > BTW - fixing eth1 issue helped mitigate LTE init problem... > As per leds, I was trying to keep things the ar71xx way, what do you think? > > Enrico > > On Tue, 17 Sep 2019, Adrian Schmutzler wrote: > > > Date: Tue, 17 Sep 2019 12:07:20 > > From: Adrian Schmutzler <mail@adrianschmutzler.de> > > To: Enrico Mioso <mrkiko.rs@gmail.com>, openwrt-devel@lists.openwrt.org > > Cc: Filip Moc <lede@moc6.cz>, Piotr Dymacz <pepe2k@gmail.com> > > Subject: Re: [OpenWrt-Devel] [PATCH] ath79: add support for TP-Link TL-MR6400 > > > > Hi, > > > > > -----Original Message----- > > > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] On Behalf Of Enrico Mioso > > > Sent: Dienstag, 17. September 2019 02:21 > > > To: openwrt-devel@lists.openwrt.org > > > Cc: Filip Moc <lede@moc6.cz>; Piotr Dymacz <pepe2k@gmail.com>; Enrico Mioso <mrkiko.rs@gmail.com> > > > Subject: [OpenWrt-Devel] [PATCH] ath79: add support for TP-Link TL-MR6400 > > > > > > This adds support to the ath79 target for the TP-Link MR6400 router. > > > > > > As per original commit, hardware specifications (v1.0 EU): > > > - SoC: QCA9531 > > > - Flash: Winbond W25Q64FV (8MiB) > > > - RAM: EtronTech EM6AB160TSE-5G (64MiB) > > > - Wireless: SoC platform only (2.4GHz b/g/n, 2x internal antenna) > > > - Ethernet: 2NIC (3x100M + 1x100M) > > > - WWAN: TP-LINK LTE MODULE (2x external detachable antenna) > > > - Power: DC 12V 1A > > > > > > Flashing instructions: > > > You can flash via tftp recovery (serve factory image as /mr6400_tp_recovery.bin > > > on 192.168.0.66/24, connect to any ethernet port and power on device while > > > holding the reset button). Flashing via OEM web interface does not work. > > > > > > Working: > > > - Wi-Fi > > > - TP-Link LTE module does it's thing (but see Notes) > > > - reset/rfkill keys > > > Untested: > > > - recovery via factory > > > - leds > > > > > > Issues for which I need help: > > > eth1 detects link when infact it's not there, and occasionally causes kernel traces due to tx timeouts. > > > I promise I'll test untested items as well in final version > > > > > > Note: as it happened occasionally in ar71xx, during bursty flash activity, LTE module init will fail, with USB enumeration errors. > > > > > > Signed-off-by: Enrico Mioso <mrkiko.rs@gmail.com> > > > CC: Filip Moc <lede@moc6.cz> > > > CC: Piotr Dymacz <pepe2k@gmail.com> > > > --- > > > .../ath79/base-files/etc/board.d/01_leds | 6 + > > > .../ath79/base-files/etc/board.d/02_network | 5 + > > > .../ath79/dts/qca9531_tplink_tl-mr6400-v1.dts | 165 ++++++++++++++++++ > > > target/linux/ath79/image/generic-tp-link.mk | 10 ++ > > > 4 files changed, 186 insertions(+) > > > create mode 100644 target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts > > > > > > diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds b/target/linux/ath79/base-files/etc/board.d/01_leds > > > index 778316e450..5728aeb491 100755 > > > --- a/target/linux/ath79/base-files/etc/board.d/01_leds > > > +++ b/target/linux/ath79/base-files/etc/board.d/01_leds > > > @@ -130,6 +130,12 @@ tplink,archer-c7-v5) > > > ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x10" > > > ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x20" > > > ;; > > > +tplink,tl-mr6400-v1) > > > + ucidef_set_led_netdev "lan" "LAN" "tp-link:white:lan" "eth0" > > > + ucidef_set_led_netdev "wan" "WAN" "tp-link:white:wan" "eth1" > > > > Here, you assign eth1 to the "wan" LED, but in 02_network you assign eth1 to "lan". > > Either change 02_network or this LED shouldn't be called WAN. > > > > > + ucidef_set_led_netdev "4g" "4G" "tp-link:white:4g" "usb0" > > > + ucidef_set_led_wlan "wlan" "WLAN" "tp-link:white:wlan" "phy0tpt" > > > > phy0tpt trigger can be moved to DTS, just have a look at other devices recently added to ath79. > > > > > + ;; > > > tplink,archer-c2-v3|\ > > > tplink,tl-wr1043nd-v4|\ > > > tplink,tl-wr1043n-v5) > > > diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network > > > index 5b47af8ef7..2b0e1ce400 100755 > > > --- a/target/linux/ath79/base-files/etc/board.d/02_network > > > +++ b/target/linux/ath79/base-files/etc/board.d/02_network > > > @@ -56,6 +56,11 @@ ath79_setup_interfaces() > > > winchannel,wb2000) > > > ucidef_set_interface_lan "eth0" > > > ;; > > > + tplink,tl-mr6400-v1) > > > + ucidef_set_interfaces_lan_wan "eth0.1 eth1" "usb0" > > > > As stated above, this will make eth1 part of "lan" ... > > > > > + ucidef_add_switch "switch0" \ > > > + "0@eth0" "1:lan" "2:lan" "3:lan" > > > + ;; > > > avm,fritz4020|\ > > > pcs,cr3000|\ > > > tplink,archer-c58-v1|\ > > > diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts > > > new file mode 100644 > > > index 0000000000..4acb1a02a4 > > > --- /dev/null > > > +++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts > > > @@ -0,0 +1,165 @@ > > > +// SPDX-License-Identifier: GPL-2.0-or-later > > > +/dts-v1/; > > > + > > > +#include <dt-bindings/gpio/gpio.h> > > > +#include <dt-bindings/input/input.h> > > > + > > > +#include "qca953x.dtsi" > > > + > > > +/ { > > > + compatible = "tplink,tl-mr6400-v1", "qca,qca9531"; > > > + model = "TP-Link TL-MR6400 v1.0"; > > > > I would remove the ".0" here, as with TP-Link the sub-revisions typically refer only to their firmware. So just "v1" should be better. > > > > > + > > > + aliases { > > > + led-boot = &led_power; > > > + led-failsafe = &led_power; > > > + led-running = &led_power; > > > + led-upgrade = &led_power; > > > + }; > > > + > > > + gpio_leds: leds { > > > + compatible = "gpio-leds"; > > > + > > > + /* D12 */ > > > > What's that? > > > > > + led_wan: wan { > > > + label = "tp-link:white:wan"; > > > + gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; > > > + }; > > > > IMO those labels only make sense if you use them, as for led_power. I would remove all of the other ones, i.e. only "wan {" here instead of "led_wan: wan {" ... > > > > > + > > > + /* D11 */ > > > + led_4g: 4g { > > > + label = "tp-link:white:4g"; > > > + gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; > > > + }; > > > + > > > + /* D5 */ > > > + led_wps: wps { > > > + label = "tp-link:white:wps"; > > > + gpios = <&gpio 3 GPIO_ACTIVE_HIGH>; > > > + }; > > > + > > > + /* D3 */ > > > + led_wlan: wlan { > > > + label = "tp-link:white:wlan"; > > > + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; > > > + }; > > > + > > > + /* D2 */ > > > + led_power: power { > > > + label = "tp-link:white:power"; > > > + gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; > > > + }; > > > + > > > + /* D4 */ > > > + led_lan: lan { > > > + label = "tp-link:white:lan"; > > > + gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; > > > + }; > > > + }; > > > + > > > + gpio-export { > > > + compatible = "gpio-export"; > > > + #size-cells = <0>; > > > + > > > + gpio_usb_power { > > > + gpio-export,name = "tp-link:power:LTE"; > > > + gpio-export,output = <0>; > > > > Sure about the 0? > > > > > + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; > > > + }; > > > + }; > > > > Please replace gpio-export by a gpio-hog. Either look at recently added devices or at https://patchwork.ozlabs.org/patch/1141057/ > > > > Note that in this case I would call the node "lte_power" or "power_lte" instead of referring to the USB, but that's a matter of taste. > > > > > + > > > + keys { > > > + compatible = "gpio-keys"; > > > + > > > + /* SW2 */ > > > + reset { > > > + label = "Reset button"; > > > + linux,code = <KEY_RESTART>; > > > + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; > > > + debounce-interval = <60>; > > > + }; > > > + > > > + /* SW3 */ > > > + rfkill { > > > + label = "RFKill button"; > > > + linux,code = <KEY_RFKILL>; > > > + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; > > > + debounce-interval = <60>; > > > + }; > > > + }; > > > +}; > > > + > > > +&uart { > > > + status = "okay"; > > > +}; > > > + > > > +&spi { > > > + status = "okay"; > > > + num-cs = <1>; > > > + > > > + flash@0 { > > > + #address-cells = <1>; > > > + #size-cells = <1>; > > > + compatible = "jedec,spi-nor"; > > > + reg = <0>; > > > + spi-max-frequency = <10000000>; > > > + > > > + partitions { > > > + compatible = "fixed-partitions"; > > > + #address-cells = <1>; > > > + #size-cells = <1>; > > > + > > > + uboot: partition@0 { > > > > There is a tab between uboot and partition. Replace by space ... > > > > > + label = "u-boot"; > > > + reg = <0x000000 0x020000>; > > > + read-only; > > > + }; > > > + > > > + partition@20000 { > > > + compatible = "tplink,firmware"; > > > + label = "firmware"; > > > + reg = <0x020000 0x7d0000>; > > > + }; > > > + > > > + art: partition@7f0000 { > > > + label = "art"; > > > + reg = <0x7f0000 0x010000>; > > > + read-only; > > > + }; > > > + }; > > > + }; > > > +}; > > > + > > > +&eth1 { > > > + mtd-mac-address = <&uboot 0x1fc00>; > > > + mtd-mac-address-increment = <(-1)>; > > > +}; > > > + > > > +&eth0 { > > > + status = "okay"; > > > + phy-handle = <&swphy4>; > > > + > > > + mtd-mac-address = <&uboot 0x1fc00>; > > > + mtd-mac-address-increment = <1>; > > > +}; > > > + > > > +&wmac { > > > + status = "okay"; > > > + mtd-cal-data = <&art 0x1000>; > > > + mtd-mac-address = <&uboot 0x1fc00>; > > > +}; > > > + > > > +&usb0 { > > > + #address-cells = <1>; > > > + #size-cells = <0>; > > > + status = "okay"; > > > + > > > + hub_port: port@1 { > > > + reg = <1>; > > > + #trigger-source-cells = <0>; > > > + }; > > > +}; > > > + > > > +&usb_phy { > > > + status = "okay"; > > > +}; > > > diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk > > > index 5519e9c960..78d7810f29 100644 > > > --- a/target/linux/ath79/image/generic-tp-link.mk > > > +++ b/target/linux/ath79/image/generic-tp-link.mk > > > @@ -393,6 +393,16 @@ define Device/tplink_tl-wr810n-v1 > > > endef > > > TARGET_DEVICES += tplink_tl-wr810n-v1 > > > > > > +define Device/tplink_tl-mr6400-v1 > > > + $(Device/tplink-8mlzma) > > > + ATH_SOC := qca9531 > > > + DEVICE_MODEL := TL-MR6400 > > > + DEVICE_VARIANT := v1 > > > + TPLINK_HWID := 0x64000001 > > > + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial kmod-usb-serial-option adb > > > > You can remove kmod-usb-core, kmod-usb-net and kmod-usb-serial, as those are dependencies of the other packages. > > > > Since this is a port from ar71xx, you should add a SUPPORTED_DEVICES entry. > > > > Best > > > > Adrian > > > > > +endef > > > +TARGET_DEVICES += tplink_tl-mr6400-v1 > > > + > > > define Device/tplink_tl-wr810n-v2 > > > $(Device/tplink-8mlzma) > > > ATH_SOC := qca9533 > > > -- > > > 2.23.0 > > > > > > > > > _______________________________________________ > > > openwrt-devel mailing list > > > openwrt-devel@lists.openwrt.org > > > https://lists.openwrt.org/mailman/listinfo/openwrt-devel > > ]