{"id":804529,"url":"http://patchwork.ozlabs.org/api/1.2/patches/804529/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1503414919-30820-13-git-send-email-bmeng.cn@gmail.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1503414919-30820-13-git-send-email-bmeng.cn@gmail.com>","list_archive_url":null,"date":"2017-08-22T15:15:17","name":"[U-Boot,12/14] nvme: Adjust the 'nvme' command to use blk_common_cmd()","commit_ref":"fceadc1459c099303f1e0cdd1937bb561b5ce288","pull_url":null,"state":"accepted","archived":false,"hash":"6dfe90be20018eee5c0243f6038a0ac6806c5205","submitter":{"id":64981,"url":"http://patchwork.ozlabs.org/api/1.2/people/64981/?format=json","name":"Bin Meng","email":"bmeng.cn@gmail.com"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/1.2/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1503414919-30820-13-git-send-email-bmeng.cn@gmail.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/804529/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/804529/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"FvAAfYid\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xcDgQ5lrPz9sNd\n\tfor ;\n\tWed, 23 Aug 2017 01:17:06 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 8758EC21F19; Tue, 22 Aug 2017 15:13:48 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 66FC2C21F0F;\n\tTue, 22 Aug 2017 15:11:56 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid AF3CBC21F25; Tue, 22 Aug 2017 15:11:20 +0000 (UTC)","from mail-io0-f193.google.com (mail-io0-f193.google.com\n\t[209.85.223.193])\n\tby lists.denx.de (Postfix) with ESMTPS id B07D8C21EF0\n\tfor ; Tue, 22 Aug 2017 15:11:16 +0000 (UTC)","by mail-io0-f193.google.com with SMTP id m40so2352621ioi.4\n\tfor ; Tue, 22 Aug 2017 08:11:16 -0700 (PDT)","from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com.\n\t[147.11.156.139]) by smtp.gmail.com with ESMTPSA id\n\ta189sm5182572itd.5.2017.08.22.08.11.13\n\t(version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 22 Aug 2017 08:11:14 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=FREEMAIL_FROM,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:subject:date:message-id:in-reply-to:references;\n\tbh=tLdTHxT307AWM3LgARSnEdaQlN/YLrtcDPwb2b2D6nw=;\n\tb=FvAAfYidDbMWRhepWO87pWcYCpUSbc2jRgGLTt58DzCFLhgvaR36yhS1ohQHGMY4+a\n\trlUAxMT94YtmA8olecxAATpLNLz9IQZA1sJsiS+j1Gg1WmR2y9CkYRypQH0bWBNlMmPS\n\t89+Q5wEKHt7jVrsFeaFCsOi4PSYq+6xIlqOj9TF1hlzuvYcUG9KyiAKuKqmW31ZcbaCW\n\tClqZr6N31AzBw1xwj90qNZdCM9yREgLrjI+fGp+HG+uHCPLJMK8YCt3mFLn38m5zetDc\n\tvMr+FF4ggIkX8lzXhm4v08jlKE+3lbUBpC077+DH8S0OaCK4Eeke2pwinyi4pUgEDR6Q\n\trY8Q==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=tLdTHxT307AWM3LgARSnEdaQlN/YLrtcDPwb2b2D6nw=;\n\tb=QzOq6h85FqJhmPsHz8LgyiHCIlYq4ODi9Gl7DC1ra1wK7YLoqPrgWCFGK29DC5ODaN\n\tg8NPK2F37kUz3i3CAHOkTbvmZiuEwiCwoUwGAhuOzVDMkRtrKOp5F4oiQV1NOWH+oyb8\n\tt5LOHRKydLGo3p0UDoSS6qNvMQAdYLQWCqQhXPsJOtmN9QLxU8RbfZMuhOHVbBo4VSjK\n\tscITQbul/lJSYC1uoBd9g2rD/NaPCtn2+Pcjs2X7H3WDjVI0AuJIZC36iXylrJDGNygm\n\tAdGYvhZVV+jP1AVHFIOE4kpX/CUuDkEf8G93Yx6eW7S3BRxqrK4cs5ObXXiMmnPOutpS\n\tFy4g==","X-Gm-Message-State":"AHYfb5hfTyCXQKANcYfu11tLJSSOYCfFBl54KyLHiLU4kd3gHBt1Z+Qc\n\tT2JXz2bjxaYf6A==","X-Received":"by 10.107.172.199 with SMTP id v190mr834140ioe.159.1503414675516;\n\tTue, 22 Aug 2017 08:11:15 -0700 (PDT)","From":"Bin Meng ","To":"Tom Rini , U-Boot Mailing List ","Date":"Tue, 22 Aug 2017 08:15:17 -0700","Message-Id":"<1503414919-30820-13-git-send-email-bmeng.cn@gmail.com>","X-Mailer":"git-send-email 1.7.9.5","In-Reply-To":"<1503414919-30820-1-git-send-email-bmeng.cn@gmail.com>","References":"<1503414919-30820-1-git-send-email-bmeng.cn@gmail.com>","Subject":"[U-Boot] [PATCH 12/14] nvme: Adjust the 'nvme' command to use\n\tblk_common_cmd()","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"Instead of having separate code in the 'nvme' command, adjust it to use\nthe common function.\n\nSigned-off-by: Bin Meng \n---\n\n cmd/nvme.c | 195 +++++++--------------------------------------\n doc/README.nvme | 4 +-\n include/config_fallbacks.h | 1 +\n 3 files changed, 30 insertions(+), 170 deletions(-)","diff":"diff --git a/cmd/nvme.c b/cmd/nvme.c\nindex e1ef95f..63a8e5a 100644\n--- a/cmd/nvme.c\n+++ b/cmd/nvme.c\n@@ -9,189 +9,48 @@\n #include \n #include \n #include \n-#include \n-#include \n \n-static int nvme_curr_device;\n+static int nvme_curr_dev;\n \n-static int do_nvme_scan(cmd_tbl_t *cmdtp, int flag,\n-\t\tint argc, char * const argv[])\n+static int do_nvme(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])\n {\n \tint ret;\n \n-\tret = nvme_scan_namespace();\n-\tif (ret)\n-\t\treturn CMD_RET_FAILURE;\n+\tif (argc == 2) {\n+\t\tif (strncmp(argv[1], \"scan\", 4) == 0) {\n+\t\t\tret = nvme_scan_namespace();\n+\t\t\tif (ret)\n+\t\t\t\treturn CMD_RET_FAILURE;\n \n-\treturn CMD_RET_SUCCESS;\n-}\n-\n-static int do_nvme_list(cmd_tbl_t *cmdtp, int flag,\n-\t\tint argc, char * const argv[])\n-{\n-\tblk_list_devices(IF_TYPE_NVME);\n-\n-\treturn CMD_RET_SUCCESS;\n-}\n-\n-static int do_nvme_info(cmd_tbl_t *cmdtp, int flag,\n-\t\tint argc, char * const argv[])\n-{\n-\tint devnum;\n-\tstruct udevice *udev;\n-\tint ret;\n-\n-\tif (argc > 1)\n-\t\tdevnum = (int)simple_strtoul(argv[1], NULL, 10);\n-\telse\n-\t\tdevnum = nvme_curr_device;\n-\n-\tret = blk_get_device(IF_TYPE_NVME, devnum, &udev);\n-\tif (ret < 0)\n-\t\treturn CMD_RET_FAILURE;\n-\n-\tnvme_print_info(udev);\n-\n-\treturn CMD_RET_SUCCESS;\n-}\n-\n-static int do_nvme_device(cmd_tbl_t *cmdtp, int flag,\n-\t\tint argc, char * const argv[])\n-{\n-\tif (argc > 1) {\n-\t\tint devnum = (int)simple_strtoul(argv[1], NULL, 10);\n-\n-\t\tif (!blk_show_device(IF_TYPE_NVME, devnum)) {\n-\t\t\tnvme_curr_device = devnum;\n-\t\t\tprintf(\"... is now current device\\n\");\n-\t\t} else {\n-\t\t\treturn CMD_RET_FAILURE;\n+\t\t\treturn ret;\n \t\t}\n-\t} else {\n-\t\tblk_show_device(IF_TYPE_NVME, nvme_curr_device);\n-\t}\n+\t\tif (strncmp(argv[1], \"deta\", 4) == 0) {\n+\t\t\tstruct udevice *udev;\n \n-\treturn CMD_RET_SUCCESS;\n-}\n+\t\t\tret = blk_get_device(IF_TYPE_NVME, nvme_curr_dev,\n+\t\t\t\t\t &udev);\n+\t\t\tif (ret < 0)\n+\t\t\t\treturn CMD_RET_FAILURE;\n \n-static int do_nvme_part(cmd_tbl_t *cmdtp, int flag,\n-\t\tint argc, char * const argv[])\n-{\n-\tif (argc > 1) {\n-\t\tint devnum = (int)simple_strtoul(argv[2], NULL, 10);\n+\t\t\tnvme_print_info(udev);\n \n-\t\tif (blk_print_part_devnum(IF_TYPE_NVME, devnum)) {\n-\t\t\tprintf(\"\\nNVMe device %d not available\\n\", devnum);\n-\t\t\treturn CMD_RET_FAILURE;\n+\t\t\treturn ret;\n \t\t}\n-\t} else {\n-\t\tblk_print_part_devnum(IF_TYPE_NVME, nvme_curr_device);\n-\t}\n-\n-\treturn CMD_RET_SUCCESS;\n-}\n-\n-static int do_nvme_read(cmd_tbl_t *cmdtp, int flag, int argc,\n-\t\tchar * const argv[])\n-{\n-\tunsigned long time;\n-\tif (argc != 4)\n-\t\treturn CMD_RET_USAGE;\n-\n-\tulong addr = simple_strtoul(argv[1], NULL, 16);\n-\tulong cnt = simple_strtoul(argv[3], NULL, 16);\n-\tulong n;\n-\tlbaint_t blk = simple_strtoul(argv[2], NULL, 16);\n-\n-\tprintf(\"\\nNVMe read: device %d block # \" LBAFU \" count %ld ... \",\n-\t nvme_curr_device, blk, cnt);\n-\n-\ttime = get_timer(0);\n-\tn = blk_read_devnum(IF_TYPE_NVME, nvme_curr_device, blk,\n-\t\t\t cnt, (ulong *)addr);\n-\ttime = get_timer(time);\n-\n-\tprintf(\"read: %s\\n\", (n == cnt) ? \"OK\" : \"ERROR\");\n-\tprintf(\"%lu bytes read in %lu ms\", cnt * 512, time);\n-\tif (time > 0) {\n-\t\tputs(\" (\");\n-\t\tprint_size(div_u64(cnt * 512, time) * 1000, \"/s\");\n-\t\tputs(\")\");\n \t}\n-\tputs(\"\\n\");\n-\n-\treturn (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;\n-}\n-\n-static int do_nvme_write(cmd_tbl_t *cmdtp, int flag, int argc,\n-\t\tchar * const argv[])\n-{\n-\tunsigned long time;\n-\tif (argc != 4)\n-\t\treturn CMD_RET_USAGE;\n-\n-\tulong addr = simple_strtoul(argv[1], NULL, 16);\n-\tulong cnt = simple_strtoul(argv[3], NULL, 16);\n-\tulong n;\n-\tlbaint_t blk = simple_strtoul(argv[2], NULL, 16);\n-\n-\tprintf(\"\\nNVMe write: device %d block # \" LBAFU \" count %ld ... \",\n-\t nvme_curr_device, blk, cnt);\n-\n-\ttime = get_timer(0);\n-\tn = blk_write_devnum(IF_TYPE_NVME, nvme_curr_device, blk,\n-\t\t\t cnt, (ulong *)addr);\n-\ttime = get_timer(time);\n-\n-\tprintf(\"write: %s\\n\", (n == cnt) ? \"OK\" : \"ERROR\");\n-\tprintf(\"%lu bytes write in %lu ms\", cnt * 512, time);\n-\tif (time > 0) {\n-\t\tputs(\" (\");\n-\t\tprint_size(div_u64(cnt * 512, time) * 1000, \"/s\");\n-\t\tputs(\")\");\n-\t}\n-\tputs(\"\\n\");\n-\n-\treturn (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;\n-}\n-\n-static cmd_tbl_t cmd_nvme[] = {\n-\tU_BOOT_CMD_MKENT(scan, 1, 1, do_nvme_scan, \"\", \"\"),\n-\tU_BOOT_CMD_MKENT(list, 1, 1, do_nvme_list, \"\", \"\"),\n-\tU_BOOT_CMD_MKENT(info, 2, 1, do_nvme_info, \"\", \"\"),\n-\tU_BOOT_CMD_MKENT(device, 2, 1, do_nvme_device, \"\", \"\"),\n-\tU_BOOT_CMD_MKENT(part, 2, 1, do_nvme_part, \"\", \"\"),\n-\tU_BOOT_CMD_MKENT(write, 4, 0, do_nvme_write, \"\", \"\"),\n-\tU_BOOT_CMD_MKENT(read, 4, 0, do_nvme_read, \"\", \"\")\n-};\n-\n-static int do_nvmecops(cmd_tbl_t *cmdtp, int flag, int argc,\n-\t\tchar * const argv[])\n-{\n-\tcmd_tbl_t *cp;\n-\n-\tcp = find_cmd_tbl(argv[1], cmd_nvme, ARRAY_SIZE(cmd_nvme));\n-\n-\targc--;\n-\targv++;\n-\n-\tif (cp == NULL || argc > cp->maxargs)\n-\t\treturn CMD_RET_USAGE;\n-\n-\tif (flag == CMD_FLAG_REPEAT && !cp->repeatable)\n-\t\treturn CMD_RET_SUCCESS;\n \n-\treturn cp->cmd(cmdtp, flag, argc, argv);\n+\treturn blk_common_cmd(argc, argv, IF_TYPE_NVME, &nvme_curr_dev);\n }\n \n U_BOOT_CMD(\n-\tnvme, 8, 1, do_nvmecops,\n+\tnvme, 8, 1, do_nvme,\n \t\"NVM Express sub-system\",\n-\t\"\\nnvme scan - scan NVMe blk devices\\n\"\n-\t\"nvme list - show all available NVMe blk devices\\n\"\n-\t\"nvme info [dev]- show current or a specific NVMe blk device\\n\"\n-\t\"nvme device [dev] - show or set current device\\n\"\n-\t\"nvme part [dev] - print partition table\\n\"\n-\t\"nvme read addr blk# cnt\\n\"\n-\t\"nvme write addr blk# cnt\"\n+\t\"scan - scan NVMe devices\\n\"\n+\t\"nvme detail - show details of current NVMe device\\n\"\n+\t\"nvme info - show all available NVMe devices\\n\"\n+\t\"nvme device [dev] - show or set current NVMe device\\n\"\n+\t\"nvme part [dev] - print partition table of one or all NVMe devices\\n\"\n+\t\"nvme read addr blk# cnt - read `cnt' blocks starting at block\\n\"\n+\t\" `blk#' to memory address `addr'\\n\"\n+\t\"nvme write addr blk# cnt - write `cnt' blocks starting at block\\n\"\n+\t\" `blk#' from memory address `addr'\"\n );\ndiff --git a/doc/README.nvme b/doc/README.nvme\nindex 3afa912..d9bda23 100644\n--- a/doc/README.nvme\n+++ b/doc/README.nvme\n@@ -50,14 +50,14 @@ identified.\n \n To list all of the NVMe hard disks, try:\n \n- => nvme list\n+ => nvme info\n Device 0: Vendor: 0x8086 Rev: 8DV10131 Prod: CVFT535600LS400BGN\n \t Type: Hard Disk\n \t Capacity: 381554.0 MB = 372.6 GB (781422768 x 512)\n \n and print out detailed information for controller and namespaces via:\n \n- => nvme info\n+ => nvme detail\n \n Raw block read/write to can be done via the 'nvme read/write' commands:\n \ndiff --git a/include/config_fallbacks.h b/include/config_fallbacks.h\nindex 961a83d..d1bde5f 100644\n--- a/include/config_fallbacks.h\n+++ b/include/config_fallbacks.h\n@@ -50,6 +50,7 @@\n \tdefined(CONFIG_CMD_PART) || \\\n \tdefined(CONFIG_CMD_GPT) || \\\n \tdefined(CONFIG_MMC) || \\\n+\tdefined(CONFIG_NVME) || \\\n \tdefined(CONFIG_SYSTEMACE) || \\\n \tdefined(CONFIG_SANDBOX)\n #define HAVE_BLOCK_DEVICE\n","prefixes":["U-Boot","12/14"]}