From nobody Tue Aug 27 01:06:32 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 4Wt8WX62kWz5TjGv; Tue, 27 Aug 2024 01:06:32 +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 4Wt8WX487lz4lWd; Tue, 27 Aug 2024 01:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724720792; 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=3Pa08BDywduvMqANJsOShy90z0pfUHGcLNaX+D3CNkU=; b=fpYGoSHGNZ2rFY+/5wNU4hUQw6feSzaqpXtukLVizgtjS5aXvPOovjFs/Z3wkZxuJFNCUB ta8/MR3eT4BIfOuBUdcETy7xCEoisq1N6zrJ1MeqbKvasK3T2fxQF7eiDhKdMjFm1voes2 cNHXTmET4h/uI+Z3DYRDBXZGuz4BAPUX4WSVq0oim3zGKkHXenbJB4AkZX1U9ajEqoVh7K UUbze1dhbxIcwu4x22BXhkAJpuAZ1gJXdvrNPey/6cJH2pP1NAC8wTpw8XwGZkUHA27flr 1uRJpEPDcFhwpi/4MmelNvz5kue4Mxwr10GM+SBSLJsNBvoCVVcEs2q2NLRZdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724720792; a=rsa-sha256; cv=none; b=qEzTTfskeht0FPhohaQ7oDUEdJ42iJMcsRkwUXx9Gte5zmACqb/pWFvxbZsSbMV4/QVExn 2ebwU5zjPWDG2O2/EiEFGFyhQAxYWJMpx91hwZnDpGuPt1HQ8HChxFT4oQ/7teyFpOVkfC 9xqwpbX5yg1wgrifmuevKCcZ81YjJ9pCPivnLJzwvhN/Xfpk6n/rPd70UTfHjuaRcZrIHs E9KmV3YWe5JmDyfgtlos+klrReLytKrMH7mZOJPTUkuH3FYWw0hNCnDNyJFdOGaV6a30Ft YmBtPqnlv2KfBGB6PEoOLdsEhR0C2K3j6NL48PYzAMLD79005hq8J1b5Psrgrg== 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=1724720792; 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=3Pa08BDywduvMqANJsOShy90z0pfUHGcLNaX+D3CNkU=; b=jpcy5l5qvIjaiULmrXrF5Bkn5P50hQ4ZiBTa1QsZRcrkuMTYLNjUZUUDOd+XBF1YBuNRaP 80pZofrtbsoHBFp78TyA3E3plDx+FlwdTiVIku4JZyhjyZa4nOoREX6CQD1r51YiLPRkda zU/I2iJ6/KrML8haDFI5Xp6bDxEk4JftKUsL/Gnwgc9YnNMEF5yaVRXYfOiJ02WYEBAbkj xHUHmZha9JTAh1/URBiKGptNNVlucWa5I4rIr8YOKE1Pgf3OlZpIujxNlX0HgPQg4CzUm1 XLH0sVM1iOWgw5Qp4vSEEJqlLtfrWn0XAxDS5o6t4OfvNWmFn5ggH9cv10kt2Q== 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 4Wt8WX2zS2zT9V; Tue, 27 Aug 2024 01:06:32 +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 47R16Wjs056778; Tue, 27 Aug 2024 01:06:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47R16W0G056775; Tue, 27 Aug 2024 01:06:32 GMT (envelope-from git) Date: Tue, 27 Aug 2024 01:06:32 GMT Message-Id: <202408270106.47R16W0G056775@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: 46c77392cbfc - stable/14 - nvme: Add NVMe over Fabrics fields to nvme_controller_data 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: 46c77392cbfcccad947f6a7945431956f03acb6a Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=46c77392cbfcccad947f6a7945431956f03acb6a commit 46c77392cbfcccad947f6a7945431956f03acb6a Author: John Baldwin AuthorDate: 2024-03-23 00:24:52 +0000 Commit: John Baldwin CommitDate: 2024-08-26 18:31:00 +0000 nvme: Add NVMe over Fabrics fields to nvme_controller_data Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44448 (cherry picked from commit 21d3a84db481e84cf240f6802b1a4110854eaec5) --- sys/dev/nvme/nvme.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 6317c65ec9cd..cceafc743519 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1349,7 +1349,13 @@ struct nvme_controller_data { uint8_t reserved8[768]; /* bytes 1792-2047: NVMe over Fabrics specification */ - uint8_t reserved9[256]; + uint32_t ioccsz; + uint32_t iorcsz; + uint16_t icdoff; + uint8_t fcatt; + uint8_t msdbd; + uint16_t ofcs; + uint8_t reserved9[242]; /* bytes 2048-3071: power state descriptors */ struct nvme_power_state power_state[32]; @@ -2066,6 +2072,10 @@ void nvme_controller_data_swapbytes(struct nvme_controller_data *s __unused) s->acwu = le16toh(s->acwu); s->sgls = le32toh(s->sgls); s->mnan = le32toh(s->mnan); + s->ioccsz = le32toh(s->ioccsz); + s->iorcsz = le32toh(s->iorcsz); + s->icdoff = le16toh(s->icdoff); + s->ofcs = le16toh(s->ofcs); for (i = 0; i < 32; i++) nvme_power_state_swapbytes(&s->power_state[i]); #endif