From patchwork Wed Sep 21 09:48:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Walter X-Patchwork-Id: 672766 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sfFhv2js1z9sf6 for ; Wed, 21 Sep 2016 20:09:19 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bmeRf-0006Xm-Fd; Wed, 21 Sep 2016 10:08:03 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bmeQu-0005nv-Rx for linux-mtd@bombadil.infradead.org; Wed, 21 Sep 2016 10:07:17 +0000 Received: from mail.sigma-star.at ([95.130.255.111]) by casper.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bme9E-0006Wn-GX for linux-mtd@lists.infradead.org; Wed, 21 Sep 2016 09:49:01 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sigma-star.at (Postfix) with ESMTP id B6C1F24E0002; Wed, 21 Sep 2016 11:48:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.sigma-star.at Received: from dw (unknown [82.150.214.13]) by mail.sigma-star.at (Postfix) with ESMTPSA id 4358816B4335; Wed, 21 Sep 2016 11:48:39 +0200 (CEST) Received: by dw (sSMTP sendmail emulation); Wed, 21 Sep 2016 11:48:40 +0200 From: Daniel Walter To: linux-mtd@lists.infradead.org Subject: [PATCH v2 12/46] mtd: nandsim: Make debugfs logic multi instance capable Date: Wed, 21 Sep 2016 11:48:39 +0200 Message-Id: X-Mailer: git-send-email 2.8.3 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160921_104900_599763_B6953357 X-CRM114-Status: GOOD ( 17.86 ) X-Spam-Score: -5.0 (-----) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (-5.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -3.1 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: boris.brezillon@free-electrons.com, computersforpeace@gmail.com, dwmw2@infradead.org, linux-kernel@vger.kernel.org, Richard Weinberger MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Richard Weinberger Instead of creating our files in /nandsim/, create one directory per instance. Signed-off-by: Richard Weinberger --- drivers/mtd/nand/nandsim.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index ab4859d..057cc7a 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c @@ -328,6 +328,7 @@ union ns_mem { * The structure which describes all the internal simulator data. */ struct nandsim { + unsigned int index; struct mtd_partition partitions[CONFIG_NANDSIM_MAX_PARTS]; unsigned int nbparts; @@ -483,6 +484,8 @@ struct grave_page { /* MTD structure for NAND controller */ static struct mtd_info *ns_mtds[NS_MAX_DEVICES]; +static struct dentry *dfs_root; + static inline struct nandsim *chip_to_ns(struct nand_chip *chip) { return (struct nandsim *)(chip + 1); @@ -560,6 +563,23 @@ static const struct file_operations dfs_fops = { .release = single_release, }; +static int nandsim_debugfs_init(void) +{ + if (!IS_ENABLED(CONFIG_DEBUG_FS)) + return 0; + + dfs_root = debugfs_create_dir("nandsim", NULL); + if (IS_ERR_OR_NULL(dfs_root)) { + int err = dfs_root ? -ENODEV : PTR_ERR(dfs_root); + + NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n", + err); + return err; + } + + return 0; +} + /** * nandsim_debugfs_create - initialize debugfs * @dev: nandsim device description object @@ -572,15 +592,21 @@ static int nandsim_debugfs_create(struct nandsim *dev) struct nandsim_debug_info *dbg = &dev->dbg; struct dentry *dent; int err; + char *dirname; if (!IS_ENABLED(CONFIG_DEBUG_FS)) return 0; - dent = debugfs_create_dir("nandsim", NULL); + dirname = kasprintf(GFP_KERNEL, "nandsim%i", dev->index); + if (!dirname) + return -ENOMEM; + + dent = debugfs_create_dir(dirname, dfs_root); + kfree(dirname); if (IS_ERR_OR_NULL(dent)) { int err = dent ? -ENODEV : PTR_ERR(dent); - NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n", + NS_ERR("cannot create nandsim debugfs sub-directory, err %d\n", err); return err; } @@ -2336,6 +2362,7 @@ static int ns_new_instance(struct nandsim_params *nsparam) nsmtd = ns_mtds[0] = nand_to_mtd(chip); nand = chip_to_ns(chip); nand_set_controller_data(chip, (void *)nand); + nand->index = 0; INIT_LIST_HEAD(&nand->weak_blocks); INIT_LIST_HEAD(&nand->grave_pages); @@ -2557,6 +2584,10 @@ static int __init ns_init_module(void) { int ret; + ret = nandsim_debugfs_init(); + if (ret) + return ret; + ret = ns_init_default(); if (ret) return ret; @@ -2569,6 +2600,7 @@ static void __exit ns_cleanup_module(void) { ns_cleanup_default(); misc_deregister(&nandsim_ctrl_cdev); + debugfs_remove_recursive(dfs_root); } module_exit(ns_cleanup_module);