From patchwork Thu Apr 20 13:57:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 752825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w81GL0vpdz9ryT for ; Fri, 21 Apr 2017 00:19:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bNR8oaXY"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DvPC2P3e"; dkim-atps=neutral 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: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=i7R9ne47HL9wcVnoz5LtBjybDNx7wIWTAvSzGQAWwqo=; b=bNR8oaXYO98V2Q s28Ozxs3LcbFN7y/TBONtalwCY/QPR/3dYcvj+zjG0Z7JuHyOvSHnmfZywU6cMj96rf2I2d50rG7I q2Ux+lhY4aD1sRkMIvBzbud/tsZhjEqmbWHtIIesqQswuqMwO+uZ7vlziyN3fZ6osBTftvDfX3nzn AbmgXBrXqVJq2cUxjOLCW5VObv4dvUYDYDn8a0Hcc+6CEkx2wGQaFWOjdIgFtcd5Xx38OtGZu/AuW NDi3A5jnLS4rVehFNPJCYHHpdqp2jiAH6g4iPg/uamM0xDDGcUgLAOCsuHEDug1g7WmvWX/EMGuj4 VRgN3ED5dcMPo0uY9xTQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d1Cvi-0006U0-BN; Thu, 20 Apr 2017 14:19:30 +0000 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d1Cb1-0007uM-3E for linux-mtd@lists.infradead.org; Thu, 20 Apr 2017 13:58:11 +0000 Received: by mail-lf0-x244.google.com with SMTP id 75so5909744lfs.3 for ; Thu, 20 Apr 2017 06:57:47 -0700 (PDT) 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=YaC7edRATNVx3GsPyxTdyh5jNfb1OjYm/NQozaFI2eg=; b=DvPC2P3eQgAk9kT3okg351s6DvNejiipsP9+72l0OjHaKshBgLfPpc7FSqmLku1kL/ h6/q5Hs+hoGaeMYU96YPmflFbswZ9hILLeMY485XLvPeeQWUgJBkoPW03ke7zJvxXy3g 41aOPtlTXYkpQURlyhNiXLw7nbdBCgNYH5c0Hg+iWwsEBFSkFuBS1IW49So4Vh2Cj34/ n3jlwoma8/9g9IWLUOq7CE+muo0tErgL+ktGQrn1hEvbLT3PQ5OcRlPISyKm1NlPm0V4 s4IIBh1ttUIdavjx/Xno4OAcSbXVklRdxDnIOiRQX7gyEqZjIrJigj3rZf3uWnqkWiKc ezZg== 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=YaC7edRATNVx3GsPyxTdyh5jNfb1OjYm/NQozaFI2eg=; b=gDXvFiFHaNdMigIZyWmzgfxo07VfemD0PEk855Ul8E8HI5Zv0uGeUKSpo7/RnigOIp Iux6KFcExirnTkvpxOFVHnn2Qwnr5OIFcVYJpQOsKPBnm1voKpEh1Y0C/wruOENEt13D xfwUroOBv/aimwtwmfVIZBe6vYKqZaEkCde/6IaoC8yGZZ2vYgHf8qtNctjfPuYjzusP 3VQtQgQaX4XVJ20CfEYhm+XaLur3NTqZJGZaDaRfJsccvPTXm3Z9IobFAyC5+0veTU4Y KZP18dvE6oznvbFTYcpNAICFgr88CH+i0sKHyjJgGQyB3cisYwAvK8WPyuY1r3jFK1/C 3D8Q== X-Gm-Message-State: AN3rC/4VlOI3nX335rT8rlwxAZnLAow/O8+YXs8kOu0EuYQClZmHbcpf sSFsIxFGzkA5/w== X-Received: by 10.25.23.164 with SMTP id 36mr2644777lfx.28.1492696666504; Thu, 20 Apr 2017 06:57:46 -0700 (PDT) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id 91sm1075260lja.53.2017.04.20.06.57.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Apr 2017 06:57:45 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , Cyrille Pitchen Subject: [PATCH RESEND 3/4] mtd: partitions: add of_match_table parser matching Date: Thu, 20 Apr 2017 15:57:30 +0200 Message-Id: <20170420135731.13272-4-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170420135731.13272-1-zajec5@gmail.com> References: <20170420135431.12585-1-zajec5@gmail.com> <20170420135731.13272-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170420_065807_847363_941645EF X-CRM114-Status: GOOD ( 14.82 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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 X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Linus Walleij , Rob Herring , linux-mtd@lists.infradead.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Frank Rowand Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Brian Norris Partition parsers can now provide an of_match_table to enable flash<-->parser matching via device tree. This support is currently limited to built-in parsers as it uses request_module() and friends. This should be sufficient for most cases though as compiling parsers as modules isn't a common choice. Signed-off-by: Brian Norris Signed-off-by: Rafał Miłecki Acked-by: Brian Norris --- drivers/mtd/mtdpart.c | 47 ++++++++++++++++++++++++++++++++++++++++++ include/linux/mtd/partitions.h | 1 + 2 files changed, 48 insertions(+) diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 73c52f1a2e4c..d0cb1a892ed2 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -861,6 +861,41 @@ static int mtd_part_do_parse(struct mtd_part_parser *parser, return ret; } +static bool of_mtd_match_mtd_parser(struct mtd_info *mtd, + struct mtd_part_parser *parser) +{ + struct device_node *np; + bool ret; + + np = mtd_get_of_node(mtd); + np = of_get_child_by_name(np, "partitions"); + + ret = !!of_match_node(parser->of_match_table, np); + + of_node_put(np); + + return ret; +} + +static struct mtd_part_parser *mtd_part_get_parser_by_of(struct mtd_info *mtd) +{ + struct mtd_part_parser *p, *ret = NULL; + + spin_lock(&part_parser_lock); + + list_for_each_entry(p, &part_parsers, list) { + if (of_mtd_match_mtd_parser(mtd, p) && + try_module_get(p->owner)) { + ret = p; + break; + } + } + + spin_unlock(&part_parser_lock); + + return ret; +} + /** * parse_mtd_partitions - parse MTD partitions * @master: the master partition (describes whole MTD device) @@ -913,6 +948,18 @@ int parse_mtd_partitions(struct mtd_info *master, const char *const *types, if (ret < 0 && !err) err = ret; } + + parser = mtd_part_get_parser_by_of(master); + if (!parser) + return err; + + ret = mtd_part_do_parse(parser, master, pparts, data); + if (ret > 0) + return 0; + mtd_part_parser_put(parser); + if (ret < 0 && !err) + err = ret; + return err; } diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h index 2787e76c030f..073e1d8d5d17 100644 --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h @@ -77,6 +77,7 @@ struct mtd_part_parser { struct list_head list; struct module *owner; const char *name; + const struct of_device_id *of_match_table; int (*parse_fn)(struct mtd_info *, const struct mtd_partition **, struct mtd_part_parser_data *); void (*cleanup)(const struct mtd_partition *pparts, int nr_parts);