From nobody Sat Mar 23 00:25:40 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 4V1g2r5D3lz5Fl8x; Sat, 23 Mar 2024 00:25:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1g2r3dq9z4Yrh; Sat, 23 Mar 2024 00:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153540; 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=JUAmeU6OAJKcG+A9OTNQbiEePY8grBOSPfDpGfbvE0M=; b=KSJq1BYNr8dFf+HWNwN+HhViyR7PhG1ASvN2z4rYr7VNuu1hx6Q+ktxCf808/FfifUUMlv ki0IgoV1nLOWkX0Nu744mPFivNw+BBA+vcZZvOOeZZ7k77k/cO+/pa9vhpW9kKfcC6tclI byj/Bv57Ep2cKK6wbN8NsBgV5YhSB2VkS399PjaMOwebViIev75fPQjgPkIB8nrSUpw8Ch CQoBsrhTMWT3xai9e0hY9IaLZ1zp+r+dNK2DBc+H+lztc7Lt8WEJ4/uFkWjtGwvD0UdinP rdErQP1led26bUm58PCE0ouYxm8FlJmG28djpduS7GdhZuMMVaw7rysFzX7r2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711153540; a=rsa-sha256; cv=none; b=xdna2czhV6khpC+F0WRJqDLWDhJN8yy/6uweTD6VIqc350zgKU0NnjJZmQA4zF3UgiWj/Z hIxggnMdJ4qQu5o7jRAKLaw6Z85UjJL95aYW6I0I8tgDhUSA9THX8zMZyFis+aq/SEjDgV k8NqWX9UC1u8/g0g/1oVKrberJb4A7Ru7UdmS1gc96HfXeznwzTBTASuo0odzyWykYzdL7 CxZLGk84Vecy46pgIKRV2zkl5eQ9CtPyeTzB/tGdO6/xpExCDWdJL5UgyMputSIGOSvc26 vGcccNvU73Gn93gwlXa5lkVtRfAhCR8e/yx1DFdH9gqLJBRJAggfQva1xSlIKg== 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=1711153540; 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=JUAmeU6OAJKcG+A9OTNQbiEePY8grBOSPfDpGfbvE0M=; b=IO78q4k5FDlP7W9UcgPvSNWtI5EmZkM+2lL5S5rHYIC1bn0szxoHnMEJULfP8jthZKAETs qW1HTJ2CbDMgBP3Da9UHHy5v4Hq7h55gnnWKyib3Ct7hI7KZZUQgf1en9KdnaklRPe+biT ejlThkfKLiCsDducrCiRPB7KtTlPtm4wJNT7cvVkuEQDRCC3ctJy59e1n+msmzGjOzbzQi be9qoZ6uyHlzxv42mlR0q3i+0KkyE9aiqSgNcWj88AOn2aRV3afe2X+h3Pthn9R6VMwYoc 9H1Ey5T/1bIOgoC+TejCLdMgfmd0lDjP+tglyy+OfJSD7NgEHAlAeHN0aDcmdA== 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 4V1g2r3G2VzQgf; Sat, 23 Mar 2024 00:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42N0PeEa006064; Sat, 23 Mar 2024 00:25:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N0PeX8006061; Sat, 23 Mar 2024 00:25:40 GMT (envelope-from git) Date: Sat, 23 Mar 2024 00:25:40 GMT Message-Id: <202403230025.42N0PeX8006061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 21d3a84db481 - main - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 21d3a84db481e84cf240f6802b1a4110854eaec5 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=21d3a84db481e84cf240f6802b1a4110854eaec5 commit 21d3a84db481e84cf240f6802b1a4110854eaec5 Author: John Baldwin AuthorDate: 2024-03-23 00:24:52 +0000 Commit: John Baldwin CommitDate: 2024-03-23 00:24:52 +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 --- 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 8e99cb7b5356..46956d5f54cf 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1350,7 +1350,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]; @@ -2067,6 +2073,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