From nobody Sat Sep 19 14:40:19 2026 X-Original-To: dev-commits-src-branches@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 4hnBwz5ypsz6srhf for ; Sat, 19 Sep 2026 14:40: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 4hnBwz5Mj2z4WLd for ; Sat, 19 Sep 2026 14:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789828819; 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=mv58XzJUlCRBkUMWp91LipATpCxBKXISaNMH6xMt4fk=; b=aeQ/fBzPonBsEeSZ8+glZOf3QJwVjxwODCLXblPLwRATtZ3NycHozJvtcGLv2ccfO4Ql+E KDApxCKu7ftcpKcQdtCjDjqm2Rf6ywIndfqYXdBrTBJect1D2v5XIt9mK75ERg7UjVPWij miPo6V+3wfHgDRNwXOdUoaHlQi6OsTDAHEDJGUegb/wTpdlo5GSYf2rzCqlw0E23uo9AV+ zuXyel0OK2AA/2HAvCjSLnoAmDs0XcXGwXnf+cPfaoDR4ZSIWsKffC0cO5R4hrMflfALsf uoKx13S5PcoTV3RIqxOZc1oH1+62JilhDK8hSxdTtjMeQChqwrC+R7TQYrultQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789828819; b=JrAOxrXIByxpEEnSuJnOvLkg7WX3MLtFs3QZay16RuWFHySDX1T9lCR6s5T6yqq6ZV08WA ICMBD0eOaU7/E1vcAoAqzX3o9RwKgbJvqQl1DScP9QuForVseZk7sjG8mZZ6KcYwMzmEWL wnJmwLAN6BRpxYgaxF/OS5/HL1CXp5RANWRNAXa4KHPge6dxeFIO1yJNEifixxaRUDLwmV ovbIhIWf69v0MZaH+vkbNYUKmbBtAudj4DNxKbq5MGim3jeSdnYX7X6UhJvh15BXt8z5mA 9PEdsGLjmmE3GcBTYsKzhT9y0mMtGQwbpI8G6VyF1lOJqg+9XbtlA9GKKfbJZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789828819; 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=mv58XzJUlCRBkUMWp91LipATpCxBKXISaNMH6xMt4fk=; b=n8mzXlRmLtSYf269JsPBo2SpvGPMiHlUbduVNr6CIZ4AS9iqJtQjYzujxeZkHGftfygKIV nNWJ3EFFAiWUwcx1mdJpBUY1oTmhtbMgSOvxN3GzyNoGtyqXadnyFaSt13XD6MpEaafhU+ AcSrpQJ6e/s02XYzGxbP2MHHJUM6bsh6lw6pjFc1fTlZmfUq4G06+VwnP+0Pdq5l6j0b2V wV6pfqPYSADUGuqAmW1RXkwMzEO42zbj3y603ptWRDZU89U+4t2dE+kMM7EOReRudvU+ry jxOVOxHd2qk3c7APHuwuDWVkJzgROKqO6SC4HybuvMgWrj+pS8gWZ4ffT2q2zw== 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 4hnBwz2lHrz16n7 for ; Sat, 19 Sep 2026 14:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1877a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 19 Sep 2026 14:40:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d7eb529adc6f - stable/15 - mlx4: apply upstream changes to convert to timer_setup() Linux KPI List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: d7eb529adc6f62088b8206d30fe8ebf1a6790ad1 Auto-Submitted: auto-generated Date: Sat, 19 Sep 2026 14:40:19 +0000 Message-Id: <6aae9ed3.1877a.473de328@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d7eb529adc6f62088b8206d30fe8ebf1a6790ad1 commit d7eb529adc6f62088b8206d30fe8ebf1a6790ad1 Author: Bjoern A. Zeeb AuthorDate: 2026-09-14 22:39:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-19 09:34:08 +0000 mlx4: apply upstream changes to convert to timer_setup() Linux KPI Apply Linux change 55c0fcc3de460 "Convert timers to use timer_setup()" to get us out of Linux version 4.15 (and earlier) KPIs. Also apply 41cb08555c416 from_timer -> timer_container_of. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D59679 (cherry picked from commit 272138c279dd1954f3fb88d9e0b2874db74597a3) --- sys/dev/mlx4/mlx4_core/mlx4_catas.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/mlx4/mlx4_core/mlx4_catas.c b/sys/dev/mlx4/mlx4_core/mlx4_catas.c index 165b8faa2896..3856147d1b53 100644 --- a/sys/dev/mlx4/mlx4_core/mlx4_catas.c +++ b/sys/dev/mlx4/mlx4_core/mlx4_catas.c @@ -226,10 +226,10 @@ static void dump_err_buf(struct mlx4_dev *dev) i, swab32(readl(priv->catas_err.map + i))); } -static void poll_catas(unsigned long dev_ptr) +static void poll_catas(struct timer_list *t) { - struct mlx4_dev *dev = (struct mlx4_dev *) dev_ptr; - struct mlx4_priv *priv = mlx4_priv(dev); + struct mlx4_priv *priv = timer_container_of(priv, t, catas_err.timer); + struct mlx4_dev *dev = &priv->dev; u32 slave_read; if (mlx4_is_slave(dev)) { @@ -272,7 +272,7 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev) phys_addr_t addr; INIT_LIST_HEAD(&priv->catas_err.list); - init_timer(&priv->catas_err.timer); + timer_setup(&priv->catas_err.timer, poll_catas, 0); priv->catas_err.map = NULL; if (!mlx4_is_slave(dev)) { @@ -288,8 +288,6 @@ void mlx4_start_catas_poll(struct mlx4_dev *dev) } } - priv->catas_err.timer.data = (unsigned long) dev; - priv->catas_err.timer.function = poll_catas; priv->catas_err.timer.expires = round_jiffies(jiffies + MLX4_CATAS_POLL_INTERVAL); add_timer(&priv->catas_err.timer);