From nobody Fri Apr 24 17:56:06 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 4g2LHC37dgz6ZxVl for ; Fri, 24 Apr 2026 17:56:07 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2LHC06p9z3qHc for ; Fri, 24 Apr 2026 17:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053367; 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=MOxwZ3yvwr2Na9oW6fTZUDKtrMRfKvKvC+cSQmvq3g0=; b=Ox7um4B/gIolnGlWgREWPuKecdshuRai7AzT95PKtp5LskOG5tBynuq4fbdOuYPMNuxa0t AuV4cKFJmLHlzcwypAy6+XmF65bepeAThYKjoKF/2YjtbW3CCRhUlFDFMPRUFehjbBBzlG yT/wKBoyoetKxtusSmqMtXquu/vWv43n/zEl7bZV44xDDkS3N+huq8tn0iKg1GqLr+QhKn w4V0E//VPV8mFr0LoNwR/87xXPw6DhJnbwNreMWXBwCQG2jmCTu4JUYa0nEeYojUt6OTVI YCjKG0jPRHsWOwP3Ld3HGg1mpGst/Odjp3dKpaW6gOanUWDqviDeCA3eoGtkOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777053367; a=rsa-sha256; cv=none; b=triXjdlr/hgCA9/N+QX3i1AmDEfwKnLUYMgjDrJSuF5QCR6CPzDCzFezu4ucfXofsH4kmn l92Ke7emt40dkBiYrjdBXbJAQ05D/YLH3J6LXlXDB7hCmnLGEjgmAWqyi5FoOFTGW/vTji FV78Xg4mIBs/M/yuxY5rGlUZWtnDaRYl3LGwezGkqtS+xLuz5mwB4A60RUurjMRDentsV+ x2pOa3tmURFkqO8U0CyyPD3nqU/s8EYa4MemV8eHg0ZtEK5yd93IVeFcfOFXqnFr7W0sUq koxt9xWx6KXPGPZK1QB2o73qTE7gX/o7WcfE5P17cgiSGF9SqxcGUdeMVbKHWA== 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=1777053367; 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=MOxwZ3yvwr2Na9oW6fTZUDKtrMRfKvKvC+cSQmvq3g0=; b=JZlNjgF3DPMZM3ekbq+u2XJ0/R/AiCm3FVyzo60rmajoqOMp9G9EMb3vG+A7ld0rkPKCAl JwGxadIWdmW7igH8TX+ocfezlDMPuEwvlaBNUA1IHnMzeaR4/VoId54z6y+SJwS/M3xkE/ Sq/9TS3H1ZmMWzy3j9vWrQj8bYD6GoQQ52eWXwwypWuK8siIv9yNrNwwk3B3wGCY6vjTlv KPI7CHHqD+88dWsscSx2Kokh2glPlrbpEOL/kHTxOendOgd5FCU6wgd8UsIpbBBHWrQVEQ k0XNdIa7fcqvm9qfGYk+6ZyAM/iQofEK2B5bdtDXhghpU70SQG+EONdwZh9ajA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2LHB5lKDz1CZy for ; Fri, 24 Apr 2026 17:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ec00 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 17:56:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Marcin Cieslak From: John Baldwin Subject: git: 92d9d996538b - stable/15 - Do not fail 'devctl clear driver' if another driver is not found 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 92d9d996538bd6bdb1e6d35a7e5c13a7d0b24134 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 17:56:06 +0000 Message-Id: <69ebaeb6.1ec00.7091c8e1@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=92d9d996538bd6bdb1e6d35a7e5c13a7d0b24134 commit 92d9d996538bd6bdb1e6d35a7e5c13a7d0b24134 Author: Marcin Cieslak AuthorDate: 2026-02-25 01:58:59 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:43:30 +0000 Do not fail 'devctl clear driver' if another driver is not found Detaching the bhyve(4) ppt driver from an unsupported PCI device should not raise a "Device not configured" error. We do not expect that a new driver must take over the device in this case. Reviewed by: imp, jhb Differential Revision: https://reviews.freebsd.org/D52050 (cherry picked from commit fba56be09f1c344cc5805b898fbfef6066950942) --- lib/libdevctl/devctl.3 | 3 ++- sys/kern/subr_bus.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/libdevctl/devctl.3 b/lib/libdevctl/devctl.3 index c8a4704825c2..94fe350e524b 100644 --- a/lib/libdevctl/devctl.3 +++ b/lib/libdevctl/devctl.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 4, 2019 +.Dd February 24, 2026 .Dt DEVCTL 3 .Os .Sh NAME @@ -193,6 +193,7 @@ is true, the device will be detached from its current device driver. After the device's name is reset, it is reprobed and attached to a suitable device driver if one is found. +If no suitable device driver is found, no error is reported. .Pp The .Fn devctl_rescan diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 1001aab2dc54..37c4bfa2cf78 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -5961,7 +5961,19 @@ devctl2_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, dev->flags &= ~DF_FIXEDCLASS; dev->flags |= DF_WILDCARD; devclass_delete_device(dev->devclass, dev); - error = device_probe_and_attach(dev); + + /* + * Don't use device_probe_and_attach so that failing + * to find a new driver isn't reported as an error. + */ + error = device_probe(dev); + if (error == ENXIO) { + error = 0; + break; + } + if (error == 0) { + error = device_attach(dev); + } break; case DEV_RESCAN: if (!device_is_attached(dev)) {