From nobody Thu Aug 28 16:33:05 2025 X-Original-To: dev-commits-src-main@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 4cCRlj6lYBz66Gvm; Thu, 28 Aug 2025 16:33:05 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCRlj5YCrz3Hdn; Thu, 28 Aug 2025 16:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756398785; 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=zWLVjRnQapjc/a1/1n2OdneRfWP1zhY7eTukz6DJZQc=; b=aDzP6z8fJOKMTautx3mK2lxcr4aktWnVYFHkcJdMpvY1bpp0lnyelpKa0oSNr+LKVMCLZC eSTELon/8za285itG4lhCTGjh5WHkHsy6uhu9JAUrc6e8ITGOK2Kg5BZTJ9XAW3cYFc4E8 u//ULaUSI0jh+JA8pGmXkjAHIdYyHXFYU7bWOlGtyz4C+GnUswl8vWlDe0UG8HBGglDCUz An++AnHNDD97A9fQGR5agUfSenYbN9IvrT+Trsll4vsfql3IhVORZjz4ghLy5CKXLMan/m iU2WjrLOb4FTdWdJKuolJOxYMJhbq09EypY8dCbRs5gdXytJkysCzLrGNhu6Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756398785; 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=zWLVjRnQapjc/a1/1n2OdneRfWP1zhY7eTukz6DJZQc=; b=vjZz/H1pYRn0HPqHWvvnj4RFEZ3tncJq/rKZWu8gsIDt+6EKJ9PcfTKzC6/KXw1SyCjXqB b6HeS2ygjMvnrkidPJMNkMl0tizFX0DVQrV7FL/s2cGGGC1/hykPNQJvmcTu276rq5mlN5 ulsATcxtl88V3Hp7Fkuf0cWrgErvb3BLI6VUcr8+o1NUq0/gr/3tzmDz5r/8poukdG7TB1 3AaWptVP/ZCSU8S0S4hIKC7uxAwkv2GS1mZ2S+dieoqyguhOsAMvVEN+VrL6bbnmpYrupV UaSFeacnUNmHum3QPs931/j1mhccantDwXEZl5myo2JM1cw2k6xURMQerrLQbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756398785; a=rsa-sha256; cv=none; b=KIksfDUj8UK7sfeO17vqlLiMxYMgMvP8pqxzQo/9v6LAL+EO3wsaQfeP5Oid//aDUohQ/1 LHg8rU8aQvOzcZrNg3dULhmvnbs4NvSiTdi4pJWTA6DcdgTOoTMxNjwby6TYRdaLulx8db hw+YQ39pjAC4Tt1/rqzA38LCjIA/2vvW8PaAT+RdmbHxPwvKgI3jhB8R1TIbQeuQVnNsdF Uf10WV3AYPsIt077jsrlwq9ejK8mbVVOzg/t36dj47Kl+g8tgIM27z7lMRHsVB3G5WhXHR TPMuTs6Tptm6+izAuQvsXwcTNcDRVERq2UdKD51wrez2h27xDxqOol1pHetYJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cCRlj50Kgz1GJf; Thu, 28 Aug 2025 16:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57SGX5iL043046; Thu, 28 Aug 2025 16:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57SGX5pK043043; Thu, 28 Aug 2025 16:33:05 GMT (envelope-from git) Date: Thu, 28 Aug 2025 16:33:05 GMT Message-Id: <202508281633.57SGX5pK043043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f13301fd3cb6 - main - nvme: fix byte conversion macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f13301fd3cb6d1ae3b55e741791cc0abe0427a04 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f13301fd3cb6d1ae3b55e741791cc0abe0427a04 commit f13301fd3cb6d1ae3b55e741791cc0abe0427a04 Author: Warner Losh AuthorDate: 2025-08-28 16:21:54 +0000 Commit: Warner Losh CommitDate: 2025-08-28 16:21:54 +0000 nvme: fix byte conversion macros Fix the byte conversion macros for rsvd{2,3}. They are 32-bit quantity, not 16, so use htole32. These typically aren't used, so this is a nop for all in-tree uses. This would only have an effect on powerpc64. Otherwise, we pass the value through unchanged. Sponsored by: Netflix --- sys/dev/nvme/nvme_ctrlr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index fd7f00ced14b..3a7576897603 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1420,8 +1420,8 @@ nvme_ctrlr_linux_passthru_cmd(struct nvme_controller *ctrlr, req->cmd.opc = npc->opcode; req->cmd.fuse = npc->flags; - req->cmd.rsvd2 = htole16(npc->cdw2); - req->cmd.rsvd3 = htole16(npc->cdw3); + req->cmd.rsvd2 = htole32(npc->cdw2); + req->cmd.rsvd3 = htole32(npc->cdw3); req->cmd.cdw10 = htole32(npc->cdw10); req->cmd.cdw11 = htole32(npc->cdw11); req->cmd.cdw12 = htole32(npc->cdw12);