From nobody Sat Feb 7 04:40:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678116439829391.7054860394802; Mon, 6 Mar 2023 07:27:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZBvR-0006Vc-K3; Mon, 06 Mar 2023 09:34:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZBvP-0006TI-I9; Mon, 06 Mar 2023 09:34:51 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZBvN-0005Vg-T8; Mon, 06 Mar 2023 09:34:51 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 213B05C030E; Mon, 6 Mar 2023 09:34:49 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 06 Mar 2023 09:34:49 -0500 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Mar 2023 09:34:46 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1678113289; x= 1678199689; bh=aiaRokQO7JW6MfW6yaEjam2OP1225/L/eTK8FjewRD4=; b=B qPAEKrhAD8GVEsbsEc/yN2jz0Z16Qoyna6UWD4YXNdbfdKMG6q6vOueRZGVZAwpN L8o9CfrlqW3VxEYOv9LXiE/8LAZ7YA5qj/+aMF1lIuEx3cZl1qVYpjbP00glNSLi eRaG9WL6LqTV85cHUVXmLGF0MWCrsHF8dZdY/s1S3Bkctpm5X4Qbk04c72tn0+QE L45GE/Ha9xw+Hs7PVdb0ldRIrBbP7ppY9tYegUGEq+jLof6Fd41MV370x62RNS1y Ey/IBqkl2fObdQYz0dppgmWtP47A0tqXSY0ZMxBjvgagQW2pEJzcG5dhe5Kg1nAM HJc86imfoPWAoivKsYl8w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1678113289; x= 1678199689; bh=aiaRokQO7JW6MfW6yaEjam2OP1225/L/eTK8FjewRD4=; b=m twH6WgqvrSi3CBfwQkbBnSql0Go6NK0bPqFyt/ujXWzEngKIRTN608vVEmdLPw4Z G+hJlCZrKcuYZIHKdxcot+NSVJkCU1tNQIdo9TfJTqcaOPWhF47J4Vc7OecWjRuX n/fWuyfnxxpvtuToOedXHPZ49xCPLNS0crfG4mQaflLSxwJk5ECIvxUEYtuyJ53U /1N1uupQCbxeC6MaSym5w4bnvVByzH8jdsKKgRhihxnr6DE/EbBVDixeB98dwW1n R4Er0vZP548Yd5Q2E5PRgK31YYDZHJSkLIZcSvwjhl3ZyJk+X7/aZ+gWCwYWCCRC H9CAYbi2ZYE2VZBwoVDnQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvddtkedgfeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghu shculfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrth htvghrnhepjefgieelgfeiveehkeeuveehheekfeevgeeigfehfefgjeejhefffeegudej udegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepih htshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: Feedback-ID: idc91472f:Fastmail From: Klaus Jensen To: qemu-devel@nongnu.org, Peter Maydell Cc: Klaus Jensen , Keith Busch , Kevin Wolf , Hanna Reitz , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Fam Zheng , Gollu Appalanaidu , Klaus Jensen Subject: [PULL 4/5] hw/nvme: basic directives support Date: Mon, 6 Mar 2023 15:34:32 +0100 Message-Id: <20230306143433.10351-5-its@irrelevant.dk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306143433.10351-1-its@irrelevant.dk> References: <20230306143433.10351-1-its@irrelevant.dk> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6175; i=k.jensen@samsung.com; h=from:subject; bh=Mkz5OwnB/2/9T6og95hwn02x2DNMAX7980KhO8V9lYw=; b=owJ4nAFtAZL+kA0DAAoBTeGvMW1PDekByyZiAGQF+fmuoHAnswZSbJdCqyaiwK7GCmNMp/K8G vha1AKqp3T/zokBMwQAAQoAHRYhBFIoM6p14tzmokdmwE3hrzFtTw3pBQJkBfn5AAoJEE3hrzFt Tw3pmgEH/joA0Dj+NJBporGWudoQUMnbxbY8B/rpqX8wy9vaNIb86ziwMcxNZ7Tg7Ev9eg0owdX Zn8JIA00ZG3ctzCkBQ7lxCuuHScnsTOO6w8vLEnW+hEtrAXeR70Q4aDY9fUq828Moar0SPVwNlC zbukHLbpwzqoP5lKQv78zG+tnMzXgaadpZHOwVg9LU3I038mjDJ6z/I1mrrB3TLPs6Ft3VpzEzF gIvnyhWXcVy2LYDwMYAesMDHzl4bpE4nBKI0JiQZCbsK5E/Tt7RoqNaLYtANl+xXoN4Z1sU0gzX ScKijf8QOOdkaZGTjTVrt1gnlvAY0YPlybpqg9CcQMlLvHLBUCaPcK16 X-Developer-Key: i=k.jensen@samsung.com; a=openpgp; fpr=DDCA4D9C9EF931CC3468427263D56FC5E55DA838 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=66.111.4.27; envelope-from=its@irrelevant.dk; helo=out3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1678116441402100003 Content-Type: text/plain; charset="utf-8" From: Gollu Appalanaidu Add support for the Directive Send and Recv commands and the Identify directive. Reviewed-by: Keith Busch Signed-off-by: Gollu Appalanaidu Signed-off-by: Klaus Jensen --- hw/nvme/ctrl.c | 40 +++++++++++++++++++++++++++++++++++++++- hw/nvme/nvme.h | 2 ++ include/block/nvme.h | 35 ++++++++++++++++++++++++++++++----- 3 files changed, 71 insertions(+), 6 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 4bfc7835b539..0ead0ee30815 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -266,6 +266,8 @@ static const uint32_t nvme_cse_acs[256] =3D { [NVME_ADM_CMD_VIRT_MNGMT] =3D NVME_CMD_EFF_CSUPP, [NVME_ADM_CMD_DBBUF_CONFIG] =3D NVME_CMD_EFF_CSUPP, [NVME_ADM_CMD_FORMAT_NVM] =3D NVME_CMD_EFF_CSUPP | NVME_CMD_EFF_= LBCC, + [NVME_ADM_CMD_DIRECTIVE_RECV] =3D NVME_CMD_EFF_CSUPP, + [NVME_ADM_CMD_DIRECTIVE_SEND] =3D NVME_CMD_EFF_CSUPP, }; =20 static const uint32_t nvme_cse_iocs_none[256]; @@ -6150,6 +6152,37 @@ static uint16_t nvme_dbbuf_config(NvmeCtrl *n, const= NvmeRequest *req) return NVME_SUCCESS; } =20 +static uint16_t nvme_directive_send(NvmeCtrl *n, NvmeRequest *req) +{ + return NVME_INVALID_FIELD | NVME_DNR; +} + +static uint16_t nvme_directive_receive(NvmeCtrl *n, NvmeRequest *req) +{ + uint32_t dw10 =3D le32_to_cpu(req->cmd.cdw10); + uint32_t dw11 =3D le32_to_cpu(req->cmd.cdw11); + uint32_t nsid =3D le32_to_cpu(req->cmd.nsid); + uint8_t doper, dtype; + uint32_t numd, trans_len; + NvmeDirectiveIdentify id =3D { + .supported =3D 1 << NVME_DIRECTIVE_IDENTIFY, + .enabled =3D 1 << NVME_DIRECTIVE_IDENTIFY, + }; + + numd =3D dw10 + 1; + doper =3D dw11 & 0xff; + dtype =3D (dw11 >> 8) & 0xff; + + trans_len =3D MIN(sizeof(NvmeDirectiveIdentify), numd << 2); + + if (nsid =3D=3D NVME_NSID_BROADCAST || dtype !=3D NVME_DIRECTIVE_IDENT= IFY || + doper !=3D NVME_DIRECTIVE_RETURN_PARAMS) { + return NVME_INVALID_FIELD | NVME_DNR; + } + + return nvme_c2h(n, (uint8_t *)&id, trans_len, req); +} + static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeRequest *req) { trace_pci_nvme_admin_cmd(nvme_cid(req), nvme_sqid(req), req->cmd.opcod= e, @@ -6198,6 +6231,10 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeRequ= est *req) return nvme_dbbuf_config(n, req); case NVME_ADM_CMD_FORMAT_NVM: return nvme_format(n, req); + case NVME_ADM_CMD_DIRECTIVE_SEND: + return nvme_directive_send(n, req); + case NVME_ADM_CMD_DIRECTIVE_RECV: + return nvme_directive_receive(n, req); default: assert(false); } @@ -7454,7 +7491,8 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) id->mdts =3D n->params.mdts; id->ver =3D cpu_to_le32(NVME_SPEC_VER); id->oacs =3D - cpu_to_le16(NVME_OACS_NS_MGMT | NVME_OACS_FORMAT | NVME_OACS_DBBUF= ); + cpu_to_le16(NVME_OACS_NS_MGMT | NVME_OACS_FORMAT | NVME_OACS_DBBUF= | + NVME_OACS_DIRECTIVES); id->cntrltype =3D 0x1; =20 /* diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h index a88e0dea5c83..e489830478ee 100644 --- a/hw/nvme/nvme.h +++ b/hw/nvme/nvme.h @@ -345,7 +345,9 @@ static inline const char *nvme_adm_opc_str(uint8_t opc) case NVME_ADM_CMD_GET_FEATURES: return "NVME_ADM_CMD_GET_FEATURES"; case NVME_ADM_CMD_ASYNC_EV_REQ: return "NVME_ADM_CMD_ASYNC_EV_REQ"; case NVME_ADM_CMD_NS_ATTACHMENT: return "NVME_ADM_CMD_NS_ATTACHMENT= "; + case NVME_ADM_CMD_DIRECTIVE_SEND: return "NVME_ADM_CMD_DIRECTIVE_SEN= D"; case NVME_ADM_CMD_VIRT_MNGMT: return "NVME_ADM_CMD_VIRT_MNGMT"; + case NVME_ADM_CMD_DIRECTIVE_RECV: return "NVME_ADM_CMD_DIRECTIVE_REC= V"; case NVME_ADM_CMD_DBBUF_CONFIG: return "NVME_ADM_CMD_DBBUF_CONFIG"; case NVME_ADM_CMD_FORMAT_NVM: return "NVME_ADM_CMD_FORMAT_NVM"; default: return "NVME_ADM_CMD_UNKNOWN"; diff --git a/include/block/nvme.h b/include/block/nvme.h index 4abc1bbfa5b6..d463d0ef5fdc 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -613,7 +613,9 @@ enum NvmeAdminCommands { NVME_ADM_CMD_ACTIVATE_FW =3D 0x10, NVME_ADM_CMD_DOWNLOAD_FW =3D 0x11, NVME_ADM_CMD_NS_ATTACHMENT =3D 0x15, + NVME_ADM_CMD_DIRECTIVE_SEND =3D 0x19, NVME_ADM_CMD_VIRT_MNGMT =3D 0x1c, + NVME_ADM_CMD_DIRECTIVE_RECV =3D 0x1a, NVME_ADM_CMD_DBBUF_CONFIG =3D 0x7c, NVME_ADM_CMD_FORMAT_NVM =3D 0x80, NVME_ADM_CMD_SECURITY_SEND =3D 0x81, @@ -1161,11 +1163,12 @@ enum NvmeIdCtrlCtratt { }; =20 enum NvmeIdCtrlOacs { - NVME_OACS_SECURITY =3D 1 << 0, - NVME_OACS_FORMAT =3D 1 << 1, - NVME_OACS_FW =3D 1 << 2, - NVME_OACS_NS_MGMT =3D 1 << 3, - NVME_OACS_DBBUF =3D 1 << 8, + NVME_OACS_SECURITY =3D 1 << 0, + NVME_OACS_FORMAT =3D 1 << 1, + NVME_OACS_FW =3D 1 << 2, + NVME_OACS_NS_MGMT =3D 1 << 3, + NVME_OACS_DIRECTIVES =3D 1 << 5, + NVME_OACS_DBBUF =3D 1 << 8, }; =20 enum NvmeIdCtrlOncs { @@ -1644,6 +1647,27 @@ typedef enum NvmeVirtualResourceType { NVME_VIRT_RES_INTERRUPT =3D 0x01, } NvmeVirtualResourceType; =20 +typedef struct NvmeDirectiveIdentify { + uint8_t supported; + uint8_t unused1[31]; + uint8_t enabled; + uint8_t unused33[31]; + uint8_t rsvd64[4032]; +} NvmeDirectiveIdentify; + +enum NvmeDirective { + NVME_DIRECTIVE_SUPPORTED =3D 0x0, + NVME_DIRECTIVE_ENABLED =3D 0x1, +}; + +enum NvmeDirectiveTypes { + NVME_DIRECTIVE_IDENTIFY =3D 0x0, +}; + +enum NvmeDirectiveOperations { + NVME_DIRECTIVE_RETURN_PARAMS =3D 0x1, +}; + static inline void _nvme_check_size(void) { QEMU_BUILD_BUG_ON(sizeof(NvmeBar) !=3D 4096); @@ -1683,5 +1707,6 @@ static inline void _nvme_check_size(void) QEMU_BUILD_BUG_ON(sizeof(NvmeSecCtrlEntry) !=3D 32); QEMU_BUILD_BUG_ON(sizeof(NvmeSecCtrlList) !=3D 4096); QEMU_BUILD_BUG_ON(sizeof(NvmeEndGrpLog) !=3D 512); + QEMU_BUILD_BUG_ON(sizeof(NvmeDirectiveIdentify) !=3D 4096); } #endif --=20 2.39.2