From patchwork Tue Nov 8 23:04:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 17267 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp26165wru; Tue, 8 Nov 2022 15:09:49 -0800 (PST) X-Google-Smtp-Source: AMsMyM7HREIe8dRXp+rxC4rqVrpSzGGKuKZ3BPbguE3aHvz2th2HdPss/RleFqJDsdj/wdDDqbgg X-Received: by 2002:a17:90a:2d8b:b0:213:b314:4652 with SMTP id p11-20020a17090a2d8b00b00213b3144652mr58172927pjd.96.1667948989319; Tue, 08 Nov 2022 15:09:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667948989; cv=none; d=google.com; s=arc-20160816; b=jnw/vukVYwdk4d12xYbCHhURv+dcgYnGMVTVa6wd5wWu0Eo76bUWFDg+/X840TdFiN HK1V6uArk7d8p/dfzTg9YRlcv54VTf5hiN9PZcp31BFs6Cfb1mBHoUkTMn+QdqaZ/LFm 83X6jXMbppkKgvDU9j6fbiOahTZMmd6nD8vndm78guO4XKhZBY6JA/54MhLoGp++vrtg tlbaxzgM4Nl8p8tLNhPGVd8U3NyBpm1aUt+uwRq7YlcupKpSaMzoTIEGgT62KSYXQQ0f eoWHV8UWYrJ6hLrurCFmj6w4ESO6JsyNlfzoG2SqYH/WSpNubOtkb5/seMjiGLMQd2VB aqcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:to:from:date; bh=ulczSCiKyYKYeEYWVUdvnRHWt1pChHSadOU6tR5w8FA=; b=kpvD3lreSZjI5O1EbJL5i5Vjyq/IIEWzF8bb5f6ayK/TC6oV4nLiT4yXpfU345encQ a7K5KoGcxtA3V/60en4AK8ch5cIOOyap7DvVlc/BAFCCiPqHW0o5N0D/wA6IfNmq+7AS nMkE0y2G6Ar4dbFEi079QCC8ptxV3RriKWyqtMJgXYs7sJ+6yUbu3/w0GrA3iQB28Skx J5iiF10U7l0WHN8swEgO0HvToIewk9QPugz/kstLECP2AbzKhKaAtuCTPnTDj6YVBmNU f6BcbrhzfjwdGuCLY3UaRmnF1khXeHVs4333uZW03Wp3gIMjSQRDftrHYgwzMKVquxsD TqGA== 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 a29-20020a631a1d000000b0046b041e1408si15334681pga.744.2022.11.08.15.09.36; Tue, 08 Nov 2022 15:09:49 -0800 (PST) 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 S229626AbiKHXF6 (ORCPT + 99 others); Tue, 8 Nov 2022 18:05:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230036AbiKHXFs (ORCPT ); Tue, 8 Nov 2022 18:05:48 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 558CF657D9; Tue, 8 Nov 2022 15:05:47 -0800 (PST) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.94.2) (envelope-from ) id 1osXex-0005vp-Nv; Wed, 09 Nov 2022 00:05:35 +0100 Date: Tue, 8 Nov 2022 23:04:13 +0000 From: Daniel Golle To: Jens Axboe , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Davidlohr Bueso , Matthew Wilcox , "Martin K. Petersen" , Chaitanya Kulkarni , Daniel Golle , Ming Lei , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-efi@vger.kernel.org Subject: [PATCH v4 4/5] mtd_blkdevs: add option to enable scanning for partitions Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748971279199838646?= X-GMAIL-MSGID: =?utf-8?q?1748971279199838646?= Add Kconfig boolean CONFIG_MTD_BLOCK_PARTITIONS and enable block partition parsers on non-NAND mtdblock devices in case it is selected. Signed-off-by: Daniel Golle Acked-by: Miquel Raynal --- drivers/mtd/Kconfig | 11 +++++++++++ drivers/mtd/mtd_blkdevs.c | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 796a2eccbef0..12874dec1569 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -69,6 +69,17 @@ config MTD_BLOCK_RO You do not need this option for use with the DiskOnChip devices. For those, enable NFTL support (CONFIG_NFTL) instead. +config MTD_BLOCK_PARTITIONS + bool "Scan for partitions on MTD block devices" + depends on MTD_BLOCK || MTD_BLOCK_RO + default y if FIT_PARTITION + help + Scan MTD block devices for partitions (ie. MBR, GPT, uImage.FIT, ...). + (NAND devices are omitted, ubiblock should be used instead when) + + Unless your MTD partitions contain sub-partitions mapped using a + partition table, say no. + comment "Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK." depends on MTD_BLOCK || MTD_BLOCK_RO diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index 60b222799871..e6f2e0888246 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -359,7 +359,9 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) } else { snprintf(gd->disk_name, sizeof(gd->disk_name), "%s%d", tr->name, new->devnum); - gd->flags |= GENHD_FL_NO_PART; + + if (!IS_ENABLED(CONFIG_MTD_BLOCK_PARTITIONS) || mtd_type_is_nand(new->mtd)) + gd->flags |= GENHD_FL_NO_PART; } set_capacity(gd, ((u64)new->size * tr->blksize) >> 9);