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>

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