Quantcast

[SRU][Yakkety][hwe-edge][PATCH 0/2] Fixes for LP:1686305

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[SRU][Yakkety][hwe-edge][PATCH 0/2] Fixes for LP:1686305

Joseph Salisbury-3
== SRU Justification ==
There is a bug in both the Marvell 88E1512 PHY and xgene-mdio
drivers that causes the link status to be read wrong.  This is causing
a failure to get an IP adderess from DHCP.

This bug is fixed by commits a13c06525a(In mainline as of 4.10-rc4) and commit
4b72436dc3(In mainline as of 4.12-rc1)

== Fixes ==
commit a13c06525ab9ff442924e67df9393a5efa914c56
Author: Russell King <[hidden email]>
Date:   Tue Jan 10 23:13:45 2017 +0000

    net: phy: marvell: fix Marvell 88E1512 used in SGMII mode

commit 4b72436dc3dd2457056b22d6f147777368c869fa
Author: Quan Nguyen <[hidden email]>
Date:   Wed Mar 15 13:27:15 2017 -0700

    drivers: net: phy: xgene: Fix mdio write

== Test Case ==
A test kernel was built with these patches and tested by the original bug reporter.
The bug reporter states the test kernel resolved the bug.


Quan Nguyen (1):
  drivers: net: phy: xgene: Fix mdio write

Russell King (1):
  net: phy: marvell: fix Marvell 88E1512 used in SGMII mode

 drivers/net/phy/marvell.c    | 3 ++-
 drivers/net/phy/mdio-xgene.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[SRU][Yakkety][hwe-edge][PATCH 1/2] net: phy: marvell: fix Marvell 88E1512 used in SGMII mode

Joseph Salisbury-3
From: Russell King <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1686305

When an Marvell 88E1512 PHY is connected to a nic in SGMII mode, the
fiber page is used for the SGMII host-side connection.  The PHY driver
notices that SUPPORTED_FIBRE is set, so it tries reading the fiber page
for the link status, and ends up reading the MAC-side status instead of
the outgoing (copper) link.  This leads to incorrect results reported
via ethtool.

If the PHY is connected via SGMII to the host, ignore the fiber page.
However, continue to allow the existing power management code to
suspend and resume the fiber page.

Fixes: 6cfb3bcc0641 ("Marvell phy: check link status in case of fiber link.")
Signed-off-by: Russell King <[hidden email]>
Signed-off-by: David S. Miller <[hidden email]>
(cherry picked from commit a13c06525ab9ff442924e67df9393a5efa914c56)
Signed-off-by: Joseph Salisbury <[hidden email]>
---
 drivers/net/phy/marvell.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index c2dcf02..5960690 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1194,7 +1194,8 @@ static int marvell_read_status(struct phy_device *phydev)
  int err;
 
  /* Check the fiber mode first */
