From nobody Thu Jun 23 19:07:23 2022 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 B45DF863C55; Thu, 23 Jun 2022 19:07:23 +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 4LTVB34ghCz3vNB; Thu, 23 Jun 2022 19:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656011243; 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=BD4wTnJM4TRpTMpnTFYsJXnzVw5BoZ1FBDl1Fr9jJ0o=; b=ZWMcL2FE5mx+4+BS78zC9KgV4aAfgIAHPclYutl1KQu+OJ1WMG7mIQpt74YnmUAcnXRhnO NtKf/3tXq166pA3uaVF3eBtV1gnUN+u2O8gMsV7UkElDbEp6Puc9CAi0JB/IJFRNU/hj5d Y24EVATh4ifePTL+tRk5c1kodCYHxI13c5O1HzgsMEaox6BJ92ePLjcBPJsxe6YZ4o4eHK iIsYOrnwasRycWSp4l7VUg5iOiYPv3g/b2KUm0yiR0XxJgaOf3IGNUh536yXDtrcGZ/xFz QLO3FH9ALkHim3tvEMSfZanwZo9txHS4Rb1tdYfiAFF5b7Bzhx90fXshwJhgww== 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 7D33520C2E; Thu, 23 Jun 2022 19:07:23 +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 25NJ7NiJ083705; Thu, 23 Jun 2022 19:07:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NJ7NCg083704; Thu, 23 Jun 2022 19:07:23 GMT (envelope-from git) Date: Thu, 23 Jun 2022 19:07:23 GMT Message-Id: <202206231907.25NJ7NCg083704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 29afffb942b1 - main - subr_bus: restore bus_null_rescan() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 29afffb942b159511ad7d5ea5d086851f65ef4a0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656011243; 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=BD4wTnJM4TRpTMpnTFYsJXnzVw5BoZ1FBDl1Fr9jJ0o=; b=wSwI2o3ucDOho3aPZ45MUSdEP8yTpgIf/drEWZN3notgVVq87JM+LlZRrMOt0mgHG/Ay4i E7qhAbM7JlqG1dak/y9KEc4xP78HT9j+kpV4N6DOFuZm9Z8KdCEuYzp8D3vd7H6CZulJk8 d39IhxtP8zP0sOKMZnqfEvQ9+pW0nsImyCvcyIljytqrzAy1AvgNL6zIhuhCPSEAvc7xUR lHdUXMYEABXvSCnsItbsbhrpUuG1Jx7cHtRjmEqi6cP32w8ugZhe8U9kJewh9R++hyYpO3 fqbLmMKVZhfAihBTvQ7zzeTRrnsmgwVCgLJnyH5yiZN5XvJsrtWF3TNrSPlAiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656011243; a=rsa-sha256; cv=none; b=yp/K/XACBmah0qMXci1q5By1DKOnsRVwfdHMDXUk8IsCMde5wPsMv8rAvRq7tFFcslmP2V 98E+dNYdfgipaCK10sb0PjV0p+m3c8nywe8Wd7Fpz7NbxQKyKtx0BFJ5HvYnUFYuvDhM5v BTpKe0CmWAb8I0Hky/dE88AhbfH+8SU0LENeaKHCFIyK7stgq2nlClw9QK30Yz/H4Fz5Gl pNSSRRQvZqyRPKu/Un5zSlxFRgcISGQwPHtCNVZS9LzJ6HrP49rgnzQc0vaRIOPzxXK35d kkclJNDjlE5sj9NaP01hXia0JsK0140UxU68kpGHYgiwRLCxVTMHmb+CvR4nLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=29afffb942b159511ad7d5ea5d086851f65ef4a0 commit 29afffb942b159511ad7d5ea5d086851f65ef4a0 Author: Mitchell Horne AuthorDate: 2022-06-23 18:44:28 +0000 Commit: Mitchell Horne CommitDate: 2022-06-23 19:07:00 +0000 subr_bus: restore bus_null_rescan() Partially revert the previous change; we need to keep this method as a specific override for pci_driver subclasses which should not use pci_rescan_method() -- cardbus and ofw_pcibus. However, change the return value to ENODEV for the same reasoning given in the original commit, and use this as the default rescan method in bus_if.m. Reported by: jhb Fixes: 36a8572ee8f5 ("bus_if: provide a default null rescan method") MFC with: 36a8572ee8f5 --- sys/dev/cardbus/cardbus.c | 1 + sys/kern/bus_if.m | 8 +------- sys/kern/subr_bus.c | 13 +++++++++++++ sys/powerpc/ofw/ofw_pcibus.c | 1 + sys/sys/bus.h | 1 + 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index d0661e0473be..c28b1558f28e 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -351,6 +351,7 @@ static device_method_t cardbus_methods[] = { DEVMETHOD(bus_get_dma_tag, bus_generic_get_dma_tag), DEVMETHOD(bus_read_ivar, cardbus_read_ivar), DEVMETHOD(bus_driver_added, cardbus_driver_added), + DEVMETHOD(bus_rescan, bus_null_rescan), /* Card Interface */ DEVMETHOD(card_attach_card, cardbus_attach_card), diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m index 9862f87aac64..6fc73a5732de 100644 --- a/sys/kern/bus_if.m +++ b/sys/kern/bus_if.m @@ -78,12 +78,6 @@ CODE { { return (0); } - - static int - null_rescan(device_t dev) - { - return (ENODEV); - } }; /** @@ -260,7 +254,7 @@ METHOD device_t add_child { */ METHOD int rescan { device_t _dev; -} DEFAULT null_rescan; +} DEFAULT bus_null_rescan; /** * @brief Allocate a system resource diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index eeecd4b189a2..78faa3a542eb 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -4708,6 +4708,19 @@ bus_generic_get_device_path(device_t bus, device_t child, const char *locator, return (0); } + +/** + * @brief Helper function for implementing BUS_RESCAN(). + * + * This null implementation of BUS_RESCAN() always fails to indicate + * the bus does not support rescanning. + */ +int +bus_null_rescan(device_t dev) +{ + return (ENODEV); +} + /* * Some convenience functions to make it easier for drivers to use the * resource-management functions. All these really do is hide the diff --git a/sys/powerpc/ofw/ofw_pcibus.c b/sys/powerpc/ofw/ofw_pcibus.c index 202adf11d53b..c0e99817888b 100644 --- a/sys/powerpc/ofw/ofw_pcibus.c +++ b/sys/powerpc/ofw/ofw_pcibus.c @@ -81,6 +81,7 @@ static device_method_t ofw_pcibus_methods[] = { /* Bus interface */ DEVMETHOD(bus_child_deleted, ofw_pcibus_child_deleted), DEVMETHOD(bus_child_pnpinfo, ofw_pcibus_child_pnpinfo_method), + DEVMETHOD(bus_rescan, bus_null_rescan), DEVMETHOD(bus_get_cpus, ofw_pcibus_get_cpus), DEVMETHOD(bus_get_domain, ofw_pcibus_get_domain), diff --git a/sys/sys/bus.h b/sys/sys/bus.h index adb6a0ac57d4..a1d11138a1cc 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -513,6 +513,7 @@ int bus_generic_get_device_path(device_t bus, device_t child, const char *locato struct sbuf *sb); int bus_helper_reset_post(device_t dev, int flags); int bus_helper_reset_prepare(device_t dev, int flags); +int bus_null_rescan(device_t dev); /* * Wrapper functions for the BUS_*_RESOURCE methods to make client code