Skip to contentSkip to conversation

net: phy: marvell: Add errata section 5.1 for Alaska PHY

PATCH Applied Stefan Roese 5 participants 7 messages May 16, 2022 – May 17, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: phy: marvell: Add errata section 5.1 for Alaska PHY

From: Leszek Polak <[email protected]>

As per Errata Section 5.1, if EEE is intended to be used, some register writes must be done once after every hardware reset. This patch now adds the necessary register writes as listed in the Marvell errata.

Without this fix we experience ethernet problems on some of our boards equipped with a new version of this ethernet PHY (different supplier).

The fix applies to Marvell Alaska 88E1510/88E1518/88E1512/88E1514 Rev. A0.

Cc Marek Behún <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Heiner Kallweit <[email protected]>
Cc Russell King <[email protected]>
Cc David S. Miller <[email protected]>

---
v2:
- Implement struct with errata reg values and loop over this struct instead of using single phy_write() call for each PHY reg value, as suggested by Marek

 drivers/net/phy/marvell.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
drivers/net/phy/marvell.c +37 -0
index 2702faf7b0f6..41353f615a66 100644
@@ -1177,7 +1177,44 @@ static int m88e1318_config_init(struct phy_device *phydev)
 
 static int m88e1510_config_init(struct phy_device *phydev)
 {
+	static const struct {
+		u16 reg17, reg16;
+	} errata_vals[] = {
+		{ 0x214b, 0x2144 },
+		{ 0x0c28, 0x2146 },
+		{ 0xb233, 0x214d },
+		{ 0xcc0c, 0x2159 },
+	};
 	int err;
+	int i;
+
+	/* As per Marvell Release Notes - Alaska 88E1510/88E1518/88E1512/
+	 * 88E1514 Rev A0, Errata Section 5.1:
+	 * If EEE is intended to be used, the following register writes
+	 * must be done once after every hardware reset.
+	 */
+	err = marvell_set_page(phydev, 0x00FF);
+	if (err < 0)
+		return err;
+
+	for (i = 0; i < ARRAY_SIZE(errata_vals); ++i) {
+		err = phy_write(phydev, 17, errata_vals[i].reg17);
+		if (err)
+			return err;
+		err = phy_write(phydev, 16, errata_vals[i].reg16);
+		if (err)
+			return err;
+	}
+
+	err = marvell_set_page(phydev, 0x00FB);
+	if (err < 0)
+		return err;
+	err = phy_write(phydev, 07, 0xC00D);
+	if (err < 0)
+		return err;
+	err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
+	if (err < 0)
+		return err;
 
 	/* SGMII-to-Copper mode initialization */
 	if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
Signature · 1 line
2.36.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 67 lines · On Mon, 16 May 2022 09:08:59 +0200 Stefan Roese <[email protected]> wrote:

From: Leszek Polak <[email protected]>

As per Errata Section 5.1, if EEE is intended to be used, some register writes must be done once after every hardware reset. This patch now adds the necessary register writes as listed in the Marvell errata.

Without this fix we experience ethernet problems on some of our boards equipped with a new version of this ethernet PHY (different supplier).

The fix applies to Marvell Alaska 88E1510/88E1518/88E1512/88E1514 Rev. A0.

Cc Marek Behún <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Heiner Kallweit <[email protected]>
Cc Russell King <[email protected]>
Cc David S. Miller <[email protected]>

---
v2:
- Implement struct with errata reg values and loop over this struct instead of using single phy_write() call for each PHY reg value, as suggested by Marek

 drivers/net/phy/marvell.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
drivers/net/phy/marvell.c +30 -0
index 2702faf7b0f6..41353f615a66 100644
@@ -1177,7 +1177,44 @@ static int m88e1318_config_init(struct phy_device *phydev)
 
 static int m88e1510_config_init(struct phy_device *phydev)
 {
+	static const struct {
+		u16 reg17, reg16;
+	} errata_vals[] = {
+		{ 0x214b, 0x2144 },
+		{ 0x0c28, 0x2146 },
+		{ 0xb233, 0x214d },
+		{ 0xcc0c, 0x2159 },
+	};
 	int err;
+	int i;
+
+	/* As per Marvell Release Notes - Alaska 88E1510/88E1518/88E1512/
+	 * 88E1514 Rev A0, Errata Section 5.1:
+	 * If EEE is intended to be used, the following register writes
+	 * must be done once after every hardware reset.
+	 */
+	err = marvell_set_page(phydev, 0x00FF);
+	if (err < 0)
+		return err;
+
+	for (i = 0; i < ARRAY_SIZE(errata_vals); ++i) {
+		err = phy_write(phydev, 17, errata_vals[i].reg17);
+		if (err)
+			return err;
+		err = phy_write(phydev, 16, errata_vals[i].reg16);
+		if (err)
+			return err;
+	}
+
+	err = marvell_set_page(phydev, 0x00FB);
+	if (err < 0)

drivers/net/phy/marvell.c static int m88e1318_config_init(struct phy_device *phydev) · line 1220

Quoted 10 lines
drivers/net/phy/marvell.c +7 -0
+		return err;
+	err = phy_write(phydev, 07, 0xC00D);
+	if (err < 0)
+		return err;
+	err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
+	if (err < 0)
+		return err;
 
 	/* SGMII-to-Copper mode initialization */
 	if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
maintainer Reviewed-by on v2 1/1
#2 lore raw
In reply to Stefan Roese
Quoted 12 lines · Stefan Roese

From: Leszek Polak <[email protected]>

As per Errata Section 5.1, if EEE is intended to be used, some register writes must be done once after every hardware reset. This patch now adds the necessary register writes as listed in the Marvell errata.

Without this fix we experience ethernet problems on some of our boards equipped with a new version of this ethernet PHY (different supplier).

The fix applies to Marvell Alaska 88E1510/88E1518/88E1512/88E1514 Rev. A0.

Quoted 7 lines
Cc Marek Behún <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Heiner Kallweit <[email protected]>
Cc Russell King <[email protected]>
Cc David S. Miller <[email protected]>

Andrew

maintainer
#3 lore raw
In reply to Stefan Roese

Hello,

Quoted 12 lines · Stefan Roese

From: Leszek Polak <[email protected]>

As per Errata Section 5.1, if EEE is intended to be used, some register writes must be done once after every hardware reset. This patch now adds the necessary register writes as listed in the Marvell errata.

Without this fix we experience ethernet problems on some of our boards equipped with a new version of this ethernet PHY (different supplier).

The fix applies to Marvell Alaska 88E1510/88E1518/88E1512/88E1514 Rev. A0.

Quoted 7 lines
Cc Marek Behún <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Heiner Kallweit <[email protected]>
Cc Russell King <[email protected]>
Cc David S. Miller <[email protected]>

It's not clear to me if you are targeting -net or net-next, could you please clarify? In case this is for -net, please add a suitable fixes tag, thanks!

/P

#4 lore raw

Hi Paolo,

Quoted 23 lines · Paolo Abeni

Hello,

Quoted 12 lines · Stefan Roese

From: Leszek Polak <[email protected]>

As per Errata Section 5.1, if EEE is intended to be used, some register writes must be done once after every hardware reset. This patch now adds the necessary register writes as listed in the Marvell errata.

Without this fix we experience ethernet problems on some of our boards equipped with a new version of this ethernet PHY (different supplier).

The fix applies to Marvell Alaska 88E1510/88E1518/88E1512/88E1514 Rev. A0.

Quoted 7 lines
Cc Marek Behún <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Heiner Kallweit <[email protected]>
Cc Russell King <[email protected]>
Cc David S. Miller <[email protected]>
Quoted 3 lines

It's not clear to me if you are targeting -net or net-next, could you please clarify? In case this is for -net, please add a suitable fixes tag, thanks!

Sorry for not being clear on this. net-next is good AFAICT.

Should I re-submit to net-next?

Thanks,
Stefan

maintainer
#5 lore raw
Quoted 22 lines · Stefan Roese
Quoted 21 lines · Paolo Abeni
Quoted 19 lines · Stefan Roese

From: Leszek Polak <[email protected]>

As per Errata Section 5.1, if EEE is intended to be used, some register writes must be done once after every hardware reset. This patch now adds the necessary register writes as listed in the Marvell errata.

Without this fix we experience ethernet problems on some of our boards equipped with a new version of this ethernet PHY (different supplier).

The fix applies to Marvell Alaska 88E1510/88E1518/88E1512/88E1514 Rev. A0.

Cc Marek Behún <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Heiner Kallweit <[email protected]>
Cc Russell King <[email protected]>
Cc David S. Miller <[email protected]>
Quoted 7 lines
Quoted 3 lines

It's not clear to me if you are targeting -net or net-next, could you please clarify? In case this is for -net, please add a suitable fixes tag, thanks!

Sorry for not being clear on this. net-next is good AFAICT.

Should I re-submit to net-next?

Not needed, I'm applying it.

Thanks!

Paolo

#6 lore raw
In reply to Stefan Roese
This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:

Quoted 10 lines · On Mon, 16 May 2022 09:08:59 +0200 you wrote:

From: Leszek Polak <[email protected]>

As per Errata Section 5.1, if EEE is intended to be used, some register writes must be done once after every hardware reset. This patch now adds the necessary register writes as listed in the Marvell errata.

Without this fix we experience ethernet problems on some of our boards equipped with a new version of this ethernet PHY (different supplier).

[...]

Here is the summary with links:
- [v2] net: phy: marvell: Add errata section 5.1 for Alaska PHY

    https://git.kernel.org/netdev/net-next/c/65a9dedc11d6

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html