2010-04-20 01:33:47

by Hiroshi Shimamoto

Subject: [PATCH] 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().

Signed-off-by: Hiroshi Shimamoto <[email protected]>
---
drivers/net/cxgb3/ael1002.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c
index 5248f9e..35cd367 100644
--- a/drivers/net/cxgb3/ael1002.c
+++ b/drivers/net/cxgb3/ael1002.c
@@ -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;
--
1.6.3.3

2010-04-21 02:05:57

by David Miller

Subject: Re: [PATCH] cxgb3: fix linkup issue

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

> 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().
>
> Signed-off-by: Hiroshi Shimamoto <[email protected]>

CXGB3 maintainers, please review.

> ---
> drivers/net/cxgb3/ael1002.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c
> index 5248f9e..35cd367 100644
> --- a/drivers/net/cxgb3/ael1002.c
> +++ b/drivers/net/cxgb3/ael1002.c
> @@ -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;
> --
> 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/

2010-04-21 19:12:02

by Divy Le ray

Subject: Re: [PATCH] cxgb3: fix linkup issue

Hiroshi Shimamoto wrote:
> 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().
>
> Signed-off-by: Hiroshi Shimamoto <[email protected]>
>

Sorry for the review delay, I just came back from some time off.
Acked-by: Divy Le Ray <[email protected]>

> ---
> drivers/net/cxgb3/ael1002.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c
> index 5248f9e..35cd367 100644
> --- a/drivers/net/cxgb3/ael1002.c
> +++ b/drivers/net/cxgb3/ael1002.c
> @@ -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;
>

2010-04-21 23:34:55

by David Miller

Subject: Re: [PATCH] cxgb3: fix linkup issue

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

> Hiroshi Shimamoto wrote:
>> 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().
>>
>> Signed-off-by: Hiroshi Shimamoto <[email protected]>
>>
>
> Sorry for the review delay, I just came back from some time off.
> Acked-by: Divy Le Ray <[email protected]>

Applied to net-2.6, thanks.