{"id":804524,"url":"http://patchwork.ozlabs.org/api/1.2/patches/804524/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1503414919-30820-8-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-8-git-send-email-bmeng.cn@gmail.com>","list_archive_url":null,"date":"2017-08-22T15:15:12","name":"[U-Boot,07/14] nvme: Use macros to access NVMe queues","commit_ref":"722e668db2b4dca735aafcd9ed325145d8a9208c","pull_url":null,"state":"accepted","archived":false,"hash":"fd1f7b0c17b6b219e50e7eac959bb1ca59ffbe73","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-8-git-send-email-bmeng.cn@gmail.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/804524/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/804524/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=\"tiEPXSMY\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xcDds5hhFz9sNd\n\tfor ;\n\tWed, 23 Aug 2017 01:15:45 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 702AAC21DA3; Tue, 22 Aug 2017 15:14:37 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id B6131C21F42;\n\tTue, 22 Aug 2017 15:12:12 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 91F7AC21F3E; Tue, 22 Aug 2017 15:11:11 +0000 (UTC)","from mail-io0-f194.google.com (mail-io0-f194.google.com\n\t[209.85.223.194])\n\tby lists.denx.de (Postfix) with ESMTPS id 8665CC21EEB\n\tfor ; Tue, 22 Aug 2017 15:11:08 +0000 (UTC)","by mail-io0-f194.google.com with SMTP id o196so3016700ioe.3\n\tfor ; Tue, 22 Aug 2017 08:11:08 -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.06\n\t(version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 22 Aug 2017 08:11:06 -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=cCyKFbvJ2O11X6UmshqwxKa7pLheNKYQ1utPqDXY1sU=;\n\tb=tiEPXSMY0SY9jK2vwNJ9amm/xP8EFHqgIEIKJQPraXWwXO8CCIWdzKMTD6Nr7SwChv\n\tazPqXFg8OK2dWKEkIvQ4hUt0O8Wv7+TZ2qqI2kw6yCzxdIiSK5tGnDd9a2TTR2bbk2dX\n\t7u3tmTeqUsx5Ki84Df1KrLVrE0F9wL+hsk6EneRMAtOGVNmnEJjcufOHsYzbTIIjKe12\n\tU9Jw5uvGQv8Rv9dxW0FsD+lEO/ryS7CF8l1UihcMZseAindBwBKfSwXp1Z/Vz/A4qRu/\n\tHoHKxhXXRvMQg3W4VViO0UkuZ7f3/fdc/3G/z8dP6Nf9fSopVZDYPerSLGcje0vi0jo0\n\tUeIw==","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=cCyKFbvJ2O11X6UmshqwxKa7pLheNKYQ1utPqDXY1sU=;\n\tb=MbUiz1B2b7MYDuImunRBzclkUuEvNv0U9LIf3yM0QGx98t7quycxJ5hvkM3gxS23YU\n\tUW5bcKKeQA4hvIBUXgci8H8l8aEyDNBC949kBS/ajqW3IEF7agqfSzoKfnKLnBhJy6x5\n\tfT9yLS1lOQ4pXqUNlv4nZR+JPcwv7ZJIG6SDthalMwyRYR9XvlBJHuosCRsNCvCGCjmo\n\tifMY4x0K9nxg3nWzmey309QilAkL41+LloRghHkp0LOUF29yOq1yKKPcfR9bh4Ak0esW\n\t+psK4efL4yyWR4DEdt+wN1dABGVfKpKhQqzoS0//XaDFqtniGiK7EdDwQbA3cQu9c8Dz\n\tMiwA==","X-Gm-Message-State":"AHYfb5iT9iJYpUQalu9hfEosKI7JOk3AoW4fSEMuaD+l0aEGW2AFD2sb\n\tfG0zL3MkQ8jVTQ==","X-Received":"by 10.107.15.40 with SMTP id x40mr844798ioi.168.1503414667436;\n\tTue, 22 Aug 2017 08:11:07 -0700 (PDT)","From":"Bin Meng ","To":"Tom Rini , U-Boot Mailing List ","Date":"Tue, 22 Aug 2017 08:15:12 -0700","Message-Id":"<1503414919-30820-8-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 07/14] nvme: Use macros to access NVMe queues","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":"NVMe driver only uses two queues. The first one is allocated to do\nadmin stuff, while the second one is for IO stuff. So far the driver\nuses magic number (0/1) to access them. Change to use macros.\n\nSigned-off-by: Bin Meng \n---\n\n drivers/nvme/nvme.c | 22 +++++++++++++++-------\n 1 file changed, 15 insertions(+), 7 deletions(-)","diff":"diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c\nindex 8867977..868ff45 100644\n--- a/drivers/nvme/nvme.c\n+++ b/drivers/nvme/nvme.c\n@@ -23,6 +23,12 @@ struct nvme_info *nvme_info;\n #define IO_TIMEOUT\t\t30\n #define MAX_PRP_POOL\t\t512\n \n+enum nvme_queue_id {\n+\tNVME_ADMIN_Q,\n+\tNVME_IO_Q,\n+\tNVME_Q_NUM,\n+};\n+\n /*\n * An NVM Express queue. Each device has at least two (one for admin\n * commands and one for I/O commands).\n@@ -209,7 +215,8 @@ static int nvme_submit_sync_cmd(struct nvme_queue *nvmeq,\n static int nvme_submit_admin_cmd(struct nvme_dev *dev, struct nvme_command *cmd,\n \t\t\t\t u32 *result)\n {\n-\treturn nvme_submit_sync_cmd(dev->queues[0], cmd, result, ADMIN_TIMEOUT);\n+\treturn nvme_submit_sync_cmd(dev->queues[NVME_ADMIN_Q], cmd,\n+\t\t\t\t result, ADMIN_TIMEOUT);\n }\n \n static struct nvme_queue *nvme_alloc_queue(struct nvme_dev *dev,\n@@ -349,7 +356,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)\n \tif (result < 0)\n \t\treturn result;\n \n-\tnvmeq = dev->queues[0];\n+\tnvmeq = dev->queues[NVME_ADMIN_Q];\n \tif (!nvmeq) {\n \t\tnvmeq = nvme_alloc_queue(dev, 0, NVME_AQ_DEPTH);\n \t\tif (!nvmeq)\n@@ -377,7 +384,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)\n \n \tnvmeq->cq_vector = 0;\n \n-\tnvme_init_queue(dev->queues[0], 0);\n+\tnvme_init_queue(dev->queues[NVME_ADMIN_Q], 0);\n \n \treturn result;\n \n@@ -691,7 +698,7 @@ static ulong nvme_blk_read(struct udevice *udev, lbaint_t blknr,\n \t\tc.rw.length = cpu_to_le16(lbas - 1);\n \t\tc.rw.prp1 = cpu_to_le64((ulong)buffer);\n \t\tc.rw.prp2 = cpu_to_le64(prp2);\n-\t\tstatus = nvme_submit_sync_cmd(dev->queues[1],\n+\t\tstatus = nvme_submit_sync_cmd(dev->queues[NVME_IO_Q],\n \t\t\t\t&c, NULL, IO_TIMEOUT);\n \t\tif (status)\n \t\t\tbreak;\n@@ -744,7 +751,7 @@ static ulong nvme_blk_write(struct udevice *udev, lbaint_t blknr,\n \t\tc.rw.length = cpu_to_le16(lbas - 1);\n \t\tc.rw.prp1 = cpu_to_le64((ulong)buffer);\n \t\tc.rw.prp2 = cpu_to_le64(prp2);\n-\t\tstatus = nvme_submit_sync_cmd(dev->queues[1],\n+\t\tstatus = nvme_submit_sync_cmd(dev->queues[NVME_IO_Q],\n \t\t\t\t&c, NULL, IO_TIMEOUT);\n \t\tif (status)\n \t\t\tbreak;\n@@ -792,13 +799,14 @@ static int nvme_probe(struct udevice *udev)\n \t\tgoto free_nvme;\n \t}\n \n-\tndev->queues = malloc(2 * sizeof(struct nvme_queue *));\n+\tndev->queues = malloc(NVME_Q_NUM * sizeof(struct nvme_queue *));\n \tif (!ndev->queues) {\n \t\tret = -ENOMEM;\n \t\tprintf(\"Error: %s: Out of memory!\\n\", udev->name);\n \t\tgoto free_nvme;\n \t}\n-\tmemset(ndev->queues, 0, sizeof(2 * sizeof(struct nvme_queue *)));\n+\tmemset(ndev->queues, 0,\n+\t sizeof(NVME_Q_NUM * sizeof(struct nvme_queue *)));\n \n \tndev->prp_pool = malloc(MAX_PRP_POOL);\n \tif (!ndev->prp_pool) {\n","prefixes":["U-Boot","07/14"]}