From nobody Mon Nov 16 21:01:09 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 4jT0df4Rx1z70wjt for ; Mon, 16 Nov 2026 21:01:10 +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 4jT0dd6zDsz4D3r for ; Mon, 16 Nov 2026 21:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862870; 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=C427NwB5AtW2yIQjxixMCc1Ziu2lZZqm+I6sFA2mjBo=; b=tiAv++Xkil6jVrXsCvrxvjXiAFO6lK68lQy7wYWiVwEiTkVgycbwFXATkeq3YJFne7gIsx uNGV/8iyoww793xSGJUhNIFOghmknwPOnYSqYd2zLHcO17+DZVPNFeppfDEZ5Gny2iA94P cPW5IjnoiOD5LLsxQGDsUorx7pAECL+KeoYS3wbcvZsBH6EX4ZDN5GSDPmMHi/eKxAOQTs Xaa753O34vqnPbt38ETvzP6210eTFhVvyKeDXY/OdCy16rszXjFq0t9regBqH35qOgG7S8 KZl48h2usQTowZIat9K4FCY1PW7gn7Nci32/U0f+DGnMK79nqdQfRboUi0I+WQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794862870; b=adqLc8CSpLTN2UR+P8EhE23UcOPjEMlIGcIQBEIDPLlICGibH7R7NY4N0pWT+1rE3EMbUi tOCSPt3mhtcXMsaE0B2z+N3QmkudnR+ilTijkM0mFGoBo74tT8ASoi6BAzrfW+onXg+dcl 5wL0DFmVQXawcGusPQHqld+GWEOC0t3laLrAZJPSJn5UFSrnSUlrOw7s+htPNdcksdAjfF Czp/qWlYfwscj1ulH8NesPW4gotV5+eHAzEhDutcN5XKuZpMMkezBoUnFt/E+6loUiQwUt 8nIHw/rUDHaIfkCSIZCM/F+ExYyO9N8ctQJV9+efiBeQobAwuGghtzq+kGpekg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794862870; 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=C427NwB5AtW2yIQjxixMCc1Ziu2lZZqm+I6sFA2mjBo=; b=buGy798P04FvtYjwjI681WKM1nkU9+I5iK5MQcAyqjHMENqs0x8KVLYO1EmfpEeIvmbb92 IxE5RNsptJFOVUM+P3JAaFynCgpt/jgV4iK+yn6XpsQsY4pRJwOnLXO4M9h+6jnpQ15Mnt uHiSEL6xVPFARUupvT0l4+wCjjVx2N3hpeRhWqokWs6DbLezoSC0k6IsffWVxqL41BviaT 718M+PdHGFXddUIS/96k+5rLZz0RZYjRkKkuAJ1tylBYCeeRYAGj0iH9RQjtLtsP0slfIk UgudGrLUU9vzUWxMN2HQIi1ML3gC3cpZ0unp+2zUPXfsS5JeLLJ63Ztu9NWG5g== 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 4jT0dd6RHWz19cG for ; Mon, 16 Nov 2026 21:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 803a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 21:01:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: bcf4600a0c0b - stable/14 - nvme: Restore the host memory buffer size calculation 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: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bcf4600a0c0beaaf66090d0aa8fe16269e372889 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 21:01:09 +0000 Message-Id: <6afb6f15.803a.aca0587@gitrepo.freebsd.org> The branch stable/14 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=bcf4600a0c0beaaf66090d0aa8fe16269e372889 commit bcf4600a0c0beaaf66090d0aa8fe16269e372889 Author: Kenneth D. Merry AuthorDate: 2026-11-09 18:46:59 +0000 Commit: Kenneth D. Merry CommitDate: 2026-11-16 21:00:06 +0000 nvme: Restore the host memory buffer size calculation When the nvme_ctrlr_cmd_set_feature() call in nvme_ctrlr_hmb_enable() was rewritten for the widened Set Features API, the HSIZE calculation reverted to dividing by a hard coded 4096 instead of the controller page size, undoing commit 3740a8db13ba. The Host Memory Buffer Size field is in units of the current memory page size (CC.MPS), so the wrong size would be programmed on controllers configured with a page size other than 4KB. Reported by: llm-postcr Fixes: 7a9e4375316b MFC after: 1 week Sponsored by: Spectra Logic Co-authored-by: Claude Fable 5 (cherry picked from commit f262bdcf24f1f946edcd01f5eb5dfa2910da9e7b) --- sys/dev/nvme/nvme_ctrlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 2f593ed7abaf..414b7041870b 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1057,7 +1057,7 @@ nvme_ctrlr_hmb_enable(struct nvme_controller *ctrlr, bool enable, bool memret) cdw11 |= 2; status.done = 0; nvme_ctrlr_cmd_set_feature(ctrlr, 0, 0, NVME_FEAT_HOST_MEMORY_BUFFER, - cdw11, ctrlr->hmb_nchunks * ctrlr->hmb_chunk / 4096, + cdw11, ctrlr->hmb_nchunks * ctrlr->hmb_chunk / ctrlr->page_size, ctrlr->hmb_desc_paddr, ctrlr->hmb_desc_paddr >> 32, ctrlr->hmb_nchunks, NULL, 0, nvme_completion_poll_cb, &status); nvme_completion_poll(&status);