From patchwork Wed Apr 8 13:22:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1268061 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=VCZhkqD2; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48y4jt452Fz9sQx for ; Wed, 8 Apr 2020 23:24:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NmzOoaa7Uy6qD2g6PBcx94hE60XHMi3a0CZJ9ZPFJzE=; b=VCZhkqD2SuVPiL NeBP3SppwwxrKSabduKOUD6tl9YRTDlmTI0nrG4eEmI8ZSIRw7mn/vybnhHu1oF7zVX/w0mu6j3R7 V+1CGJqRt2hSFYWlo6xkxzjNk2M/10g4l+/2h6NLU4295k+YM70M4Ok/EEzeCTvO4pqZMNFz7gXlJ /5J4ZqvEPcyOp6WzmaHaV6CPzADmNgQIoEcgx4vCd0153Q1jd399L+iuc8O9N+p+7QRLmFmNJNjhc qjwJFzstQjrZm/QMS1ICo86MYfrxlbWsv8+Rir/gCVwmX75nxuZ6o3EQcdTx3dLWYo+++D5vbMOfu oyMXFkxcVQItl1eJPeUQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jMAgP-0000BM-44; Wed, 08 Apr 2020 13:23:57 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jMAfs-0007vA-Gy for openwrt-devel@lists.openwrt.org; Wed, 08 Apr 2020 13:23:26 +0000 Received: from buildfff.adridolf.com ([188.192.136.31]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MSqbe-1jjnfl0oVa-00UKLE; Wed, 08 Apr 2020 15:23:19 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Wed, 8 Apr 2020 15:22:27 +0200 Message-Id: <20200408132229.3873-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200408132229.3873-1-freifunk@adrianschmutzler.de> References: <20200408132229.3873-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:bHKrI7TKqbnUi6nAPbOTRWWhnW7l8BzlXo0qb/kMMtEFS9qjM51 mbyBjiqRnlTu2dce8fIELnhqgFyTYlIzjMfWEEutf1LB4Tc3mZXn2I4AedEO3wlwahVjdRq 4fIZ7hlneRJZ4apNhV1iJizI94l+BSDRBnwm4j5ailrq8w51KDsp+AbB7aJArL6HjzyCuJz 4VPFzg2vsuTbe5c3tQrFA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:cuKpnUG2jKs=:PtxXIpgMwuUQ7UnLr2eTlw VQ5WhOuVsoV4tAaRuWuASTs8y/6PRRAqgbRYTFm/LHTCvHw7Bk+y1Kfb6oq0uozx5PFjFm6pJ rUirV+8jmvr7erNQA5G7stbt1QjRBkAXK2zPjBVFHRU7rGVZ6Z/Zie0jZNvcj8RLLZC2iTqrr y25vFcSMRFbtk+Sm7zs9sweip5chsIVN9lKKOH3DDMLaRoivsskVDsGrUOXEPpQ0MnquMKt0y 5DIv1/57TIo/xl7gm1bW4hoT4Ym05gh9cI2be/9JJA9p5tKWbCBa9ek/8t+Hll4nfDOJcU6sN gOUySp0Aw3s60iEElpsIE5BKkmVAmIg+fgLaGchM1TCSIBXVt+swB2TYRtJbAPCR5HOlJlLCW cDL/ZWc9iBjXw+SztH79NornGWP93Eo62SAQS11b26eJ5Okua+hTrbXIaXk9t/Uk1Xl2CvqKG PJsrXKgdPM8TV+ff3JTVvxBKQuWdKNsmAmTNfGcREyYyZ5MSSuADPnifwkTPNwJDsFeXNuNuD 6jSChcZ/qvEulXKw+r3m3Pr1P/xZi9c/O6p3E0xb+t2VhiAhlKhdMxCPMMVqeWT7hxWlH4zt7 ZNjGsWUFQnhJUAoO+joavh+ncLMJJdh5Izwz+9eWnql1jEQenriAS/UBg/rCJ+afiN0MGCuHV THh6Sf7F4QwYIaLLqc+ZtcPq0qSwJpARIWeI+zeOzP0pmMi0xMkKyjGhvg8Jr5uXvvnLMqdwn rM+OrXp61pRMti0DCt0avXUeN5mKEJcRpYyJUvbSYKRdPp2pYDXE8qPUuDsrzHDkhKRrwijLZ w1UdjnPtlmSaZUecCramk/6/CAbDnjqwkKTSw3ELd7hHvFOept6tUzJjdratVFhLtTTEbDJ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200408_062324_870337_08A9D72E X-CRM114-Status: GOOD ( 14.23 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.133 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [RFC PATCH 1/3] ath79: fix wmac initialization for Zyxel NBG6716 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guillaume Lefebvre Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Guillaume Lefebvre 2.4 GHz Wifi on ath79 is set up in 10-ath9k-eeprom, but in ar71xx it was done with ath79_register_wmac. Thus, the following errors are observed on the device: ath: phy1: Unable to initialize hardware; initialization status: -5 ath9k 18100000.wmac: failed to initialize device ath9k: probe of 18100000.wmac failed with error -5 This patch changes the ath79 support to properly use wmac as well. This will also require fixing the MAC address in a different way. Signed-off-by: Guillaume Lefebvre [several adjustments to 10-fix-wifi-mac, use correct MAC address, rewrite commit message] Signed-off-by: Adrian Schmutzler --- While the device seems to come up correctly now, the MAC adjustment is not working (random MAC address for 2g). --- .../linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 2 ++ .../etc/hotplug.d/firmware/10-ath9k-eeprom | 4 ---- .../etc/hotplug.d/ieee80211/10-fix-wifi-mac | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 target/linux/ath79/nand/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index 4ad65c31e8..a495bb187b 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -262,6 +262,8 @@ &wmac { status = "okay"; + + mtd-cal-data = <&art 0x1000>; }; &pcie1 { diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index d2f8bae1ca..f5fae46dfb 100644 --- a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -15,10 +15,6 @@ case "$FIRMWARE" in netgear,wndr4500-v3) caldata_extract "caldata" 0x1000 0x440 ;; - zyxel,nbg6716) - caldata_extract "art" 0x1000 0x440 - ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env ethaddr) - ;; *) caldata_die "board $board is not supported yet" ;; diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac b/target/linux/ath79/nand/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac new file mode 100644 index 0000000000..1940a5a576 --- /dev/null +++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac @@ -0,0 +1,18 @@ +[ "$ACTION" = "add" ] || exit 0 + +PHYNBR=${DEVPATH##*/phy} + +[ -n $PHYNBR ] || exit 0 + +. /lib/functions.sh +. /lib/functions/system.sh + +board=$(board_name) + +case $board in + zyxel,nbg6716) + # Set mac address for ath9k device + [ "$PHYNBR" -eq 1 ] && \ + mtd_get_mac_ascii u-boot-env ethaddr > /sys${DEVPATH}/macaddress + ;; +esac From patchwork Wed Apr 8 13:22:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1268059 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=OyX0nsDv; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48y4jL742Hz9sQx for ; Wed, 8 Apr 2020 23:23:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=L2Fvv/s6H2oWN+CFMXZZAmoRlNUE4G6J0FXY9E3F71s=; b=OyX0nsDvgPomtz2/XbMg+vD9Wn F9JJTFodjDyDXOF/rEneaIHN1ovRZfC2c/EV7jQ505cpcu3TqeY8rwHggt8QbT+DOUoGA+8v3RddG B5tL3R2R/jIXw1jY9W2uA5E+Ir/y4Z6RWjOPlR8HHG//TVY2FoK8RcmIsPRWI2Ns+wpwGOmHGzhvD k6lXUrNgkMnEsfC5p40KEGhVtrGhkGqOnwFtb5J5HCzM52enFgH5e88tVuNnRUvZPEopRygkRxyiE kvC5H16BU+Q3tA6cTRFmUcrfP6XW3gJo2gI2eUzegKzKR9aVVBM3KgIoCLJNyDAMwJs6ZPVVDHAAZ 556kR5fg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jMAg1-00085O-1L; Wed, 08 Apr 2020 13:23:33 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jMAfr-0007v6-8H for openwrt-devel@lists.openwrt.org; Wed, 08 Apr 2020 13:23:24 +0000 Received: from buildfff.adridolf.com ([188.192.136.31]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M8k65-1jQHPa1dMf-004jQR for ; Wed, 08 Apr 2020 15:23:19 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Wed, 8 Apr 2020 15:22:28 +0200 Message-Id: <20200408132229.3873-3-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200408132229.3873-1-freifunk@adrianschmutzler.de> References: <20200408132229.3873-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:2HT712134asquw2umGB4OOSWzHbklLrCrVyOdkMASt+U4CmsgnA 8GEe0sJTIJzxThC04JoX9nd1oEU1v9PqraociLSzYpg7w7JwDo5cxfcfQ091CyiR4jqgLKM k2GoT8W203FOlLwAntVtoLt+92fLQwWsj4coCpCRroZgERdDTE/sWSBBFe3xo+lWn/s7bvL f9hRkokQt95LbFNHsM69A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:VYXlQzpyEcU=:t9NtqetXB6creXu6u/gOXV JQWC0Ady/kYAIYaztbAdor05/ME82gZa7kYgrNgOfMntmipVCmpqGZRJuAvvqB2rkz1jWeF7S 5cPLrV1T8MHsx32Dg7/SG7USWEX1lNsM9Ei4GYmchsaQEEyZv80W6fnxISCMFi/VTFwdn28Qc HvkO4qQuvu1nQkKP9qs0e7hIrZ/es2d71ikX6R6Vtrk2jJm+NV0D83R6ABtm2Y1q89gKqiFKC FAPOIYngvc4+nJrqlpJZvNWjag3K6K/8TAPeD82WsFTpnzyOqrf/9qh3lXtS3ewxfkmllrvtW UWPkfqQrmZdW5tw1kAL/9/yfo1wBo3NAT03e43YpXQalFZdIGMvHjcMAvnSbTatykts0YPeLd 5vOQCwld51EdZDS7/0BxdiGjMz83WICq/VSCF9JvHtNTmdiDIvBCgeGLbZXWCu1SePbID0HA+ liEk1cbq+bNVLoGvwSUcqcMGmp9AGMLH0ZD7bY7N/24BmAZ/l6UIJYwgMnD20/OuzMNyGqX4z 0gHiSVehviDWjIQZaEmu+Yut9lXPXMcdYRffzjqF8zidT8oJmTyaXSb3w9et9NBsET+nDw0o7 4IFNPCiAMfvNaoLGWFSC/eH0QoS4sHfan9Mm7nZ9ZzkpV2NvHn7Y2I/08EIL+cog2jVNfihY5 mvcRx8d+Lm/G8OVXPs9feqmGDlGx721MPXURRjzG51cmlGOQrmrUx7T7Dz/zCxhGzhQ1ES569 ALeteOi5BOCu+5LXci90ukr2xA7+2Uq+XLsWdls+CzvT5n/mEVzoT/DoTYoO3Ue5dY6kOWYUJ uU5bCuZz23ZL/ptIqnqK2yMiyGbbsdGa+sZkQTNlhZri3s671lXfGkPv+fmmF8RnifNKPsa X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200408_062323_579591_7B4CFEC3 X-CRM114-Status: UNSURE ( 9.32 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.187 listed in wl.mailspike.net] Subject: [OpenWrt-Devel] [RFC PATCH 2/3] ath79: further fixes for ZyXEL NBG6716 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This applies further fixes to the DTS of ZyXEL NBG6716 based on what is found in ar71xx (mach-nbg6716.c): - use WiFi label names as in ar71xx - fix WPS gpio number - fix GPIO_ACTIVE_HIGH and mode for WiFi switch - add codes for USB eject buttons Despite, add the WAN led to 01_leds. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 15 +++++++++------ .../ath79/nand/base-files/etc/board.d/01_leds | 3 +++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index a495bb187b..33650dc7dd 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -48,21 +48,21 @@ trigger-sources = <&hub_port1>; }; - wifi2 { - label = "nbg6716:white:wifi2"; + wifi2g { + label = "nbg6716:white:wifi2g"; gpios = <&gpio 19 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; - wifi5 { - label = "nbg6716:white:wifi5"; + wifi5g { + label = "nbg6716:white:wifi5g"; gpios = <&gpio 17 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy0tpt"; }; wps { label = "nbg6716:white:wps"; - gpios = <&gpio 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio 21 GPIO_ACTIVE_LOW>; }; }; @@ -79,18 +79,21 @@ wifi { label = "WiFi button"; linux,code = ; - gpios = <&gpio 1 GPIO_ACTIVE_LOW>; + linux,input-type = ; + gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; debounce-interval = <60>; }; usb1 { label = "USB1 eject button"; + linux,code = ; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; debounce-interval = <60>; }; usb2 { label = "USB2 eject button"; + linux,code = ; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; debounce-interval = <60>; }; diff --git a/target/linux/ath79/nand/base-files/etc/board.d/01_leds b/target/linux/ath79/nand/base-files/etc/board.d/01_leds index d9989ec538..73fd7089f5 100755 --- a/target/linux/ath79/nand/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/nand/base-files/etc/board.d/01_leds @@ -18,6 +18,9 @@ netgear,wndr4300-v2|\ netgear,wndr4500-v3) ucidef_set_led_switch "wan-amber" "WAN (amber)" "netgear:amber:wan" "switch0" "0x20" ;; +zyxel,nbg6716) + ucidef_set_led_netdev "wan" "WAN" "$boardname:white:internet" "eth1" + ;; esac board_config_flush From patchwork Wed Apr 8 13:22:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1268060 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=WbUoQaJ0; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48y4jb3xjjz9sQx for ; Wed, 8 Apr 2020 23:23:47 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=kN7T47rGzVcrSv32w4iXwnki/RsavvYEddBwSXrzQi8=; b=WbUoQaJ0XsUpRrKmMaUazUiNjd VRgcKjOZiUIJEnaOPHmdTJqvhAHn0x/wLzMgLfaKkEDPH4Dm8w/lcra1x5Dxi8dMLyenyr/Ayha0x YKjrlnltPa+jB+xkhiMjOLJ4Ghncnr7Uu1TY/0VSY2D6jLIQ59yWhLDHf7Lkyhl+DcHt1tBm9fXgx vJqKGLoQK5ThSUL5bbOCTFvCg8w9cXB1qZo6kRha+AIewMTBenlnXn7ensdEG4SLHbBXFHPGz5/UR V8paEEcD/m172kCZ9Y7S1VGtY5U8LW6JTSxCLtDiug5tHiTd3Qv+624WNGKyAbY6EjvzS1Pf0vV9D F68lIiwQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jMAgC-0008KX-0U; Wed, 08 Apr 2020 13:23:44 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jMAfr-0007v7-BI for openwrt-devel@lists.openwrt.org; Wed, 08 Apr 2020 13:23:25 +0000 Received: from buildfff.adridolf.com ([188.192.136.31]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MIyiY-1jc3tl2RvW-00KSzA for ; Wed, 08 Apr 2020 15:23:19 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Wed, 8 Apr 2020 15:22:29 +0200 Message-Id: <20200408132229.3873-4-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200408132229.3873-1-freifunk@adrianschmutzler.de> References: <20200408132229.3873-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:EG0sXjg0hMVAQI1wyBaQTyVxiqQqwL/UtM3EPT2JYZDM6H9FOwe oGgY92IbozRrJX/NH0h8ntsIXPTyacaSgq653jWUBcZaRUgvHx73g9epAhbk9K2jYF/sdOD izNI4HHvIbPuF9bWOA/askMf9wQrGaUSnCpMaZp5jTS0fe+ggv8p+yes1kv9VKwPqUt2k+N AuHWlumAm7ZrILeE9thvA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:VQqjfMfpLRM=:oQEd/pErFRHA0KDNMRzrkd q658lDAIm1qo1NXqdvpdhRkxBR87OHpUuFEV3SMcVoey6WJyDmgVRDihPYHo7Yp2N80FlOueM yCspGr61LqzPWpWp8ZqpRS5l1Bpj4QJSPij1m4/WnOB17M7ofLFncKprnym1DB0EEzUjTOUO5 nJnU5pszyoFeR81Rxx2h+emfhsxC0rvPc95rmhCVcqDuzz6Gd2I6pidPHVjjnZeUGEoTW6tm/ wcDsaPh4vm84EPLE8zKx3uC3N8E0q1V1rqalXeXVd2tFZyRQ439zOAxWa7vSMdMIfAb2a9iU+ rxr+UaAaroHYRZSk405XUQq1qslO90MKs75eqsSsIeox9Nea4jLag0tYcHKHwxFtwjFC9EmNR qsgW5VSxUwWh91augkqpmmvovIcg1XkB0t8awUmz11SSsbMYFdTLjzLivrr4JluLtobjIimJw /yir0LFdV+25gOxXgDXV0M2/L6Q1tQ5jWzJmSRofOwugeJErdEN7E3nWtk64/UGWACp1lJFnr NWXWUY95YmC6zzD7F/Khyh4X0h/FypdRJRhwpA4Ho6Bc4dndclGq8GR9ITQzSUeNZT83hlOJ1 TXgTjWbO2BfK56VspIPaOdf8SDMr1TkHsym7SpqNsNlz5C0pQAX/1NX5HEDytAEadZ7h+pNtj ll/XSgnBA1JXw7eWWDONSnmCooGf665xyHxp8D2bbsxGnCpUbZ3mPYjfDQKBUYehQpiSDrc7E xBsHB/7NKAOC9vP2D89JIiVUaY+1OdYpt92sCt/+KNbIAbrjodstW+2ZqhQbb6hBMBXtDf8gh xgcmoPRcfyqUjPQb1TUc7AI1yYgb7M6HwJ6DyLmwsTi+JQt5EQc8ReMYx18uF91lcH8r/4i X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200408_062323_686427_E1953396 X-CRM114-Status: GOOD ( 14.22 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.187 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [RFC PATCH 3/3] ath79: fix 5 GHz Wi-Fi on Zyxel NBG6716 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This reimplements a fix for the Zyxel NBG6716 from ar71xx: Some NBG6716 do not have ath10k calibration data in flash, only in chip OTP. To determine if flash has a valid calibration data, the first two bytes telling the length of the calibration data are checked against the requested length. If the lengths match, calibration data is valid and read from flash. Based on: 2ea98fc39b21 ("ar71xx: fix 5 GHz Wi-Fi on NBG6716") Signed-off-by: Adrian Schmutzler --- This is just a copy-paste job, since I found the relevant patch during looking up stuff for the NBG6716. I don't think that's a particularly nice solution and would be happy if there are better ideas. (We are actually comparing strings of sizes here ...) If there is a nice solution though, one should consider adding that one to generic caldata_extract at some point. This will break extractions with wrong size set; however, if we can and will extract size this way, the size parameter in the function call would be actually obselete. I'd be interested in general feedback on this subject. --- .../etc/hotplug.d/firmware/11-ath10k-caldata | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index d5fd3db24d..5e47b84332 100644 --- a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -4,6 +4,24 @@ . /lib/functions/caldata.sh +caldata_extract_if_present() { + local part=$1 + local offset=$(($2)) + local count=$(($3)) + local mtd + + mtd=$(find_mtd_chardev $part) + [ -n "$mtd" ] || caldata_die "no mtd device found for partition $part" + + # Check that the calibration data size in header equals the desired size + cal_size=$(dd if=$mtd bs=2 count=1 iflag=skip_bytes skip=$offset conv=swab 2>/dev/null | hexdump -ve '1/2 "%d"') + + [ "$count" = "$cal_size" ] || caldata_die "no calibration data found in $part" + + dd if=$mtd of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \ + caldata_die "failed to extract calibration data from $mtd" +} + board=$(board_name) case "$FIRMWARE" in @@ -19,7 +37,7 @@ case "$FIRMWARE" in ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +1) ;; zyxel,nbg6716) - caldata_extract "art" 0x5000 0x844 + caldata_extract_if_present "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1) ;; esac