From nobody Wed Nov 11 20:54: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 4jPwkL5c7qz6xnGy for ; Wed, 11 Nov 2026 20:54: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPwkL4c5mz4SSM for ; Wed, 11 Nov 2026 20:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794430474; 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=1Qx17CwFnHVa5md2BJ9dV7lrA3jUpozFlgSz70YA4gA=; b=rHLEwhoA0DUpDWnJrcugzI/466aGt9Q1yXq59N5XLD3gYoRhtDaUbOAtedeHPq2sDZ9bGr K79thCTHzYUoFN+DwWPhxJ66BdCVaPXimpB7bn0P7Nvos0LpNjFK3TW33w3m9o1DkRg/Xi V6tohQeYBx/kqQ/cSv4GQ531lyAAD0GQryCbeJQwZD5FUvkwOOTMm+kCFKiZOTx+QW1GWX 4lXLaEKGH3vUVKTQQVdXKfQIA9H3kzLtmhtoJni57RWKPaT6phXvhyUolbK6ecv7OVEgih JBPtrANkNeuAGXsOI/QK/US4AP/jbd5IcdHP5Tmt4js50zJikgmu2xHWiwF3ww== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794430474; b=LbgXOD5kJQM4QpAqxEbUOej//bOS+X5O4tSOpcPZi3RWH/6pa9jTFa6zGWhp0IkfjeaD66 byI+UBkQEmX5lizhnyQVVt8gY/pwHAQY3pYzxomtOJV+oUujnc9gCDpXFWOGIzsTn/euNw eYV9RAm+g2+SdkU0C6CBc6K62g6XMXqEzdST34pbtqzQfKyTzpEBhdLVvN0V5IRaInHdFc ekR7lexoPHEoECL2wlwILlGKyVhMoBMW/GoiOPdKtMGAGUQjhk8Y7beYNtKhdQVsS/qo3Q axYZhoYHiInN4STJsP0qSt8+jWZ/SWAGZRR2w5JpbC5tNavslqWPLKd0Os8yHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794430474; 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=1Qx17CwFnHVa5md2BJ9dV7lrA3jUpozFlgSz70YA4gA=; b=k5bGBXC+9Tr21i3T4FAz5O6B/++Eipa+e33QwGj0rkr9lpO0BWNm9gGOJTu5UORkOqggUD bk6ZY+pV3uCm6kL6GR6i8PwUWGo01dyKXMUPvZXHZxwvblLLntjd86XVkHX9UV6rH2CPDn xabbB7FBlavaK+yB75tkmTatCOliJbJMV3VSBjz8/kfecUr0gl0btC+rrqngubEThlfcXo NLVaacjUboHQ5PAn6ltyC/MsHCQOraYsoI0/JzDUllTXq5MSgh++vDsjczLxzML6g7/uM3 wOmt9vNAaRMuWWC40HcOPHy1xQiV0UtZbYrsEQNF0IxUReUe6ARm6hP4ifBIGw== 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 4jPwkL3yZfzVrH for ; Wed, 11 Nov 2026 20:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 100af by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 20:54:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: bd1bd0ba5540 - main - nvme: honor CRTO for the controller ready timeout List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: bd1bd0ba5540f773a21c6fc6c8949bd198e7ed9a Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 20:54:34 +0000 Message-Id: <6af4d60a.100af.30b0dbd5@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=bd1bd0ba5540f773a21c6fc6c8949bd198e7ed9a commit bd1bd0ba5540f773a21c6fc6c8949bd198e7ed9a Author: Abdelkader Boudih AuthorDate: 2026-11-11 20:54:01 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-11 20:54:01 +0000 nvme: honor CRTO for the controller ready timeout CAP.TO is a 8b field and saturate at 127.5 seconds; a controller that needs longer reports the real worst case in CRTO.CRWMT. Waiting only CAP.TO can reset a controller that is still within its declared recovery time after e.g. an abrupt shutdown. Taking the larger of CRTO.CRWMT and CAP.TO when CAP.CRWMS show CRTO support. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D59631 --- sys/dev/nvme/nvme.h | 10 ++++++++++ sys/dev/nvme/nvme_ctrlr.c | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index ee39a101f48c..48bd5a10a93e 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -195,6 +195,16 @@ struct sbuf; #define NVME_AQA_REG_ACQS_SHIFT (16) #define NVME_AQA_REG_ACQS_MASK (0xFFF) +#define NVME_CRTO_REG_CRWMT_SHIFT (0) +#define NVME_CRTO_REG_CRWMT_MASK (0xFFFF) +#define NVME_CRTO_REG_CRIMT_SHIFT (16) +#define NVME_CRTO_REG_CRIMT_MASK (0xFFFF) + +#define NVME_CRTO_CRWMT(x) \ + NVMEV(NVME_CRTO_REG_CRWMT, x) +#define NVME_CRTO_CRIMT(x) \ + NVMEV(NVME_CRTO_REG_CRIMT, x) + #define NVME_PMRCAP_REG_RDS_SHIFT (3) #define NVME_PMRCAP_REG_RDS_MASK (0x1) #define NVME_PMRCAP_REG_WDS_SHIFT (4) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 11c09efc684f..b70ae561c833 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1828,7 +1828,7 @@ nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev) struct make_dev_args md_args; uint32_t cap_lo; uint32_t cap_hi; - uint32_t to, vs, pmrcap; + uint32_t crto, to, vs, pmrcap; int status, timeout_period; ctrlr->dev = dev; @@ -1891,7 +1891,11 @@ nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev) ctrlr->page_size = 1 << (NVME_MPS_SHIFT + ctrlr->mps); /* Get ready timeout value from controller, in units of 500ms. */ - to = NVME_CAP_LO_TO(cap_lo) + 1; + if (NVME_CAP_HI_CRWMS(cap_hi)) { + crto = nvme_mmio_read_4(ctrlr, crto); + to = max(NVME_CRTO_CRWMT(crto), NVME_CAP_LO_TO(cap_lo)) + 1; + } else + to = NVME_CAP_LO_TO(cap_lo) + 1; ctrlr->ready_timeout_in_ms = to * 500; timeout_period = NVME_ADMIN_TIMEOUT_PERIOD;