From: "Daniel González Cabanelas" <dgcbueu@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, thomas.petazzoni@bootlin.com, andrew@lunn.ch
Subject: [PATCH] net: mvneta: only do WoL speed down if the PHY is valid
Date: Thu, 21 May 2020 16:19:53 +0200 [thread overview]
Message-ID: <3268996.Ej3Lftc7GC@tool> (raw)
Previous patch:
"net: mvneta: speed down the PHY, if WoL used, to save energy"
was causing a NULL pointer dereference when ethernet switches are
connected to mvneta, because they aren't handled directly as PHYs.
Fix it by restricting the mentioned patch for the PHY detected cases.
Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Daniel González Cabanelas <dgcbueu@gmail.com>
---
drivers/net/ethernet/marvell/mvneta.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 41d2a0eac..f9170bc93 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3567,8 +3567,9 @@ static void mvneta_start_dev(struct mvneta_port *pp)
phylink_start(pp->phylink);
- /* We may have called phy_speed_down before */
- phy_speed_up(pp->dev->phydev);
+ if(pp->dev->phydev)
+ /* We may have called phy_speed_down before */
+ phy_speed_up(pp->dev->phydev);
netif_tx_start_all_queues(pp->dev);
}
@@ -3577,7 +3578,7 @@ static void mvneta_stop_dev(struct mvneta_port *pp)
{
unsigned int cpu;
- if (device_may_wakeup(&pp->dev->dev))
+ if (pp->dev->phydev && device_may_wakeup(&pp->dev->dev))
phy_speed_down(pp->dev->phydev, false);
phylink_stop(pp->phylink);
--
2.26.2
next reply other threads:[~2020-05-21 14:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 14:19 Daniel González Cabanelas [this message]
2020-05-21 15:19 ` [PATCH] net: mvneta: only do WoL speed down if the PHY is valid Andrew Lunn
2020-05-21 15:26 ` Russell King - ARM Linux admin
2020-05-21 15:55 ` Andrew Lunn
2020-05-21 18:20 ` Russell King - ARM Linux admin
2020-05-22 23:10 ` David Miller
2020-05-21 15:55 ` Daniel González Cabanelas
2020-06-05 9:49 ` Russell King - ARM Linux admin
2020-06-07 0:25 ` Daniel González Cabanelas
2020-06-24 9:29 ` Russell King - ARM Linux admin
2020-05-21 15:55 ` Florian Fainelli
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=3268996.Ej3Lftc7GC@tool \
--to=dgcbueu@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=thomas.petazzoni@bootlin.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.