From nobody Thu Sep 24 14:20:34 2026 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 4hrGFt6yFyz6sT1T for ; Thu, 24 Sep 2026 14:20:34 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hrGFt471sz4Bnl for ; Thu, 24 Sep 2026 14:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790259634; 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=ZwqNHPwAxfdKLMg4Ksd7sKGphoR8a2raC1TBMEGwdWk=; b=nXTwje3z3Y4ufQp1OxMr8dug5+m7iOfvJwdudyc5qkpv2aoLJ3o7gb6LvYm/9M0A+mPNmb a1jIqwFKHt7LrnKl1Pwq5cO8zZNyNS2ew+PgHgOjxZTMa3krS6Et3q0YOjHUTcbizkrCnd CLOL+HHfzjPybW7EGlAqkXKSv6VjwmLlmSel8hvcPdRhPksjRya06z0V33i20dfLndfjUO xkwUWFYZIRyRIpqhZRbVfjQgHL/NGKP89k0V5JizEUcliAHuY6Px20o2bqlppK/fnK9J/0 H4y2ajBWExQkOu+0p7Quf/wEEqjEJzx4gxb7KjxcnSVbUsYxhEAZddUGhyaB7Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790259634; b=OvU13OAECWG8oSLhbpVa4SP6nnxT9QUK0b6rjQQ1EFaqJy/gzztifzm7TXUN4XofwzRX6D LDoT3TElZDegjoF8LwxmnFCWSc1BC7664WpoLG+Dlr2tVHOP7POFNud0Btpaoi2O5KjN4t Ou7i/AJgvJkud6b3gtOs15KIPUSnLo+8v2u/w3vZm0Mcusco3Vk5NRi8ZRe8IKCNtcMxmd tDET9r7y/yD/csVn+RC5NNM63RcjYUZWmRMwDVu9z4DqD63S2FCTyMECWVpK1fXi80DULj f3J/Mq186A18ng0i8bG7K6w0JD1YAuUvUq+PMs9MnaCJWHGwDFuiSfd5PBP1nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790259634; 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=ZwqNHPwAxfdKLMg4Ksd7sKGphoR8a2raC1TBMEGwdWk=; b=MO4VJKodKh4ZOhrNc9rll1WKlaM+E65CPOfeAkqvlQ1O8T5+qUuh9m2sdWJfke5/UYvxui mwxwOkMEfTupPdfUwUQBjjzYaKMDPrhjQurPZqkkZVlsMZWf71NFbRFl8LLTKVnL6o0HVr 4JZErraSRTVQ6yxlONfJH8w5uRN5AyRrdn057UMOSTNwU7nPO3049DrsdxinWwTYePzRK7 +XKwMBtPid+dKF10iGxnDGF2fdI9QZ0dZFcUclbur7WWnvTXNOGla7Ywta0+ItJkKwP6Wm SO1FUvNFAGU+WMtodxs3AX433LEgrXT5umLrtNGv9rv/AiHfkJ5i6wfAuZAdCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hrGFt2GtdzR5F for ; Thu, 24 Sep 2026 14:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b49f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 24 Sep 2026 14:20:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: b99595c9c7f8 - main - nvme: derive CC.CSS from CAP.CSS instead of hardcoding the NVM set 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b99595c9c7f8b3cee9973ed0dd9c1599a575c5f9 Auto-Submitted: auto-generated Date: Thu, 24 Sep 2026 14:20:34 +0000 Message-Id: <6ab531b2.3b49f.71c0de69@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=b99595c9c7f8b3cee9973ed0dd9c1599a575c5f9 commit b99595c9c7f8b3cee9973ed0dd9c1599a575c5f9 Author: Abdelkader Boudih AuthorDate: 2026-09-24 14:20:13 +0000 Commit: Abdelkader Boudih CommitDate: 2026-09-24 14:20:13 +0000 nvme: derive CC.CSS from CAP.CSS instead of hardcoding the NVM set CC.CSS was always writting zero, which is a reserved encoding on a controller that does not support the NVM command set. Select 111b on admin-only controllers and 110b when the I/O command set mechanism is available. Reviewed by: ngie, imp, adrian Differential Revision: https://reviews.freebsd.org/D59628 --- sys/dev/nvme/nvme.h | 9 +++++++++ sys/dev/nvme/nvme_ctrlr.c | 13 +++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 25e2bd67f258..f6ca0500ea75 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -103,6 +103,11 @@ struct sbuf; #define NVME_CAP_HI_REG_CSS_MASK (0xff) #define NVME_CAP_HI_REG_CSS_NVM_SHIFT (5) #define NVME_CAP_HI_REG_CSS_NVM_MASK (0x1) + +/* CAP.CSS command set support flags */ +#define NVME_CAP_CSS_NVM (0x01) +#define NVME_CAP_CSS_IOCSS (0x40) +#define NVME_CAP_CSS_NOIOCSS (0x80) #define NVME_CAP_HI_REG_BPS_SHIFT (13) #define NVME_CAP_HI_REG_BPS_MASK (0x1) #define NVME_CAP_HI_REG_CPS_SHIFT (14) @@ -152,6 +157,10 @@ struct sbuf; #define NVME_CC_REG_EN_MASK (0x1) #define NVME_CC_REG_CSS_SHIFT (4) #define NVME_CC_REG_CSS_MASK (0x7) +/* CC.CSS values */ +#define NVME_CC_CSS_NVM (0x0) +#define NVME_CC_CSS_IOCSS (0x6) +#define NVME_CC_CSS_ADMIN (0x7) #define NVME_CC_REG_MPS_SHIFT (7) #define NVME_CC_REG_MPS_MASK (0xF) #define NVME_CC_REG_AMS_SHIFT (11) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 6d2749b90b20..ae98482fecbd 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -363,7 +363,7 @@ nvme_ctrlr_enable(struct nvme_controller *ctrlr) uint32_t csts; uint32_t aqa; uint32_t qsize; - uint8_t en, rdy; + uint8_t css, en, rdy; int err; cc = nvme_mmio_read_4(ctrlr, cc); @@ -400,7 +400,16 @@ nvme_ctrlr_enable(struct nvme_controller *ctrlr) /* Initialization values for CC */ cc = 0; cc |= NVMEF(NVME_CC_REG_EN, 1); - cc |= NVMEF(NVME_CC_REG_CSS, 0); + /* No CSI support; prefer the NVM command set when present. */ + css = NVME_CAP_HI_CSS(ctrlr->cap_hi); + if ((css & NVME_CAP_CSS_NVM) != 0) + cc |= NVMEF(NVME_CC_REG_CSS, NVME_CC_CSS_NVM); + else if ((css & NVME_CAP_CSS_NOIOCSS) != 0) + cc |= NVMEF(NVME_CC_REG_CSS, NVME_CC_CSS_ADMIN); + else if ((css & NVME_CAP_CSS_IOCSS) != 0) + cc |= NVMEF(NVME_CC_REG_CSS, NVME_CC_CSS_IOCSS); + else + cc |= NVMEF(NVME_CC_REG_CSS, NVME_CC_CSS_NVM); cc |= NVMEF(NVME_CC_REG_AMS, 0); cc |= NVMEF(NVME_CC_REG_SHN, 0); cc |= NVMEF(NVME_CC_REG_IOSQES, ctrlr->io_sqes);