netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Marangi <ansuelsmth@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
	Heiner Kallweit <hkallweit1@gmail.com>,
	Russell King <linux@armlinux.org.uk>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Christian Marangi <ansuelsmth@gmail.com>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Daniel Golle <daniel@makrotopia.org>, stable@vger.kernel.org
Subject: [net PATCH 2/2] net: phy: Skip PHY LEDs OF registration for Generic PHY driver
Date: Fri,  4 Oct 2024 00:10:05 +0200	[thread overview]
Message-ID: <20241003221006.4568-2-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20241003221006.4568-1-ansuelsmth@gmail.com>

It might happen that a PHY driver fails to probe or is not present in
the system as it's a kmod. In such case the Device Tree might have LED
entry but the Generic PHY is probed instead.

In this scenario, PHY LEDs OF registration should be skipped as
controlling the PHY LEDs is not possible.

Tested-by: Daniel Golle <daniel@makrotopia.org>
Cc: stable@vger.kernel.org
Fixes: 01e5b728e9e4 ("net: phy: Add a binding for PHY LEDs")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
 drivers/net/phy/phy_device.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 499797646580..af088bf00bae 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -3411,6 +3411,11 @@ static int of_phy_leds(struct phy_device *phydev)
 	struct device_node *leds;
 	int err;
 
+	/* Skip LED registration if we are Generic PHY */
+	if (phy_driver_is_genphy(phydev) ||
+	    phy_driver_is_genphy_10g(phydev))
+		return 0;
+
 	if (!IS_ENABLED(CONFIG_OF_MDIO))
 		return 0;
 
-- 
2.45.2


  reply	other threads:[~2024-10-03 22:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-03 22:10 [net PATCH 1/2] net: phy: Remove LED entry from LEDs list on unregister Christian Marangi
2024-10-03 22:10 ` Christian Marangi [this message]
2024-10-03 22:50   ` [net PATCH 2/2] net: phy: Skip PHY LEDs OF registration for Generic PHY driver Andrew Lunn
2024-10-04  9:13     ` Christian Marangi
2024-10-04 13:44       ` Andrew Lunn
2024-10-04 13:46         ` Christian Marangi
2024-10-04 14:11           ` Andrew Lunn
2024-10-04 14:12             ` Christian Marangi
2024-10-03 22:45 ` [net PATCH 1/2] net: phy: Remove LED entry from LEDs list on unregister Andrew Lunn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241003221006.4568-2-ansuelsmth@gmail.com \
    --to=ansuelsmth@gmail.com \
    --cc=andrew@lunn.ch \
    --cc=daniel@makrotopia.org \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=f.fainelli@gmail.com \
    --cc=hkallweit1@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).