From nobody Thu Sep 17 21:16:43 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 4hm7qJ3LGXz6s5fH for ; Thu, 17 Sep 2026 21:16:44 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hm7qJ0rHkz4s9w for ; Thu, 17 Sep 2026 21:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789679804; 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=rAOgMFZLETDMth8HoG6NbnhflBbSHMt0mFEGTxNLeSs=; b=J3ifvmwe6kA964sbBA5I6aT1AYrLddnI/VpbM3aw3tXoH4PKWEl7EGhgHIWaXVwQguOCL9 E6TMIAxB1dYUSBUw4cuJvQEo9IDjKoi735R5tAHOfBxvvN/ukAmcJ3frPmUF26Qgivq+Dk cOvjR+fDBJP3O2zJl6WCmEckScHXQmpXBUdeCQ1qPKZ5vuhLYyL4rERZgSJIDbDbk4yhbK eRlfu8kj3lbvz2zox5DwvstBGRc+RlQEY7A7u9pO59gA8BxkYE0l2NnEc2cuBktFE9tmWp i0y6jPTesG+sUpLWDOPsco1niQxYPJkB2taiBwokf7uP0x2vxlLH+9ZDqQsWqA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789679804; b=TjxyRWJrwVG3PhLGyOdpcHC4UnkUZfChJS2EinQWM3+NAsmBHVOzF/d8lotwj9qx5BkpSD eFIbYLUZmJWTtzZx7EpD5m4FNuUZw0/BARsj5hOM05PbOtNt2zlTcuyzAW8ufZmXxtpqk4 UkSN1DU2btaPYlna5aCD2EsnCVAn+EKREInN7Y7Wgjcwnk9m4khtYuT2COBy4nid9xMTPr B3x5VO4yQyfC++VEfauqlRD6InVUdNd52HKruO/oAy/zWTTUzVg9PSjfeCNZU/0disa40p Abs9Px3ajBsslkSsa77pHKY1xA+GHi4gnth8undU1Yrwe7ebQjIHcYZm6fg5yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789679804; 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=rAOgMFZLETDMth8HoG6NbnhflBbSHMt0mFEGTxNLeSs=; b=SaSlk9vYHH1puoHC/iM+uIbJycO73CAFshMzWWF8RJzkqlaahyBNRBil7hFwVi0nLCZTaj i4L6eLocDFxpI+s9cKthuieqG1zxootbvwCgqG61SMPGqn+KrCVnOxq7/SwT2Ow/aVcijd N8n3lhLun2tLCb7GxuHuqV/2OvzA7C6ssoMWsmbiYDx/9l/4jUdv8Yjr+UyO9IEGLD+aI9 OJJoOFEJsRGuL+fYG0rY3Zb4XOPKbPMVmc+taEFFKfQgbPaDSlt4/6e3mRoJdT+0RBWcxY ys53xTYjJjyYhoExmAodiiEqJPceLY0apfSyea2oy0ysGx2r4wzLgpHgXPAKWw== 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 4hm7qH6vT0zqCp for ; Thu, 17 Sep 2026 21:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 460fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 17 Sep 2026 21:16:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 871c09c9b47e - main - mlx4: convert to timer_setup() Linux KPI 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 871c09c9b47eb0ef0f17a5a1fc2299dba7693516 Auto-Submitted: auto-generated Date: Thu, 17 Sep 2026 21:16:43 +0000 Message-Id: <6aac58bb.460fd.66930ec3@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=871c09c9b47eb0ef0f17a5a1fc2299dba7693516 commit 871c09c9b47eb0ef0f17a5a1fc2299dba7693516 Author: Bjoern A. Zeeb AuthorDate: 2026-09-14 22:51:09 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-17 21:15:24 +0000 mlx4: convert to timer_setup() Linux KPI The Linux driver switched away from using this timer in e22979d96a55d. Locally adjust the code to use timer_setup/from_timer in order to get us out of Linux version 4.15 (and earlier) KPIs. Also, right away, apply 41cb08555c416 from_timer -> timer_container_of. MFC after: 3 days Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D59680 --- sys/dev/mlx4/mlx4_en/en.h | 2 +- sys/dev/mlx4/mlx4_en/mlx4_en_cq.c | 4 +--- sys/dev/mlx4/mlx4_en/mlx4_en_tx.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/mlx4/mlx4_en/en.h b/sys/dev/mlx4/mlx4_en/en.h index 838894f7b02f..dbe29f1d24ec 100644 --- a/sys/dev/mlx4/mlx4_en/en.h +++ b/sys/dev/mlx4/mlx4_en/en.h @@ -836,7 +836,7 @@ void mlx4_en_deactivate_rx_ring(struct mlx4_en_priv *priv, int mlx4_en_process_rx_cq(if_t dev, struct mlx4_en_cq *cq, int budget); -void mlx4_en_poll_tx_cq(unsigned long data); +void mlx4_en_poll_tx_cq(struct timer_list *t); void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride, int is_tx, int rss, int qpn, int cqn, int user_prio, struct mlx4_qp_context *context); diff --git a/sys/dev/mlx4/mlx4_en/mlx4_en_cq.c b/sys/dev/mlx4/mlx4_en/mlx4_en_cq.c index 1b198778bfdd..00a506d08663 100644 --- a/sys/dev/mlx4/mlx4_en/mlx4_en_cq.c +++ b/sys/dev/mlx4/mlx4_en/mlx4_en_cq.c @@ -164,9 +164,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, cq->mcq.event = mlx4_en_cq_event; if (cq->is_tx) { - init_timer(&cq->timer); - cq->timer.function = mlx4_en_poll_tx_cq; - cq->timer.data = (unsigned long) cq; + timer_setup(&cq->timer, mlx4_en_poll_tx_cq, 0); } diff --git a/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c b/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c index d45ccacd7499..afb31cbb7104 100644 --- a/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c +++ b/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c @@ -433,9 +433,9 @@ void mlx4_en_tx_irq(struct mlx4_cq *mcq) spin_unlock(&ring->comp_lock); } -void mlx4_en_poll_tx_cq(unsigned long data) +void mlx4_en_poll_tx_cq(struct timer_list *t) { - struct mlx4_en_cq *cq = (struct mlx4_en_cq *) data; + struct mlx4_en_cq *cq = timer_container_of(cq, t, timer); struct mlx4_en_priv *priv = mlx4_netdev_priv(cq->dev); struct mlx4_en_tx_ring *ring = priv->tx_ring[cq->ring]; u32 inflight;