From nobody Thu Sep 17 21:16:42 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 4hm7qH4c6qz6s5TR for ; Thu, 17 Sep 2026 21:16:43 +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 4hm7qH126gz4s9q for ; Thu, 17 Sep 2026 21:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789679803; 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=LuJWyXQHV3TvRg5l8Wzr2yRiyMtq/P80sY6jgbT4BPc=; b=mvcA+HsxI6RPpTcgAvZB1yTh/6poaFKxJyMFqFPfp92n/2AaNZWdUwFGc6SdLiRkhwAJuL qOcfswkf1K9ZlnhgHBAkY0obz7GTnDqz6JgHKz4cA2w06mNNJO2i2pm3DJ4Ov57AxfCunf sCsg4/GQSjqM/5pJu+oPwl1nilzjbBCm4bMvmlz/HtBrMejknc/e7lXv2zAkBVUSWbkv0S lG1Ma75rRWJNpAYatPYMNGpIhXfJJ5R2zjNx76ZvumdoYP8YPvXdgcpBHXaAw9Y0/ohQ7q 82ckb7Yg+gkejuvcMO62lYdGAEeD53j4V7r4O4Lo+GJvL/o7heGsjBWWmfM1qA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789679803; b=eb4S1v24yYpOrdhYobqH2rJugrdVG6kv6DG/+jjMnRaTjhgXzRx06QyHAJQ3MlcIA7K8Li vJNHQOpR5sQF0FwBPQTLR58QPPWPch3FilgZJDlp4K4zYjcUFbyEb/DABR6rKlTFAmNXfS hi7tsY0bpuHyLULC+++eXOo3/T8gWB+DiJKdWXog+V06OVSJaRPvHTCJ3d030LuLljtp37 Moco5uPV4+7oVm5n2pQY2TvcBPfGSRkbnsofaDx8VDwcTGziON16NtIimiaNvsuse1p6i2 83fEcpiK+mS5n4pkjNs76RxVl7QTdJUCr3R4x2H78tkUexqQLX6/HhnZqeJekg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789679803; 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=LuJWyXQHV3TvRg5l8Wzr2yRiyMtq/P80sY6jgbT4BPc=; b=M7b+/v5ZvJA+m7YqUrRquG8G4p2VSH7XLxjw8i1WUur/nOt5AvF7c5zD3pV51R7EwS/muA FZEgQhIx7NMIO8IamOXTRioll1wOgxObyCziomorG3U9ZHf9vHsbZlyB0TX89MkKx52qv5 wdy4liMe3IEFGcl5xk1zFLZDpSj9HsRKJradxWOgo2thhzyiyYGO2I8NXUPhlixtR19Tx2 zofJ68bF78cnbw6yZTEgSHubDtpM+KHFkEU/28yUcDCbiJ3WFWJPbUMVTSaFMKC+Jn24cn n1mJPCNAKzgke0wMNFHSggo3AdtHaqCuy9y/DkEQJtbz7NQDgaIiKmXipIkbTA== 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 4hm7qG67j9zqkn for ; Thu, 17 Sep 2026 21:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43fd9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 17 Sep 2026 21:16:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 272138c279dd - main - mlx4: apply upstream changes to 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: 272138c279dd1954f3fb88d9e0b2874db74597a3 Auto-Submitted: auto-generated Date: Thu, 17 Sep 2026 21:16:42 +0000 Message-Id: <6aac58ba.43fd9.63b8513b@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=272138c279dd1954f3fb88d9e0b2874db74597a3 commit 272138c279dd1954f3fb88d9e0b2874db74597a3 Author: Bjoern A. Zeeb AuthorDate: 2026-09-14 22:39:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-17 21:15:05 +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. MFC after: 3 days Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D59679 --- 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);