From nobody Wed Aug 26 00:48:14 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 4hV5bz2jk1z6qKWH for ; Wed, 26 Aug 2026 00:48:15 +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 4hV5bz0Sxcz3sNw for ; Wed, 26 Aug 2026 00:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787705295; 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=65V93Fgq8eceXOFGdh2sBE1KrfZAOAesaD1UzqlKscs=; b=rTRyNKiJDUhrVHXZcHI5EIdvys8gysiS+HERQ2PfHlQKxUD2XF6s8ZxmgdfyculXWsag/+ Xwbvnkslnm6xb9DjcHvtC6gkGdWctfQ+tqhSJ46UrO7H5qpkpElkOo7cmQvs7i1HvhWHBP UiV2+anXZ/QXhrkvb6zytnz8fLgQI5mwyhv3KD10he+wlR7hfI3MiQj3u1xu1arpUVw5At Z7PL9o7BmDUToOA2WZaZmEycnUu+M2F9b8ecLf9sS1UdCdCflxZuthOjuO1dKSgek+c0Gv MGcE6rNTKZqym0BdGungoS0sD/1ax4Xrmy/dTK1kXDzCatoNQLiVhRRy51KywQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787705295; a=rsa-sha256; cv=none; b=qMH7KZzryyB7KCYksDQvYxlxK06Y3Ss4Uk6Fbu/jrDezVEHzvbcCngkh6f1XAbC/oQ+jVs XP7AEYJThsfOoKo0Ks+mGdm7OSiLZvpVgrHDfEP3bi5V0lpr5cRvQLl9k5NIDHUY7DjXnl MlkzO5sDQXjrRYmN/82rsFTnSL9IC8DhjvtXBYrI7bMwv7SdKqDf2U+35NKUXAnf6TkEag Jyn7I6JdfC2t2c9jYkOCJTcEeHfyZ+b6hRmuI9DTMtOHKRykzVUezo6qTwIvXD/bITkNB/ 4aTmwdN4VHR74bQKV0cgYrM6OG40bp08Utv1F2OL5KDywXKubN8KIjP4lofzWQ== 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=1787705295; 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=65V93Fgq8eceXOFGdh2sBE1KrfZAOAesaD1UzqlKscs=; b=rIYpNny6IIiPcw/k1mCa98/V84jJekr1T21ZKfaYwSJUGP81NEQN7BRPF5d3QTY5GG6+ZK m/kXOntos8WUOBG/QqDZlmVpxqMpeYOa60nnSHas7u8uxfyoJ4ySj/6PkenO1DtfbjzPU6 aIA1jnGxhvnhWr22bTjb+iIggpWX01f39H+57kLDfyWXclkIJXcFgFGgNFeCDN5fEjF2/U pk0ZnGk43Rea7XL6LMvFprY52i58IQb4HgsDojVgtUbznU1wO0TnkP5/lAbYdUZChpN1AI IJRNOAVZfMai3eGnysdoaeO6NM2Weoneb/hJnCkNPkEnNB2If5f/ZwbE5s7S5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hV5by4zcCzSl for ; Wed, 26 Aug 2026 00:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 426a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Aug 2026 00:48:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ff47081093c8 - stable/15 - mlx5(4): convert to timer_setup() linuxKPI 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ff47081093c8d4c6c405cd8ddd41bbbbca32b6e4 Auto-Submitted: auto-generated Date: Wed, 26 Aug 2026 00:48:14 +0000 Message-Id: <6a8e37ce.426a4.125785b5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ff47081093c8d4c6c405cd8ddd41bbbbca32b6e4 commit ff47081093c8d4c6c405cd8ddd41bbbbca32b6e4 Author: Konstantin Belousov AuthorDate: 2026-08-19 02:13:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-26 00:44:11 +0000 mlx5(4): convert to timer_setup() linuxKPI (cherry picked from commit 814cd919981e98120c3065906092dca2546fdd74) --- sys/dev/mlx5/mlx5_core/mlx5_health.c | 6 +++--- sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_health.c b/sys/dev/mlx5/mlx5_core/mlx5_health.c index bedd51eb02e4..5a33e2dc2edc 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_health.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_health.c @@ -608,9 +608,9 @@ mlx5_trigger_health_watchdog(struct mlx5_core_dev *dev) spin_unlock_irqrestore(&health->wq_lock, flags); } -static void poll_health(unsigned long data) +static void poll_health(struct timer_list *timer) { - struct mlx5_core_dev *dev = (struct mlx5_core_dev *)data; + struct mlx5_core_dev *dev = timer_container_of(dev, timer, priv.health.timer); struct mlx5_core_health *health = &dev->priv.health; u32 fatal_error; u32 count; @@ -656,7 +656,7 @@ void mlx5_start_health_poll(struct mlx5_core_dev *dev) health->health = &dev->iseg->health; health->health_counter = &dev->iseg->health_counter; - setup_timer(&health->timer, poll_health, (unsigned long)dev); + timer_setup(&health->timer, poll_health, 0); mod_timer(&health->timer, round_jiffies(jiffies + MLX5_HEALTH_POLL_INTERVAL)); diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c index 50219d922f54..d28ecb4a1761 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c @@ -410,9 +410,9 @@ static void clean_keys(struct mlx5_ib_dev *dev, int c) } } -static void delay_time_func(unsigned long ctx) +static void delay_time_func(struct timer_list *timer) { - struct mlx5_ib_dev *dev = (struct mlx5_ib_dev *)ctx; + struct mlx5_ib_dev *dev = timer_container_of(dev, timer, delay_timer); dev->fill_delay = 0; } @@ -432,7 +432,7 @@ int mlx5_mr_cache_init(struct mlx5_ib_dev *dev) } mlx5_cmd_init_async_ctx(dev->mdev, &dev->async_ctx); - setup_timer(&dev->delay_timer, delay_time_func, (unsigned long)dev); + timer_setup(&dev->delay_timer, delay_time_func, 0); for (i = 0; i < MAX_MR_CACHE_ENTRIES; i++) { INIT_LIST_HEAD(&cache->ent[i].head); spin_lock_init(&cache->ent[i].lock);