From nobody Tue Nov 25 21:17:26 2025 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 4dGFrk5d8Hz6HpTB for ; Tue, 25 Nov 2025 21:17:26 +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 4dGFrk52lFz3TdS for ; Tue, 25 Nov 2025 21:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764105446; 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=i3WDvaR91c4q1N0XCBEVMRV9zn72kbtz2DVWBVDNs7c=; b=xUOof2dfzJ1YV/8CbvlMX3qzjaHl9BvpA+DgUoxd08HGh351SIlxaps4mH6F/SgaB5Ze5s 0ZKA5k4deShg7h2NR834NXx5XuNudh694qSttHAkQ3njLMmKjXQibvVyfpa18cwjq2xBV7 61//lDRt9jju5dOmPrseuKGHijpNno2Xm/BcMACl6M3AtHvUsNIT8Fz98jVLsPn+KDTpkx 6yH3wkvkAjTi2NmD5XaB0IeQnuwUcDebWTS2maXm0uPYs2lsSGpi5ckpQweO/LESm2DVzw EPKZ7ma/RkCdn8lJ2t88FM/37ByQgBdnU+IY9+WURSq1OA8XXjqNG03ll6+tug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764105446; 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=i3WDvaR91c4q1N0XCBEVMRV9zn72kbtz2DVWBVDNs7c=; b=Rtt34NIgl1gJxwb7sZLMRXYHnI+FWsWyyJ8Z2w9YkBog1zp7f5GImC+RFXA6/YEyV18XjW 5wqGuuATmHvEsofWVhumZO+Qm+Xzud0ec01TwWucXJrEh8WCgTUMyOu4We87/fcGel4Iyj LuXT4AQwg8lzm/BRhucbCwN41+oMHEud6XZoCvZIJfODjDt2aX2ibuOUqXwiULs3K0eatK iaAOqFFbIkwlGnbKt63FKJshoEMeFZ8dZcLFt1NfsyFz7phoggwGldfjM/tKch8RKWzWOV SqHTsM0Q5tAGJDTDkNcKuqucNrOpdZQQqJw1KZTe/sNftA4F3LHOkU/QmD9GvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764105446; a=rsa-sha256; cv=none; b=GoGtBy2Wc+eTOn9CfFM+JBUl1i1/GOE8p00Yd9HugF7iiFs4spdm4iCPT0pKBbaWAAENnf zPiac2wj/IVf2G9GfNnv7kGdE5Mc/jwhXGXOJ8Vzqk9GL2TsAV/4nG2rbmYgEEGd2krNzZ IKeMd1aSKCkvho/MAF7+ZAv/2L2j/++zu848fiPLvuKGa9wQkkFMbHFrcX35AMs036dYRA NjXv7KxMoYHwslrZgz1LVNexgTlO10LYqZWeRKGd9p5xwVxGXcTfnEFGMZyd12mroLRuNf a4NhcHiqygTfIPQq3qAuk4eYgBA6UNd2cdyPjzn06TmtZseA3QkMmLuuodS5jQ== 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 4dGFrk43YDz33w for ; Tue, 25 Nov 2025 21:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31d1c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 21:17:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 98f6f6e4f4bb - main - cxgbe(4): Enable IFCAP_NV and implement SIOCGIFCAPNV/SIOCSIFCAPNV 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98f6f6e4f4bb7b19e12de89fc8cc034915f7a759 Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 21:17:26 +0000 Message-Id: <69261ce6.31d1c.79c43e11@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=98f6f6e4f4bb7b19e12de89fc8cc034915f7a759 commit 98f6f6e4f4bb7b19e12de89fc8cc034915f7a759 Author: Navdeep Parhar AuthorDate: 2025-11-25 19:04:30 +0000 Commit: Navdeep Parhar CommitDate: 2025-11-25 21:08:03 +0000 cxgbe(4): Enable IFCAP_NV and implement SIOCGIFCAPNV/SIOCSIFCAPNV MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 946eb84457a3..5e02b47da8d9 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2817,7 +2817,7 @@ cxgbe_probe(device_t dev) #define T4_CAP (IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU | IFCAP_HWCSUM | \ IFCAP_VLAN_HWCSUM | IFCAP_TSO | IFCAP_JUMBO_MTU | IFCAP_LRO | \ IFCAP_VLAN_HWTSO | IFCAP_LINKSTATE | IFCAP_HWCSUM_IPV6 | IFCAP_HWSTATS | \ - IFCAP_HWRXTSTMP | IFCAP_MEXTPG) + IFCAP_HWRXTSTMP | IFCAP_MEXTPG | IFCAP_NV) #define T4_CAP_ENABLE (T4_CAP) static void @@ -3065,7 +3065,7 @@ cxgbe_ioctl(if_t ifp, unsigned long cmd, caddr_t data) struct port_info *pi = vi->pi; struct adapter *sc = pi->adapter; struct ifreq *ifr = (struct ifreq *)data; - uint32_t mask; + uint32_t mask, mask2; switch (cmd) { case SIOCSIFMTU: @@ -3124,12 +3124,24 @@ cxgbe_ioctl(if_t ifp, unsigned long cmd, caddr_t data) end_synchronized_op(sc, 0); break; + case SIOCGIFCAPNV: + break; + case SIOCSIFCAPNV: case SIOCSIFCAP: rc = begin_synchronized_op(sc, vi, SLEEP_OK | INTR_OK, "t4cap"); if (rc) return (rc); - mask = ifr->ifr_reqcap ^ if_getcapenable(ifp); + if (cmd == SIOCSIFCAPNV) { + const struct siocsifcapnv_driver_data *ifr_nv = + (struct siocsifcapnv_driver_data *)data; + + mask = ifr_nv->reqcap ^ if_getcapenable(ifp); + mask2 = ifr_nv->reqcap2 ^ if_getcapenable2(ifp); + } else { + mask = ifr->ifr_reqcap ^ if_getcapenable(ifp); + mask2 = 0; + } if (mask & IFCAP_TXCSUM) { if_togglecapenable(ifp, IFCAP_TXCSUM); if_togglehwassist(ifp, CSUM_TCP | CSUM_UDP | CSUM_IP); @@ -3264,6 +3276,9 @@ cxgbe_ioctl(if_t ifp, unsigned long cmd, caddr_t data) CSUM_INNER_IP_TSO); } + MPASS(mask2 == 0); + (void)mask2; + #ifdef VLAN_CAPABILITIES VLAN_CAPABILITIES(ifp); #endif