From patchwork Wed Jan 25 06:42:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1731530 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=EIXRu5c2; 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=qelMhdqY; 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 4P1vTd51yVz23h0 for ; Wed, 25 Jan 2023 17:44:53 +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=ECjra+YIwkzFg1EiQnntiPnV46u9FYj7hglcvxzayR8=; b=EIXRu5c2KcqyOf u0L4i14LqUt0pAu6LtewkGMTCJ5icnJth7kidzZ48Hi9mby1iVvswUlFscUBG/c/pv8b+5galzHdW 6RMJlt2uSi+sVtEIXAW9VH0Ui9iJjhPzsmoIDDVC202r8ztRj4haI93qivVnK1Q0druX6gLv7Ugyy NWK7GybIdxJ9Us2KLZccKZUCUoBPV3CTidTfimpyab011Cwxwjqup3RuR8a4LJzS2GA9cAdhPxda6 3eVg28MzS2lVA6g6ui6W50nER72Q5a7iViqpvnN0aGa9bmlf8RBEoImrrMfMuajOF0SLwEwLOQ692 aXTfbWHem2Lfl3Vgr0dQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKZUo-0069ms-Lu; Wed, 25 Jan 2023 06:42:58 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKZUh-0069k8-ED for openwrt-devel@lists.openwrt.org; Wed, 25 Jan 2023 06:42:53 +0000 Received: by mail-pl1-x62e.google.com with SMTP id c6so17033929pls.4 for ; Tue, 24 Jan 2023 22:42:48 -0800 (PST) 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=wJLXjAPDBxHcnJFE9rcFaTVGuVveNg9VaGzG20pUa0k=; b=qelMhdqYO1+2iFPzXG36yISdb+xayaWVqXwwswD695iPym4CIAf0QZ8eyQYw0aGuQl pDNMyUUBh3TSLAbWDjF7sRKBNiSIaWGr0JhCYAMnPUdN6R6oz1KaPbYgrjC4V18oS+wy 3k0W7olz5NxLiiz/D5FfEp0A/FRcgWLCs+CFSiJiNsgBY5KQ/fuCKXi2B7BQ02YbNlck RrNz/AFGf4MlGyE4nUNC+B37BHugGW0qWVTkhyKCTSe73FMDWSuNHLYmoaGY4TreGh6n kCQw/30l0SRo7kDIXgYTBEs63qoTwjBTNflLHEcAc7QdNn3rGWdmMFqaw2UyxdhQLNxZ zLow== 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=wJLXjAPDBxHcnJFE9rcFaTVGuVveNg9VaGzG20pUa0k=; b=nluM2CAqdcuzUwCQP1Apq0rugo2MVcihd8Xo6u3B2AVR1KxDXBT1YVDZLvzsJ2NAi+ EbGJl/lb1nR6TjCx2DOPgGftjzAAdZim5NfRD3PFKV/rm+D2wNb1g52nVTkFJ8uxQwTV bTtOU82ZCNzPPsoda5b1VHmdk9oftE1mF1QTZ6bXqNjQi4UedkcowX3IK5zsQM31+4BR zKsaH8fFf729xjYZesltrZo7zkjHGD/hW7dsbDOKpRQoVPim/GJ6GxT8HudZwS4AGU+z +hnQwqJaA/2HTZAmaa9vi2A22AIOwkgNPfRkvvTvCAL/w9pm/n/BJeiiN0ie13S0IHh4 86ug== X-Gm-Message-State: AFqh2koiwO0dLv822ZQywqCdeYEjgo9/BpfzV+KospnieMmPUzku6l7e TwPTh+2BFrc+VFvuMlH0coH0luIjifY= X-Google-Smtp-Source: AMrXdXsv18O42CfJ6/99VwUgDsZbt987defUgj49hcp92QK/A4O2fFo8/pSjRMZ9Tam3dqmy4NKmTQ== X-Received: by 2002:a05:6a20:428b:b0:a5:798c:f929 with SMTP id o11-20020a056a20428b00b000a5798cf929mr41222005pzj.10.1674628968234; Tue, 24 Jan 2023 22:42:48 -0800 (PST) Received: from localhost ([2600:1700:38c1:1d7f:f66d:4ff:fe3c:3ceb]) by smtp.gmail.com with ESMTPSA id j75-20020a636e4e000000b00476c2180dbcsm2500397pgc.29.2023.01.24.22.42.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2023 22:42:47 -0800 (PST) From: Brian Norris To: openwrt-devel@lists.openwrt.org Cc: Ansuel Smith , Brian Norris Subject: [PATCH] ipq806x: onhub: Enable fstools_partname_fallback_scan Date: Tue, 24 Jan 2023 22:42:07 -0800 Message-Id: <20230125064207.2518191-1-computersforpeace@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230124_224251_505660_52536168 X-CRM114-Status: GOOD ( 13.87 ) 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: When fstools is unable to parse our root=<...> arg correctly, it can fall back to scanning all block devices for a 'rootfs_data' partition. This fallback was deemed wrong (or at least, a breaking/inco [...] 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:62e 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 When fstools is unable to parse our root=<...> arg correctly, it can fall back to scanning all block devices for a 'rootfs_data' partition. This fallback was deemed wrong (or at least, a breaking/incompatible change) for some targets, so we're forced to opt back into it with fstools_partname_fallback_scan=1. Without this, OnHub devices will use a rootfs-appended loop device for rootfs_data instead of the intended 3rd partition. NB: it would be nice to allow this rootfs_data partition by default in fstools, but in chats with Ansuel, it sounds like it would be intractable to locate all potentially-breaking targets programmatically. Perhaps we can reconsider (and leverage DEVICE_COMPAT_VERSION for the upgrade-incompatible targets) in the future. While I'm at it, just move all the boot args into the 'cros-vboot' build rule, instead of using the custom bootargs-append. All cros-vboot subtargets here are using the same rootwait (to support both eMMC and USB boot) and root/partition args. Signed-off-by: Brian Norris --- This patch is only useful once we commit this (and pull in new fstools): https://patchwork.ozlabs.org/project/openwrt/patch/20230125062814.2517900-1-computersforpeace@gmail.com/ [fstools] partname: Correct fstools_partname_fallback_scan comparison .../files-5.15/arch/arm/boot/dts/qcom-ipq8064-asus-onhub.dts | 4 ---- .../arch/arm/boot/dts/qcom-ipq8064-tplink-onhub.dts | 4 ---- target/linux/ipq806x/image/chromium.mk | 4 +++- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-asus-onhub.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-asus-onhub.dts index 5b60ddb04b3f..442bcf19a675 100644 --- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-asus-onhub.dts +++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-asus-onhub.dts @@ -11,10 +11,6 @@ / { model = "ASUS OnHub"; compatible = "asus,onhub", "google,arkham", "qcom,ipq8064"; - - chosen { - bootargs-append = " rootwait"; - }; }; &qcom_pinmux { diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-tplink-onhub.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-tplink-onhub.dts index 6dd39f0d9584..6adc6be4aec6 100644 --- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-tplink-onhub.dts +++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-tplink-onhub.dts @@ -11,10 +11,6 @@ / { model = "TP-Link OnHub"; compatible = "tplink,onhub", "google,whirlwind-sp5", "qcom,ipq8064"; - - chosen { - bootargs-append = " rootwait"; - }; }; &qcom_pinmux { diff --git a/target/linux/ipq806x/image/chromium.mk b/target/linux/ipq806x/image/chromium.mk index 16af6b95ba6c..f908472419d1 100644 --- a/target/linux/ipq806x/image/chromium.mk +++ b/target/linux/ipq806x/image/chromium.mk @@ -20,7 +20,9 @@ endef # (PARTNROFF=1) partition as their rootfs. define Build/cros-vboot $(STAGING_DIR_HOST)/bin/cros-vbutil \ - -k $@ -c "root=PARTUUID=%U/PARTNROFF=1" -o $@.new + -k $@ \ + -c "root=PARTUUID=%U/PARTNROFF=1 rootwait fstools_partname_fallback_scan=1" \ + -o $@.new @mv $@.new $@ endef