* [PATCH 1/1] net: phy: marvell: enable downshift by default
@ 2021-04-28 12:48 Maxim Kochetkov
2021-04-28 19:30 ` Andrew Lunn
2021-04-29 21:50 ` Andrew Lunn
0 siblings, 2 replies; 4+ messages in thread
From: Maxim Kochetkov @ 2021-04-28 12:48 UTC (permalink / raw)
To: netdev
Cc: andrew, hkallweit1, linux, davem, kuba, f.fainelli, Maxim Kochetkov
Enable downshift for all supported PHYs by default like 88E1116R does.
Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
---
drivers/net/phy/marvell.c | 62 +++++++++++++++++++++++++++++++--------
1 file changed, 50 insertions(+), 12 deletions(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 0b2cccb0d865..e6721c1c26c2 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1088,6 +1088,38 @@ static int m88e1011_set_tunable(struct phy_device *phydev,
}
}
+static int m88e1112_config_init(struct phy_device *phydev)
+{
+ int err;
+
+ err = m88e1011_set_downshift(phydev, 3);
+ if (err < 0)
+ return err;
+
+ return m88e1111_config_init(phydev);
+}
+
+static int m88e1111gbe_config_init(struct phy_device *phydev)
+{
+ int err;
+
+ err = m88e1111_set_downshift(phydev, 3);
+ if (err < 0)
+ return err;
+
+ return m88e1111_config_init(phydev);
+}
+
+static int marvell_1011gbe_config_init(struct phy_device *phydev)
+{
+ int err;
+
+ err = m88e1011_set_downshift(phydev, 3);
+ if (err < 0)
+ return err;
+
+ return marvell_config_init(phydev);
+}
static int m88e1116r_config_init(struct phy_device *phydev)
{
int err;
@@ -1168,6 +1200,9 @@ static int m88e1510_config_init(struct phy_device *phydev)
if (err < 0)
return err;
}
+ err = m88e1011_set_downshift(phydev, 3);
+ if (err < 0)
+ return err;
return m88e1318_config_init(phydev);
}
@@ -1320,6 +1355,9 @@ static int m88e1145_config_init(struct phy_device *phydev)
if (err < 0)
return err;
}
+ err = m88e1111_set_downshift(phydev, 3);
+ if (err < 0)
+ return err;
err = marvell_of_reg_init(phydev);
if (err < 0)
@@ -2698,7 +2736,7 @@ static struct phy_driver marvell_drivers[] = {
.name = "Marvell 88E1112",
/* PHY_GBIT_FEATURES */
.probe = marvell_probe,
- .config_init = m88e1111_config_init,
+ .config_init = m88e1112_config_init,
.config_aneg = marvell_config_aneg,
.config_intr = marvell_config_intr,
.handle_interrupt = marvell_handle_interrupt,
@@ -2718,7 +2756,7 @@ static struct phy_driver marvell_drivers[] = {
.name = "Marvell 88E1111",
/* PHY_GBIT_FEATURES */
.probe = marvell_probe,
- .config_init = m88e1111_config_init,
+ .config_init = m88e1111gbe_config_init,
.config_aneg = m88e1111_config_aneg,
.read_status = marvell_read_status,
.config_intr = marvell_config_intr,
@@ -2739,7 +2777,7 @@ static struct phy_driver marvell_drivers[] = {
.name = "Marvell 88E1111 (Finisar)",
/* PHY_GBIT_FEATURES */
.probe = marvell_probe,
- .config_init = m88e1111_config_init,
+ .config_init = m88e1111gbe_config_init,
.config_aneg = m88e1111_config_aneg,
.read_status = marvell_read_status,
.config_intr = marvell_config_intr,
@@ -2779,7 +2817,7 @@ static struct phy_driver marvell_drivers[] = {
.driver_data = DEF_MARVELL_HWMON_OPS(m88e1121_hwmon_ops),
/* PHY_GBIT_FEATURES */
.probe = marvell_probe,
- .config_init = marvell_config_init,
+ .config_init = marvell_1011gbe_config_init,
.config_aneg = m88e1121_config_aneg,
.read_status = marvell_read_status,
.config_intr = marvell_config_intr,
@@ -2859,7 +2897,7 @@ static struct phy_driver marvell_drivers[] = {
.name = "Marvell 88E1240",
/* PHY_GBIT_FEATURES */
.probe = marvell_probe,
- .config_init = m88e1111_config_init,
+ .config_init = m88e1112_config_init,
.config_aneg = marvell_config_aneg,
.config_intr = marvell_config_intr,
.handle_interrupt = marvell_handle_interrupt,
@@ -2929,7 +2967,7 @@ static struct phy_driver marvell_drivers[] = {
/* PHY_GBIT_FEATURES */
.flags = PHY_POLL_CABLE_TEST,
.probe = marvell_probe,
- .config_init = marvell_config_init,
+ .config_init = marvell_1011gbe_config_init,
.config_aneg = m88e1510_config_aneg,
.read_status = marvell_read_status,
.config_intr = marvell_config_intr,
@@ -2955,7 +2993,7 @@ static struct phy_driver marvell_drivers[] = {
.probe = marvell_probe,
/* PHY_GBIT_FEATURES */
.flags = PHY_POLL_CABLE_TEST,
- .config_init = marvell_config_init,
+ .config_init = marvell_1011gbe_config_init,
.config_aneg = m88e1510_config_aneg,
.read_status = marvell_read_status,
.config_intr = marvell_config_intr,
@@ -3000,7 +3038,7 @@ static struct phy_driver marvell_drivers[] = {
/* PHY_GBIT_FEATURES */
.flags = PHY_POLL_CABLE_TEST,
.probe = marvell_probe,
- .config_init = marvell_config_init,
+ .config_init = marvell_1011gbe_config_init,
.config_aneg = m88e6390_config_aneg,
.read_status = marvell_read_status,
.config_intr = marvell_config_intr,
@@ -3026,7 +3064,7 @@ static struct phy_driver marvell_drivers[] = {
/* PHY_GBIT_FEATURES */
.flags = PHY_POLL_CABLE_TEST,
.probe = marvell_probe,
- .config_init = marvell_config_init,
+ .config_init = marvell_1011gbe_config_init,
.config_aneg = m88e6390_config_aneg,
.read_status = marvell_read_status,
.config_intr = marvell_config_intr,
@@ -3052,7 +3090,7 @@ static struct phy_driver marvell_drivers[] = {
/* PHY_GBIT_FEATURES */
.flags = PHY_POLL_CABLE_TEST,
.probe = marvell_probe,
- .config_init = marvell_config_init,
+ .config_init = marvell_1011gbe_config_init,
.config_aneg = m88e1510_config_aneg,
.read_status = marvell_read_status,
.config_intr = marvell_config_intr,
@@ -3077,7 +3115,7 @@ static struct phy_driver marvell_drivers[] = {
.driver_data = DEF_MARVELL_HWMON_OPS(m88e1510_hwmon_ops),
.probe = marvell_probe,
/* PHY_GBIT_FEATURES */
- .config_init = marvell_config_init,
+ .config_init = marvell_1011gbe_config_init,
.config_aneg = m88e1510_config_aneg,
.read_status = marvell_read_status,
.config_intr = marvell_config_intr,
@@ -3099,7 +3137,7 @@ static struct phy_driver marvell_drivers[] = {
.driver_data = DEF_MARVELL_HWMON_OPS(m88e1510_hwmon_ops),
.probe = marvell_probe,
.features = PHY_GBIT_FIBRE_FEATURES,
- .config_init = marvell_config_init,
+ .config_init = marvell_1011gbe_config_init,
.config_aneg = m88e1510_config_aneg,
.read_status = marvell_read_status,
.config_intr = marvell_config_intr,
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/1] net: phy: marvell: enable downshift by default
2021-04-28 12:48 [PATCH 1/1] net: phy: marvell: enable downshift by default Maxim Kochetkov
@ 2021-04-28 19:30 ` Andrew Lunn
2021-04-29 3:52 ` Maxim Kochetkov
2021-04-29 21:50 ` Andrew Lunn
1 sibling, 1 reply; 4+ messages in thread
From: Andrew Lunn @ 2021-04-28 19:30 UTC (permalink / raw)
To: Maxim Kochetkov; +Cc: netdev, hkallweit1, linux, davem, kuba, f.fainelli
On Wed, Apr 28, 2021 at 03:48:53PM +0300, Maxim Kochetkov wrote:
> Enable downshift for all supported PHYs by default like 88E1116R does.
There are two different mechanisms to set to downshift. And i think
some of the older PHYs don't support it at all. How did you decide on
which method to use for each PHY?
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/1] net: phy: marvell: enable downshift by default
2021-04-28 19:30 ` Andrew Lunn
@ 2021-04-29 3:52 ` Maxim Kochetkov
0 siblings, 0 replies; 4+ messages in thread
From: Maxim Kochetkov @ 2021-04-29 3:52 UTC (permalink / raw)
To: Andrew Lunn; +Cc: netdev, hkallweit1, linux, davem, kuba, f.fainelli
28.04.2021 22:30, Andrew Lunn wrote:
> On Wed, Apr 28, 2021 at 03:48:53PM +0300, Maxim Kochetkov wrote:
>> Enable downshift for all supported PHYs by default like 88E1116R does.
>
> There are two different mechanisms to set to downshift. And i think
> some of the older PHYs don't support it at all. How did you decide on
> which method to use for each PHY?
>
> Andrew
>
When I said "For all supported PHYs" I mean PHYs whith set_phy_tunable
defined. So I just added appropriate call of set_downshift found at
m88*_set_tunable functions to config_init of each PHY with
set_phy_tunable defined.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] net: phy: marvell: enable downshift by default
2021-04-28 12:48 [PATCH 1/1] net: phy: marvell: enable downshift by default Maxim Kochetkov
2021-04-28 19:30 ` Andrew Lunn
@ 2021-04-29 21:50 ` Andrew Lunn
1 sibling, 0 replies; 4+ messages in thread
From: Andrew Lunn @ 2021-04-29 21:50 UTC (permalink / raw)
To: Maxim Kochetkov; +Cc: netdev, hkallweit1, linux, davem, kuba, f.fainelli
On Wed, Apr 28, 2021 at 03:48:53PM +0300, Maxim Kochetkov wrote:
> Enable downshift for all supported PHYs by default like 88E1116R does.
Hi Maxim
Please expand the commit message. It does not explain enough, which is
why i asked the odd question. Maybe something like:
A number of PHYs support the PHY tunable to set and get
downshift. However, only 88E1116R enables downshift by default. Extend
this default enabled to all the PHYs that support the downshift
tunable.
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-29 21:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-28 12:48 [PATCH 1/1] net: phy: marvell: enable downshift by default Maxim Kochetkov
2021-04-28 19:30 ` Andrew Lunn
2021-04-29 3:52 ` Maxim Kochetkov
2021-04-29 21:50 ` Andrew Lunn
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).