Skip to contentSkip to conversation

cxgb3: fix linkup issue

PATCH Applied Hiroshi Shimamoto 3 participants 5 messages Apr 20, 2010 – May 10, 2010

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

PATCH 1/1 cxgb3: fix linkup issue

From: Hiroshi Shimamoto <[email protected]>

I encountered an issue that not to link up on cxgb3 fabric. I bisected and found that this regression was introduced by 0f07c4ee8c800923ae7918c231532a9256233eed.

Correct to pass phy_addr to cphy_init() at t3_xaui_direct_phy_prep().

---
 drivers/net/cxgb3/ael1002.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/cxgb3/ael1002.c +1 -1
index 5248f9e..35cd367 100644
@@ -934,7 +934,7 @@ static struct cphy_ops xaui_direct_ops = {
 int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter,
 			    int phy_addr, const struct mdio_ops *mdio_ops)
 {
-	cphy_init(phy, adapter, MDIO_PRTAD_NONE, &xaui_direct_ops, mdio_ops,
+	cphy_init(phy, adapter, phy_addr, &xaui_direct_ops, mdio_ops,
 		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP,
 		  "10GBASE-CX4");
 	return 0;
Signature · 1 line
1.6.3.3
maintainer
#1 lore raw

From: Hiroshi Shimamoto <[email protected]>
Date: Tue, 20 Apr 2010 10:32:20 +0900

Quoted 9 lines

From: Hiroshi Shimamoto <[email protected]>

I encountered an issue that not to link up on cxgb3 fabric. I bisected and found that this regression was introduced by 0f07c4ee8c800923ae7918c231532a9256233eed.

Correct to pass phy_addr to cphy_init() at t3_xaui_direct_phy_prep().

CXGB3 maintainers, please review.

Quoted 25 lines
---
 drivers/net/cxgb3/ael1002.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/cxgb3/ael1002.c +1 -1
index 5248f9e..35cd367 100644
@@ -934,7 +934,7 @@ static struct cphy_ops xaui_direct_ops = {
 int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter,
 			    int phy_addr, const struct mdio_ops *mdio_ops)
 {
-	cphy_init(phy, adapter, MDIO_PRTAD_NONE, &xaui_direct_ops, mdio_ops,
+	cphy_init(phy, adapter, phy_addr, &xaui_direct_ops, mdio_ops,
 		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP,
 		  "10GBASE-CX4");
 	return 0;
Signature · 7 lines
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Acked-by on v1 1/1
#2 lore raw
In reply to Hiroshi Shimamoto
Quoted 10 lines · Hiroshi Shimamoto

From: Hiroshi Shimamoto <[email protected]>

I encountered an issue that not to link up on cxgb3 fabric. I bisected and found that this regression was introduced by 0f07c4ee8c800923ae7918c231532a9256233eed.

Correct to pass phy_addr to cphy_init() at t3_xaui_direct_phy_prep().

Sorry for the review delay, I just came back from some time off.

Quoted 18 lines
---
 drivers/net/cxgb3/ael1002.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/cxgb3/ael1002.c +1 -1
index 5248f9e..35cd367 100644
@@ -934,7 +934,7 @@ static struct cphy_ops xaui_direct_ops = {
 int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter,
 			    int phy_addr, const struct mdio_ops *mdio_ops)
 {
-	cphy_init(phy, adapter, MDIO_PRTAD_NONE, &xaui_direct_ops, mdio_ops,
+	cphy_init(phy, adapter, phy_addr, &xaui_direct_ops, mdio_ops,
 		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_TP,
 		  "10GBASE-CX4");
 	return 0;
maintainer Applied
#3 lore raw

From: Divy Le Ray <[email protected]>
Date: Wed, 21 Apr 2010 12:12:14 -0700

Quoted 7 lines
Quoted 6 lines · Hiroshi Shimamoto

From: Hiroshi Shimamoto <[email protected]>

I encountered an issue that not to link up on cxgb3 fabric. I bisected and found that this regression was introduced by 0f07c4ee8c800923ae7918c231532a9256233eed.

Quoted 7 lines
Quoted 4 lines

Correct to pass phy_addr to cphy_init() at t3_xaui_direct_phy_prep().

Sorry for the review delay, I just came back from some time off.

Applied to net-2.6, thanks.

#4 lore raw
Quoted 10 lines · David Miller

From: Divy Le Ray <[email protected]>
Date: Wed, 21 Apr 2010 12:12:14 -0700

Quoted 7 lines
Quoted 6 lines · Hiroshi Shimamoto

From: Hiroshi Shimamoto <[email protected]>

I encountered an issue that not to link up on cxgb3 fabric. I bisected and found that this regression was introduced by 0f07c4ee8c800923ae7918c231532a9256233eed.

Quoted 9 lines
Quoted 6 lines
Quoted 4 lines

Correct to pass phy_addr to cphy_init() at t3_xaui_direct_phy_prep().

Sorry for the review delay, I just came back from some time off.

Applied to net-2.6, thanks.

I think this patch should be in -stable, right?
I can see this issue on Fedora12 and Ubuntu10.04.

thanks,
Hiroshi