From nobody Wed Aug 19 23:17:17 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 4hQMsq0H8Pz6nc3B for ; Wed, 19 Aug 2026 23:17:19 +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 4hQMsp4RrVz40yk for ; Wed, 19 Aug 2026 23:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787181438; 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=+nDg+mDXHUMauY21fS+6eO8rcxENAOGcO3omArT1jRQ=; b=Wp7J4HjXGtTZXSr95fspaW3HhA4Ie8FRFbP60QotGxVpTA36Bd3bYTFnW1G9cKli6brGuY TntppR10R5MSng0ZKx7F52tgFsTQb8RvNBVrDjmsWRvbCn7ytgs81OPsuDvHD8NO9AqFYs Rp+uC3y80RQWgraEOgUvyW22KjgoyqU0MIKPqkMB9bJ8U8DnTjaukjO/OgLF23YsKgNrN5 ojLfdJNG/p9HM/I82gyRB3JMJXneLLuHVyFjVFjrYHyl8GtopmXYwbZXBbxcfWG/xTrdWu 1LfEj6ByukyWVe3muT5RplZl+Fg+3PMCQUSBAZG7RgP9+u27kaQlKZRCngvP0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787181438; a=rsa-sha256; cv=none; b=JnKerOxt7YbdCuH7JhF2gj7qp+mnYgZLBtGpZkyAAyZrotwPWA5eMNCkDalFVVZwoH9t4j nmYPMzrxAXkShexG9N6gbYtiloAgqKQrV7/qwjczeFDH3w88SnH4kS+EdMZK+7ndohBtRp QoUE2e3iermHpPCUQaYm6piEPSSNLuV+1QfdmxRe4/y3A4pHOd7uH7OYqugH+0Br3oJTxn f8eGPhF48YC6bOGLzdJhMTLwzDtFqN9GafwQx967WyL9JONzCgpDZk9KPYuwn6psYd4jhe wUVnyytVS5/uEpGoHy3GiEhGXlKnxIFDJAt6iLaxg4+Z2ADaESAZY3WlUuVU8Q== 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=1787181438; 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=+nDg+mDXHUMauY21fS+6eO8rcxENAOGcO3omArT1jRQ=; b=v0D3wvuYOc4Xi2uJhgZpQboiqHMZomr1vi/YdhKhF1X3xNdAaEFAuPOhSb6ldhaX4Y9q/j ze/YA4AthB7kf+06awG/PFvkSzUdH8Ct67wtZ8RhSiZg9vkWkbt63hqGUw1H+uWOa3xPM+ HLmzIp/o4DpT1B5zTg0S+nNyFKnBBlroDn5A7G5M3lXKuDa60L8lBq4aRtcX9Iz/LyMJSR 2Q1fltlrjq/gcNc6Yhz2bFY4J2vekIVsBBuokbkUOD0jvcfKvIX7TAh8wDaoh/q0ANxVcU irfD9gNFMu5XXmub3t0ZXrwyxPgxgv2sgDZorksDclDeeR80DSu7Pcup6xVWgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQMsp0vDQzrb6 for ; Wed, 19 Aug 2026 23:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fc87 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Aug 2026 23:17:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 814cd919981e - main - mlx5(4): convert to timer_setup() linuxKPI 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 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/main X-Git-Reftype: branch X-Git-Commit: 814cd919981e98120c3065906092dca2546fdd74 Auto-Submitted: auto-generated Date: Wed, 19 Aug 2026 23:17:17 +0000 Message-Id: <6a86397d.3fc87.19a80bf9@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=814cd919981e98120c3065906092dca2546fdd74 commit 814cd919981e98120c3065906092dca2546fdd74 Author: Konstantin Belousov AuthorDate: 2026-08-19 02:13:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-19 23:16:53 +0000 mlx5(4): convert to timer_setup() linuxKPI Reviewed by: bz Sponsored by: NVidia networking MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58941 --- 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);