From nobody Fri Sep 25 20:48:28 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA83258B6A3 for ; Tue, 8 Sep 2026 15:57:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788883057; cv=none; b=rsbu+8MzgKrUWNSI95u+8TKWjrPDij9g05evSwZLg1YRYxZ56hyjQ27PeY2gYBFM7blGqM5a8HUbQR5NXf+f54x0bWs1Zn5JvihdxlECTq6cDsWYt0EbABLLRQP/Y1sS47+2kQiCwToSuvm7pA7P668Ym+qpJ3SOSnPm7yHdio4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788883057; c=relaxed/simple; bh=3S8+SIZMe++uc49JSNvJUaBmn7A9ZJ1K3lr9hNoioA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n4E0CZ37mD5IkqJUihFeMsD0adRRWqHZ7/WygmeOV8OzzY17tz/s7xuqehqNfb0bjwyGXgSSyKsN+u5/jTQDFT0lSQAewrQa/jnZqMJLP04KE7XukpEznyRIl/4mnKjCTzgDlDBJ05syxe4srSRgCKiNQ7fMEj4cAHbR+1BkCWg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lex.la; spf=pass smtp.mailfrom=lex.la; dkim=pass (2048-bit key) header.d=lex.la header.i=@lex.la header.b=eVK5xf7K; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lex.la Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lex.la Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lex.la header.i=@lex.la header.b="eVK5xf7K" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-49d036e0e99so19036205e9.1 for ; Tue, 08 Sep 2026 08:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lex.la; s=google; t=1788883052; x=1789487852; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=qYSjeGcJ1MZAeWSYitC/YaPtibetrH4tpM+XIfJ1kBg=; b=eVK5xf7KjGe1194lZRCfwEUhxfJZmJGwmKZXQ0lMZvL65VY6beZ9+BN6ISyQmuAeHI relgsr7oS/xlAJrI8M5VFlK9L9X2/sFc6MWEBofvj5BoX6Y/MCBhHKM3caJ3I6sYg+4I miVeqrDn/VcoQR4LeWjpetE6/cWLuvQC6nNvkZZ6W9jkZ1MpTN692RF8Jju22lZBMCOP LaFRTTaO1uXMYm+dheRLe7AdkXa0owHDZbvgN+7mtwu3LK4mjmCupHSNiI1CsjaU4GsH 8OfsD20r15gKfKQfyZzf+rDS4OysOSGvnZOmXg0ZfoaOTEFrylGr1MDzqZ81cJoetXvm bQTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788883052; x=1789487852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=qYSjeGcJ1MZAeWSYitC/YaPtibetrH4tpM+XIfJ1kBg=; b=Xv5z323tbwc7NmrrqlUCRnpGsf71tv/z6qIMSXIiECFMO/XztYeLxI2douciVLrQGB 21z679ITUSF+IWlh+YI2j14sre/e7BSAa8UeuP/CcuL+u329pBKSptXfLYUyu+AXV/Qs dfQip4139hyNlu4cP6VQZKvyU8J1YKNxMmG/e+w3M/yrzPhJK9E0UNC8o/HbdUCz0O7R sAutHNJan07JSaQ8wv1cl/5keqKpngnGe3o0O683Z8p5ZiH9TevRAlANHuS1Bc7z2VYL JgjbvtFJ1pWgUb6m8aYEhZ4gdpBc9XJThoWwcyFej5QOAaAFUHCthsULzJk7kj6f7VSI V8xg== X-Forwarded-Encrypted: i=1; AKwUvBwaw6kMt6DhYn1CMj0E0s14g8pVcy3Z0Ul5HjzsrMXSO2CEjPwaVh+pnppozeTR/7fVgDHfEWzlo5If4Ak=@vger.kernel.org X-Gm-Message-State: AFuF++lqyVCxGSwxlwzwLN3OJh6vpjCcH8u5XO8RNHPfPoY89Rd/4w+C OpVb5OGJoEiFBBtqcWUwfq2ur1p5XBif6b//36M5CiLHcd9dOrsCLmT/Y6bHaLVf/ec= X-Gm-Gg: AYBFou3IPoejseBsdTh7LQRLjU6r45rxGuvtmxKZoDSa4YuTXmPs0SYSBIYqqhziLmb lzX6xCQP9P7pf+FbArI/bRW8++PJGglQN5ZDzcU6rXE5AuL1saoA2MRRTJL+ea5AVB6m3r8PZLZ 9tH2RdXGekFizPtR6b5D7LITh9EL07lpyI4XFODjFQ6870u273f6QLlWmAr4OwPSFiW7kv02MaZ XvqTBIY8FUFrEx17jt9fqRKr733QXGYbXbJimZgxOZLGu7d8UAxOC3Rf6YCCn1yUkfBLk31KyPI yGfiiOZaAaD89ITBbHaOOPqshdkjltEQZRn5mhg0/6X6Pibcqn+etN4UrhLz2UQcFE8Yjsac0DM pr8mAbpVdMvZKkFcrh5fKzzTQaq4Y5fit4MftSp0a0R3vLDxMf3K2QJ1jqNsDtnOlfGydI8Vszh erkXVysMqUYi1RvndUpqUi4s7ZsDhsswnPTJCoUZk= X-Received: by 2002:a05:600c:4e16:b0:49c:fc6c:bdfc with SMTP id 5b1f17b1804b1-49cfc6cc01bmr257597585e9.19.1788883052584; Tue, 08 Sep 2026 08:57:32 -0700 (PDT) Received: from remote-01 ([84.17.55.227]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cf7703cefsm542370045e9.5.2026.09.08.08.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 08:57:32 -0700 (PDT) From: Aleksei Sviridkin To: linux@armlinux.org.uk, andrew@lunn.ch, andrew+netdev@lunn.ch, hkallweit1@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: conor@kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Aleksei Sviridkin Subject: [RFC PATCH net-next v2 1/2] dt-bindings: net: ethernet-phy: add needs-host-firmware Date: Tue, 8 Sep 2026 15:57:27 +0000 Message-ID: <20260908155729.4164814-2-f@lex.la> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260908155729.4164814-1-f@lex.la> References: <20260908155729.4164814-1-f@lex.la> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A PHY can be one that the host has to load firmware into before it can be driven at all. A controller that connects to such a PHY at setup finds nothing usable and drops the port for the whole uptime, even though the PHY works seconds later. The flag declares that. A consumer that sees it keeps the port and connects the PHY once its driver binds. It describes the PHY, so it sits on the PHY node and needs no prefix naming one. Assisted-by: LLM Signed-off-by: Aleksei Sviridkin --- Documentation/devicetree/bindings/net/ethernet-phy.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/devicetree/bindings/net/ethernet-phy.yaml b/Docu= mentation/devicetree/bindings/net/ethernet-phy.yaml index c3ebb3af8b52..e217101fd54a 100644 --- a/Documentation/devicetree/bindings/net/ethernet-phy.yaml +++ b/Documentation/devicetree/bindings/net/ethernet-phy.yaml @@ -215,6 +215,14 @@ properties: used. The absence of this property indicates the muxers should be configured so that the external PHY is used. =20 + needs-host-firmware: + $ref: /schemas/types.yaml#/definitions/flag + description: + This PHY runs firmware that the host must load before it can be + driven, and is not usable for as long as that has not happened. A + controller referencing it keeps the port and connects the PHY once + its driver binds, instead of failing at setup. + resets: maxItems: 1 =20 --=20 2.53.0 From nobody Fri Sep 25 20:48:28 2026 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5849A58B6AF for ; Tue, 8 Sep 2026 15:57:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788883060; cv=none; b=sP2MT9xswAIGoEhyYvBGXvfAgFPKDvTLAB2AbNYCURpQiydXMNedAqlD9YIshxXQtjZu4cZvkmGimL+JYPxBi2LorCotQFNbYTKRQo1hdEEq+NI0syyzMQmn/0kwPQmeGYigUB//ohM+W89SrrD4sFwGTVSMmfrT+jcxA5ap7sI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788883060; c=relaxed/simple; bh=RichJAb3WUIXvHmkckzegxBh9c+qsyloSrT5sVgqtYk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pk1DmUmSMueWCH/MKhzbaZQo7OpoNbSpOo/fvEkOpixmOEC6msdhqac+RaGIf43J2mRcbFbx9/7/DZ/hxdF5wjhOWFKtahJ/WhtwVi4mztgGjJMr2b8vv8RXTn3jowkR9m73HqtNig/31p/cqGhyD7otl3vmd/PfNxnd/6JCe30= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lex.la; spf=pass smtp.mailfrom=lex.la; dkim=pass (2048-bit key) header.d=lex.la header.i=@lex.la header.b=Q2StC/yO; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lex.la Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lex.la Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lex.la header.i=@lex.la header.b="Q2StC/yO" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-49b9320423cso54556305e9.0 for ; Tue, 08 Sep 2026 08:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lex.la; s=google; t=1788883054; x=1789487854; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=FgFh9Cc2TQQLTwmVJEQQxCEyfMY2XV4D1NQ7tPACFGU=; b=Q2StC/yO1kKmgE8cN2MyLVeU1va6dRJapVE18yA2Epk4zoh3tbodgX0FE7Rtfgk726 IjjB+K9pMc0rngUEIeC1FIzdqB8BrTELImJ7nfTO+axahsOJz/gktuVCfKBJwWDLz5vC 1ly8Yh/3FQvGzHS8VCGNalXDQ6iTNXINMhFHi1V3XMVPIYsdvjFzLbvjQQZZpyBPXbYe OipvPtjy/HtLUeI2dAyozw/wKStNYxr1edVM7JjmfDsoSx5vMV05SK6tQYb+ZajeajjT hpdDv0LhUb7QPkAU8/RegE2u16VUJE9OGYgXnfSaglAMIZ4jF80WMnXw8guWDCSyzKtt +4DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788883054; x=1789487854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=FgFh9Cc2TQQLTwmVJEQQxCEyfMY2XV4D1NQ7tPACFGU=; b=gRHTHC3eSo/MEtm80Qc99PmnvBN+5bLfOxF/0Dhvf0LD5HB14xKV1qhR1++jfnoJiU DCMnuixOOGMQHW2DHwWdHd8gGkQSajbPytPOEMGhFERgbs3gL0zfVJPRjhFWOPauPCBI H/a1i+oD6HpfFzj+/pQeIg9YFM11TMLZ3QGhcqhX+z8+TCdnwGgD9f4RqA/bn9rfdy6v fydRTgZGzO8rwIbas2a3yVwaQEhkaO51aZI6KBYB4tMUt4JEPcpD7qx406ABsbM1BsG6 26EnSNnkn7ibqOnPjp+dv0kdv38I7YfZDsl25ZcVkGeFwi9E+KcyxTuMgrnbwBYB/XvN UV/Q== X-Forwarded-Encrypted: i=1; AKwUvByXLOt7a3EZuZqriVhVsloAZ36nZNl3hBm/+fWMvCOYpxJHC1ihQ3ZG4eYWnVWVgp5APWB6A+vHjYyj/K4=@vger.kernel.org X-Gm-Message-State: AFuF++lKyJCINm9Eal11zlkkjGzkubR5Add4k60bJ7CDNXXP652Pjw5y WB/svYfth+bZ9nSOWgX2bq+tcXSmqKII85ov8v7TDG7TwP6gtTVqqQJVNOCrCrAqnbc= X-Gm-Gg: AYBFou3nCN9Yeus0VsOGpq3X0Q87qTt8rsF4JnZSzKraIABeVDkbKblm0cnrLMsMyFe xwngMEuAZG8PEEeI3aS3lMQ8IqkD86hIc7QY+rj47NM+D1oLorIGYYXQYgRbYc1r6ksZh1PAEEW 4XLB+YjZJEJ14I3mCvC0tdbnAmowrsyILvmhvKqHr+3W+oEMfT32e6A31LXRIFLoJEjsg6s8aj1 sBqB05i3yETDlBnRXYfecSdbjqjw5aWhDO27Rq6gYzAiazM/JLXO4BTmpxPhw0JypjYEq5DsmO3 fa22/yn4vUMt9MibNWFONwxkndwI3cUM860Z9IBFnPkdn5Ec9Mp2aqE6F8fyFfwv+zjQZsPZu3X q5WPICQQoqbEOJtlTRp2+RFt8CofJl1wR1UlYtIC8B/IQdm8ZxYC2gU483eRrU6V1oNEicyOSe5 R5FWL1cJTXRxV2C9lh0qiR7CaWpvXEow0Kc7xnXNw= X-Received: by 2002:a05:600c:3485:b0:49c:cee0:e7c1 with SMTP id 5b1f17b1804b1-49cf825c119mr660622285e9.16.1788883054080; Tue, 08 Sep 2026 08:57:34 -0700 (PDT) Received: from remote-01 ([84.17.55.227]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cf7703cefsm542370045e9.5.2026.09.08.08.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 08:57:33 -0700 (PDT) From: Aleksei Sviridkin To: linux@armlinux.org.uk, andrew@lunn.ch, andrew+netdev@lunn.ch, hkallweit1@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: conor@kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Aleksei Sviridkin Subject: [RFC PATCH net-next v2 2/2] net: phylink: wait for PHYs that are known to probe late Date: Tue, 8 Sep 2026 15:57:28 +0000 Message-ID: <20260908155729.4164814-3-f@lex.la> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260908155729.4164814-1-f@lex.la> References: <20260908155729.4164814-1-f@lex.la> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A PHY whose driver or firmware lives on a filesystem mounted after the MAC probes cannot be connected when the port is set up, and the port is lost for the rest of the uptime. Let the PHY declare that with needs-host-firmware and poll for it instead of failing. Deferring the MAC's own probe is not an option: it would take every port with it, including the one needed to mount the filesystem that holds the firmware. Return 0 rather than -ENODEV, because DSA reads -ENODEV as permission to look for the PHY on the switch's internal MDIO bus, which is the wrong device. Wait for a driver that has bound, not for a device that exists, because the generic driver would otherwise bind and cannot drive such a PHY. The test cannot be made to hold past its own return: the device lock it wants cannot be held across the attach, whose failure path takes it again. What is caught instead is the outcome one step later, where the attach bound a generic driver and returned success, and the poll puts that back. The window before it, where phy_attach_direct() meets a NULL phydev->drv, stays open; closing it wants a check inside that function, or an event from the bind instead of this poll. Only that lost race is retried. A connect that fails with the real driver bound is not, because the failure path ends in phy_detach(), which asserts a PHY-node reset line - and on the boards this exists for that erases the firmware a retry would need, once per attempt for the uptime. A PHY that was ready at connect time arms no poll and keeps the old behaviour. Every path that arms the poller cancels it first and waits, so nothing else has to keep the poller and its state apart. While the poll runs the port has no PHY, so reporting the MAC's own link modes would describe a link that cannot come up and would let ethtool accept settings for it. Report an empty set instead, and refuse to configure, to set pause parameters, and to restart autonegotiation, which has nothing to renegotiate with. The reply says autonegotiation is off, which is the ethtool core's zero left in place and agrees with the empty set: a port advertising nothing is negotiating nothing. Reading pause parameters is left alone, because it reports the configured request rather than a capability, and the EEE calls already return -EOPNOTSUPP with no PHY attached. Assisted-by: LLM Signed-off-by: Aleksei Sviridkin --- drivers/net/phy/phylink.c | 210 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 203 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 6ed2219961fb..a872f000204a 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -98,6 +98,14 @@ struct phylink { =20 u32 wolopts_mac; u8 wol_sopass[SOPASS_MAX]; + + /* The poller owns these; every other writer cancels it first. */ + struct fwnode_handle *late_phy_fwnode; + u32 late_phy_flags; + struct delayed_work late_phy_poll; + unsigned int late_phy_poll_ms; + unsigned int late_phy_waited_ms; + bool late_phy_warned; }; =20 #define phylink_printk(level, pl, fmt, ...) \ @@ -1829,6 +1837,20 @@ int phylink_set_fixed_link(struct phylink *pl, } EXPORT_SYMBOL_GPL(phylink_set_fixed_link); =20 +static void phylink_late_phy_poll(struct work_struct *work); + +/* Synchronous because the node is put here and the poller reads it, and + * not every caller holds the rtnl that would keep them apart. It cannot + * deadlock on a caller that does: the poller only ever takes rtnl with + * trylock, so it never waits for the lock this may be called under. + */ +static void phylink_late_phy_cancel(struct phylink *pl) +{ + cancel_delayed_work_sync(&pl->late_phy_poll); + fwnode_handle_put(pl->late_phy_fwnode); + pl->late_phy_fwnode =3D NULL; +} + /** * phylink_update_pause_state() - Update the phylink pause frame configura= tion * @pl: a pointer to a &struct phylink instance @@ -1987,6 +2009,7 @@ struct phylink *phylink_create(struct phylink_config = *config, mutex_init(&pl->phydev_mutex); mutex_init(&pl->state_mutex); INIT_WORK(&pl->resolve, phylink_resolve); + INIT_DELAYED_WORK(&pl->late_phy_poll, phylink_late_phy_poll); =20 pl->config =3D config; if (config->type =3D=3D PHYLINK_NETDEV) { @@ -2070,6 +2093,8 @@ void phylink_destroy(struct phylink *pl) if (pl->link_gpio) gpiod_put(pl->link_gpio); =20 + phylink_late_phy_cancel(pl); + cancel_work_sync(&pl->resolve); kfree(pl); } @@ -2339,10 +2364,8 @@ static int phylink_bringup_phy(struct phylink *pl, s= truct phy_device *phy, } =20 static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy, - phy_interface_t interface) + phy_interface_t interface, u32 flags) { - u32 flags =3D 0; - if (WARN_ON(pl->cfg_link_an_mode =3D=3D MLO_AN_FIXED)) return -EINVAL; =20 @@ -2380,7 +2403,7 @@ int phylink_connect_phy(struct phylink *pl, struct ph= y_device *phy) pl->link_config.interface =3D pl->link_interface; } =20 - ret =3D phylink_attach_phy(pl, phy, pl->link_interface); + ret =3D phylink_attach_phy(pl, phy, pl->link_interface, 0); if (ret < 0) return ret; =20 @@ -2392,6 +2415,133 @@ int phylink_connect_phy(struct phylink *pl, struct = phy_device *phy) } EXPORT_SYMBOL_GPL(phylink_connect_phy); =20 +#define PHYLINK_LATE_PHY_POLL_MS 1000 +#define PHYLINK_LATE_PHY_WARN_MS 60000 +#define PHYLINK_LATE_PHY_POLL_MAX_MS 30000 + +static bool phylink_late_phy_pending(struct phylink *pl) +{ + return pl->late_phy_fwnode && !pl->phydev; +} + +/* Stale the moment it returns: the device lock this wants cannot be held + * across the attach, whose own failure path takes it again. + */ +static bool phylink_phy_is_usable(struct phy_device *phy_dev) +{ + return phy_dev && device_is_bound(&phy_dev->mdio.dev) && phy_dev->drv; +} + +static void phylink_late_phy_backoff(struct phylink *pl) +{ + pl->late_phy_poll_ms =3D min_t(unsigned int, pl->late_phy_poll_ms * 2, + PHYLINK_LATE_PHY_POLL_MAX_MS); +} + +static void phylink_late_phy_poll(struct work_struct *work) +{ + struct phylink *pl =3D container_of(to_delayed_work(work), struct phylink, + late_phy_poll); + struct phy_device *phy_dev; + bool again =3D false, lost_race =3D false; + int ret; + + /* Never block on rtnl: this runs on a shared workqueue. */ + if (!rtnl_trylock()) { + pl->late_phy_waited_ms +=3D pl->late_phy_poll_ms; + goto requeue; + } + + /* Stable here: whoever clears it waits for this work first. */ + phy_dev =3D fwnode_phy_find_device(pl->late_phy_fwnode); + if (!phylink_phy_is_usable(phy_dev)) { + if (phy_dev) + phy_device_free(phy_dev); + + if (!pl->late_phy_warned && + pl->late_phy_waited_ms >=3D PHYLINK_LATE_PHY_WARN_MS) { + pl->late_phy_warned =3D true; + phylink_warn(pl, + "still waiting for %pfw (needs-host-firmware)\n", + pl->late_phy_fwnode); + } + /* Past the warn it may never come: stop paying 1 Hz for it. */ + if (pl->late_phy_waited_ms >=3D PHYLINK_LATE_PHY_WARN_MS) + phylink_late_phy_backoff(pl); + /* The first run is immediate, so count the sleep ahead. */ + pl->late_phy_waited_ms +=3D pl->late_phy_poll_ms; + rtnl_unlock(); + goto requeue; + } + + /* Under the mutex, unlike at connect: this port may be live. */ + if (pl->link_interface =3D=3D PHY_INTERFACE_MODE_NA) { + mutex_lock(&pl->state_mutex); + pl->link_interface =3D phy_dev->interface; + pl->link_config.interface =3D pl->link_interface; + mutex_unlock(&pl->state_mutex); + } + + ret =3D phylink_attach_phy(pl, phy_dev, pl->link_interface, + pl->late_phy_flags); + if (!ret && phy_driver_is_genphy(phy_dev)) { + /* Lost the race: the attach bound the generic driver, which + * is the outcome this poller exists to avoid. + */ + phy_detach(phy_dev); + lost_race =3D true; + ret =3D -EAGAIN; + } + if (!ret) { + ret =3D phylink_bringup_phy(pl, phy_dev, + pl->link_config.interface); + if (ret) { + phy_detach(phy_dev); + } else { + /* Only a major config programs the masks bringup + * narrowed. + */ + if (!test_bit(PHYLINK_DISABLE_STOPPED, + &pl->phylink_disable_state)) { + mutex_lock(&pl->state_mutex); + pl->force_major_config =3D true; + mutex_unlock(&pl->state_mutex); + /* MAC before the PHY, the order a start + * uses; on a port already running that is a + * forced major config, not an initial one. + */ + phylink_run_resolve(pl); + flush_work(&pl->resolve); + phy_start(phy_dev); + } + } + } + if (lost_race) { + /* The lost race unbound the generic driver again, and the + * real one is arriving, so look again at the current rate + * without spending the wait's budget. + */ + again =3D true; + } else if (ret) { + /* Not retried: every attempt ends in phy_detach(), which + * asserts a PHY-node reset line, and on the boards this + * exists for that erases the firmware a retry would need. + */ + phylink_err(pl, "failed to connect late PHY: %pe\n", + ERR_PTR(ret)); + } + phy_device_free(phy_dev); + rtnl_unlock(); + + if (!again) + return; + +requeue: + queue_delayed_work(system_freezable_power_efficient_wq, + &pl->late_phy_poll, + msecs_to_jiffies(pl->late_phy_poll_ms)); +} + /** * phylink_of_phy_connect() - connect the PHY specified in the DT mode. * @pl: a pointer to a &struct phylink returned from phylink_create() @@ -2402,7 +2552,8 @@ EXPORT_SYMBOL_GPL(phylink_connect_phy); * specified by @pl. Actions specified in phylink_connect_phy() will be * performed. * - * Returns 0 on success or a negative errno. + * Returns what phylink_fwnode_phy_connect() returns, including 0 for a + * deferred connect with no PHY attached yet. */ int phylink_of_phy_connect(struct phylink *pl, struct device_node *dn, u32 flags) @@ -2420,7 +2571,13 @@ EXPORT_SYMBOL_GPL(phylink_of_phy_connect); * Connect the phy specified @fwnode to the phylink instance specified * by @pl. * - * Returns 0 on success or a negative errno. + * If the PHY node carries the needs-host-firmware property and the + * PHY is not usable yet, 0 is returned with no PHY connected: a poller + * connects it once its driver has probed. Until then the MAC runs + * without a PHY and ethtool reports no link modes. + * + * Returns 0 on success - the PHY connected, or the deferred connect + * armed - or a negative errno. */ int phylink_fwnode_phy_connect(struct phylink *pl, const struct fwnode_handle *fwnode, @@ -2430,6 +2587,8 @@ int phylink_fwnode_phy_connect(struct phylink *pl, struct phy_device *phy_dev; int ret; =20 + phylink_late_phy_cancel(pl); + if (!phylink_expects_phy(pl)) return 0; =20 @@ -2442,6 +2601,22 @@ int phylink_fwnode_phy_connect(struct phylink *pl, } =20 phy_dev =3D fwnode_phy_find_device(phy_fwnode); + if (fwnode_property_present(phy_fwnode, "needs-host-firmware") && + !phylink_phy_is_usable(phy_dev)) { + /* -ENODEV here would also send DSA to the switch's own bus. */ + if (phy_dev) + phy_device_free(phy_dev); + + pl->late_phy_fwnode =3D phy_fwnode; + pl->late_phy_flags =3D flags; + pl->late_phy_poll_ms =3D PHYLINK_LATE_PHY_POLL_MS; + pl->late_phy_waited_ms =3D 0; + pl->late_phy_warned =3D false; + queue_delayed_work(system_freezable_power_efficient_wq, + &pl->late_phy_poll, 0); + return 0; + } + /* We're done with the phy_node handle */ fwnode_handle_put(phy_fwnode); if (!phy_dev) @@ -2483,6 +2658,8 @@ void phylink_disconnect_phy(struct phylink *pl) =20 ASSERT_RTNL(); =20 + phylink_late_phy_cancel(pl); + mutex_lock(&pl->phydev_mutex); phy =3D pl->phydev; if (phy) @@ -3042,6 +3219,14 @@ int phylink_ethtool_ksettings_get(struct phylink *pl, =20 ASSERT_RTNL(); =20 + /* No PHY yet: the port supports nothing, not what the MAC alone can. */ + if (phylink_late_phy_pending(pl)) { + kset->base.port =3D pl->link_port; + kset->base.speed =3D SPEED_UNKNOWN; + kset->base.duplex =3D DUPLEX_UNKNOWN; + return 0; + } + if (pl->phydev) phy_ethtool_ksettings_get(pl->phydev, kset); else @@ -3114,6 +3299,10 @@ int phylink_ethtool_ksettings_set(struct phylink *pl, =20 ASSERT_RTNL(); =20 + /* Would configure the MAC alone, for a link that cannot come up. */ + if (phylink_late_phy_pending(pl)) + return -EOPNOTSUPP; + if (pl->phydev) { struct ethtool_link_ksettings phy_kset =3D *kset; =20 @@ -3287,6 +3476,9 @@ int phylink_ethtool_nway_reset(struct phylink *pl) =20 ASSERT_RTNL(); =20 + if (phylink_late_phy_pending(pl)) + return -EOPNOTSUPP; + if (pl->phydev) ret =3D phy_restart_aneg(pl->phydev); phylink_pcs_an_restart(pl); @@ -3326,6 +3518,10 @@ int phylink_ethtool_set_pauseparam(struct phylink *p= l, if (pl->req_link_an_mode =3D=3D MLO_AN_FIXED) return -EOPNOTSUPP; =20 + /* pl->supported still describes the MAC, so the test below passes. */ + if (phylink_late_phy_pending(pl)) + return -EOPNOTSUPP; + if (!phylink_test(pl->supported, Pause) && !phylink_test(pl->supported, Asym_Pause)) return -EOPNOTSUPP; @@ -3812,7 +4008,7 @@ static int phylink_sfp_config_phy(struct phylink *pl,= struct phy_device *phy) /* Attach the PHY so that the PHY is present when we do the major * configuration step. */ - ret =3D phylink_attach_phy(pl, phy, config.interface); + ret =3D phylink_attach_phy(pl, phy, config.interface, 0); if (ret < 0) return ret; =20 --=20 2.53.0