- if (phydev->supported & SUPPORTED_FIBRE) {
+ if (phydev->supported & SUPPORTED_FIBRE &&
+    phydev->interface != PHY_INTERFACE_MODE_SGMII) {
  err = phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_M1111_FIBER);
  if (err < 0)
  goto error;
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[SRU][Yakkety][hwe-edge][PATCH 2/2] drivers: net: phy: xgene: Fix mdio write

Joseph Salisbury-3
In reply to this post by Joseph Salisbury-3
From: Quan Nguyen <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/1686305

This patches fixes a typo in the argument to xgene_enet_wr_mdio_csr().

Signed-off-by: Quan Nguyen <[hidden email]>
Signed-off-by: Iyappan Subramanian <[hidden email]>
Signed-off-by: David S. Miller <[hidden email]>
(cherry picked from commit 4b72436dc3dd2457056b22d6f147777368c869fa)
Signed-off-by: Joseph Salisbury <[hidden email]>
---
 drivers/net/phy/mdio-xgene.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/mdio-xgene.c b/drivers/net/phy/mdio-xgene.c
index 92af182..7ed5470 100644
--- a/drivers/net/phy/mdio-xgene.c
+++ b/drivers/net/phy/mdio-xgene.c
@@ -229,7 +229,7 @@ static int xgene_xfi_mdio_write(struct mii_bus *bus, int phy_id,
 
  val = SET_VAL(HSTPHYADX, phy_id) | SET_VAL(HSTREGADX, reg) |
       SET_VAL(HSTMIIMWRDAT, data);
- xgene_enet_wr_mdio_csr(addr, MIIM_FIELD_ADDR, data);
+ xgene_enet_wr_mdio_csr(addr, MIIM_FIELD_ADDR, val);
 
  val = HSTLDCMD | SET_VAL(HSTMIIMCMD, MIIM_CMD_LEGACY_WRITE);
  xgene_enet_wr_mdio_csr(addr, MIIM_COMMAND_ADDR, val);
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [SRU][Yakkety][hwe-edge][PATCH 0/2] Fixes for LP:1686305

Stefan Bader-2
In reply to this post by Joseph Salisbury-3
On 17.05.2017 13:16, Joseph Salisbury wrote:
> == SRU Justification ==
> There is a bug in both the Marvell 88E1512 PHY and xgene-mdio
> drivers that causes the link status to be read wrong.  This is causing
> a failure to get an IP adderess from DHCP.
>
> This bug is fixed by commits a13c06525a(In mainline as of 4.10-rc4) and commit
> 4b72436dc3(In mainline as of 4.12-rc1)

The targets are confusing. I believe you want this in Yakkety and Zesty to end
up in the hwe/hwe-edge backport kernels, right?

-Stefan

>
> == Fixes ==
> commit a13c06525ab9ff442924e67df9393a5efa914c56
> Author: Russell King <[hidden email]>
> Date:   Tue Jan 10 23:13:45 2017 +0000
>
>     net: phy: marvell: fix Marvell 88E1512 used in SGMII mode
>
> commit 4b72436dc3dd2457056b22d6f147777368c869fa
> Author: Quan Nguyen <[hidden email]>
> Date:   Wed Mar 15 13:27:15 2017 -0700
>
>     drivers: net: phy: xgene: Fix mdio write
>
> == Test Case ==
> A test kernel was built with these patches and tested by the original bug reporter.
> The bug reporter states the test kernel resolved the bug.
>
>
> Quan Nguyen (1):
>   drivers: net: phy: xgene: Fix mdio write
>
> Russell King (1):
>   net: phy: marvell: fix Marvell 88E1512 used in SGMII mode
>
>  drivers/net/phy/marvell.c    | 3 ++-
>  drivers/net/phy/mdio-xgene.c | 2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

ACK: [SRU][Yakkety][hwe-edge][PATCH 0/2] Fixes for LP:1686305

Colin Ian King-2
In reply to this post by Joseph Salisbury-3
On 17/05/17 12:16, Joseph Salisbury wrote:

> == SRU Justification ==
> There is a bug in both the Marvell 88E1512 PHY and xgene-mdio
> drivers that causes the link status to be read wrong.  This is causing
> a failure to get an IP adderess from DHCP.
>
> This bug is fixed by commits a13c06525a(In mainline as of 4.10-rc4) and commit
> 4b72436dc3(In mainline as of 4.12-rc1)
>
> == Fixes ==
> commit a13c06525ab9ff442924e67df9393a5efa914c56
> Author: Russell King <[hidden email]>
> Date:   Tue Jan 10 23:13:45 2017 +0000
>
>     net: phy: marvell: fix Marvell 88E1512 used in SGMII mode
>
> commit 4b72436dc3dd2457056b22d6f147777368c869fa
> Author: Quan Nguyen <[hidden email]>
> Date:   Wed Mar 15 13:27:15 2017 -0700
>
>     drivers: net: phy: xgene: Fix mdio write
>
> == Test Case ==
> A test kernel was built with these patches and tested by the original bug reporter.
> The bug reporter states the test kernel resolved the bug.
>
>
> Quan Nguyen (1):
>   drivers: net: phy: xgene: Fix mdio write
>
> Russell King (1):
>   net: phy: marvell: fix Marvell 88E1512 used in SGMII mode
>
>  drivers/net/phy/marvell.c    | 3 ++-
>  drivers/net/phy/mdio-xgene.c | 2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
>

Both are clean cherry picks that fix the issue and seem reasonable to me.

Acked-by: Colin Ian King <[hidden email]>



--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Loading...