From patchwork Mon Jul 31 19:13:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 128848 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2229574vqg; Mon, 31 Jul 2023 12:46:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlEGPBxK/PIExtvVUfOyCtoMfmBflK+6Bh6mNEVCjmUNT5drlptVCA3QIfNeTYmBNg0Mf1pf X-Received: by 2002:aa7:d507:0:b0:522:cb97:f198 with SMTP id y7-20020aa7d507000000b00522cb97f198mr735564edq.38.1690832775954; Mon, 31 Jul 2023 12:46:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690832775; cv=none; d=google.com; s=arc-20160816; b=qpdL6oBCVzo9su43mTRCBEf2niG82qXTjaMeynEXUMbyfn/XmV24e441pTKNrZwkh1 ZAnJW9vtZhUU5siwjh2DPpkGV4p1H+Ei7w/OKPHZflzad7UjoDX2SlnJs/wLlqDtRwJs 0Gw83c12krjduW/RLlEtTbgsPthAJWdN96EG110WsFsSqP+Q50LYc7A6q6Og2yghRHLR IXy1Tb5IfuYzwyAAGD4w/XPPZH49bcD0SA1ipi4aOq4eSR8rasNqqvcKADdVi91GMyhn ozsNYyLJhwtulrgHp9MFeGl1ZnekzV4jjdq7bcyUQx/2y9bfW5dJGrdk1n8x5AAomizf SOAA== 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=kFGsI/e2yvLWxse1j39HJ6gb+i8cDJSBRhHonL9x+u0=; b=w6eI0aRFbpfVNcfR3YoWwvlXTiZkqR1TKpPpOSreGUK60Ze+KsgD30b7oTBEovnqI6 Sho32DDKYGLM3I+Bfd94u539PGr6e5NYSTtjkde9ISoU5Z2/l8MrLmPIkFBfP+UB62Km A56TgI3DwIgDEBxTm0fpjzX0kij8CuWZmQLtKKo320/R9fAWNgUyt8ROMZogwQ6gB2dZ 6TE05yyKm7UCXl6dIt/iOwqyJqMdK9hF+B2F8nx6ibTH4r1J2F5c8EOhFKN2QifUYMyt do9/upeAMYjMIehY/Jkb8VQkoQyqSknX5ND4bO2xk/Q9dKRPOvOsDPfQz+6zTloTlFMD Tc7Q== 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 d15-20020a056402516f00b005223c32fd2asi6717263ede.570.2023.07.31.12.45.51; Mon, 31 Jul 2023 12:46:15 -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 S230010AbjGaTOE (ORCPT + 99 others); Mon, 31 Jul 2023 15:14:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229610AbjGaTOC (ORCPT ); Mon, 31 Jul 2023 15:14:02 -0400 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10555184 for ; Mon, 31 Jul 2023 12:14:02 -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 1qQYL8-0001iX-2t; Mon, 31 Jul 2023 19:14:00 +0000 Date: Mon, 31 Jul 2023 20:13:47 +0100 From: Daniel Golle To: Richard Weinberger , Miquel Raynal , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH 5/6] mtd: ubi: populate ubi volume fwnode Message-ID: <3efb1ac62048dd6818688737e22cdaabb9f65ce3.1690823629.git.daniel@makrotopia.org> 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,T_SCC_BODY_TEXT_LINE 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: 1772966668677335487 X-GMAIL-MSGID: 1772966668677335487 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);