From patchwork Tue Feb 16 21:26:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 1441122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=01MnkMDF; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=H7N31piU; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4DgDZy0dytz9sBJ for ; Wed, 17 Feb 2021 08:27:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6q96H9HheIyIkNgZ6pk5OJHXsKCL/3Zx3sHAWlBELhM=; b=01MnkMDFzEBJgeJMOWtFs2qqI qjC+L61pQ0Ja+MJcy+K1kz/ZBLUQWezY9WxjZf3u0BKnysnbsqK8W3ys48KgDN6cmzE8TMHXljBif 0z3v0bfIK+nZTfdBa6gSRd1TYbBTNvFMEy9B1rZPSx2QbSj9S8s8r2BDmWKgBU0Y81f28d8mqjLpq s+bhjIQvhUJDGW7WS62ASatZ/QoW7UckHH9elcAqYxr7rrVDZjq7LF+Q7f231TukqiRY99Z5/5XEX +Kj325sH/zbQOTp3+PB1lsGYLPEsKPEiELz46jETTAqsh0PUq20Q3O9x/5dgRyNEq7vHZQ8DXZH+w VNtggju/w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lC7s6-0004Y7-6P; Tue, 16 Feb 2021 21:27:02 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lC7s4-0004XV-8m for linux-mtd@lists.infradead.org; Tue, 16 Feb 2021 21:27:01 +0000 Received: by mail-wr1-x431.google.com with SMTP id v14so15051455wro.7 for ; Tue, 16 Feb 2021 13:26:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gTKUWEdr7X7gHT2/c0rh/4HOUp41ym8Za7G+Wwf9Lwk=; b=H7N31piULCOG4p3kVh8VEIuac2d288j8dXkSoYRRVRXCpfTrJ8LSuVH+sv+wqjaRgm JKmEI0x7hme53FbBwsJ52shL93m6Ne341jtSUlUD78GDni7Yt8ZGmjJjdGzQIhSewRw/ bG23eubM2pktJY/ePOXFOTat5SoALpSnW8rCvhfYtPUyYPZRvxDUrKl3gEoUy7bnQQWK GQKctLHu31M9ygX5YwaNu4I4tOnAYTdpbLFZo67bPV3HseTrTo5Lx8Afc8DsbSYqojAv MBHc1aWsiiXz6Uwty36AEG9Xi6AYFEJWoVeHOymKpN6LvFG6UWD1pdfH5Kk2cwOYFoV6 Ft2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gTKUWEdr7X7gHT2/c0rh/4HOUp41ym8Za7G+Wwf9Lwk=; b=dUjc3b0J1K/4BmTzOOJagwRRXQWFHhYqrEGvHTB/oCwz269twIKIqcjkcOCfe+SRIZ v5KN8M6SnwIw5o9g5ABD8aF16mV3WXHYJ2x6bIpVFyYlWXfxrxhArBarJA+uqnfy/LqT lFgYwinkRXlrALySCeeiMCY7nxmhINR273lECkKDeJ+8XSXptTwZz/m4k4NcvgfaTWJy IahHhbgzM8cJqR612RRky4JilvMNl0U4qYZS5JX86FGJ1YS2NP2/Cd0dyAtIHLfi+2jD kjtKfzPKWMY974h10ryrK34w57m5sOqpmMTO9siWOyFKLGz1ubDgMKGq2ofR5VjAC7le 1bmA== X-Gm-Message-State: AOAM530TYGzMlmCtvwO5qF8qA+q0sgQ0EDpKKhiPtSZ/Sng1mmmfB0SO jfMXuSebxdVIUK5MSbYhwcc= X-Google-Smtp-Source: ABdhPJywo7VmsW32KITYWmVvyUWc2zBCwLyTACvX3mOy6RmpF6iQNI6DbIv8VsnZrxqhev97rJHmBw== X-Received: by 2002:adf:edc8:: with SMTP id v8mr25548852wro.330.1613510817997; Tue, 16 Feb 2021 13:26:57 -0800 (PST) Received: from Ansuel-xps.localdomain (host-87-6-252-11.retail.telecomitalia.it. [87.6.252.11]) by smtp.googlemail.com with ESMTPSA id s14sm7132182wmj.23.2021.02.16.13.26.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Feb 2021 13:26:57 -0800 (PST) From: Ansuel Smith To: Richard Weinberger Subject: [PATCH v2 1/3] mtd: partitions: ofpart: skip subnodes parse with compatible Date: Tue, 16 Feb 2021 22:26:26 +0100 Message-Id: <20210216212638.28382-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210216212638.28382-1-ansuelsmth@gmail.com> References: <20210216212638.28382-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210216_162700_331945_FD76F791 X-CRM114-Status: GOOD ( 14.75 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:431 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 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [ansuelsmth[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Vignesh Raghavendra , Boris Brezillon , linux-kernel@vger.kernel.org, Rob Herring , linux-mtd@lists.infradead.org, Miquel Raynal , Ansuel Smith Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org If a partitions structure is not used, parse direct subnodes as fixed-partitions only if a compatible is not found or is of type fixed-partition. A parser can be used directly on the subnode and subnodes should not be parsed as fixed-partitions by default. Signed-off-by: Ansuel Smith --- drivers/mtd/parsers/ofpart.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/mtd/parsers/ofpart.c b/drivers/mtd/parsers/ofpart.c index daf507c123e6..4b363dd0311c 100644 --- a/drivers/mtd/parsers/ofpart.c +++ b/drivers/mtd/parsers/ofpart.c @@ -50,6 +50,11 @@ static int parse_fixed_partitions(struct mtd_info *master, master->name, mtd_node); ofpart_node = mtd_node; dedicated = false; + + /* Skip parsing direct subnodes if a compatible is found and is not fixed-partitions */ + if (node_has_compatible(ofpart_node) && + !of_device_is_compatible(ofpart_node, "fixed-partitions")) + return 0; } else if (!of_device_is_compatible(ofpart_node, "fixed-partitions")) { /* The 'partitions' subnode might be used by another parser */ return 0;