From patchwork Sat Oct 22 20:00:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1693417 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=O/Ck7rwo; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=MMbdv7St; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MvsjS0Zyrz23jk for ; Sun, 23 Oct 2022 07:03:55 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=sl35hwDkuroDaHMcRIYE89ZPe28VsOAvMPO9LkA65h4=; b=O/Ck7rwoVnJfmW kcmlPGdR5t6U9zcMq0pKFV9shXQrgF5laY5Fn0OxpkW8Xft5NY7qxURdE92sY0LRhCfD7BLyTJeV9 mB84ZTbVDzK6z9nssW5u4SsIRVrJVBwPSMOv3TOcNHf/GFc6rAzOQWSgL9L5nmJvb/lYdumJlMCek +5VCKHQ24qznl1GVkA/Cy1NqsUYRe0dEtI4PVwNS+yIrlbjTfBCgtlOXC6BP8S/lp7KXFyI1lTe41 mlARotCXEJwFrSwlKKbsbwntnWeZfNxp6lr9hpd/QZQB7KZYK2iTI5JnoK6IHTcH89tzR9vkmFCJJ r45+w/a5W83sELrUb14A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1omKfw-00DhoG-Fa; Sat, 22 Oct 2022 20:00:56 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1omKft-00Dhnd-DT for openwrt-devel@lists.openwrt.org; Sat, 22 Oct 2022 20:00:54 +0000 Received: by mail-pj1-x1030.google.com with SMTP id a5-20020a17090aa50500b002008eeb040eso7113869pjq.1 for ; Sat, 22 Oct 2022 13:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NkWhNRct7i2Gw7J0V0vfJMlvK01m1piHvK6sgOwRkkA=; b=MMbdv7Stm4BCDUylKTS5v0l+cu8FnbIkE1s2ctZ+gAsN9Bcg3IBhSKrthIfT4IiKgq OTGpBUteaeSGM/VGmwL9SQN+Ekw2zcqG2CIAKYSLwpNMwYTNjYCbYwuOs5PeLcwqWtN6 aCPAMTGEWuCsmLqTNWJju5Q+XAg09lP5BVEpEqUpVCim2sON/GBj3brhPjBRdgyCUEl9 KLU5VzBgG/1xmI+Bu9IqpR0GSUDLkPNV3QxWVcosQaORQAGEGuv0znq4J4aOWfp3d5Mm LKMgj1otfrhteQoii9gb9r/cRm+N5njMObYvBVMR9jqN50g4y5oahCxhcnopy8dwx/zx nzbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NkWhNRct7i2Gw7J0V0vfJMlvK01m1piHvK6sgOwRkkA=; b=b7JMsgDw8AbiBIjBlIbrcWFsXFWOH2vSPkMsdC/NRIcV7VRmIexoaSu13sj6eSrN9U PjMubNFTZHiIKNx4mB7g/NDE9qTkbZETGmk/ojyI3NMIUEijp+Ofuabo4sL0VYXk6X/V io7o4cBJYcBQJRh3yhSBsKIIhEeVOdLjsPUlxRlhW5l792fhUXkSeUyciul2C3ahUlTf ayhv6m1upYvn86Do+56O3AjHdyVNy2b3sA26IvWKn3vHMoQPWl28Rd4QRKwh76I22aNK KUT3Tv1KK/IhkzEN3pLxJda9f9JaQxe94bnTengG8GDQibXbZuzpNTTeZet5gJFVegqN GjVg== X-Gm-Message-State: ACrzQf0tl8GFap8Z3HZHkyHwuqQ/l2dAPUqigyMrMMahu34msxpraAAT 5iUN2hNx+koTZKOE/tzwp+JolQS/IVE= X-Google-Smtp-Source: AMsMyM6/zKR5hvv4tr+2G6Vsa54+UTiON4/hoCBhbb9vMjIjDE0aYRINx07JFPYMMWEvzQOxjy3OGw== X-Received: by 2002:a17:90b:1bc5:b0:20d:7bbf:46cc with SMTP id oa5-20020a17090b1bc500b0020d7bbf46ccmr29959267pjb.212.1666468851438; Sat, 22 Oct 2022 13:00:51 -0700 (PDT) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id n18-20020aa79852000000b005631af4ece2sm17217422pfq.182.2022.10.22.13.00.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Oct 2022 13:00:50 -0700 (PDT) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Brian Norris , David Bauer , Robert Marko Subject: [PATCH] ipq40xx: Convert Google Wifi to DSA, reenable Date: Sat, 22 Oct 2022 13:00:38 -0700 Message-Id: <20221022200038.1007919-1-computersforpeace@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221022_130053_493796_24956D98 X-CRM114-Status: GOOD ( 13.26 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as 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 the administrator of that system for details. Content preview: Undo parts of these: 116feb4a1cad ipq40xx: remove non-converted network configs db19efee9512 ipq40xx: disable boards not converted to DSA Reintroduce the DT paths /soc/edma@c080000/gmac{0,1}, because the stock bootloader has memorized them (instead of following aliases); then plug the MAC address back in via 05_set_iface_mac_ipq40xx.sh, [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1030 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 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [computersforpeace[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List 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 Undo parts of these: 116feb4a1cad ipq40xx: remove non-converted network configs db19efee9512 ipq40xx: disable boards not converted to DSA Reintroduce the DT paths /soc/edma@c080000/gmac{0,1}, because the stock bootloader has memorized them (instead of following aliases); then plug the MAC address back in via 05_set_iface_mac_ipq40xx.sh, since the 'local-mac-address' property is no longer in the correct node. Cc: David Bauer Cc: Robert Marko Signed-off-by: Brian Norris --- .../ipq40xx/base-files/etc/board.d/02_network | 5 +++ .../arch/arm/boot/dts/qcom-ipq4019-wifi.dts | 42 +++++++++++++++++++ target/linux/ipq40xx/image/chromium.mk | 3 +- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network index 36f1f7c24a55..0cfcac513c7a 100644 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network @@ -31,6 +31,7 @@ ipq40xx_setup_interfaces() cilab,meshpoint-one|\ edgecore,ecw5211|\ glinet,gl-b2200|\ + google,wifi|\ luma,wrtq-329acn|\ mikrotik,cap-ac|\ netgear,wac510|\ @@ -114,6 +115,10 @@ ipq40xx_setup_macs() ezviz,cs-w3-wd1200g-eup) label_mac=$(mtd_get_mac_binary "ART" 0x6) ;; + google,wifi) + wan_mac=$(get_mac_label) + lan_mac=$(macaddr_add "$wan_mac" 1) + ;; linksys,ea6350v3|\ linksys,ea8300 |\ linksys,mr8300) diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wifi.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wifi.dts index 643449f8e4c8..65f593330558 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wifi.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wifi.dts @@ -13,6 +13,10 @@ model = "Google WiFi (Gale)"; compatible = "google,wifi", "google,gale-v2", "qcom,ipq4019"; + aliases { + label-mac-device = &gmac0; + }; + chosen { /* * rootwait: in case we're booting from slow/async USB storage. @@ -25,6 +29,26 @@ device_type = "memory"; reg = <0x80000000 0x20000000>; /* 512MB */ }; + + soc { + edma@c080000 { + /* + * Factory bootloader (depthcharge) will fail to boot + * if this exact path (soc/edma@c080000/gmac0) doesn't + * exist. + */ + gmac0: gmac0 { + }; + + /* + * Factory bootloader (depthcharge) will fail to boot + * if this exact path (soc/edma@c080000/gmac1) doesn't + * exist. + */ + gmac1 { + }; + }; + }; }; &tlmm { @@ -325,6 +349,10 @@ status = "okay"; }; +&gmac { + status = "okay"; +}; + &mdio { status = "okay"; pinctrl-0 = <&mdio_pins>; @@ -344,6 +372,20 @@ non-removable; }; +&switch { + status = "okay"; +}; + +&swport4 { + status = "okay"; + + label = "lan"; +}; + +&swport5 { + status = "okay"; +}; + &usb2 { status = "okay"; }; diff --git a/target/linux/ipq40xx/image/chromium.mk b/target/linux/ipq40xx/image/chromium.mk index 7410794fb4c7..2abd2df02ae4 100644 --- a/target/linux/ipq40xx/image/chromium.mk +++ b/target/linux/ipq40xx/image/chromium.mk @@ -33,5 +33,4 @@ define Device/google_wifi DEVICE_PACKAGES := partx-utils mkf2fs e2fsprogs \ kmod-fs-ext4 kmod-fs-f2fs kmod-google-firmware endef -# Missing DSA Setup -#TARGET_DEVICES += google_wifi +TARGET_DEVICES += google_wifi