Date: Mon, 28 Aug 2023 23:33:05 GMT From: Justin Hibbits <jhibbits@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 570688f0a5c2 - main - spibus: Make ofw_spibus probe just a little more favored Message-ID: <202308282333.37SNX5YT076947@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=570688f0a5c2db8e006a9f1f805103d7c407281f commit 570688f0a5c2db8e006a9f1f805103d7c407281f Author: Justin Hibbits <jhibbits@FreeBSD.org> AuthorDate: 2023-08-28 23:27:11 +0000 Commit: Justin Hibbits <jhibbits@FreeBSD.org> CommitDate: 2023-08-28 23:32:44 +0000 spibus: Make ofw_spibus probe just a little more favored With ade70a1ad(svn r332196) ofw_spibus probes at the BUS_PROBE_DEFAULT instead of 0. However, this races with spibus, resulting in ofw_spibus often times losing the race and the OFW node not being referenced. This in turn causes child device tree nodes to not be attached. Solve this by returning 1 higher than spibus, just like acpi_spibus. Sponsored by: Juniper Networks, Inc. MFC after: 1 week --- sys/dev/spibus/ofw_spibus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/spibus/ofw_spibus.c b/sys/dev/spibus/ofw_spibus.c index f9323ab342ee..9460b0cadfe8 100644 --- a/sys/dev/spibus/ofw_spibus.c +++ b/sys/dev/spibus/ofw_spibus.c @@ -69,7 +69,7 @@ ofw_spibus_probe(device_t dev) return (ENXIO); device_set_desc(dev, "OFW SPI bus"); - return (BUS_PROBE_DEFAULT); + return (BUS_PROBE_DEFAULT + 1); } static int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308282333.37SNX5YT076947>