From nobody Wed Apr 8 14:01:36 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 4frPr13Dpgz6YB4k for ; Wed, 08 Apr 2026 14:01:37 +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 4frPr05FLnz3gCQ for ; Wed, 08 Apr 2026 14:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775656896; 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=8+X9iGDffmfioKfy9SFGrazyw6ZLeNKIn+4AYP3HA8U=; b=kFoojgFt53OPKvY3AhakPgnb4Qk2m2B5S8zbgYYh95Gc78sG2UOyfw4EF2pUWR1SF/kGSA UrRrgY+8+pc0JM8DyNid7Zq9XOPZTT5qUlRtiPrJ9xWJLOqzB4iBORY55eGvwRBSXTOzh0 MFU3YKaNBGKUEGpyo3CpOJP177E94klQRKYoW2fJLHjtQU4WkmD484ghjH3wjaJlUhgyV+ 2zHBYWwf8Gr838PpCnSi13jRijb/VUuI63Cy58SaszjoFjB/dKcI/hTviFjx6w+QOMIL38 fy3dJv0MnkYmfAduE0G7n/ywGvuQTvBEwKL/4saOYAMyYVGT5SODi8JsdNSWTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775656896; a=rsa-sha256; cv=none; b=S/dY8+XviMBEEtt5GWC/ohAeynMEoTYJjN+11IP6XKmhP4xq96g7eL4zL3TtmI+rrzjXjW 5fdn/zuVAz0MSPrUrZCJlo7IxjFUiBBxHGU6b6opMa66Os/Lg1mOjtJZzPdWd6Iod1pbp6 OUaIRSPbsgNa5vG/k3C7bOQgs/OVx+Jo19G0boik8fT6U0xYx9OI8thTCxXPAa8XG5IPE5 5kLILzR5aPNKUM6zCxVfxc8bHdzfGg5+T2VAhslMAoxG0hNChb1NbP9WuSb4k1J7Dk8+XS KjAdjScfEua4/ZhwIvdJWDm/E+ZYhkbZVCHRCID0YV6n5nROiOUPHiuUmbg8hA== 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=1775656896; 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=8+X9iGDffmfioKfy9SFGrazyw6ZLeNKIn+4AYP3HA8U=; b=dVL49/K26q+JVmyrrrX5uNenpczfEXuJlJT6lE7J4Gx/CeSMkqDlY/5KMr836LonlF+tk3 C/Q3kaRsbQfpwq8R8ewzUXyLEjxgDgZ32xPmAky8ws5rEGMpodwpEoej6PF/6eB2PG7cm1 dcmfEa7kmH9DcPuhXsAIvuCQFah6tXwH3AfZCzRmZHk0UXN8AEH8M9KyEvAxe73E4wtOC3 cNeFH2LipkyM0RZsjxt2nxS8SzzYufZdBSTY36PGdnNv48jDTquF1ZjcV3k1ZL3njjLK1L xaFym+54idd61+sD82Ebpo8Z6MnEVqYbVXMxQSpdMPNMp5ocvxyMSdjsr8QkiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPr04XDczDJC for ; Wed, 08 Apr 2026 14:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bd28 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:01:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: db2a34bc4528 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: db2a34bc45288405ab6f41a667a141c32bf232a5 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:01:36 +0000 Message-Id: <69d65fc0.3bd28.3d331219@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=db2a34bc45288405ab6f41a667a141c32bf232a5 commit db2a34bc45288405ab6f41a667a141c32bf232a5 Author: Andrew Turner AuthorDate: 2026-02-18 14:20:57 +0000 Commit: Andrew Turner CommitDate: 2026-04-08 13:59:53 +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 (cherry picked from commit bfb7c81f93b534f8c10928d80ea56c8177a6f39f) --- 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");