From nobody Tue Dec 03 02:17:08 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 4Y2PRm5Kjcz5fRm9; Tue, 03 Dec 2024 02:17:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2PRm4syxz4hP3; Tue, 3 Dec 2024 02:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733192228; 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=0qR9gh7A34MTzyhFBRK6W1193SupGfcyBktqcjU1gLo=; b=EtisOy/IPzHhR2T7EfX7jw1RPCJr1ws/oucxA7+CJEwFuMcr3IFBvaL5SXs4j50xTaX9sm 3Y55b7UWiFpYKx4qJJT+AwoAliHdjv3R/m3jYbS5rtwNep3PlolzbYUW/vj+fPswusbp41 xx3eofHidUDsFKo+zq7KGE2RHKRBYyI9dVIpwAO71ysFk24WGfSOtphF2PWD4B8G97Lp2B xkF9CU080gNeDScpsAltlota/HwIvgFZiaD/RoOnumCUzZkv5l5yejbXmriUVFs9hg+XON 3Z7QiG5aD1qozmV8QxvyAAAKdJj9rROeRB7iMNMh/IluqKJTIjTDj2nAFhW9Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733192228; 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=0qR9gh7A34MTzyhFBRK6W1193SupGfcyBktqcjU1gLo=; b=dqXeUFt1OkkhTq6CaCnxuXf4fG7pVC8drtoiTtR+SIC2iTU09IjKydAicJQIxgV6W7xlvx nClVdt0w0aGHoaNYUgCk3A15XsINPtj8ZXj3wlAe7qaA4D3PyVNSJY8N/zHLZ3VDsXWhSW 7qQn0V5t9SGkUJSKBwW6OHj/umpoT8P2EsQbbGcyzgKMuWlGhsxccLIl7EHhwlR1UKZeoR CAlLsAOmcYSubJDKZ38JCLHV8N8QJ16uBHh1BKp561PGK7TUIikYlgclXdI7Xu4K/aAAL6 HDxaVZOoo6alQa48FW2sfvYJ9GvQDLVMfl5HtvAMyp2qJxkM1/tKtfeSE04acw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733192228; a=rsa-sha256; cv=none; b=LwF6Vz2jhIyFjqySajgmNaWBX58vMsx2th1qududb7H1poyY8bnGavjt6efeitbWFDdMhZ dpPy+nr8fXHClwW5A5KypEAT+OYShwk36UPDbV9AgcsuzMbXbSHVeRqv8Atc1XXhT4LiAL UgCFhjKJzaQXNCxVeTnnDpaTqWtkaFYsiU4oJg/4V0OqlfAYfh3qTxI9GhTfCqsUM4ZoRj hrJHlAcZk6yD43trZ1fC/cgTS9poI/UTr0uY/WzpqAFZ5cWuHFD6COyIcEMo8YNA83Smzg siiRHR/FQHx6+CBrSsdNfolPkUIfqphra7WQdwJdxdMKuLukHPqvMBvDyB4srw== 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 4Y2PRm4Lj4z13mK; Tue, 3 Dec 2024 02:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B32H8PP070554; Tue, 3 Dec 2024 02:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B32H8q0070551; Tue, 3 Dec 2024 02:17:08 GMT (envelope-from git) Date: Tue, 3 Dec 2024 02:17:08 GMT Message-Id: <202412030217.4B32H8q0070551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a5c39c444891 - stable/14 - mii_fdt: Search for the "ethernet-ports" subnode 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a5c39c4448919d227fc671f7c229daab92c1ceff Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a5c39c4448919d227fc671f7c229daab92c1ceff commit a5c39c4448919d227fc671f7c229daab92c1ceff Author: Mark Johnston AuthorDate: 2024-11-19 21:05:19 +0000 Commit: Mark Johnston CommitDate: 2024-12-03 01:01:59 +0000 mii_fdt: Search for the "ethernet-ports" subnode This is a more common name for the parent of the port nodes. PR: 280770 MFC after: 2 weeks Reported by: Mike Belanger (cherry picked from commit d6b692835e52d85441dfdd20a01c12e17cb50914) --- sys/dev/mii/mii_fdt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/mii/mii_fdt.c b/sys/dev/mii/mii_fdt.c index 240312114cf2..2254af162a34 100644 --- a/sys/dev/mii/mii_fdt.c +++ b/sys/dev/mii/mii_fdt.c @@ -115,6 +115,8 @@ mii_fdt_lookup_phy(phandle_t node, int addr) * Since we have multiple candidates select one based on PHY address. */ ports = ofw_bus_find_child(node, "ports"); + if (ports <= 0) + ports = ofw_bus_find_child(node, "ethernet-ports"); if (ports <= 0) return (-1);