From nobody Thu Aug 11 14:32:45 2022 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 4M3TmZ02dsz4Y211; Thu, 11 Aug 2022 14:32:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M3TmY6Vylz3M9J; Thu, 11 Aug 2022 14:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660228365; 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=Porv66dHrF7rfTiHBES/LXrJnQIoiE9FSjrhsLRTbXU=; b=nQIqEBniptZ8WeJPVhWV6yixLbj+p8GcDVFdvX+zg0PGm4exjs5lWKp15+nTyUtrAfgWrz fFlh1/Zc0MIUhbkggwEnyukUIVOVkA1rjeGetMA7a4AVun3F+JRyV109OKnvg3nHlso0ZW x84aNHrJ/eZxFp7rFsEy+StIcXU9ggmCnzX+xNss5AakZAXgWDG4GYZN9eILFzP3jOOMAK KrsTeQA4grDB6Z5EvJV4lE71huLoxY9yiRn6cyZdxnabbvkeFhuE/cFsNQghBFjT980yDW 4xNwrRtKYU4DsrvP4W+arFuoneBsT3G1REDZHCqo7iFSTKRygK51JwudRr6vug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M3TmY5ZF3zvLV; Thu, 11 Aug 2022 14:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27BEWjIb004472; Thu, 11 Aug 2022 14:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BEWjCQ004471; Thu, 11 Aug 2022 14:32:45 GMT (envelope-from git) Date: Thu, 11 Aug 2022 14:32:45 GMT Message-Id: <202208111432.27BEWjCQ004471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: e554a6d0ce3b - stable/13 - bus_if: provide a default null rescan method 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e554a6d0ce3bdbeb65ea5b5fdf0bdf8c1095c3df Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660228365; 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=Porv66dHrF7rfTiHBES/LXrJnQIoiE9FSjrhsLRTbXU=; b=YxM8KvccFqM3e9uyabJkGVVyvw5cSjBS/vu+rtAJdfCmskTRvV36IHgy12/SuSR9vhye9d X0f5+ziJ5ZfOxU8UTaH/3auaN42PvIR+fEfbx07qso3tvSaTrcOZ/ikZceyQjVJY/JxBGv Z6RqY1CXwRK/H35rQdE9ipBTLYJYsn9qXpqaWT4w1Z8MUVJC3GTvspXHe38YjpgneKY3UT fMEeiVi24MzJJvgKc5E0NhXu2iQMbA8tSf7BUrE3eggNU++9OfrpEID+TCkSa8ob9W2tDP I9eydjmpeTspx247NiG5oiCv5sx9GHsW335Yj/yfOmLy/2LbU+IPknndBHFc4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660228365; a=rsa-sha256; cv=none; b=FfffAH2/qqZNykSaPw064fwB3tYXPxptWWRb2xnZNL1LV1fUIhNhKsoE7h4kEIckkk3lmC ePptEhih27SoTDq3e5NkxoEnqeq6Mjw1rMx6fdADu2teumZ86dXHp1PRUxnGAI+EtIMn0Z vbxkX/TDMmuEkiuwtCRF0IC4Uoyh6m+ARXj60khakSrK3QDHK9yx7zJaTXz0MyVnP2hmmF k0OldGWoqZt3ZK2UzM8Y9Yvgw9su1DkCrVS/rl/UPV7vM8iprI7iNCUgM9qw0IpAi1+OKQ byjMIpmBFDq8hbJtl+YMLomsTiYlx+SdM/uxWckX9RaqF6t9MTU5+4vlXZwlZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e554a6d0ce3bdbeb65ea5b5fdf0bdf8c1095c3df commit e554a6d0ce3bdbeb65ea5b5fdf0bdf8c1095c3df Author: Mitchell Horne AuthorDate: 2022-06-21 13:29:53 +0000 Commit: Mitchell Horne CommitDate: 2022-08-11 14:18:21 +0000 bus_if: provide a default null rescan method There is an existing helper function, bus_null_rescan(), but most drivers won't use it except to override an inherited rescan method. It also returns the same error as an empty method. Make this the default rescan method in bus_if.m and return a more sensible error code. This gives a slightly more meaningful error message when attempting 'devctl rescan' on buses and devices alike: "Device not configured" --> "Operation not supported by device" Reviewed by: imp MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35501 (cherry picked from commit 36a8572ee8f5db7ecb64bedc5738a363ec7cad36) (cherry picked from commit 29afffb942b159511ad7d5ea5d086851f65ef4a0) --- sys/kern/bus_if.m | 8 +++++--- sys/kern/subr_bus.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m index fa6d1d85c412..dbc738abb1f5 100644 --- a/sys/kern/bus_if.m +++ b/sys/kern/bus_if.m @@ -67,12 +67,14 @@ CODE { panic("bus_add_child is not implemented"); } - static int null_reset_post(device_t bus, device_t dev) + static int + null_reset_post(device_t bus, device_t dev) { return (0); } - static int null_reset_prepare(device_t bus, device_t dev) + static int + null_reset_prepare(device_t bus, device_t dev) { return (0); } @@ -264,7 +266,7 @@ METHOD device_t add_child { */ METHOD int rescan { device_t _dev; -} +} DEFAULT bus_null_rescan; /** * @brief Allocate a system resource diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index f7e55e7f48d8..c70e0e7b5ec1 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -4613,7 +4613,7 @@ bus_generic_get_domain(device_t dev, device_t child, int *domain) int bus_null_rescan(device_t dev) { - return (ENXIO); + return (ENODEV); } /*