From nobody Fri Mar 08 14:10:07 2024 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 4Trp332fkxz5DCkS; Fri, 8 Mar 2024 14:10: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Trp3320Zdz4WwS; Fri, 8 Mar 2024 14:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907007; 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=5gUP50FVTvNtEDFHETuzq9ceNof2UVsQ4FPQe2pBuS8=; b=N/YeeQxF1nI9VNv+rexo1LOKapAPVhSNItivdcrdJ5nRHLcmE2ctpUdvS3gD3FKdYI/B+h wsNE0SgsexBsJHxgGTTLrKHjB7yVs/Zp8dXIuRfAvL0NxyJTH0ugQjmVTmuhSOUTEM9om3 +WSeVRdVUA5b4Eu39EYb2mi2okTPOAWHpebCeaGD4PGAdQZGtg1YFIPgDduMg28HfMqGz5 08vj/HzR2M4v/UNm+yt742FrhVzBOzNRA44sAhy7ZZKpHWrTmpDt0x1Qh0CmaHw1KMaM+O jW4XmHlixznRVk9l8DLynRpXKj6V9pW5RlM7NGtU66QRY309KqSpJDZVg3WF3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709907007; a=rsa-sha256; cv=none; b=DwrCCwico6wvgdj0omJpUgSfN6vnj7KD5VY75PCyaF5iXghL45uq0WePJ1H/xONoRMwm5a TrFE7lTBoSGGGwvVVk/pg51x27YPmVjJqHbD64muwb+7j5BCqiwlcHjdVI55hROMVc9mzP xf1y0AdX70UuReugbdgeT8kBrk7WPZTguh3WioWz5sjcq1JhIZERQIBIhVxkvsPEbMoQB2 MrV7GOGOegtT3QrtyOOt1IqyBA8l+VvN4o/acMlNOPhdWNxr/QMtTj7Pd4s53kR9kwx/sS qXyxgByQwD7k+5ckxBdgHWCgn+BpVzwGhM5sWWEUUJ7/Zii9pdpWoBaDdr9uAQ== 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=1709907007; 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=5gUP50FVTvNtEDFHETuzq9ceNof2UVsQ4FPQe2pBuS8=; b=ArS2XYJuHactdnb0aN40VY0KQlqVzuAbyox8md30odo3/KQK60n7TM2IP3TQiG6jc2z4h2 QRNR273OpUZHhCQ953cBCxNCyBUSxGTD6k8QtX7L9UpFe5y72/92UU4fw8TqGoyyDKH9Oj z5PWg+EfWa1wafnUz2wK+pGN/5G7PdXJjQg9ph/AICXpV+boFEasBPkjqwgmTt9X77kI66 kXBrB8l48cpTS6a1mlqlpVZ6UqIGhNmeH0Lx+ZDmjVpWg48u035no8x2AkW2cePsErTvUx J+oztQnJm0ga56wa36Q9LhMM+RTHBc87mN4NhA6Dgl76yHR5zn0pXKqYLKxmPQ== 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 4Trp331cwQzLhB; Fri, 8 Mar 2024 14:10:07 +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 428EA7BB057646; Fri, 8 Mar 2024 14:10:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428EA7JG057642; Fri, 8 Mar 2024 14:10:07 GMT (envelope-from git) Date: Fri, 8 Mar 2024 14:10:07 GMT Message-Id: <202403081410.428EA7JG057642@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: accda7815317 - main - simple_mfd: don't attach children twice 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/main X-Git-Reftype: branch X-Git-Commit: accda781531788a814bc438e1e96ef544c12aeaf Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=accda781531788a814bc438e1e96ef544c12aeaf commit accda781531788a814bc438e1e96ef544c12aeaf Author: Mitchell Horne AuthorDate: 2024-03-08 14:09:17 +0000 Commit: Mitchell Horne CommitDate: 2024-03-08 14:09:36 +0000 simple_mfd: don't attach children twice Trying to probe+attach the child device at the point it is added comes before the syscon handle is set up (if relevant). It will therefore be unavailable to the attach method which is expecting it, and the first attempt to attach the device will fail. Just rely on the call to bus_generic_attach() at the end of the function to perform probe+attach of dev's children. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44268 --- sys/dev/fdt/simple_mfd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/fdt/simple_mfd.c b/sys/dev/fdt/simple_mfd.c index 3ca7578d234d..5228c6998821 100644 --- a/sys/dev/fdt/simple_mfd.c +++ b/sys/dev/fdt/simple_mfd.c @@ -168,7 +168,6 @@ simple_mfd_attach(device_t dev) { struct simple_mfd_softc *sc; phandle_t node, child; - device_t cdev; int rid; sc = device_get_softc(dev); @@ -203,9 +202,7 @@ simple_mfd_attach(device_t dev) /* Attach child devices */ for (child = OF_child(node); child > 0; child = OF_peer(child)) { - cdev = simple_mfd_add_device(dev, child, 0, NULL, -1, NULL); - if (cdev != NULL) - device_probe_and_attach(cdev); + (void)simple_mfd_add_device(dev, child, 0, NULL, -1, NULL); } if (ofw_bus_is_compatible(dev, "syscon")) {