nvme: Adjust the 'nvme' command to use blk_common_cmd()

Instead of having separate code in the 'nvme' command, adjust it to use the common function. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

nvme: Adjust the 'nvme' command to use blk_common_cmd()
Instead of having separate code in the 'nvme' command, adjust it to use the common function. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Bin Meng · Tom Rini
1 parent 18aa5a4134
Showing 3 changed files with 30 additions and 170 deletions Side-by-side Diff
cmd/nvme.c
doc/README.nvme
include/config_fallbacks.h
@@ -9,190 +9,49 @@
 #include <command.h>
 #include <dm.h>
 #include <nvme.h>
-#include <part.h>
-#include <linux/math64.h>
  
-static int nvme_curr_device;
+static int nvme_curr_dev;
  
-static int do_nvme_scan(cmd_tbl_t *cmdtp, int flag,
-		int argc, char * const argv[])
+static int do_nvme(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	int ret;
  
-	ret = nvme_scan_namespace();
-	if (ret)
-		return CMD_RET_FAILURE;
+	if (argc == 2) {
+		if (strncmp(argv[1], "scan", 4) == 0) {
+			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;
+			return ret;
 		}
-	} else {
-		blk_show_device(IF_TYPE_NVME, nvme_curr_device);
-	}
+		if (strncmp(argv[1], "deta", 4) == 0) {
+			struct udevice *udev;
  
-	return CMD_RET_SUCCESS;
-}
+			ret = blk_get_device(IF_TYPE_NVME, nvme_curr_dev,
+					     &udev);
+			if (ret < 0)
+				return CMD_RET_FAILURE;
  
-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);
+			nvme_print_info(udev);
  
-		if (blk_print_part_devnum(IF_TYPE_NVME, devnum)) {
-			printf("\nNVMe device %d not available\n", devnum);
-			return CMD_RET_FAILURE;
+			return ret;
 		}
-	} else {
-		blk_print_part_devnum(IF_TYPE_NVME, nvme_curr_device);
 	}
  
-	return CMD_RET_SUCCESS;
+	return blk_common_cmd(argc, argv, IF_TYPE_NVME, &nvme_curr_dev);
 }
  
-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,
+	nvme, 8, 1, do_nvme,
 	"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"
+	"scan - scan NVMe devices\n"
+	"nvme detail - show details of current NVMe device\n"
+	"nvme info - show all available NVMe devices\n"
+	"nvme device [dev] - show or set current NVMe device\n"
+	"nvme part [dev] - print partition table of one or all NVMe devices\n"
+	"nvme read addr blk# cnt - read `cnt' blocks starting at block\n"
+	"     `blk#' to memory address `addr'\n"
+	"nvme write addr blk# cnt - write `cnt' blocks starting at block\n"
+	"     `blk#' from memory address `addr'"
 );
@@ -50,14 +50,14 @@
  
 To list all of the NVMe hard disks, try:
  
-  => nvme list
+  => nvme info
   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
+  => nvme detail
  
 Raw block read/write to can be done via the 'nvme read/write' commands:
  
@@ -50,6 +50,7 @@
 	defined(CONFIG_CMD_PART) || \
 	defined(CONFIG_CMD_GPT) || \
 	defined(CONFIG_MMC) || \
+	defined(CONFIG_NVME) || \
 	defined(CONFIG_SYSTEMACE) || \
 	defined(CONFIG_SANDBOX)
 #define HAVE_BLOCK_DEVICE
...	...	@@ -9,190 +9,49 @@
9	9	#include <command.h>
10	10	#include <dm.h>
11	11	#include <nvme.h>
12		-#include <part.h>
13		-#include <linux/math64.h>
14	12
15		-static int nvme_curr_device;
	13	+static int nvme_curr_dev;
16	14
17		-static int do_nvme_scan(cmd_tbl_t *cmdtp, int flag,
18		- int argc, char * const argv[])
	15	+static int do_nvme(cmd_tbl_t cmdtp, int flag, int argc, char const argv[])
