diff options
| author | Divy Le Ray <divy@chelsio.com> | 2009-07-07 19:48:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-08 10:54:18 -0700 |
| commit | 2c3d50f7db6c4aa85b099613aba8660da6de75d4 (patch) | |
| tree | d00a9775137ff2b3e3e01df285477855156fc08a /drivers/net/cxgb3/aq100x.c | |
| parent | 09bb9aa0ed22bea814b0f137390f911af33ddd1b (diff) | |
| download | blackbird-op-linux-2c3d50f7db6c4aa85b099613aba8660da6de75d4.tar.gz blackbird-op-linux-2c3d50f7db6c4aa85b099613aba8660da6de75d4.zip | |
cxgb3: AQ100X phy support update
Add missing SUPPORTED_TP flag.
Update FW version checking.
Do the full initialization even if the FW version is unknown,
it might help catching further issues.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3/aq100x.c')
| -rw-r--r-- | drivers/net/cxgb3/aq100x.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/cxgb3/aq100x.c b/drivers/net/cxgb3/aq100x.c index b1fd5bf836e4..341b7ef1508f 100644 --- a/drivers/net/cxgb3/aq100x.c +++ b/drivers/net/cxgb3/aq100x.c @@ -271,7 +271,8 @@ int t3_aq100x_phy_prep(struct cphy *phy, struct adapter *adapter, int phy_addr, cphy_init(phy, adapter, phy_addr, &aq100x_ops, mdio_ops, SUPPORTED_1000baseT_Full | SUPPORTED_10000baseT_Full | - SUPPORTED_Autoneg | SUPPORTED_AUI, "1000/10GBASE-T"); + SUPPORTED_TP | SUPPORTED_Autoneg | SUPPORTED_AUI, + "1000/10GBASE-T"); /* * The PHY has been out of reset ever since the system powered up. So @@ -316,11 +317,9 @@ int t3_aq100x_phy_prep(struct cphy *phy, struct adapter *adapter, int phy_addr, /* Firmware version check. */ t3_mdio_read(phy, MDIO_MMD_VEND1, AQ_FW_VERSION, &v); - if (v != 30) { + if (v != 101) CH_WARN(adapter, "PHY%d: unsupported firmware %d\n", phy_addr, v); - return 0; /* allow t3_prep_adapter to succeed */ - } /* * The PHY should start in really-low-power mode. Prepare it for normal |
