From patchwork Sat Aug 5 16:26:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 131506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp548886vqr; Sat, 5 Aug 2023 09:57:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1vfHYTmrKVtnuyyRT13j4bZTJUDKFriWVU0AIqvdWkFaSbdPvh1pwNR77mzSrwdbuTcsz X-Received: by 2002:a05:6a20:8409:b0:137:2f8c:fab0 with SMTP id c9-20020a056a20840900b001372f8cfab0mr5457588pzd.49.1691254639268; Sat, 05 Aug 2023 09:57:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691254639; cv=none; d=google.com; s=arc-20160816; b=BUBZI3sE5Dz8seSIdEGbDPWrRdlfBsFsQU7mysaBKsMyHxBUp2zoAM7wLpYIjoXr6I QMvvm6UvVvK7hRFMdICmhh11rnOJ2q/AxVCRfRT/hwcrrVoRPfpFJZaeyGqkmSgjpa1Y w0iKAU9h6S9liv7+RaqmSJjAyXRvvzpC9x7PLICs7AE/WMS1/6QVaZwRnwNPKv1Phzai JBppvrxUMnoZqP8x477wgRIIdR0ErR5pWLHZgsUHf2+knUS7rnDdN0DTOtnA+zsxCGeu 6Vu0ALf2nTdeofi31nTIRKhLseyG1Ez7Irr7peflgQqGqTtSi9zKiwmg+zR9PXjr2rzL y5Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date; bh=o9y8ga7ysIvZ1tA1LAIP7ohY/ZuMF48QFqDAHAq8I6A=; fh=WrF5P4rt5GKLKZXFPrBfHwP5VFIZG8GPN/h4vsvn4l4=; b=lZbdlOKOBgQyqEYmjOyczYkQif5UyagsDFbA8QGmwjSk/TmiiOOUOWl2KUanN/x1n7 ESpqyJuJ2w8MNnOLAxbxxdcPxoFhGmZh0SD9iRphde1x7ix+mj3WXk4gUyA6QQLdB3FW EjgpdC2Aa8kNU94h01m3JwX6F4nTQYXmOsi0ihAhpDUjlI2ciO7haly93uGBmFiHK64q AWaWedl9REBNHEuHj/OehlwdYMLEoPiY3khviOKTgFvY7FmnkaA2UdHCS/mXSElG8SLB daICmbdDJ4HuUKtBeLZnBsX0oF2rip8Ujx4TwamrI43hqGSE+xKwgwY09m8Az+IHCy15 OjDg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c66-20020a633545000000b00563fc0ccc20si3398604pga.818.2023.08.05.09.57.05; Sat, 05 Aug 2023 09:57:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229913AbjHEQ0n (ORCPT + 99 others); Sat, 5 Aug 2023 12:26:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229905AbjHEQ0l (ORCPT ); Sat, 5 Aug 2023 12:26:41 -0400 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 649364204 for ; Sat, 5 Aug 2023 09:26:31 -0700 (PDT) Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1qSK6l-0000fK-1j; Sat, 05 Aug 2023 16:26:27 +0000 Date: Sat, 5 Aug 2023 17:26:20 +0100 From: Daniel Golle To: Randy Dunlap , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH v2 6/7] mtd: ubi: populate ubi volume fwnode Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773409024561656157 X-GMAIL-MSGID: 1773409024561656157 Look for the 'volumes' subnode of an MTD partition attached to a UBI device and attach matching child nodes to UBI volumes. This allows UBI volumes to be referenced in device tree, e.g. for use as NVMEM providers. Signed-off-by: Daniel Golle --- drivers/mtd/ubi/vmt.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c index eed4b57c61bda..3b997256cfba7 100644 --- a/drivers/mtd/ubi/vmt.c +++ b/drivers/mtd/ubi/vmt.c @@ -124,6 +124,35 @@ static void vol_release(struct device *dev) kfree(vol); } +static struct fwnode_handle *find_volume_fwnode(struct ubi_volume *vol) +{ + struct fwnode_handle *fw_vols, *fw_vol; + const char *volname; + u32 reg; + + fw_vols = device_get_named_child_node(vol->dev.parent->parent, "volumes"); + if (!fw_vols) + return NULL; + + fwnode_for_each_child_node(fw_vols, fw_vol) { + if (!fwnode_property_read_string(fw_vol, "volname", &volname) && + strncmp(volname, vol->name, vol->name_len)) + continue; + + /* + * volume id (reg) in device tree greater than UBI_MAX_VOLUMES + * can be used to match by volname only + */ + if (!fwnode_property_read_u32(fw_vol, "reg", ®) && + reg < UBI_MAX_VOLUMES && vol->vol_id != reg) + continue; + + return fw_vol; + } + + return NULL; +} + /** * ubi_create_volume - create volume. * @ubi: UBI device description object @@ -223,6 +252,7 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) vol->name_len = req->name_len; memcpy(vol->name, req->name, vol->name_len); vol->ubi = ubi; + device_set_node(&vol->dev, find_volume_fwnode(vol)); /* * Finish all pending erases because there may be some LEBs belonging @@ -597,6 +627,7 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) vol->dev.class = &ubi_class; vol->dev.groups = volume_dev_groups; dev_set_name(&vol->dev, "%s_%d", ubi->ubi_name, vol->vol_id); + device_set_node(&vol->dev, find_volume_fwnode(vol)); err = device_register(&vol->dev); if (err) { cdev_del(&vol->cdev);