19	16	{
20	17	int ret;
21	18
22		- ret = nvme_scan_namespace();
23		- if (ret)
24		- return CMD_RET_FAILURE;
	19	+ if (argc == 2) {
	20	+ if (strncmp(argv[1], "scan", 4) == 0) {
	21	+ ret = nvme_scan_namespace();
	22	+ if (ret)
	23	+ return CMD_RET_FAILURE;
25	24
26		- return CMD_RET_SUCCESS;
27		-}
28		-
29		-static int do_nvme_list(cmd_tbl_t *cmdtp, int flag,
30		- int argc, char * const argv[])
31		-{
32		- blk_list_devices(IF_TYPE_NVME);
33		-
34		- return CMD_RET_SUCCESS;
35		-}
36		-
37		-static int do_nvme_info(cmd_tbl_t *cmdtp, int flag,
38		- int argc, char * const argv[])
39		-{
40		- int devnum;
41		- struct udevice *udev;
42		- int ret;
43		-
44		- if (argc > 1)
45		- devnum = (int)simple_strtoul(argv[1], NULL, 10);
46		- else
47		- devnum = nvme_curr_device;
48		-
49		- ret = blk_get_device(IF_TYPE_NVME, devnum, &udev);
50		- if (ret < 0)
51		- return CMD_RET_FAILURE;
52		-
53		- nvme_print_info(udev);
54		-
55		- return CMD_RET_SUCCESS;
56		-}
57		-
58		-static int do_nvme_device(cmd_tbl_t *cmdtp, int flag,
59		- int argc, char * const argv[])
60		-{
61		- if (argc > 1) {
62		- int devnum = (int)simple_strtoul(argv[1], NULL, 10);
63		-
64		- if (!blk_show_device(IF_TYPE_NVME, devnum)) {
65		- nvme_curr_device = devnum;
66		- printf("... is now current device\n");
67		- } else {
68		- return CMD_RET_FAILURE;
	25	+ return ret;
69	26	}
70		- } else {
71		- blk_show_device(IF_TYPE_NVME, nvme_curr_device);
72		- }
	27	+ if (strncmp(argv[1], "deta", 4) == 0) {
	28	+ struct udevice *udev;
73	29
74		- return CMD_RET_SUCCESS;
75		-}
	30	+ ret = blk_get_device(IF_TYPE_NVME, nvme_curr_dev,
	31	+ &udev);
	32	+ if (ret < 0)
	33	+ return CMD_RET_FAILURE;
76	34
77		-static int do_nvme_part(cmd_tbl_t *cmdtp, int flag,
78		- int argc, char * const argv[])
79		-{
80		- if (argc > 1) {
81		- int devnum = (int)simple_strtoul(argv[2], NULL, 10);
	35	+ nvme_print_info(udev);
82	36
83		- if (blk_print_part_devnum(IF_TYPE_NVME, devnum)) {
84		- printf("\nNVMe device %d not available\n", devnum);
85		- return CMD_RET_FAILURE;
	37	+ return ret;
86	38	}
87		- } else {
88		- blk_print_part_devnum(IF_TYPE_NVME, nvme_curr_device);
89	39	}
90	40
91		- return CMD_RET_SUCCESS;
	41	+ return blk_common_cmd(argc, argv, IF_TYPE_NVME, &nvme_curr_dev);
92	42	}
93	43
94		-static int do_nvme_read(cmd_tbl_t *cmdtp, int flag, int argc,
95		- char * const argv[])
96		-{
97		- unsigned long time;
98		- if (argc != 4)
99		- return CMD_RET_USAGE;
100		-
101		- ulong addr = simple_strtoul(argv[1], NULL, 16);
102		- ulong cnt = simple_strtoul(argv[3], NULL, 16);
103		- ulong n;
104		- lbaint_t blk = simple_strtoul(argv[2], NULL, 16);
105		-
106		- printf("\nNVMe read: device %d block # " LBAFU " count %ld ... ",
107		- nvme_curr_device, blk, cnt);
108		-
109		- time = get_timer(0);
110		- n = blk_read_devnum(IF_TYPE_NVME, nvme_curr_device, blk,
111		- cnt, (ulong *)addr);
112		- time = get_timer(time);
113		-
114		- printf("read: %s\n", (n == cnt) ? "OK" : "ERROR");
115		- printf("%lu bytes read in %lu ms", cnt * 512, time);
116		- if (time > 0) {
117		- puts(" (");
118		- print_size(div_u64(cnt * 512, time) * 1000, "/s");
119		- puts(")");
120		- }
121		- puts("\n");
122		-
123		- return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
124		-}
125		-
126		-static int do_nvme_write(cmd_tbl_t *cmdtp, int flag, int argc,
127		- char * const argv[])
128		-{
129		- unsigned long time;
130		- if (argc != 4)
131		- return CMD_RET_USAGE;
132		-
133		- ulong addr = simple_strtoul(argv[1], NULL, 16);
134		- ulong cnt = simple_strtoul(argv[3], NULL, 16);
135		- ulong n;
136		- lbaint_t blk = simple_strtoul(argv[2], NULL, 16);
137		-
138		- printf("\nNVMe write: device %d block # " LBAFU " count %ld ... ",
139		- nvme_curr_device, blk, cnt);
140		-
141		- time = get_timer(0);
142		- n = blk_write_devnum(IF_TYPE_NVME, nvme_curr_device, blk,
143		- cnt, (ulong *)addr);
144		- time = get_timer(time);
145		-
146		- printf("write: %s\n", (n == cnt) ? "OK" : "ERROR");
147		- printf("%lu bytes write in %lu ms", cnt * 512, time);
148		- if (time > 0) {
149		- puts(" (");
150		- print_size(div_u64(cnt * 512, time) * 1000, "/s");
151		- puts(")");
152		- }
153		- puts("\n");
154		-
155		- return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
156		-}
157		-
158		-static cmd_tbl_t cmd_nvme[] = {
159		- U_BOOT_CMD_MKENT(scan, 1, 1, do_nvme_scan, "", ""),
160		- U_BOOT_CMD_MKENT(list, 1, 1, do_nvme_list, "", ""),
161		- U_BOOT_CMD_MKENT(info, 2, 1, do_nvme_info, "", ""),
162		- U_BOOT_CMD_MKENT(device, 2, 1, do_nvme_device, "", ""),
163		- U_BOOT_CMD_MKENT(part, 2, 1, do_nvme_part, "", ""),
164		- U_BOOT_CMD_MKENT(write, 4, 0, do_nvme_write, "", ""),
165		- U_BOOT_CMD_MKENT(read, 4, 0, do_nvme_read, "", "")
166		-};
167		-
168		-static int do_nvmecops(cmd_tbl_t *cmdtp, int flag, int argc,
169		- char * const argv[])
170		-{
171		- cmd_tbl_t *cp;
172		-
173		- cp = find_cmd_tbl(argv[1], cmd_nvme, ARRAY_SIZE(cmd_nvme));
174		-
175		- argc--;
176		- argv++;
177		-
178		- if (cp == NULL \|\| argc > cp->maxargs)
179		- return CMD_RET_USAGE;
180		-
181		- if (flag == CMD_FLAG_REPEAT && !cp->repeatable)
182		- return CMD_RET_SUCCESS;
183		-
184		- return cp->cmd(cmdtp, flag, argc, argv);
185		-}
186		-
187	44	U_BOOT_CMD(
188		- nvme, 8, 1, do_nvmecops,
	45	+ nvme, 8, 1, do_nvme,
189	46	"NVM Express sub-system",
190		- "\nnvme scan - scan NVMe blk devices\n"
191		- "nvme list - show all available NVMe blk devices\n"
192		- "nvme info [dev]- show current or a specific NVMe blk device\n"
193		- "nvme device [dev] - show or set current device\n"
194		- "nvme part [dev] - print partition table\n"
195		- "nvme read addr blk# cnt\n"
196		- "nvme write addr blk# cnt"
	47	+ "scan - scan NVMe devices\n"
	48	+ "nvme detail - show details of current NVMe device\n"
	49	+ "nvme info - show all available NVMe devices\n"
	50	+ "nvme device [dev] - show or set current NVMe device\n"
	51	+ "nvme part [dev] - print partition table of one or all NVMe devices\n"
	52	+ "nvme read addr blk# cnt - read `cnt' blocks starting at block\n"
	53	+ " `blk#' to memory address `addr'\n"
	54	+ "nvme write addr blk# cnt - write `cnt' blocks starting at block\n"
	55	+ " `blk#' from memory address `addr'"
197	56	);
...	...	@@ -50,14 +50,14 @@
50	50
51	51	To list all of the NVMe hard disks, try:
52	52
53		- => nvme list
	53	+ => nvme info
54	54	Device 0: Vendor: 0x8086 Rev: 8DV10131 Prod: CVFT535600LS400BGN
55	55	Type: Hard Disk
56	56	Capacity: 381554.0 MB = 372.6 GB (781422768 x 512)
57	57
58	58	and print out detailed information for controller and namespaces via:
59	59
60		- => nvme info
	60	+ => nvme detail
61	61
62	62	Raw block read/write to can be done via the 'nvme read/write' commands:
63	63
...	...	@@ -50,6 +50,7 @@
50	50	defined(CONFIG_CMD_PART) \|\| \
51	51	defined(CONFIG_CMD_GPT) \|\| \
52	52	defined(CONFIG_MMC) \|\| \
	53	+ defined(CONFIG_NVME) \|\| \
53	54	defined(CONFIG_SYSTEMACE) \|\| \
54	55	defined(CONFIG_SANDBOX)
55	56	#define HAVE_BLOCK_DEVICE