From nobody Wed Feb 18 15:16:01 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 4fGKpT2m0Rz6SL8M for ; Wed, 18 Feb 2026 15:16:01 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGKpT1v6Cz3xCH for ; Wed, 18 Feb 2026 15:16:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771427761; 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=D7novWErdb/bDADbd57VcWcuJRmyxCC3fn5KkB1oM64=; b=FARh2fTfDVJpri/2Io98e0nOMo7tLLNLz78jg0VRt+svRsVeHiVHnOSTYzba3vGazh8tn2 pw9zrdkQl8q3rIQP8gaujRpbWCMgdLeAfwJEzjvPvqDnrcR6Cqjx8rLPbCAEEQUfIN70c/ ar58P2EOypcI/tJZqReKlrl0EGQ4zaGrtKk20ECPSF0tcNDt6S79LPHxJhHl9MrEfyOIM8 xxXbmsaTM1m3ty8nwhCxUGwWo5HN4fkuy5/C/sSdW4ozn1Frg+nbfC/tp9w8K60weXxsmd rHOnIJQQq5jkJUsBUIntDQe3mCupR9KHEX2+d3lYCscH9iMNJtQDTg1oR5Nrug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771427761; a=rsa-sha256; cv=none; b=u0cV7qwvSy/PddrSRvj4xR9yZfaySTA+QKjFEKdN/AwYJkt+8D1FawhrWEQXl00b/0piWx fcp3R2Z/5pY2kjzsyva+96KPcD4jpRPUCQjM3CSjxLS4sKzmtXYS/czuob7k7LKX60oGTb DPeGGKO3LF4kCBtATThANW9YXH0/zE5poMnConKFNd7KKfDEV7WPbC8Blr5bWtsahqU+zw UJdvY8yGEg3ZeVhoeYugRus3CvkFFtXJAoAFhPKKcH6yXCxhffApOBTkIA+3R2n7owKP0P hqVMlWzCN8mpzin5YJpg3ILd2IaSraqC0B+BhXOpg74OWjNuJqwG/6GCo/sMJw== 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=1771427761; 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=D7novWErdb/bDADbd57VcWcuJRmyxCC3fn5KkB1oM64=; b=aZjhjDBw9I1P60SehEvYIfHAuIJAHqIrUtJ5isxCtZsp8qfLYZ5XrcOuyOh3ipz9NAqLtq qZMHZWyCe/TRs8/2UjiMOY9cXO2osZL6kHLy5AujzWzs+eqTnrXspaYMG1w2ZrCywcsBgC Z39TS/9nkzml7m92y+ED98Frj51DRG3mioY4DusNTHG0l5ESPN7gzadnzn7kM8WxfmghKG Fy9K/fUVhZ95se36hbTX6aB7kzM5IB6132Y0hMzKmV34z4ELid728EYSLm4MK4eMT9uf1e zBkE+7bFwN2oATWnp1y5SXVzhpmiqO6pI3NSLLyCjAEy85vbcSx0Z0FqHWG+3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGKpT1Sx7z11gd for ; Wed, 18 Feb 2026 15:16:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 235e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Feb 2026 15:16:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: bfb7c81f93b5 - main - nvmecontrol: Remove an incorrect use of PAGE_SIZE 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfb7c81f93b534f8c10928d80ea56c8177a6f39f Auto-Submitted: auto-generated Date: Wed, 18 Feb 2026 15:16:01 +0000 Message-Id: <6995d7b1.235e1.7f51839@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=bfb7c81f93b534f8c10928d80ea56c8177a6f39f commit bfb7c81f93b534f8c10928d80ea56c8177a6f39f Author: Andrew Turner AuthorDate: 2026-02-18 14:20:57 +0000 Commit: Andrew Turner CommitDate: 2026-02-18 15:15:41 +0000 nvmecontrol: Remove an incorrect use of PAGE_SIZE The mdts value is in terms of the nvme page size, not the host page size. On many architectures these are both 4k, however on arm64 it is possible to build a system with the host page size of 16k. Use NVME_MPS_SHIFT to get the correct nvme page shift. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55334 --- sbin/nvmecontrol/identify_ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c index 95ca4b5187d4..13b1d21ce97e 100644 --- a/sbin/nvmecontrol/identify_ext.c +++ b/sbin/nvmecontrol/identify_ext.c @@ -106,7 +106,7 @@ nvme_print_controller(struct nvme_controller_data *cdata) if (cdata->mdts == 0) printf("Unlimited\n"); else - printf("%ld bytes\n", PAGE_SIZE * (1L << cdata->mdts)); + printf("%ld bytes\n", 1L << (cdata->mdts + NVME_MPS_SHIFT)); printf("Sanitize Crypto Erase: %s\n", NVMEV(NVME_CTRLR_DATA_SANICAP_CES, cdata->sanicap) != 0 ? "Supported" : "Not Supported");