From nobody Mon Jul 20 22:50:19 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 4h3whX3VgYz6dZgv for ; Mon, 20 Jul 2026 22:50:20 +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 4h3whW5SZfz3Mjc for ; Mon, 20 Jul 2026 22:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784587819; 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=VTtbxH+27rPiOUchY/SkYg8iE3B3I5QQZ3a50Y0tmZ4=; b=LFLNOslvkK8qFbORkrwAFBSYRrqR4K5UVU24QMmB7NdAyvrY+HP95t1sXtlXl2bdqN2Y01 sMe3pL7ywuANMTLsJxanYskGSCqg8AeJhHNSIsRafVYyGXDx3hu+htR8OzzF3bY0G9po+e FmFDQ9NZa+4rXoVJlhEuXX+aCAb25O4nWngqj5Br2hW2REGGSJ9ki0q16htPRzGxiLF1lH lAXExIqR9w+puHZmbC8O3et5NlSBXJvAXrCXB8+JCSoe+7zRiOy5XqsDSmP8UPHfnyK1AC raisU0G7EaMxRdoksosH+qpsvl9iLnX9YM+1bizmrm9fvbbBIVt6Tda10LYL3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784587819; a=rsa-sha256; cv=none; b=VGDsdprbPhe99bkuVuYlIlJ7eC1JubrEf6cn6yA7NzaovX+bCJxrd4YJRKwG6VSj4JBp6U 1/4U92ldl2Fcp3gF21XBr+Qu9lEWf0UdYMDA2T3oBcsv1Bmykcra6tbpC1khbmBocLBAzY 6C6HPK62upXG/ecpg5iJCcK92fAfKw9y9V9OCTC/t70GaVlOF21caaNQowtGPxf0EaKsrT 5ZQqBRyHAenJaBA5FAUp8wyGDhIp9LRmC0sntcupAKrZFySzon4yb4jU75SSz6sWVs3rhy f1bjZud66xSud6E/j6lhHPmUjub4oQ9eCgN78CU4Jsk6AIzK+w5h5yZ/U1liTA== 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=1784587819; 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=VTtbxH+27rPiOUchY/SkYg8iE3B3I5QQZ3a50Y0tmZ4=; b=sG/3f3fvw4BrhQH9nFngs/QGXxP2L4Vc1EsxIx4y4nk7jdXKysFYUBWMl/B7sRsim/HsVy S718PLEH2CXGUVLeIrfpWAfTeEDN1icxwlQkJmromviYgSdpK+SnJzo+OEAtZOwYXGptnM KITVdq4iO4MA1538tGuMZoP4q5EObPYRXgsGIRg5dlVb5orNvmZQ237EMi8qzgCQfsyelm 1isUsoli9GDrRckKAg9+ZRo00ro8tKP8pWjpoVsbFouD/d5m8ANkqMkXV8FY25mgVcBDqS SxlMDUjTtZZEY5ZAlNad+YHPrzEYKwaqxGgExYvNM+YthXZQHfU+anujqy7EBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3whW1sYZz6MR for ; Mon, 20 Jul 2026 22:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30aff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 22:50:19 +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: 5b7449ad47be - main - firewire: drain pending xfers after callout stop in detach 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b7449ad47be4582ff451ce4615753dab4a6f882 Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 22:50:19 +0000 Message-Id: <6a5ea62b.30aff.5360d636@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=5b7449ad47be4582ff451ce4615753dab4a6f882 commit 5b7449ad47be4582ff451ce4615753dab4a6f882 Author: Abdelkader Boudih AuthorDate: 2026-07-20 22:47:02 +0000 Commit: Adrian Chadd CommitDate: 2026-07-20 22:47:22 +0000 firewire: drain pending xfers after callout stop in detach Removes a TODO that predates the existing drain call. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D58308 --- sys/dev/firewire/firewire.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index d3808f5c8e62..cc0cf9e5b7ad 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -564,7 +564,9 @@ firewire_detach(device_t dev) callout_stop(&fc->bmr_callout); callout_stop(&fc->busprobe_callout); - /* TODO: cancel pending xfers in atq/ats queues */ + /* Drain xfers queued by children during detach or pending callouts. */ + fw_drain_txq(fc); + for (fwdev = STAILQ_FIRST(&fc->devices); fwdev != NULL; fwdev = fwdev_next) { fwdev_next = STAILQ_NEXT(fwdev, link);