From nobody Tue Aug 27 01:06:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wt8WR0T6wz5TjNT; Tue, 27 Aug 2024 01:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wt8WQ5zZlz4lXq; Tue, 27 Aug 2024 01:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724720786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ourddm0P6v8x53oOjZad8j7YceyPjIqS/uHFOlg5Zfk=; b=rUE+tAzUAGNy2iKzUzK0X5m3NFvGBXuhzYSGyqtFLW99+AdUg6+ILs+Y7a5HuKfHlcWOGR JXM3jzvqG04jMBGKVVNQ/yiGw/8nPsfHa7vAXDoZv+cIb27w6YIMTKnB5U8ZsX0Hggp+un Si7F+HbOGwrlcAlIgxtgs6mGZpHAfn+u+V/7FLnEe3L5MjNrYNXLqAL0WPiFN/fSK68Orc JYhmoyaPM+7EEL/v2aXG3+Y3bfZZYD179jqmDkedhBlkPCkA42Pbs3TI1RwgUDwsp/rRRR r+5oN7ItUx4ww6xH6ZucmrvoSEIzfySE2Rieqj8CWIX8vjQ1+kPwanuiQFmJ3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724720786; a=rsa-sha256; cv=none; b=YkeOl5bOaDob6H64qE4Gr8DwOB7PYDyHQs3ImouA+xl5CKJ7bBN4f9c7s+thMvw8YKsboF PX4AZx/GwQ4w3ScKmBPCEPVqkjRsRr4Mokov+h5iokGAA2r98Zevjrtr2JD1FGU03UwjMY IcOo9EuScQdNNMGHI9ioeqouk49KVvC/sbhe/Z+EaOWJ2VmDoddvAiJ7lz4DzYPPgUQ+af +q6f+Mk0aPySxLWNGkWeHw9bDMMQp0C/oW680650QekIP+nOJfHxrzEPHN0VfsXLIx9yx2 O4WT+q6X2NxJWWLKgDW2BcA4YN38gLJyjI9Gnn6BHm3xQuqiis1AUg2fbC0Ddw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724720786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ourddm0P6v8x53oOjZad8j7YceyPjIqS/uHFOlg5Zfk=; b=tGgpcs68OUP2pMbfoV5SUpHMl/g/nQZ24TpaKjXWKhNt3wR1MPC0Sbru4+JHwtF6v/TrEj dYNPekL1GtvAYBTk8sZYpB+Qi0TuLqK+ps+rMt8aS5hC3u2cu2NNHJU7C9qnPXDuDSUvPE aXkO3nIlZ846xgEPvc0u7B+QZmCKHhH9mXu3/gfbGi7Ymv4m81AdkA1hPEiOImPuHhzCBb CYb3mUkwbNxvKknQUsBMHDaw9JrA0gjdYLX6pn9VCB4S3YIeoMIWiq/VdERYKzNITJtgqf 4wE3r8N9wv9vI6K+H7UUny/ZrLsXZIIhT5qVGG/uNTv7nINxIae+G8AllkTOsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wt8WQ4hBVzTfd; Tue, 27 Aug 2024 01:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47R16Qib056483; Tue, 27 Aug 2024 01:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47R16Q1t056480; Tue, 27 Aug 2024 01:06:26 GMT (envelope-from git) Date: Tue, 27 Aug 2024 01:06:26 GMT Message-Id: <202408270106.47R16Q1t056480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: da548abbc35c - stable/14 - nvme: Add constants for the PSDT field in cdw0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: da548abbc35c86d4f504c5392ce79ec1c67bd432 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=da548abbc35c86d4f504c5392ce79ec1c67bd432 commit da548abbc35c86d4f504c5392ce79ec1c67bd432 Author: John Baldwin AuthorDate: 2024-03-23 00:23:24 +0000 Commit: John Baldwin CommitDate: 2024-08-26 18:27:36 +0000 nvme: Add constants for the PSDT field in cdw0 This is not used in nvme(4) but is used in NVMe over Fabrics transports which use SGLs to describe buffers instead of PRPs. While here, adjust the shift value for the FUSE field to be relative to the 'fuse' member of 'struct nvme_command'. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44443 (cherry picked from commit b8cb8dd3625d7396ea98152d89e1e64b16e77bc6) --- sys/dev/nvme/nvme.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index f00090731dff..04eec1ff0917 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -211,9 +211,18 @@ /* Command field definitions */ -#define NVME_CMD_FUSE_SHIFT (8) +#define NVME_CMD_FUSE_SHIFT (0) #define NVME_CMD_FUSE_MASK (0x3) +enum nvme_psdt { + NVME_PSDT_PRP = 0x0, + NVME_PSDT_SGL = 0x1, + NVME_PSDT_SGL_MPTR = 0x2 +}; +#define NVME_CMD_PSDT_SHIFT (6) +#define NVME_CMD_PSDT_MASK (0x3) + + #define NVME_STATUS_P_SHIFT (0) #define NVME_STATUS_P_MASK (0x1) #define NVME_STATUS_SC_SHIFT (1)