nvme: Add nvme commands

Add nvme commands in U-Boot command line.

1. "nvme scan" - scan NVMe blk devices
2. "nvme list" - show all available NVMe blk devices
3. "nvme info" - show current or a specific NVMe blk device
4. "nvme device" - show or set current device
5. "nvme part" - print partition table
6. "nvme read" - read data from NVMe blk device
7. "nvme write" - write data to NVMe blk device

Signed-off-by: Zhikang Zhang <zhikang.zhang@nxp.com>
Signed-off-by: Wenbin Song <wenbin.song@nxp.com>
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 183f93260d3ea05d7b0f22e3796f7914d70c4173..42d955c96aee9520bd68462b09ed01ff47b03f82 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -773,6 +773,13 @@ config CMD_NAND_TORTURE
 
 endif # CMD_NAND
 
+config CMD_NVME
+       bool "nvme"
+       depends on NVME
+       default y if NVME
+       help
+         NVM Express device support
+
 config CMD_MMC_SPI
        bool "mmc_spi - Set up MMC SPI device"
        help

diff --git a/cmd/Makefile b/cmd/Makefile
index 1bf6e3f71182c3a092bcfcecf069d0e86e27126d..13c86f8fccc2dadc24ad9fa0cdc65e46280530c0 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -105,6 +105,7 @@ obj-$(CONFIG_CMD_REISER) += reiser.o
 obj-$(CONFIG_CMD_REMOTEPROC) += remoteproc.o
 obj-$(CONFIG_SANDBOX) += host.o
 obj-$(CONFIG_CMD_SATA) += sata.o
+obj-$(CONFIG_CMD_NVME) += nvme.o
 obj-$(CONFIG_CMD_SF) += sf.o
 obj-$(CONFIG_CMD_SCSI) += scsi.o disk.o
 obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o

