From: Daniel Walter <dwalter@sigma-star.at>
To: linux-mtd@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, computersforpeace@gmail.com,
dwmw2@infradead.org, boris.brezillon@free-electrons.com,
Daniel Walter <dwalter@sigma-star.at>
Subject: [PATCH v2 46/46] mtd/nandsim: Add ioctl for info
Date: Wed, 21 Sep 2016 11:57:55 +0200 [thread overview]
Message-ID: <08f4115e8c68001317fc35a67dc791933073c787.1474450296.git.dwalter@sigma-star.at> (raw)
In-Reply-To: <cover.1474450295.git.dwalter@sigma-star.at>
Add a ioctl() call for nandsim information.
This information includes, nand id, backend type
and path to the file if the file backend is used
Signed-off-by: Daniel Walter <dwalter@sigma-star.at>
---
drivers/mtd/nand/nandsim.c | 65 +++++++++++++++++++++++++++++++++++++++++
include/uapi/mtd/nandsim-user.h | 11 +++++++
2 files changed, 76 insertions(+)
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index b901155..dd78fc3 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -2893,6 +2893,56 @@ out:
return ret;
}
+static void ns_put_device(struct mtd_info *);
+static int ns_get_device(struct mtd_info *);
+
+static int ns_ctrl_info_instance(struct ns_info_instance_req *req)
+{
+ struct mtd_info *nsmtd;
+ int id = req->id, ret = 0;
+ struct nand_chip *chip;
+ struct nandsim *ns;
+ struct ns_file_data *file_data;
+ char buf[NANDSIM_FILENAME_SIZE];
+ char *tmp;
+
+ if (id < 0 || id >= NANDSIM_MAX_DEVICES)
+ return -EINVAL;
+
+ mutex_lock(&ns_mtd_mutex);
+ nsmtd = ns_mtds[id];
+ if (nsmtd) {
+ ret = ns_get_device(nsmtd);
+ if (ret)
+ goto out;
+ chip = mtd_to_nand(nsmtd);
+ ns = nand_get_controller_data(chip);
+ req->no_oob = ns->no_oob;
+ memcpy(req->id_bytes, ns->ids, 8);
+ req->parts_num = ns->nbparts;
+ if (ns->bops == &ns_cachefile_bops) {
+ req->backend = NANDSIM_BACKEND_CACHEFILE;
+ } else if (ns->bops == &ns_file_bops) {
+ req->backend = NANDSIM_BACKEND_FILE;
+ file_data = ns->backend_data;
+ tmp = d_path(&file_data->file->f_path, buf, NANDSIM_FILENAME_SIZE);
+ memcpy(req->filename, tmp, NANDSIM_FILENAME_SIZE);
+ } else if (ns->bops == &ns_ram_bops) {
+ req->backend = NANDSIM_BACKEND_RAM;
+ } else {
+ req->backend = -1;
+ }
+
+ ns_put_device(nsmtd);
+ } else {
+ ret = -EINVAL;
+ }
+out:
+ mutex_unlock(&ns_mtd_mutex);
+ return ret;
+
+}
+
static long ns_ctrl_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
@@ -2931,6 +2981,21 @@ static long ns_ctrl_ioctl(struct file *file, unsigned int cmd,
ret = ns_ctrl_destroy_instance(&req);
break;
}
+ case NANDSIM_IOC_INFO_INSTANCE:
+ {
+ struct ns_info_instance_req req;
+
+ ret = copy_from_user(&req, argp, sizeof(struct ns_info_instance_req));
+ if (ret) {
+ ret = -EFAULT;
+ goto out;
+ }
+ ret = ns_ctrl_info_instance(&req);
+ if (ret)
+ goto out;
+ ret = copy_to_user(argp, &req, sizeof(struct ns_info_instance_req));
+ break;
+ }
default:
ret = -ENOTTY;
diff --git a/include/uapi/mtd/nandsim-user.h b/include/uapi/mtd/nandsim-user.h
index b52d620..a00ab2d 100644
--- a/include/uapi/mtd/nandsim-user.h
+++ b/include/uapi/mtd/nandsim-user.h
@@ -7,9 +7,11 @@
#define NANDSIM_IOC_NEW_INSTANCE _IOW(NANDSIM_IOC_MAGIC, 0, struct ns_new_instance_req)
#define NANDSIM_IOC_DESTROY_INSTANCE _IOW(NANDSIM_IOC_MAGIC, 1, struct ns_destroy_instance_req)
+#define NANDSIM_IOC_INFO_INSTANCE _IOW(NANDSIM_IOC_MAGIC, 2, struct ns_info_instance_req)
#define NANDSIM_MAX_DEVICES 32
#define NANDSIM_MAX_PARTS 32
+#define NANDSIM_FILENAME_SIZE 64
enum ns_backend_type {
NANDSIM_BACKEND_RAM = 0,
@@ -99,4 +101,13 @@ struct ns_destroy_instance_req {
__s8 padding[7];
} __packed;
+struct ns_info_instance_req {
+ __s8 id;
+ __s8 no_oob;
+ __s8 id_bytes[8];
+ __s8 parts_num;
+ __s8 backend;
+ __u8 filename[NANDSIM_FILENAME_SIZE];
+} __packed;
+
#endif /* __NANDSIM_USER_H__ */
--
2.8.3
next prev parent reply other threads:[~2016-09-21 9:58 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-21 9:43 [PATCH v2 00/46] Nandsim facelift (part I of II) Daniel Walter
2016-09-21 9:43 ` [PATCH v2 01/46] mtdpart: Propagate _get/put_device() Daniel Walter
2016-09-21 10:15 ` Boris Brezillon
2016-09-28 20:16 ` Brian Norris
2016-12-14 19:24 ` Karl Beldan
2016-12-14 21:09 ` Brian Norris
2016-12-14 21:12 ` Richard Weinberger
2016-12-14 23:40 ` Brian Norris
2016-12-15 7:09 ` Karl Beldan
2016-12-15 7:51 ` Richard Weinberger
2016-12-28 18:53 ` Karl Beldan
2016-09-21 9:44 ` [PATCH v2 02/46] mtd: nand: Provide nand_cleanup() function to free NAND related resources Daniel Walter
2016-09-21 9:58 ` Boris Brezillon
2016-09-21 12:43 ` kbuild test robot
2016-09-21 14:25 ` Boris Brezillon
2016-09-21 14:38 ` Daniel Walter
2016-09-21 14:42 ` Boris Brezillon
2016-09-21 9:45 ` [PATCH v2 03/46] mtd: Don't unconditionally unregister reboot notifier Daniel Walter
2016-09-21 14:31 ` Boris Brezillon
2016-09-21 14:33 ` Daniel Walter
2016-10-09 5:20 ` Brian Norris
2016-09-21 9:45 ` [PATCH v2 04/46] mtd: Don't unconditionally execute remove notifiers Daniel Walter
2016-09-21 9:46 ` [PATCH v2 05/46] mtd: Don't print a scary message when trying to remove a busy MTD Daniel Walter
2016-09-21 9:46 ` [PATCH v2 06/46] mtd: nandsim: Add basic control file support Daniel Walter
2016-09-21 9:47 ` [PATCH v2 07/46] mtd: nandsim: Begin with removal of global state Daniel Walter
2016-09-21 9:47 ` [PATCH v2 08/46] mtd: nandsim: Kill global nsmtd Daniel Walter
2016-09-21 9:47 ` [PATCH v2 09/46] mtd: nandsim: Don't directly use module parameters Daniel Walter
2016-09-21 9:48 ` [PATCH v2 10/46] mtd: nandsim: Add helper functions for pointer magic Daniel Walter
2016-09-21 9:48 ` [PATCH v2 11/46] mtd: nandsim: Factor out nandsim parameters Daniel Walter
2016-09-21 9:48 ` [PATCH v2 12/46] mtd: nandsim: Make debugfs logic multi instance capable Daniel Walter
2016-09-21 9:49 ` [PATCH v2 13/46] mtd: nandsim: Add final logic for multiple instances Daniel Walter
2016-09-21 9:49 ` [PATCH v2 14/46] mtd: nandsim: Add simulator id to MTD parition name Daniel Walter
2016-09-21 9:49 ` [PATCH v2 15/46] mtd: nandsim: Introduce backend operations Daniel Walter
2016-09-21 9:49 ` [PATCH v2 16/46] mtd: nandsim: Print error when backend init failed Daniel Walter
2016-09-21 9:50 ` [PATCH v2 17/46] mtd: nandsim: Allow external backends Daniel Walter
2016-09-21 9:50 ` [PATCH v2 18/46] mtd: nandsim: Add basic support for a file backend Daniel Walter
2016-09-21 9:50 ` [PATCH v2 19/46] mtd: nandsim: UAPI v1 Daniel Walter
2016-11-20 10:13 ` Boris Brezillon
2016-09-21 9:51 ` [PATCH v2 20/46] mtd: nandsim: Implement preliminary constructor function Daniel Walter
2016-09-21 9:51 ` [PATCH v2 21/46] mtd: nandsim: Implement preliminary destructor function Daniel Walter
2016-09-21 12:56 ` kbuild test robot
2016-09-21 9:51 ` [PATCH v2 22/46] mtd: nandsim: Cleanup destroy handlers Daniel Walter
2016-09-21 9:51 ` [PATCH v2 23/46] mtd: nandsim: Unify file backend init logic Daniel Walter
2016-09-21 9:51 ` [PATCH v2 24/46] mtd: nandsim: Wire up NANDSIM_MODE_CACHEFILE ioctl mode Daniel Walter
2016-09-21 9:52 ` [PATCH v2 25/46] mtd: nandsim: Print backend name Daniel Walter
2016-09-21 9:52 ` [PATCH v2 26/46] mtd: nandsim: use the existing output macros Daniel Walter
2016-09-21 9:52 ` [PATCH v2 27/46] mtd: nandsim: Add no_oob mode Daniel Walter
2016-09-21 9:52 ` [PATCH v2 28/46] mtd: nandsim: Refine exports Daniel Walter
2016-09-21 9:54 ` [PATCH v2 29/46] um: Add nandsim backend driver Daniel Walter
2016-09-21 9:54 ` [PATCH v2 30/46] mtd: nandsim: Use pr_ style logging Daniel Walter
2016-09-21 9:54 ` [PATCH v2 31/46] mtd: nandsim: Remove NS_RAW_OFFSET_OOB Daniel Walter
2016-09-21 9:54 ` [PATCH v2 32/46] mtd: nandsim: Remove NS_IS_INITIALIZED Daniel Walter
2016-09-21 9:55 ` [PATCH v2 33/46] mtd: nandsim: Relax page size restrictions Daniel Walter
2016-09-21 9:55 ` [PATCH v2 34/46] mtd: nandsim: Support bitflip and read error emulation in file backend Daniel Walter
2016-09-21 9:55 ` [PATCH v2 35/46] mtd: nandsim: Make NANDSIM_MAX_DEVICES part of uapi Daniel Walter
2016-09-21 9:55 ` [PATCH v2 36/46] mtd: nandsim: Cleanup constants Daniel Walter
2016-09-21 9:55 ` [PATCH v2 37/46] mtd: nandsim: Turn parts[] into a integer Daniel Walter
2016-09-21 9:56 ` [PATCH v2 38/46] mtd: nandsim: Expose partition creation logic to user space Daniel Walter
2016-09-21 9:56 ` [PATCH v2 39/46] mtd: nandsim: Rework init error paths Daniel Walter
2016-09-21 9:56 ` [PATCH v2 40/46] mtd: nandsim: Expose BBT, delays, etc.. to userspace Daniel Walter
2016-09-21 9:56 ` [PATCH v2 41/46] mtd: nandsim: Expose support for weakpages/blocks " Daniel Walter
2016-09-21 9:57 ` [PATCH v2 42/46] mtd: nandsim: Don't printk on ENOMEM Daniel Walter
2016-09-21 9:57 ` [PATCH v2 43/46] mtd: nandsim: Wire up NANDSIM_IOC_NEW_INSTANCE Daniel Walter
2016-09-21 9:57 ` [PATCH v2 44/46] mtd: nandsim: Wire up NANDSIM_IOC_DESTROY_INSTANCE Daniel Walter
2016-09-21 9:57 ` [PATCH v2 45/46] mtd: nandsim: Always answer all 8 bytes from NAND_CMD_READID Daniel Walter
2016-09-21 9:57 ` Daniel Walter [this message]
2016-10-16 16:24 ` [PATCH v2 00/46] Nandsim facelift (part I of II) Boris Brezillon
2016-11-14 16:24 ` Richard Weinberger
2016-11-20 10:26 ` Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=08f4115e8c68001317fc35a67dc791933073c787.1474450296.git.dwalter@sigma-star.at \
--to=dwalter@sigma-star.at \
--cc=boris.brezillon@free-electrons.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).