From nobody Mon Jul 20 22:50:20 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 4h3whY0Y3fz6dZwr for ; Mon, 20 Jul 2026 22:50:21 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h3whX3Fhgz3MgS for ; Mon, 20 Jul 2026 22:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784587820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lhqw1amwOF+aTiowFQlL/c1ain+U1pN30LHir0kDmNc=; b=UcKnie9YjEWrNESqajE4xTp+i1MR1Icpym8lqM1QQGKWk0CfkwYIMkfyZCJJd/cRNBcb/N fWFPKcv2NKJ/KzhVK4TkqLBZa5ozn03uS+dlebx61PEHJjKzFXeb/tc/VG272EfV4r9Z+P unnQF4yJb04+tabsavHgYsQBoHRMAcZaCCCYpzK0m5vZ8ygmfFa0lww60jY+X/YVfwxWbq S78mL+60e7grIRY4+Cd51zEK1jYAmYxg4aFHTBt1GsAedsBpQuRfUxDRdpkHBXDSnY3i9r GzO1a9gCrapzfcFerlmDzgEJmUu1scg0cQVgH8yzLO66BoscvKsO3hCHU5DQ+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784587820; a=rsa-sha256; cv=none; b=taZBCw0u3GAjOPxOCCVZk4+lVUilkEbb/M9E95TguDue4GR1KL9P4dkAOgLxLhduj8meq5 selpdF3GWBHdpDZ4h+iZeiVk+BlLtHbm28k+4FbNHmhjtzM1QSsRBrgpYQ6y+D90IpUxtx h61Ei93C+1+RHyEZM7PlmdEb67wDu1v9IARpeRZZMStfb3G9JfAjVee1j9eBj3IqYZV1qX /dw7+a8ZE/Hbg4b4qexTHOtWfuKU0l+J3A+XRENnrJrUI3jn6pNOqV6IMDQ6IHForsqMyY lpN2eCnhb+Er1SuX7EsdaH+r+y9miA0gjBwgpa4YFRsI//+BnSMUb62G46tmkA== 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=1784587820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lhqw1amwOF+aTiowFQlL/c1ain+U1pN30LHir0kDmNc=; b=arv3YE+A/5y7zwoAcTusnrVSQACkP9TQ9bEzyMVSGBQ1nXP6kXPiGLnA705Q4AEUJCqm7K HE0LOUnQjlUuGFSTVgyC+O1ukvcaob7axHr6GzBMDrngfcfSI0loOVcgwz0fVdnoaeV0VJ gB9Vbfn52YVeoT0x5feaFBGmVu8Ma1TCI8eKji//cFIk1ZCWY+BqZdCCpvWssa+l+bJE5j nU+zLq0QdyuDeG0w0jDDxl3jXU1QG9hJQJSrLKL239uMF5UY8lIU5ewS0Xt2ioBAp6t/TL uivSrY+IptO6t+Ur44fFOizin53WKqFcKnVWX6Bnkqe0vb2n5+e2sq9yvWRikA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3whX2BR3z6C9 for ; Mon, 20 Jul 2026 22:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b90 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 22:50:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 23ea903f6801 - main - firewire: force root change when root node is not cycle master capable 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23ea903f68017f781ff579325caa01c928612d57 Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 22:50:20 +0000 Message-Id: <6a5ea62c.31b90.15b33c5b@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=23ea903f68017f781ff579325caa01c928612d57 commit 23ea903f68017f781ff579325caa01c928612d57 Author: Abdelkader Boudih AuthorDate: 2026-07-20 22:47:49 +0000 Commit: Adrian Chadd CommitDate: 2026-07-20 22:47:58 +0000 firewire: force root change when root node is not cycle master capable When a FireWire bus resets, all devices negotiate who is the new boss. when we detect the root node can't be cycle master, we send a PHY config packet that forces a reelection. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D58309 --- sys/dev/firewire/firewire.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index cc0cf9e5b7ad..1020aff31929 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -2491,9 +2491,10 @@ fw_bmr(struct firewire_comm *fc) cmstr = fc->max_node; else { device_printf(fc->bdev, - "root node is not cycle master capable\n"); - /* TODO: issue PHY config to force root change + bus reset */ - cmstr = fc->nodeid; + "root node is not cycle master capable, " + "forcing root to node %d\n", fc->nodeid); + fw_phy_config(fc, fc->nodeid, -1); + return 0; } } else cmstr = -1;