diff --git a/cmd/nvme.c b/cmd/nvme.c
new file mode 100644 (file)
index 0000000..e1ef95f
--- /dev/null
+++ b/cmd/nvme.c
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2017 NXP Semiconductors
+ * Copyright (C) 2017 Bin Meng <bmeng.cn@gmail.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <command.h>
+#include <dm.h>
+#include <nvme.h>
+#include <part.h>
+#include <linux/math64.h>
+
+static int nvme_curr_device;
+
+static int do_nvme_scan(cmd_tbl_t *cmdtp, int flag,
+               int argc, char * const argv[])
+{
+       int ret;
+
+       ret = nvme_scan_namespace();
+       if (ret)
+               return CMD_RET_FAILURE;
+
+       return CMD_RET_SUCCESS;
+}
+
+static int do_nvme_list(cmd_tbl_t *cmdtp, int flag,
+               int argc, char * const argv[])
+{
+       blk_list_devices(IF_TYPE_NVME);
+
+       return CMD_RET_SUCCESS;
+}
+
+static int do_nvme_info(cmd_tbl_t *cmdtp, int flag,
+               int argc, char * const argv[])
+{
+       int devnum;
+       struct udevice *udev;
+       int ret;
+
+       if (argc > 1)
+               devnum = (int)simple_strtoul(argv[1], NULL, 10);
+       else
+               devnum = nvme_curr_device;
+
+       ret = blk_get_device(IF_TYPE_NVME, devnum, &udev);
+       if (ret < 0)
+               return CMD_RET_FAILURE;
+
+       nvme_print_info(udev);
+
+       return CMD_RET_SUCCESS;
+}
+
+static int do_nvme_device(cmd_tbl_t *cmdtp, int flag,
+               int argc, char * const argv[])
+{
+       if (argc > 1) {
+               int devnum = (int)simple_strtoul(argv[1], NULL, 10);
+
+               if (!blk_show_device(IF_TYPE_NVME, devnum)) {
+                       nvme_curr_device = devnum;
+                       printf("... is now current device\n");
+               } else {
+                       return CMD_RET_FAILURE;
+               }
+       } else {
+               blk_show_device(IF_TYPE_NVME, nvme_curr_device);
+       }
+
+       return CMD_RET_SUCCESS;
+}
+
+static int do_nvme_part(cmd_tbl_t *cmdtp, int flag,
+               int argc, char * const argv[])
+{
+       if (argc > 1) {
+               int devnum = (int)simple_strtoul(argv[2], NULL, 10);
+
+               if (blk_print_part_devnum(IF_TYPE_NVME, devnum)) {
+                       printf("\nNVMe device %d not available\n", devnum);
+                       return CMD_RET_FAILURE;
+               }
+       } else {
+               blk_print_part_devnum(IF_TYPE_NVME, nvme_curr_device);
+       }
+
+       return CMD_RET_SUCCESS;
+}
+
+static int do_nvme_read(cmd_tbl_t *cmdtp, int flag, int argc,
+               char * const argv[])
+{
+       unsigned long time;
+       if (argc != 4)
+               return CMD_RET_USAGE;
+
+       ulong addr = simple_strtoul(argv[1], NULL, 16);
+       ulong cnt = simple_strtoul(argv[3], NULL, 16);
+       ulong n;
+       lbaint_t blk = simple_strtoul(argv[2], NULL, 16);
+
+       printf("\nNVMe read: device %d block # " LBAFU " count %ld ... ",
+              nvme_curr_device, blk, cnt);
+
+       time = get_timer(0);
+       n = blk_read_devnum(IF_TYPE_NVME, nvme_curr_device, blk,
+                           cnt, (ulong *)addr);
+       time = get_timer(time);
+
+       printf("read: %s\n", (n == cnt) ? "OK" : "ERROR");
+       printf("%lu bytes read in %lu ms", cnt * 512, time);
+       if (time > 0) {
+               puts(" (");
+               print_size(div_u64(cnt * 512, time) * 1000, "/s");
+               puts(")");
+       }
+       puts("\n");
+
+       return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
+}
+
+static int do_nvme_write(cmd_tbl_t *cmdtp, int flag, int argc,
+               char * const argv[])
+{
+       unsigned long time;
+       if (argc != 4)
+               return CMD_RET_USAGE;
+
+       ulong addr = simple_strtoul(argv[1], NULL, 16);
+       ulong cnt = simple_strtoul(argv[3], NULL, 16);
+       ulong n;
+       lbaint_t blk = simple_strtoul(argv[2], NULL, 16);
+
+       printf("\nNVMe write: device %d block # " LBAFU " count %ld ... ",
+              nvme_curr_device, blk, cnt);
+
+       time = get_timer(0);
+       n = blk_write_devnum(IF_TYPE_NVME, nvme_curr_device, blk,
+                           cnt, (ulong *)addr);
+       time = get_timer(time);
+
+       printf("write: %s\n", (n == cnt) ? "OK" : "ERROR");
+       printf("%lu bytes write in %lu ms", cnt * 512, time);
+       if (time > 0) {
+               puts(" (");
+               print_size(div_u64(cnt * 512, time) * 1000, "/s");
+               puts(")");
+       }
+       puts("\n");
+
+       return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
+}
+
+static cmd_tbl_t cmd_nvme[] = {
+       U_BOOT_CMD_MKENT(scan, 1, 1, do_nvme_scan, "", ""),
+       U_BOOT_CMD_MKENT(list, 1, 1, do_nvme_list, "", ""),
+       U_BOOT_CMD_MKENT(info, 2, 1, do_nvme_info, "", ""),
+       U_BOOT_CMD_MKENT(device, 2, 1, do_nvme_device, "", ""),
+       U_BOOT_CMD_MKENT(part, 2, 1, do_nvme_part, "", ""),
+       U_BOOT_CMD_MKENT(write, 4, 0, do_nvme_write, "", ""),
+       U_BOOT_CMD_MKENT(read, 4, 0, do_nvme_read, "", "")
+};
+
+static int do_nvmecops(cmd_tbl_t *cmdtp, int flag, int argc,
+               char * const argv[])
+{
+       cmd_tbl_t *cp;
+
+       cp = find_cmd_tbl(argv[1], cmd_nvme, ARRAY_SIZE(cmd_nvme));
+
+       argc--;
+       argv++;
+
+       if (cp == NULL || argc > cp->maxargs)
+               return CMD_RET_USAGE;
+
+       if (flag == CMD_FLAG_REPEAT && !cp->repeatable)
+               return CMD_RET_SUCCESS;
+
+       return cp->cmd(cmdtp, flag, argc, argv);
+}
+
+U_BOOT_CMD(
+       nvme, 8, 1, do_nvmecops,
+       "NVM Express sub-system",
+       "\nnvme scan - scan NVMe blk devices\n"
+       "nvme list - show all available NVMe blk devices\n"
+       "nvme info [dev]- show current or a specific NVMe blk device\n"
+       "nvme device [dev] - show or set current device\n"
+       "nvme part [dev] - print partition table\n"
+       "nvme read  addr blk# cnt\n"
+       "nvme write addr blk# cnt"
+);

diff --git a/doc/README.nvme b/doc/README.nvme
index d2b917d61b86d219602d5df06da0b3a5aa526c05..28ecf54000110164df4d943ad8b9dc9f60140463 100644 (file)
--- a/doc/README.nvme
+++ b/doc/README.nvme
@@ -40,3 +40,39 @@ It only support basic block read/write functions in the NVMe driver.
 Config options
 --------------
 CONFIG_NVME    Enable NVMe device support
+CONFIG_CMD_NVME        Enable basic NVMe commands
+
+Usage in U-Boot
+---------------
+To use an NVMe hard disk from U-Boot shell, a 'nvme scan' command needs to
+be executed for all NVMe hard disks attached to the NVMe controller to be
+identified.
+
+To list all of the NVMe hard disks, try:
+
+  => nvme list
+  Device 0: Vendor: 0x8086 Rev: 8DV10131 Prod: CVFT535600LS400BGN
+           Type: Hard Disk
+           Capacity: 381554.0 MB = 372.6 GB (781422768 x 512)
+
+and print out detailed information for controller and namespaces via:
+
+  => nvme info
+
+Raw block read/write to can be done via the 'nvme read/write' commands:
+
+  => nvme read a0000000 0 11000
+
+  => tftp 80000000 /tftpboot/kernel.itb
+  => nvme write 80000000 0 11000
+
+Of course, file system command can be used on the NVMe hard disk as well:
+
+  => fatls nvme 0:1
+       32376967   kernel.itb
+       22929408   100m
+
+       2 file(s), 0 dir(s)
+
+  => fatload nvme 0:1 a0000000 /kernel.itb
+  => bootm a0000000