From nobody Thu Sep 17 21:16:41 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 4hm7qM2vj4z6s5fV for ; Thu, 17 Sep 2026 21:16:47 +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 4hm7qM05Gdz4sDD for ; Thu, 17 Sep 2026 21:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789679807; 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=VsPNxXU2Z6uUCxDhVD2hhh9mzoN+3hU8RcDvz6t7HGI=; b=AvJS9ngJU4mAX+CuxK7hcyWYiYE5IyqU4O/2gA7DMpgZ2zLQr6/QaWWLMBLaE4wZhMDNym wQtm5zLNcCAOGYKpBIan0PVkQf1t4AVsYG9DhVtGlLLKOhcFl+lPthqrFt0EM8unSm1qxP jakcZi7QlHFuGQwNfC9A/iolBVDqwbfm0W2wHWKz349ORKIAYVYUMiTa2l7GhA+rOJSmld VOFR9qcQmc/MH9ndH0nrNfwIOMcx5KwmtpeKcNLeJX2aQATTTHCbQkhBBiueEldkvyHZes gCpvioNiG31BzzHs9BcVf3h3CjlfZ0txcwQ8dY4YOnWW+43E+NAFRLZ62FO4iA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789679807; b=V644bUMVUx3E073okUTvsPBHjbk+Pi3pthYF/p1FM9/tsHs8N9k2ucsmiNjXVgjwPsuDAD cnCHBLTzL+AZ6mAAZpDcrFqdBjQOoyjMivu3AURUjwwQW48qfmt2nDbJOVaS9+Mt2JP36/ NUF2fWxjGbjx5p9pHR0R+AbaoyUEwVaCha3VIIBb3EHAxNe+940y9SlOVj3DO1sVNPWMbD wqItAaT+/gIuny/PYbHF0Ec0hQPJUV/y7LB8TeDUzIFXzE2XyZkElWqHhyTlhZLI6f4KBG 7GUTfBm9NN3gltjerSdT9mebx5iwFJ7DTuoBud93Sf/i5HUpNxG+KeNvB2YG0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789679807; 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=VsPNxXU2Z6uUCxDhVD2hhh9mzoN+3hU8RcDvz6t7HGI=; b=Vf4nAT9DBBcxnuDQ1pW2+zgkIqjpOgnn9czH/MR3uRKRo6zFjhZI8m1ahANafIha6CDtMt 8kkXrgEB3fwfYK42D/djve4wFm8rtT2i/7laJwH3prQBKLNqtN9dQGA4G/IX46hfl1ce1G DRldGY8L7Q/2L/CNsL0nUk2uB25GvdanXZm1XUuvLjPTN8wJ3+lHImytvi4cDOKu3sRH0o uXi+yOFbSZOttAI4dW25CKCaY+0broWWW3BSPNh5XdSXahYDd91RHa+dKlKZzAx27ALrL7 NpfMr4fweenYNMD1d/No9vQWYHw2EnhPzf3dXIvjWWBm2KmlQe0fBfsmlG+dNQ== 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 4hm7qL6HbTzqxc for ; Thu, 17 Sep 2026 21:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46b05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 17 Sep 2026 21:16:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9d467dfa3192 - main - mthca: apply upstream changes to 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d467dfa31922b3b2fbb145f202200bf66ca550a Auto-Submitted: auto-generated Date: Thu, 17 Sep 2026 21:16:41 +0000 Message-Id: <6aac58b9.46b05.586e0876@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9d467dfa31922b3b2fbb145f202200bf66ca550a commit 9d467dfa31922b3b2fbb145f202200bf66ca550a Author: Bjoern A. Zeeb AuthorDate: 2026-09-14 22:27:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-17 21:14:41 +0000 mthca: apply upstream changes to convert to timer_setup() LinuxKPI Apply upstream changes b9eaf18722221 init_timer() -> setup_timer(), and 86cb30ec07cdc7 setup_timer() -> 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: jhb, emaste Differential Revision: https://reviews.freebsd.org/D59677 --- sys/dev/mthca/mthca_catas.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/mthca/mthca_catas.c b/sys/dev/mthca/mthca_catas.c index 9a66e87a5822..67ab6b6a43ff 100644 --- a/sys/dev/mthca/mthca_catas.c +++ b/sys/dev/mthca/mthca_catas.c @@ -132,9 +132,9 @@ static void handle_catas(struct mthca_dev *dev) spin_unlock_irqrestore(&catas_lock, flags); } -static void poll_catas(unsigned long dev_ptr) +static void poll_catas(struct timer_list *t) { - struct mthca_dev *dev = (struct mthca_dev *) dev_ptr; + struct mthca_dev *dev = timer_container_of(dev, t, catas_err.timer); int i; for (i = 0; i < dev->catas_err.size; ++i) @@ -151,7 +151,7 @@ void mthca_start_catas_poll(struct mthca_dev *dev) { phys_addr_t addr; - init_timer(&dev->catas_err.timer); + timer_setup(&dev->catas_err.timer, poll_catas, 0); dev->catas_err.map = NULL; addr = pci_resource_start(dev->pdev, 0) + @@ -166,8 +166,6 @@ void mthca_start_catas_poll(struct mthca_dev *dev) return; } - dev->catas_err.timer.data = (unsigned long) dev; - dev->catas_err.timer.function = poll_catas; dev->catas_err.timer.expires = jiffies + MTHCA_CATAS_POLL_INTERVAL; INIT_LIST_HEAD(&dev->catas_err.list); add_timer(&dev->catas_err.timer);