From nobody Fri Oct 10 00:21:11 2025 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 4cjS8S3CGWz6CNbH; Fri, 10 Oct 2025 00:21:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjS8R5hBQz41Qy; Fri, 10 Oct 2025 00:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760055671; 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=dccBdGpnmNnos8YXPSE8LQ5yfTjWoK/ra7Luu9j9Vss=; b=UhkPWhQ0Ww4NlGwynd1THIHgCnkG/DNgvnNmDtROLrKGqmBdVjZKtxWBK3iTeG/mioFoX8 1Ew1gHQRLUe676rc72Cl3vW025jP19dD2J1B2xDHhSU3tVdxfdXKuOwMc7QxXsZC3RYxLN 4o3YTJ59AkTjeYfReHBOVPs65qjvgXSVNz+btRos+jd6viy0bOnAfy6pp31hBvnuF3GB6b bBUhSA+BuO/NWNVqlnaR2OyLuOe0OYjf5X3HwD2DV9dDTYfVAMZvlE7tErv6gLqYtNDjwU AZuGV0ocfybrJCGLJtSCDFVlLfnXw7MTJz+M5YDDq1idlMxVt4T4J+gU0CTP2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760055671; 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=dccBdGpnmNnos8YXPSE8LQ5yfTjWoK/ra7Luu9j9Vss=; b=PKUbz2zB0pGRD3tv22cbTO1RM9de2JmBrF6olyfPOiM3zJewx4tuKJpw2G7l8jRuCvdYCg mEnfPZ7iJS+pk+0Dp8pM94gZvr1sytEleOxItZrzh+E9lFArtQuTIyr7hYob8uLFJZv1Ij b/lBmMCyGcxChsI1XjWdfl3ATNynm95JsAzp6qaFHBi4MJqIav3AEUujmxU5aHPhfitP2R 4sZY5eQAEyWmIAfAbS4hH5SBSuluzTHyECAqS4ci5XKVjzUQXTuiE/Q513WZYLyEEXqN7v AE4hcQyPmo2t5tZnpzra5TOnF27ZHyH+/sWdWpmsKNnfthYZX+yDOqnnuZCoMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760055671; a=rsa-sha256; cv=none; b=HZAxvzDXKfNnwPQoP2cQauJ0zsnm8/L9bqDSoEi1heWwHqfZhJUUP76q6PL40QMQkO67RZ MrsUKN81mBXH8YGL9q1/WdZVuTB6ZqZZGRH+FmS6brUeyMfJyNn09GVcjRR1rU6XQnmZ3E VRcnz0HFKW8CNWzDPrrrjMdSXly4O4r/Z7mick34pUujLbY1VFEDULlm9aB34qYeU+c3wW Kzx2U4oVgNPPTUqP6WNw8lBFZdBBgnZXo2oZQLfs0yUjiXash1ZEw5f3J05PkI94i2+uNS 78t05XRSJAd+IVJ2Aaa5/+rkkbqxy/T8PeVCII2fs32BTaVQs+bVYSBF4SHJMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cjS8R54mVzgrS; Fri, 10 Oct 2025 00:21:11 +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 59A0LBGV001970; Fri, 10 Oct 2025 00:21:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59A0LBYG001967; Fri, 10 Oct 2025 00:21:11 GMT (envelope-from git) Date: Fri, 10 Oct 2025 00:21:11 GMT Message-Id: <202510100021.59A0LBYG001967@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 53825afc5dd1 - main - nvme: There's 64 LBAF descriptors, not 16 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53825afc5dd13f3d16c3db6727260d7184bcd581 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=53825afc5dd13f3d16c3db6727260d7184bcd581 commit 53825afc5dd13f3d16c3db6727260d7184bcd581 Author: Warner Losh AuthorDate: 2025-10-10 00:16:47 +0000 Commit: Warner Losh CommitDate: 2025-10-10 00:19:04 +0000 nvme: There's 64 LBAF descriptors, not 16 Older versions of the standard were limited to 16, but the actual limit is 64. Bump the limit to 64. This should be a #define, but there's no good standardized name, so I'm punting on that. All the places that use it, apart from the byte swapping code, do the right thing and use the nlbaf field to limit what to access. Sponsored by: Netflix --- sys/dev/nvme/nvme.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 17c5cdb4db87..57cb37907e65 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1507,9 +1507,7 @@ struct nvme_namespace_data { uint8_t eui64[8]; /** lba format support */ - uint32_t lbaf[16]; - - uint8_t reserved7[192]; + uint32_t lbaf[64]; uint8_t vendor_specific[3712]; } __packed __aligned(4); @@ -2175,7 +2173,7 @@ void nvme_namespace_data_swapbytes(struct nvme_namespace_data *s __unused) s->anagrpid = le32toh(s->anagrpid); s->nvmsetid = le16toh(s->nvmsetid); s->endgid = le16toh(s->endgid); - for (i = 0; i < 16; i++) + for (i = 0; i < 64; i++) s->lbaf[i] = le32toh(s->lbaf[i]); #endif }