From patchwork Mon Oct 21 12:32:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Valentin?= X-Patchwork-Id: 1180554 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=none (p=none dis=none) header.from=marcant.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="coq+f4CQ"; 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 46xbdW0Q7bz9sPd for ; Mon, 21 Oct 2019 23:33:03 +1100 (AEDT) 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=wI30p1WPCdmoRifmhvJVSXwA/4KtpkdpNSHGAftahoE=; b=coq+f4CQ6bX/AF H2ZaVTybJ9SaSawYi9DIB0rRwZ7/t8DGmGodjWNM6kHf9Fd+6ZwuAtZt0TQHCuM5cFcFajokL+qU6 6OpYgMk+G5jG5SOLQsgxIAYqxn0DGdcFNJEhXiZf36+3Uav3wHTcDGRA2uYQY1Y9KoBH5QXanzx40 dhekVtTXdjJLep+bBpdyEYJQAusWaWYPEH2pAMu6TTvuHhrhvs1bDr1z1Rd34DZhOf57UW/i0lCPd mqZrKkpSOYlH7DWuKnNf3VmAEk5t/ccqeTaoB37JtOhIUQNJNHloIFo/zU9Gzc+ZO8oHnI4n6E8Vl A4YrrcC1N7zayJVePeIg==; 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 1iMWrm-0006EK-Oo; Mon, 21 Oct 2019 12:32:54 +0000 Received: from mail3.marcant.net ([217.14.160.188]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMWrN-0005kw-Rq for openwrt-devel@lists.openwrt.org; Mon, 21 Oct 2019 12:32:33 +0000 Received: from [192.168.180.1] (port=54458 helo=admins.marcant.net) by mail3.marcant.net with esmtp (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1iMWrE-00081D-26 for openwrt-devel@lists.openwrt.org; Mon, 21 Oct 2019 14:32:20 +0200 Received: from varus.marcant.loc (unknown [192.168.3.44]) by admins.marcant.net (Postfix) with ESMTPA id 7EDD22802BF; Mon, 21 Oct 2019 14:32:20 +0200 (CEST) From: =?utf-8?q?Andr=C3=A9_Valentin?= To: openwrt-devel@lists.openwrt.org Date: Mon, 21 Oct 2019 14:32:10 +0200 Message-Id: <20191021123214.2252-2-avalentin@marcant.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191021123214.2252-1-avalentin@marcant.net> References: <20191021123214.2252-1-avalentin@marcant.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191021_053230_060130_940E05C3 X-CRM114-Status: GOOD ( 10.27 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.14.160.188 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 1/5] tools/mkrasimage: Add support for 128k header size 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: avalentin@marcant.net Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 128k header size support is needed for ZyXEL NBG6716. Signed-off-by: André Valentin --- tools/firmware-utils/src/mkrasimage.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/firmware-utils/src/mkrasimage.c b/tools/firmware-utils/src/mkrasimage.c index 8eee29cc08..526a1f3a43 100644 --- a/tools/firmware-utils/src/mkrasimage.c +++ b/tools/firmware-utils/src/mkrasimage.c @@ -57,7 +57,6 @@ #define BOARD_HEADER_LEN 68 #define HEADER_PARTITION_CALC_LENGTH 2048 -#define HEADER_PARTITION_LENGTH 0x10000 struct file_info { char *name; /* name of the file */ @@ -70,6 +69,7 @@ static char *progname; static char *board_name = 0; static char *version_name = 0; static unsigned int rootfs_size = 0; +static unsigned int header_length = 0x10000; static struct file_info kernel = { NULL, NULL, 0 }; static struct file_info rootfs = { NULL, NULL, 0 }; @@ -144,6 +144,7 @@ void usage(int status) " -v version string\n" " -b name of board to generate image for\n" " -o name of output image\n" + " -l length of header, default 65536\n" " -h show this screen\n" ); @@ -334,7 +335,7 @@ int build_image() board_header = generate_board_header(kernel_header, rootfs_header, board_name); /* Prepare output file */ - out.size = HEADER_PARTITION_LENGTH + rootfs_out.size; + out.size = header_length + rootfs_out.size; if (kernel.name) out.size += kernel.size; out.data = malloc(out.size); @@ -345,7 +346,7 @@ int build_image() memcpy(out.data + ROOTFS_HEADER_LEN, board_header, BOARD_HEADER_LEN); if (kernel.name) memcpy(out.data + ROOTFS_HEADER_LEN + BOARD_HEADER_LEN, kernel_header, KERNEL_HEADER_LEN); - ptr = HEADER_PARTITION_LENGTH; + ptr = header_length; memcpy(out.data + ptr, rootfs_out.data, rootfs_out.size); ptr += rootfs_out.size; if (kernel.name) @@ -410,7 +411,7 @@ int main(int argc, char *argv[]) while (1) { int c; - c = getopt(argc, argv, "b:k:o:r:s:v:h"); + c = getopt(argc, argv, "b:k:o:r:s:v:l:h"); if (c == -1) break; @@ -436,6 +437,9 @@ int main(int argc, char *argv[]) case 'v': version_name = optarg; break; + case 'l': + sscanf(optarg, "%u", &header_length); + break; default: usage(EXIT_FAILURE); break; From patchwork Mon Oct 21 12:32:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Valentin?= X-Patchwork-Id: 1180555 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=none (p=none dis=none) header.from=marcant.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PUxvmaIT"; 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 46xbdn5BpGz9sPL for ; Mon, 21 Oct 2019 23:33:17 +1100 (AEDT) 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=z5RRBifPRThqAXw+Ui1vImAAOkLrLbHVqf7daYWAx7M=; b=PUxvmaITC2SEyP 4J150Og2POmWCK2QmKl+OwN8pyfi9uNDoly1hlWnvaWUksHd3fNOXEbNkWvzsAMJfOJ7By5knQd9H iyeElFevmneLx00P72MfQO77p/H2q/RS0+dXsQsO5RV0jEb7OmhqHR1QM+NSmUbBJWR1KX2J67pGy xeBVBN8m8GO38+0LXRJ98Zxd3QAFu8Yq5odJyfIuDYMBG+clTe3sssFmKq9XBCbQnj0efgdeTJWJi KuhT+CTADeSfdaRNAkY/k5hOaT0zHUevuzll+QTpr6bNtEx+iJYWjHghyYApI/RcLuzVOEpMKCuSt 1c8Pl8iOekQBRcItWAhg==; 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 1iMWrz-0006Vr-7d; Mon, 21 Oct 2019 12:33:07 +0000 Received: from mail3.marcant.net ([217.14.160.188]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMWrN-0005kx-Rf for openwrt-devel@lists.openwrt.org; Mon, 21 Oct 2019 12:32:33 +0000 Received: from [192.168.180.1] (port=54462 helo=admins.marcant.net) by mail3.marcant.net with esmtp (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1iMWrE-00081F-2O for openwrt-devel@lists.openwrt.org; Mon, 21 Oct 2019 14:32:20 +0200 Received: from varus.marcant.loc (unknown [192.168.3.44]) by admins.marcant.net (Postfix) with ESMTPA id 9E9AF2804A3; Mon, 21 Oct 2019 14:32:20 +0200 (CEST) From: =?utf-8?q?Andr=C3=A9_Valentin?= To: openwrt-devel@lists.openwrt.org Date: Mon, 21 Oct 2019 14:32:11 +0200 Message-Id: <20191021123214.2252-3-avalentin@marcant.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191021123214.2252-1-avalentin@marcant.net> References: <20191021123214.2252-1-avalentin@marcant.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191021_053230_068290_187A77D1 X-CRM114-Status: UNSURE ( 7.56 ) X-CRM114-Notice: Please train this message. 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.14.160.188 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 2/5] ar71xx: fix bug in NBG6716 kernelpackaging, add firmware partition allowing ath79 update 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: avalentin@marcant.net Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org -Fix the kernel image generation (more robust) -Add a firmware partition table allowing easy upgrade to ath79 Signed-off-by: André Valentin --- target/linux/ar71xx/image/legacy.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/image/legacy.mk b/target/linux/ar71xx/image/legacy.mk index 363e0956c7..1072dfb999 100644 --- a/target/linux/ar71xx/image/legacy.mk +++ b/target/linux/ar71xx/image/legacy.mk @@ -273,7 +273,7 @@ tew823dru_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(nvram)ro,15296k(firmware) wndr4300_mtdlayout=mtdparts=ar934x-nfc:256k(u-boot)ro,256k(u-boot-env)ro,256k(caldata)ro,512k(pot),2048k(language),512k(config),3072k(traffic_meter),2048k(kernel),23552k(ubi),25600k@0x6c0000(firmware),256k(caldata_backup),-(reserved) zcn1523h_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6208k(rootfs),1472k(kernel),64k(configure)ro,64k(mfg)ro,64k(art)ro,7680k@0x50000(firmware) mynet_rext_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,7808k(firmware),64k(nvram)ro,64k(ART)ro -zyx_nbg6716_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(env)ro,64k(RFdata)ro,-(nbu);ar934x-nfc:2048k(zyxel_rfsd),2048k(romd),1024k(header),2048k(kernel),-(ubi) +zyx_nbg6716_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(env)ro,64k(RFdata)ro,-(nbu);ar934x-nfc:2048k@0x0(zyxel_rfsd),2048k@0x200000(romd),1024k@0x400000(header),2048k@0x500000(kernel),125952k@0x500000(firmware),-@0x700000(ubi) define Image/BuildKernel cp $(KDIR)/vmlinux.elf $(VMLINUX).elf @@ -771,13 +771,15 @@ define Image/Build/ZyXEL fi; fi endef + +# attention: only zlib compression is allowed for the boot fs define Image/Build/ZyXELNAND/buildkernel $(eval kernelsize=$(call mtdpartsize,kernel,$(5))) $(call MkuImageLzma,$(2),$(3) $(5) $(6)) mkdir -p $(KDIR_TMP)/$(2)/image/boot cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR_TMP)/$(2)/image/boot/vmlinux.lzma.uImage $(STAGING_DIR_HOST)/bin/mkfs.jffs2 \ - --pad=$(kernelsize) --big-endian --squash-uids -v -e 128KiB \ + --pad=$(kernelsize) --big-endian --squash-uids -v -e 128KiB -q -f -n -x lzma -x rtime \ -o $(KDIR_TMP)/$(2)-kernel.jffs2 \ -d $(KDIR_TMP)/$(2)/image \ 2>&1 1>/dev/null | awk '/^.+$$/' From patchwork Mon Oct 21 12:32:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Valentin?= X-Patchwork-Id: 1180557 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=none (p=none dis=none) header.from=marcant.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OhJHc/Ru"; 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 46xbfF2wfjz9sPZ for ; Mon, 21 Oct 2019 23:33:41 +1100 (AEDT) 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=NRwZK/r8qvX2tv3cr/odiQYERsf9Q9T7aZ234xl+7bA=; b=OhJHc/Ru2J0AfS OgplxPFft0Myen6PyyVifXaBezrVqortCuZC3TAwYPlfiStsew2sT8Jd9BcqVgWEqS5cmFDKK38k4 QKxeWkLy49RLCWIpTHEmSIjfP0+yZEKZe9EjAc/4ITiwTQ+t6kb8FHYY4EsjCQp/fN+Z3Cgtu+soY HaPxNEFlaGyvnqzE4UzgGBcp3G+UEy6iXKW8YO5CV/YaSBBUCMfGPWVq8HDWcNhjwzlKlpIsKc73B PRlYOO2XLu4JR1Hl62w8HLcelMzPie92JNF6Yuf2OyGfEjuImrBVg96gXUz4N0/Kp+3QnP0uEdH53 d6h22ROgdNajkjjLEm6Q==; 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 1iMWsR-00077e-O0; Mon, 21 Oct 2019 12:33:35 +0000 Received: from mail3.marcant.net ([217.14.160.188]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMWrN-0005ku-Rs for openwrt-devel@lists.openwrt.org; Mon, 21 Oct 2019 12:32:35 +0000 Received: from [192.168.180.1] (port=54466 helo=admins.marcant.net) by mail3.marcant.net with esmtp (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1iMWrE-00081G-2k for openwrt-devel@lists.openwrt.org; Mon, 21 Oct 2019 14:32:20 +0200 Received: from varus.marcant.loc (unknown [192.168.3.44]) by admins.marcant.net (Postfix) with ESMTPA id B62FF28049B; Mon, 21 Oct 2019 14:32:20 +0200 (CEST) From: =?utf-8?q?Andr=C3=A9_Valentin?= To: openwrt-devel@lists.openwrt.org Date: Mon, 21 Oct 2019 14:32:12 +0200 Message-Id: <20191021123214.2252-4-avalentin@marcant.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191021123214.2252-1-avalentin@marcant.net> References: <20191021123214.2252-1-avalentin@marcant.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191021_053230_220981_B62A2BA4 X-CRM114-Status: GOOD ( 19.38 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.14.160.188 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 3/5] ath79: add support 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: avalentin@marcant.net Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Attention: Kernel partition size has been enlarged to 4MB. To switch, you must update to latest ar71xx-nand snapshort and flash the image: mtd -r write openwrt-ath79-nand-zyxel_nbg6716-squashfs-sysupgrade-4M-Kernel.bin firmware You will end up with a fresh config if you do not inject config into the image. Access the real u-boot shell: ZyXEL uses a proprietary loader/shell on top of u-boot: "ZyXEL zloader v2.02" When the device is starting up, the user can enter the the loader shell by simply pressing a key within the 3 seconds once the following string appears on the serial console: | Hit any key to stop autoboot: 3 The user is then dropped to a locked shell. |NBG6716> HELP |ATEN x[,y] set BootExtension Debug Flag (y=password) |ATSE x show the seed of password generator |ATSH dump manufacturer related data in ROM |ATRT [x,y,z,u] RAM read/write test (x=level, y=start addr, z=end addr, u=iterations) |ATGO boot up whole system |ATUR x upgrade RAS image (filename) |NBG6716> In order to escape/unlock a password challenge has to be passed. Note: the value is dynamic! you have to calculate your own! First use ATSE $MODELNAME (MODELNAME is the hostname in u-boot env) to get the challange value/seed. |NBG6716> ATSE NBG6716 |012345678901 This seed/value can be converted to the password with the help of this bash script (Thanks to http://www.adslayuda.com/Zyxel650-9.html authors): - tool.sh - ror32() { echo $(( ($1 >> $2) | (($1 << (32 - $2) & (2**32-1)) ) )) } v="0x$1" a="0x${v:2:6}" b=$(( $a + 0x10F0A563)) c=$(( 0x${v:12:14} & 7 )) p=$(( $(ror32 $b $c) ^ $a )) printf "ATEN 1,%X\n" $p - end of tool.sh - |# bash ./tool.sh 012345678901 | |ATEN 1,879C711 copy and paste the result into the shell to unlock zloader. |NBG6716> ATEN 1,0046B0017430 If the entered code was correct the shell will change to use the ATGU command to enter the real u-boot shell. |NBG6716> ATGU |NBG6716# Signed-off-by: André Valentin --- .../ath79/base-files/etc/board.d/02_network | 8 + .../etc/hotplug.d/firmware/10-ath9k-eeprom | 4 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 4 + .../etc/hotplug.d/ieee80211/00-wifi-migration | 1 + .../ath79/base-files/lib/upgrade/platform.sh | 3 + target/linux/ath79/dts/qca9557.dtsi | 18 ++ .../linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 302 ++++++++++++++++++ target/linux/ath79/image/Makefile | 2 + target/linux/ath79/image/common-zyxel.mk | 28 ++ target/linux/ath79/image/nand-zyxel.mk | 20 ++ 10 files changed, 390 insertions(+) create mode 100644 target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts create mode 100644 target/linux/ath79/image/common-zyxel.mk create mode 100644 target/linux/ath79/image/nand-zyxel.mk 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 fe74bddbf1..575e50c12d 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -295,6 +295,10 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "5:lan" "1:wan" ;; + zyxel,nbg6716) + ucidef_add_switch "switch0" \ + "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1" + ;; zbtlink,zbt-wd323|\ xiaomi,mi-router-4q) ucidef_set_interface_wan "eth1" @@ -435,6 +439,10 @@ ath79_setup_macs() wd,mynet-wifi-rangeextender) lan_mac=$(nvram get et0macaddr) ;; + zyxel,nbg6716) + lan_mac=$(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2) + wan_mac=$(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3) + ;; esac [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 3240026aec..f8241541cd 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -46,6 +46,10 @@ case "$FIRMWARE" in caldata_extract "radiocfg" 0x1000 0x440 ath9k_patch_mac $(mtd_get_mac_ascii devdata "wlan24mac") ;; + zyxel,nbg6716) + ath9k_eeprom_extract "art" 0x1000 0x440 + ath9k_patch_fw_mac $(mtd_get_mac_ascii u-boot-env ethaddr) 0x2 + ;; *) caldata_die "board $board is not supported yet" ;; diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 8ab0f6f6ad..8b885864c6 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -41,6 +41,10 @@ case "$FIRMWARE" in caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1) ;; + zyxel,nbg6716) + ath10kcal_extract "art" 0x5000 0x844 + ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1) + ;; engenius,ews511ap) caldata_extract "art" 0x5000 0x844 ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1) diff --git a/target/linux/ath79/base-files/etc/hotplug.d/ieee80211/00-wifi-migration b/target/linux/ath79/base-files/etc/hotplug.d/ieee80211/00-wifi-migration index 37a1346fe7..637bfe9ea0 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/ieee80211/00-wifi-migration +++ b/target/linux/ath79/base-files/etc/hotplug.d/ieee80211/00-wifi-migration @@ -14,6 +14,7 @@ migrate_wifi_path() { board=$(board_name) case "$board" in + zyxel,nbg6716|\ tplink,archer-c7-v1|\ tplink,archer-c7-v2) path="pci0000:00/0000:00:00.0" diff --git a/target/linux/ath79/base-files/lib/upgrade/platform.sh b/target/linux/ath79/base-files/lib/upgrade/platform.sh index f4fca06384..46bd6ab9ef 100644 --- a/target/linux/ath79/base-files/lib/upgrade/platform.sh +++ b/target/linux/ath79/base-files/lib/upgrade/platform.sh @@ -51,6 +51,9 @@ platform_do_upgrade() { ubnt,routerstation-pro) redboot_fis_do_upgrade "$1" kernel ;; + zyxel,nbg6716) + nand_do_upgrade "$1" + ;; *) default_do_upgrade "$1" ;; diff --git a/target/linux/ath79/dts/qca9557.dtsi b/target/linux/ath79/dts/qca9557.dtsi index b29dfc72b2..61e1d5f6a4 100644 --- a/target/linux/ath79/dts/qca9557.dtsi +++ b/target/linux/ath79/dts/qca9557.dtsi @@ -178,6 +178,24 @@ }; }; + nand: nand@1b800200 { + compatible = "qca,ar934x-nand"; + reg = <0x1b800200 0xb8>; + + interrupts = <21>; + interrupt-parent = <&miscintc>; + + resets = <&rst 14>; + reset-names = "nand"; + + nand-ecc-mode = "hw"; + + #address-cells = <1>; + #size-cells = <0>; + + status = "disabled"; + }; + gmac: gmac@18070000 { compatible = "qca,qca9550-gmac"; reg = <0x18070000 0x58>; diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts new file mode 100644 index 0000000000..677aa7aac5 --- /dev/null +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -0,0 +1,302 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "qca9557.dtsi" + +/ { + compatible = "zyxel,nbg6716", "qca,qca9558"; + model = "ZyXEL NBG6716"; + + chosen { + bootargs = "console=ttyS0,115200n8"; + }; + + aliases { + led-boot = &power; + led-failsafe = &power; + led-running = &power; + led-upgrade = &power; + label-mac-device = ð0; + }; + leds { + compatible = "gpio-leds"; + + power: power { + label = "nbg6716:white:power"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + + wan { + label = "nbg6716:white:internet"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + }; + usb1 { + label = "nbg6716:white:usb1"; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + linux,default-trigger = "usbport"; + trigger-sources = <&hub_port0>; + }; + usb2 { + label = "nbg6716:white:usb2"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + linux,default-trigger = "usbport"; + trigger-sources = <&hub_port1>; + }; + wifi2 { + label = "nbg6716:white:wifi2"; + gpios = <&gpio 19 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + wifi5 { + label = "nbg6716:white:wifi5"; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + wps { + label = "nbg6716:white:wps"; + gpios = <&gpio 2 GPIO_ACTIVE_LOW>; + }; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + wifi_button { + label = "WiFi button"; + linux,code = ; + gpios = <&gpio 1 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + usb1 { + label = "USB1 eject button"; + gpios = <&gpio 0 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + usb2 { + label = "USB2 eject button"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + + wps { + label = "WPS button"; + linux,code = ; + gpios = <&gpio 22 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; + gpio-export { + compatible = "gpio-export"; + #size-cells = <0>; + + gpio_usb_power { + gpio-export,name = "nbg6716:power:usb"; + gpio-export,output = <1>; + gpios = <&gpio 16 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +&uart { + status = "okay"; +}; + +&spi { + status = "okay"; + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + label = "u-boot"; + reg = <0x000000 0x040000>; + read-only; + }; + + partition@40000 { + label = "u-boot-env"; + reg = <0x040000 0x010000>; + }; + + art: partition@50000 { + label = "art"; + reg = <0x050000 0x010000>; + read-only; + }; + + partition@60000 { + label = "nbu"; + reg = <0x060000 0xFA0000>; + }; + }; + }; +}; + +&nand { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "zyxel_rfsd"; + reg = <0x0 0x200000>; + }; + + partition@200000 { + label = "romd"; + reg = <0x200000 0x200000>; + }; + + partition@400000 { + label = "header"; + reg = <0x400000 0x100000>; + }; + + firmware@500000 { + label = "firmware"; + reg = <0x500000 0x7B00000>; + }; + + partition@500000 { + label = "kernel"; + reg = <0x500000 0x400000>; + }; + + partition@900000 { + label = "ubi"; + reg = <0x900000 0x7700000>; + }; + }; +}; + +&mdio0 { + status = "okay"; + + phy0: ethernet-phy@0 { + reg = <17>; + phy-mode = "rgmii-id"; + }; + + switch0@1f { + compatible = "qca,ar8327"; + reg = <0x1f>; + qca,ar8327-initvals = < + 0x04 0x87600000 /* PORT0 PAD MODE CTRL */ + 0x0c 0x00080080 /* PORT6 PAD MODE CTRL */ + 0x10 0x81000080 /* POWER_ON_STRIP */ + 0x50 0xffb7ffb7 /* LED_CTRL0 */ + 0x54 0xffb7ffb7 /* LED_CTRL1 */ + 0x58 0xffb7ffb7 /* LED_CTRL2 */ + 0x5c 0x03ffff00 /* LED_CTRL3 */ + 0x7c 0x0000007e /* PORT0_STATUS */ + 0x94 0x0000007e /* PORT6 STATUS */ + >; + }; +}; + +&mdio1 { + status = "okay"; + + phy1: ethernet-phy@1 { + reg = <1>; + phy-mode = "sgmii"; + }; +}; + + +ð0 { + status = "okay"; + + pll-data = <0xa6000000 0x00000101 0x00001616>; + mtd-mac-address = <&uboot 0x5E2>; + phy-handle = <&phy0>; + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +ð1 { + status = "okay"; + + pll-data = <0x03000101 0x00000101 0x00001616>; + mtd-mac-address = <&uboot 0x5E2>; + mtd-mac-address-increment = <1>; + phy-handle = <&phy1>; + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +// This node is required for the Ethernet ports to work correctly. +&gpio { + status = "okay"; +}; + +&wmac { + status = "okay"; + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&uboot 0x5E2>; + mtd-mac-address-increment = <3>; +}; + +&pcie1 { + status = "okay"; + + wifi@0,0 { + compatible = "qcom,ath10k"; + reg = <0 0 0 0 0>; + }; +}; + +&usb_phy0 { + status = "okay"; +}; + +&usb_phy1 { + status = "okay"; +}; + +&usb0 { + status = "okay"; + + hub_port0: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; + +}; + +&usb1 { + status = "okay"; + + hub_port1: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; +}; + diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile index 24768ef5e0..21775b4b48 100644 --- a/target/linux/ath79/image/Makefile +++ b/target/linux/ath79/image/Makefile @@ -77,6 +77,8 @@ include ./generic-ubnt.mk endif ifeq ($(SUBTARGET),nand) include ./nand.mk +include ./nand-netgear.mk +include ./nand-zyxel.mk endif ifeq ($(SUBTARGET),tiny) include ./tiny.mk diff --git a/target/linux/ath79/image/common-zyxel.mk b/target/linux/ath79/image/common-zyxel.mk new file mode 100644 index 0000000000..74f699c7df --- /dev/null +++ b/target/linux/ath79/image/common-zyxel.mk @@ -0,0 +1,28 @@ +DEVICE_VARS += ZYXEL_BOARD_ID + +# attention: only zlib compression is allowed for the boot fs +define Build/zyxel-buildkerneljffs + rm -rf $(KDIR_TMP)/zyxelnbg6716 + mkdir -p $(KDIR_TMP)/zyxelnbg6716/image/boot + cp $@ $(KDIR_TMP)/zyxelnbg6716/image/boot/vmlinux.lzma.uImage + $(STAGING_DIR_HOST)/bin/mkfs.jffs2 \ + --big-endian --squash-uids -v -e 128KiB -q -f -n -x lzma -x rtime \ + -o $@ \ + -d $(KDIR_TMP)/zyxelnbg6716/image + rm -rf $(KDIR_TMP)/zyxelnbg6716 +endef + +define Build/zyxel-factory + cp $@ $(KDIR_TMP)/factory.bin + ( \ + cd $(KDIR_TMP) && \ + $(STAGING_DIR_HOST)/bin/mkzyxfw-nbg6716 \ + -i factory.bin \ + -v "OpenWrt Linux-$(LINUX_VERSION)" \ + -p "$(ZYXEL_BOARD_ID)" \ + -s 0x20000 \ + -o ras.bin \ + ) + cat $(KDIR_TMP)/ras.bin $(KDIR_TMP)/factory.bin >$@ + rm $(KDIR_TMP)/factory.bin $(KDIR_TMP)/ras.bin +endef diff --git a/target/linux/ath79/image/nand-zyxel.mk b/target/linux/ath79/image/nand-zyxel.mk new file mode 100644 index 0000000000..bc177fa49c --- /dev/null +++ b/target/linux/ath79/image/nand-zyxel.mk @@ -0,0 +1,20 @@ +include ./common-zyxel.mk + +define Device/zyxel_nbg6716 + ATH_SOC := qca9558 + DEVICE_VENDOR := ZyXEL + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct-htt + ZYXEL_BOARD_ID := NBG6716 + KERNEL_SIZE := 4096k + BLOCKSIZE := 128k + PAGESIZE := 2048 + IMAGE_SIZE := 125000k + KERNEL := kernel-bin | append-dtb | uImage none | \ + zyxel-buildkerneljffs | check-size 4096k + IMAGES := factory.ras sysupgrade.tar sysupgrade-4M-Kernel.bin + IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$${BLOCKSIZE} | sysupgrade-tar rootfs=$$$$@ | append-metadata + IMAGE/sysupgrade-4M-Kernel.bin/squashfs := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi + IMAGE/factory.ras := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | zyxel-factory + UBINIZE_OPTS := -E 5 +endef +TARGET_DEVICES += zyxel_nbg6716 From patchwork Mon Oct 21 12:32:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Valentin?= X-Patchwork-Id: 1180556 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=none (p=none dis=none) header.from=marcant.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SQGiPcF/"; 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 46xbdt4StYz9sPL for ; Mon, 21 Oct 2019 23:33:22 +1100 (AEDT) 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=APzWptvvQe7naKgc7HJoydg2pmvB9kvSMUSpYXifSFE=; b=SQGiPcF/cvcbTl 89D9oKCNmVCF62mWni1w2m5ZZK/kVZMhu6hipWrhFY6+fLp6AOS2sQ29Z5TNF9I2ROETGCvIwkdMd 361Su8ZDX/RfQWkyOdP1qzRwEEw4xd4DPZ7XjlpMlS9x9HYC5N8U9cczuj8LUC3Dxa0UcLo+ClsYn ktMyVX51HpKGFTBcLQuJK0FS6MlvZ0GvfwCaRFUfHCt/41EYY+3RCy+RCqCoUKzFzbY427wg339OZ 7FlsZYntMLBJQQvy+QfW2Q/SkMd1GSMJmHhy0jjfQv8T2xvMj7nmUGdXfgFNgdZsBK+4fmP+hF/Zj jLasecxdhJjTbrWEFzPA==; 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 1iMWs8-0006kb-8b; Mon, 21 Oct 2019 12:33:16 +0000 Received: from mail3.marcant.net ([217.14.160.188]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMWrN-0005kv-Rj for openwrt-devel@lists.openwrt.org; Mon, 21 Oct 2019 12:32:33 +0000 Received: from [192.168.180.1] (port=54470 helo=admins.marcant.net) by mail3.marcant.net with esmtp (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1iMWrE-00081H-30 for openwrt-devel@lists.openwrt.org; Mon, 21 Oct 2019 14:32:20 +0200 Received: from varus.marcant.loc (unknown [192.168.3.44]) by admins.marcant.net (Postfix) with ESMTPA id CEB0E2802BF; Mon, 21 Oct 2019 14:32:20 +0200 (CEST) From: =?utf-8?q?Andr=C3=A9_Valentin?= To: openwrt-devel@lists.openwrt.org Date: Mon, 21 Oct 2019 14:32:13 +0200 Message-Id: <20191021123214.2252-5-avalentin@marcant.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191021123214.2252-1-avalentin@marcant.net> References: <20191021123214.2252-1-avalentin@marcant.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191021_053230_067976_E4044A41 X-CRM114-Status: GOOD ( 12.29 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.14.160.188 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 4/5] target/generic: add ascii search option to mtd-mac-address helper 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: avalentin@marcant.net Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This improves the function of_get_mac_address_mtd the be able to handle u-boot environement. It is now possible to read a MAC address from the env and set this in the dt. Code has been taken from ar71xx. Signed-off-by: André Valentin --- ...ET-add-of_get_mac_address_mtd_search.patch | 96 +++++++++++++++++++ ...ET-add-of_get_mac_address_mtd_search.patch | 96 +++++++++++++++++++ 2 files changed, 192 insertions(+) create mode 100644 target/linux/generic/hack-4.14/680-NET-add-of_get_mac_address_mtd_search.patch create mode 100644 target/linux/generic/hack-4.19/680-NET-add-of_get_mac_address_mtd_search.patch diff --git a/target/linux/generic/hack-4.14/680-NET-add-of_get_mac_address_mtd_search.patch b/target/linux/generic/hack-4.14/680-NET-add-of_get_mac_address_mtd_search.patch new file mode 100644 index 0000000000..bf8ff608c0 --- /dev/null +++ b/target/linux/generic/hack-4.14/680-NET-add-of_get_mac_address_mtd_search.patch @@ -0,0 +1,96 @@ +--- a/drivers/of/of_net.c ++++ b/drivers/of/of_net.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + /** + * of_get_phy_mode - Get phy mode for given device_node +@@ -49,6 +50,28 @@ static void *of_get_mac_addr(struct devi + return NULL; + } + ++char *of_get_mac_address_mtd_helper(const char *name, const char *buf, unsigned buf_len) ++{ ++ unsigned len = strlen(name); ++ char *cur, *last; ++ ++ if (buf_len == 0 || len == 0) ++ return NULL; ++ ++ if (buf_len < len) ++ return NULL; ++ ++ if (len == 1) ++ return memchr(buf, (int) *name, buf_len); ++ ++ last = (char *) buf + buf_len - len; ++ for (cur = (char *) buf; cur <= last; cur++) ++ if (cur[0] == name[0] && memcmp(cur, name, len) == 0) ++ return cur + len; ++ ++ return NULL; ++} ++ + static const void *of_get_mac_address_mtd(struct device_node *np) + { + #ifdef CONFIG_MTD +@@ -58,6 +81,7 @@ static const void *of_get_mac_address_mt + int size, ret; + struct mtd_info *mtd; + const char *part; ++ const char *search; + const __be32 *list; + phandle phandle; + u32 mac_inc = 0; +@@ -84,8 +109,46 @@ static const void *of_get_mac_address_mt + if (IS_ERR(mtd)) + return NULL; + +- ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac); +- put_mtd_device(mtd); ++ if (of_property_read_string(np, "mtd-mac-search", &search) == 0) { ++ // try to find mac address in mtd ++ char *buf; ++ char *mac_str; ++ int t; ++ ++ buf = vmalloc(mtd->size); ++ ++ ret = mtd_read(mtd, be32_to_cpup(list), mtd->size-be32_to_cpup(list), &retlen, buf); ++ put_mtd_device(mtd); ++ ++ buf[retlen - 1] = '\0'; ++ mac_str = of_get_mac_address_mtd_helper(search, buf, retlen); ++ ++ if (!mac_str) { ++ vfree(buf); ++ return NULL;; ++ } ++ ++ if (strlen(mac_str) == 19 && mac_str[0] == '"' && mac_str[18] == '"') { ++ mac_str[18] = 0; ++ mac_str++; ++ } ++ ++ t = sscanf(mac_str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", ++ &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); ++ ++ if (t != ETH_ALEN) ++ t = sscanf(mac_str, "%02hhx-%02hhx-%02hhx-%02hhx-%02hhx-%02hhx", ++ &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); ++ ++ if (t != ETH_ALEN) { ++ vfree(buf); ++ return NULL; ++ } ++ vfree(buf); ++ } else { ++ ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac); ++ put_mtd_device(mtd); ++ } + + if (of_property_read_u32(np, "mtd-mac-address-increment-byte", &inc_idx)) + inc_idx = 5; diff --git a/target/linux/generic/hack-4.19/680-NET-add-of_get_mac_address_mtd_search.patch b/target/linux/generic/hack-4.19/680-NET-add-of_get_mac_address_mtd_search.patch new file mode 100644 index 0000000000..bf8ff608c0 --- /dev/null +++ b/target/linux/generic/hack-4.19/680-NET-add-of_get_mac_address_mtd_search.patch @@ -0,0 +1,96 @@ +--- a/drivers/of/of_net.c ++++ b/drivers/of/of_net.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + /** + * of_get_phy_mode - Get phy mode for given device_node +@@ -49,6 +50,28 @@ static void *of_get_mac_addr(struct devi + return NULL; + } + ++char *of_get_mac_address_mtd_helper(const char *name, const char *buf, unsigned buf_len) ++{ ++ unsigned len = strlen(name); ++ char *cur, *last; ++ ++ if (buf_len == 0 || len == 0) ++ return NULL; ++ ++ if (buf_len < len) ++ return NULL; ++ ++ if (len == 1) ++ return memchr(buf, (int) *name, buf_len); ++ ++ last = (char *) buf + buf_len - len; ++ for (cur = (char *) buf; cur <= last; cur++) ++ if (cur[0] == name[0] && memcmp(cur, name, len) == 0) ++ return cur + len; ++ ++ return NULL; ++} ++ + static const void *of_get_mac_address_mtd(struct device_node *np) + { + #ifdef CONFIG_MTD +@@ -58,6 +81,7 @@ static const void *of_get_mac_address_mt + int size, ret; + struct mtd_info *mtd; + const char *part; ++ const char *search; + const __be32 *list; + phandle phandle; + u32 mac_inc = 0; +@@ -84,8 +109,46 @@ static const void *of_get_mac_address_mt + if (IS_ERR(mtd)) + return NULL; + +- ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac); +- put_mtd_device(mtd); ++ if (of_property_read_string(np, "mtd-mac-search", &search) == 0) { ++ // try to find mac address in mtd ++ char *buf; ++ char *mac_str; ++ int t; ++ ++ buf = vmalloc(mtd->size); ++ ++ ret = mtd_read(mtd, be32_to_cpup(list), mtd->size-be32_to_cpup(list), &retlen, buf); ++ put_mtd_device(mtd); ++ ++ buf[retlen - 1] = '\0'; ++ mac_str = of_get_mac_address_mtd_helper(search, buf, retlen); ++ ++ if (!mac_str) { ++ vfree(buf); ++ return NULL;; ++ } ++ ++ if (strlen(mac_str) == 19 && mac_str[0] == '"' && mac_str[18] == '"') { ++ mac_str[18] = 0; ++ mac_str++; ++ } ++ ++ t = sscanf(mac_str, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", ++ &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); ++ ++ if (t != ETH_ALEN) ++ t = sscanf(mac_str, "%02hhx-%02hhx-%02hhx-%02hhx-%02hhx-%02hhx", ++ &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]); ++ ++ if (t != ETH_ALEN) { ++ vfree(buf); ++ return NULL; ++ } ++ vfree(buf); ++ } else { ++ ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac); ++ put_mtd_device(mtd); ++ } + + if (of_property_read_u32(np, "mtd-mac-address-increment-byte", &inc_idx)) + inc_idx = 5; From patchwork Mon Oct 21 12:32:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Valentin?= X-Patchwork-Id: 1180553 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=none (p=none dis=none) header.from=marcant.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jr6dmyXO"; 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 46xbdP0YV2z9sPj for ; Mon, 21 Oct 2019 23:32:57 +1100 (AEDT) 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=b1XMsUzT7v2PIeH01b8LP7/Lcqk7Ny2dDDhTCukLK3M=; b=jr6dmyXOwFFu/A U49pW9vDOJyM1S7syL1w7WffPJ5yz6EqDMy47P2KsOPJZBahmaol+PMlOvdJ0PbrImvDjUugMFkgB cp23NF0/DmflMLK6K3DK/Qn9UkZUZScd5z33kpIpoTKQ/lJiMN+rzelqOrrreJlOAh3Fx1eqK5Nuk rQiedXA73Ce0LBd1RKHYswVpDyfvjTd6Pmih1DjEn3sihHrJHNKa7qKhjMAlhzO9xcGVGzXY2M8LW NEHG4bNsPsPCrZldIz5lrfPxCNa/7lWpB0HMH5xHG7gB33YbKHc7dwZuf8DC8C6h3JQbwXpA01Dle nvGd62PFWilgpcmIC4zA==; 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 1iMWrb-0005yD-Ls; Mon, 21 Oct 2019 12:32:43 +0000 Received: from mail3.marcant.net ([217.14.160.188]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMWrN-0005ky-Rr for openwrt-devel@lists.openwrt.org; Mon, 21 Oct 2019 12:32:32 +0000 Received: from [192.168.180.1] (port=54474 helo=admins.marcant.net) by mail3.marcant.net with esmtp (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1iMWrF-00081I-04 for openwrt-devel@lists.openwrt.org; Mon, 21 Oct 2019 14:32:21 +0200 Received: from varus.marcant.loc (unknown [192.168.3.44]) by admins.marcant.net (Postfix) with ESMTPA id E265428021C; Mon, 21 Oct 2019 14:32:20 +0200 (CEST) From: =?utf-8?q?Andr=C3=A9_Valentin?= To: openwrt-devel@lists.openwrt.org Date: Mon, 21 Oct 2019 14:32:14 +0200 Message-Id: <20191021123214.2252-6-avalentin@marcant.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191021123214.2252-1-avalentin@marcant.net> References: <20191021123214.2252-1-avalentin@marcant.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191021_053230_066460_79635276 X-CRM114-Status: UNSURE ( 7.77 ) X-CRM114-Notice: Please train this message. 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.14.160.188 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 5/5] ath79/zyxel_nbg6716: add macs from uboot-env partition 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: avalentin@marcant.net Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Switch NBG6716 to use the new mtd mac parser for u-boot env. Signed-off-by: André Valentin --- .../linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index 677aa7aac5..0d4bc7de46 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -133,7 +133,7 @@ read-only; }; - partition@40000 { + uboot_env: partition@40000 { label = "u-boot-env"; reg = <0x040000 0x010000>; }; @@ -231,7 +231,9 @@ status = "okay"; pll-data = <0xa6000000 0x00000101 0x00001616>; - mtd-mac-address = <&uboot 0x5E2>; + mtd-mac-address = <&uboot_env 0x0>; + mtd-mac-search = "ethaddr="; + mtd-mac-address-increment = <2>; phy-handle = <&phy0>; fixed-link { speed = <1000>; @@ -243,8 +245,9 @@ status = "okay"; pll-data = <0x03000101 0x00000101 0x00001616>; - mtd-mac-address = <&uboot 0x5E2>; - mtd-mac-address-increment = <1>; + mtd-mac-address = <&uboot_env 0x0>; + mtd-mac-search = "ethaddr="; + mtd-mac-address-increment = <3>; phy-handle = <&phy1>; fixed-link { speed = <1000>; @@ -260,8 +263,8 @@ &wmac { status = "okay"; mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&uboot 0x5E2>; - mtd-mac-address-increment = <3>; + mtd-mac-address = <&uboot_env 0x0>; + mtd-mac-search = "ethaddr="; }; &pcie1 { @@ -270,6 +273,10 @@ wifi@0,0 { compatible = "qcom,ath10k"; reg = <0 0 0 0 0>; + mtd-mac-address = <&uboot_env 0x0>; + mtd-mac-search = "ethaddr="; + mtd-mac-address-increment = <1>; + qcom,ath10k-calibration-variant = "ZyXEL-NBG6716"; }; };