From nobody Mon Aug 28 23:33:05 2023 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 4RZRgj3rgTz4s4sC; Mon, 28 Aug 2023 23:33:05 +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 4RZRgj3HSQz4c9Q; Mon, 28 Aug 2023 23:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693265585; 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=Nvd70PI/7Od0AhTw4JzScPe3psLCe27g4jj3VSG7PEY=; b=tEHsD9sANk4HsvNZ9dGOIQc772fJMn+FNFFstUc4Ub1o6vMbE9bB1IdF+I8+LEsCgHeMjn 3l4aJhx6Mz2VJyNuXe0y3qw9sgMiANzCsodfa2IbMSR1Or8svyM+P5rOhCbK4zcwTN8Pkh 1iAme9MjbVWGCvCdad0mCZpJWGP9aJ2j2Vo+XdGrre6YaFivcfCj3KFN0OZGTIPhEBIUkv vs+aSZUlANoIf03scVZ7o8F3kACgD1MAc2m20hILOfol1G1PguYVbRpNcA8EhXFNY+abvu k4551WUWipUZ9GJw3D/Xv616nprvuqBxSibCiU6hOgGUpEVMzZajMm3gYp0Esg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693265585; a=rsa-sha256; cv=none; b=H2vTq5CKj3WVGe/q3WONWpXlDdUET35DcBGumCRXuss+9Rr/WQNRB2rTxsxIp4hlCOzEvt HlPmmaXikgI7/vY4YD1zhMlgYd3P8VodT3+xoWMd5QWX7SNrpAIUbGr+TZWEESh57mZjvl Y8CDWyzXSqx1X3HnMTQizVS5tJR2N5p2ACTJXDHQsXwGksEhUEpmelCH0RTfCsTxcu3kKH oHogCMAW8ZBQ3LAfNou467eVm4SKjpoMO3Irw8j2PPrgQDc2IOPUsqRnzLcf5irhm4wdp8 VOPV6pDSi3r9zalQEk18gOTXOalw+Hgp8GCVcWkMRoXZiR9f7k3e290how2tgQ== 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=1693265585; 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=Nvd70PI/7Od0AhTw4JzScPe3psLCe27g4jj3VSG7PEY=; b=Xu8CZtkx4XgBPYdwf7TaseT8BMoiAEfha40g4aZlcVE2NsZJ14h01x5rLE4KPqnCytmcwP 1vpAe0kBW95VRCB91/jRsZdzR24n6WnBoX4jBGN3triQZ33Q0ujMShBlhflq7zr4EBPZnw F2pFDy/joOvZD8AYSe8MMKMo0yAbU0Zj4MggfFOZbjSdg9Wxd3hxJF2sSsusKEvYnkOi3e fzeC/yeb8OQnjRrNDWiagDczAALw411WYhT46HfnDkC4Sz2B5DABM+FwqwHfQTDi/hJmht CfaBpQcvY0F8RBY5KaHd5KMmGg/EL2094uX+skIYxpVkBnOQk8wIWNMAKegx4Q== 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 4RZRgj2KdCzD0G; Mon, 28 Aug 2023 23:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37SNX5hK076950; Mon, 28 Aug 2023 23:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37SNX5YT076947; Mon, 28 Aug 2023 23:33:05 GMT (envelope-from git) Date: Mon, 28 Aug 2023 23:33:05 GMT Message-Id: <202308282333.37SNX5YT076947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 570688f0a5c2 - main - spibus: Make ofw_spibus probe just a little more favored 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 570688f0a5c2db8e006a9f1f805103d7c407281f Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=570688f0a5c2db8e006a9f1f805103d7c407281f commit 570688f0a5c2db8e006a9f1f805103d7c407281f Author: Justin Hibbits AuthorDate: 2023-08-28 23:27:11 +0000 Commit: Justin Hibbits 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