From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Woojung Huh <woojung.huh@microchip.com>,
UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Vivien Didelot <vivien.didelot@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>,
kernel@pengutronix.de, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Russell King <linux@armlinux.org.uk>,
Michael Grzeschik <m.grzeschik@pengutronix.de>
Subject: [PATCH net-next v3 8/9] net: dsa: dsa_slave_phy_connect(): extend phy's flags with port specific phy flags
Date: Wed, 26 May 2021 06:30:36 +0200 [thread overview]
Message-ID: <20210526043037.9830-9-o.rempel@pengutronix.de> (raw)
In-Reply-To: <20210526043037.9830-1-o.rempel@pengutronix.de>
This patch extends the flags of the phy that's being connected with the
port specific flags of the switch port.
This is needed to handle a port specific erratum of the KSZ8873 switch,
which is added in a later patch.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/phy/phylink.c | 2 +-
net/dsa/slave.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 96d8e88b4e46..167c2277814f 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1029,7 +1029,7 @@ static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy,
if (pl->phydev)
return -EBUSY;
- return phy_attach_direct(pl->netdev, phy, 0, interface);
+ return phy_attach_direct(pl->netdev, phy, phy->dev_flags, interface);
}
/**
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 8c0f3c6ab365..7e208f16f006 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1758,6 +1758,10 @@ static int dsa_slave_phy_connect(struct net_device *slave_dev, int addr)
return -ENODEV;
}
+ if (ds->ops->get_phy_flags)
+ slave_dev->phydev->dev_flags |=
+ ds->ops->get_phy_flags(ds, dp->index);
+
return phylink_connect_phy(dp->pl, slave_dev->phydev);
}
--
2.29.2
next prev parent reply other threads:[~2021-05-26 4:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 4:30 [PATCH net-next v3 0/9] provide cable test support for the ksz886x switch Oleksij Rempel
2021-05-26 4:30 ` [PATCH net-next v3 1/9] net: phy: micrel: move phy reg offsets to common header Oleksij Rempel
2021-05-26 22:01 ` Vladimir Oltean
2021-05-27 15:16 ` Andrew Lunn
2021-05-26 4:30 ` [PATCH net-next v3 2/9] net: dsa: microchip: ksz8795: add phylink support Oleksij Rempel
2021-05-26 22:13 ` Vladimir Oltean
2021-06-10 10:20 ` Oleksij Rempel
2021-05-26 4:30 ` [PATCH net-next v3 3/9] net: phy: micrel: use consistent indention after define Oleksij Rempel
2021-05-26 22:24 ` Vladimir Oltean
2021-06-10 10:30 ` Oleksij Rempel
2021-05-26 4:30 ` [PATCH net-next v3 4/9] net: phy: micrel: apply resume errata workaround for ksz8873 and ksz8863 Oleksij Rempel
2021-05-26 22:43 ` Vladimir Oltean
2021-06-10 11:49 ` Oleksij Rempel
2021-06-10 13:04 ` Vladimir Oltean
2021-06-10 13:25 ` Oleksij Rempel
2021-06-10 18:18 ` Vladimir Oltean
2021-05-26 4:30 ` [PATCH net-next v3 5/9] net: phy/dsa micrel/ksz886x add MDI-X support Oleksij Rempel
2021-05-26 4:30 ` [PATCH net-next v3 6/9] net: phy: micrel: ksz8081 " Oleksij Rempel
2021-05-26 4:30 ` [PATCH net-next v3 7/9] net: dsa: microchip: ksz8795: add LINK_MD register support Oleksij Rempel
2021-05-26 4:30 ` Oleksij Rempel [this message]
2021-05-26 15:08 ` [PATCH net-next v3 8/9] net: dsa: dsa_slave_phy_connect(): extend phy's flags with port specific phy flags Russell King (Oracle)
2021-06-10 10:04 ` Oleksij Rempel
2021-05-26 4:30 ` [PATCH net-next v3 9/9] net: phy: micrel: ksz886x/ksz8081: add cabletest support Oleksij Rempel
2021-05-26 19:32 ` Jakub Kicinski
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=20210526043037.9830-9-o.rempel@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=m.grzeschik@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=vivien.didelot@gmail.com \
--cc=woojung.huh@microchip.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 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).