From nobody Fri Jan 9 10:43:12 2026 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 4dndfG0TCbz6Nd86 for ; Fri, 09 Jan 2026 10:43:18 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dndfF6x1tz3CGG for ; Fri, 09 Jan 2026 10:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767955398; 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=RGFJXF4pyaEf1ItWww4SIbRkbCKGKQWHzo1e8i0S+y8=; b=q7uOil1G7rBqcbC6+TTLPvIY1N3ivfeqONCtXgzvsB/w2qVtBrjUG0BKDmp9GpfnKS15Nw O2PyMy6CmEpvaBGUycoA3xUzEv6txMzml4DvHn7I3uPcxbipOl43T0wiAitpFsTKAvXOQf gqr+HgW2s7e2O0en+HcBd2Lty1x70DNY54FiBPXNZ0RhDVjycrTwsY5KXYu4TW9zqyT7B7 0W71n36MJttn+0+aF9i4jmk8HMq8310veO9g9yuRFJ9XXX7X2PGBEK7hJoQTRAqWRBu901 UECQ9Go0OOFJCidy4hTplDXgNOMhWiU4kwrshWl7S9S3KbU6tRi+SjSgO2KkNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767955398; 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=RGFJXF4pyaEf1ItWww4SIbRkbCKGKQWHzo1e8i0S+y8=; b=L8iCjqyHjxhjniC10bigYGMeAiBKBfDjd3yI6PYPrh5LPe2WwYUJxWYo7Rr340fEPPGGED bHcOtVwvjjsi2q6cP/iGt3cLCMq2xg69E3DFrziHXHh5B4jzX4KR5UU5LrsNAlTFvYUPD0 m6Lw1zXRWM5F7Z6IzpkBnYsn0DDm53o+8z+F6gVa31eN8dl9Q3MdF9XliUprPcdO+zNaOl pXo0JvWdJ8qBSTkyeBp3zDwNvuewBu0AJs5OxIf28t8Ye+bEj8E2jKqwZib6L0g7QJGt6G olr4NJ1TCC/KASb6UhLJk1mppv2dcDAoWTjTuq5JICYxhrhRKSCoxSTsFFz5WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767955398; a=rsa-sha256; cv=none; b=I79wM8znAIJiqmsQDCpLp2hGSwT2cHGJM4dBDerBWznIiIMADLrftPs6cAyE2IEekOPeb3 CSbxya7E/wS8fKJA5+jkCYHTTVWZKgwF376Olq2J1GKdQEgxqxdDZ35cQ2eS4/XyYk2UJ9 sJIE9en6omRQvqLjEYqcJEGu37F/7esTLIHiyDap/kS1KWWKgCxLzhmaRpc+K9zsA9Gdd4 b/UeGExzXVzLed17aXGHo3K8MReKTbv+sHTlcqV04RAgYfQlcimLNtC7UNFggCgqJDyk3p C4vIJGWdEldy6idGmt416xPIWyC7/soHkqE80OP2MkqXbACJEw1Cw5LRQZVA5w== 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 4dndfF6WTvz1Jb1 for ; Fri, 09 Jan 2026 10:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30525 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 10:43:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: d53d7b466016 - main - bnxt: Fix up ioctl opcodes to support IOC_VOID along with IOC_IN 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: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d53d7b466016408229491cfd2f8bdc742ff642e3 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 10:43:12 +0000 Message-Id: <6960dbc0.30525.c2d9dba@gitrepo.freebsd.org> The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=d53d7b466016408229491cfd2f8bdc742ff642e3 commit d53d7b466016408229491cfd2f8bdc742ff642e3 Author: Sumit Saxena AuthorDate: 2026-01-09 10:28:53 +0000 Commit: Sumit Saxena CommitDate: 2026-01-09 10:40:18 +0000 bnxt: Fix up ioctl opcodes to support IOC_VOID along with IOC_IN The driver and applications currently use hard-coded numeric ioctl command opcodes. These opcodes are interpreted as having the IOC_IN direction (data copied from the user application to the driver), regardless of the actual packet size. Consequently, when the packet size is zero and the direction is set to IOC_IN, the kernel fails these ioctls if COMPAT is disabled. While the driver and applications should ideally set the direction correctly— for example, using IOC_VOID when the packet size is zero—the driver will now be updated to define ioctl opcodes using the _IOC macro to support both IOC_VOID and IOC_IN. This change ensures backward compatibility with older applications that exclusively use IOC_IN. Reviewed by: gallatin Differential Revision: https://reviews.freebsd.org/D54601 MFC after: 3 days --- sys/dev/bnxt/bnxt_en/bnxt_mgmt.c | 9 ++++++--- sys/dev/bnxt/bnxt_en/bnxt_mgmt.h | 11 ++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c b/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c index bbc12b96d8c6..98ae9848c42b 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_mgmt.c @@ -387,15 +387,18 @@ bnxt_mgmt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, int ret = 0; switch(cmd) { - case BNXT_MGMT_OPCODE_GET_DEV_INFO: + case IO_BNXT_MGMT_OPCODE_GET_DEV_INFO: + case IOW_BNXT_MGMT_OPCODE_GET_DEV_INFO: ret = bnxt_mgmt_get_dev_info(dev, cmd, data, flag, td); break; - case BNXT_MGMT_OPCODE_PASSTHROUGH_HWRM: + case IO_BNXT_MGMT_OPCODE_PASSTHROUGH_HWRM: + case IOW_BNXT_MGMT_OPCODE_PASSTHROUGH_HWRM: mtx_lock(&mgmt_lock); ret = bnxt_mgmt_process_hwrm(dev, cmd, data, flag, td); mtx_unlock(&mgmt_lock); break; - case BNXT_MGMT_OPCODE_DCB_OPS: + case IO_BNXT_MGMT_OPCODE_DCB_OPS: + case IOW_BNXT_MGMT_OPCODE_DCB_OPS: ret = bnxt_mgmt_process_dcb(dev, cmd, data, flag, td); break; default: diff --git a/sys/dev/bnxt/bnxt_en/bnxt_mgmt.h b/sys/dev/bnxt/bnxt_en/bnxt_mgmt.h index 8489a223adef..5b94184b1646 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_mgmt.h +++ b/sys/dev/bnxt/bnxt_en/bnxt_mgmt.h @@ -39,9 +39,14 @@ #define DRIVER_NAME "if_bnxt" -#define BNXT_MGMT_OPCODE_GET_DEV_INFO 0x80000000 -#define BNXT_MGMT_OPCODE_PASSTHROUGH_HWRM 0x80000001 -#define BNXT_MGMT_OPCODE_DCB_OPS 0x80000002 + +#define IOW_BNXT_MGMT_OPCODE_GET_DEV_INFO _IOW(0, 0, 0) +#define IOW_BNXT_MGMT_OPCODE_PASSTHROUGH_HWRM _IOW(0, 1, 0) +#define IOW_BNXT_MGMT_OPCODE_DCB_OPS _IOW(0, 2, 0) + +#define IO_BNXT_MGMT_OPCODE_GET_DEV_INFO _IO(0, 0) +#define IO_BNXT_MGMT_OPCODE_PASSTHROUGH_HWRM _IO(0, 1) +#define IO_BNXT_MGMT_OPCODE_DCB_OPS _IO(0, 2) #define BNXT_MGMT_MAX_HWRM_REQ_LENGTH HWRM_MAX_REQ_LEN #define BNXT_MGMT_MAX_HWRM_RESP_LENGTH (512)