net/ixgbe/base: remove PHY access for some 1G ports

This patch removes some some 1GBASE-T PHY access since the FW
configures the PHY. SW shall not configure or initialize link.
Accessing the PHY would require the use of MDI clause 22 which
should be avoided in high layer driver code.

Signed-off-by: Wei Dai <wei.dai@intel.com>

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index 674dc14..dd8be75 100644 (file)
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -459,9 +459,13 @@ STATIC s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw)
                hw->phy.type = ixgbe_phy_x550em_kr;
                break;
        case IXGBE_DEV_ID_X550EM_A_10G_T:
-       case IXGBE_DEV_ID_X550EM_X_1G_T:
        case IXGBE_DEV_ID_X550EM_X_10G_T:
                return ixgbe_identify_phy_generic(hw);
+       case IXGBE_DEV_ID_X550EM_X_1G_T:
+               hw->phy.type = ixgbe_phy_ext_1g_t;
+               hw->phy.ops.read_reg = NULL;
+               hw->phy.ops.write_reg = NULL;
+               break;
        case IXGBE_DEV_ID_X550EM_A_1G_T:
        case IXGBE_DEV_ID_X550EM_A_1G_T_L:
                hw->phy.type = ixgbe_phy_fw;
@@ -751,6 +755,11 @@ s32 ixgbe_init_ops_X550EM(struct ixgbe_hw *hw)
                phy->ops.set_phy_power = NULL;
                phy->ops.get_firmware_version = NULL;
                break;
+       case IXGBE_DEV_ID_X550EM_X_1G_T:
+               mac->ops.setup_fc = NULL;
+               phy->ops.identify = ixgbe_identify_phy_x550em;
+               phy->ops.set_phy_power = NULL;
+               break;
        default:
                phy->ops.identify = ixgbe_identify_phy_x550em;
        }
@@ -945,6 +954,10 @@ s32 ixgbe_init_ops_X550EM_x(struct ixgbe_hw *hw)
                                      ixgbe_write_i2c_combined_generic_unlocked;
        link->addr = IXGBE_CS4227;
 
+       if (hw->device_id == IXGBE_DEV_ID_X550EM_X_1G_T) {
+               mac->ops.setup_fc = NULL;
+               mac->ops.setup_eee = NULL;
+       }
 
        return ret_val;
 }
@@ -1915,6 +1928,8 @@ void ixgbe_init_mac_link_ops_X550em(struct ixgbe_hw *hw)
                                                ixgbe_setup_mac_link_sfp_x550em;
                break;
        case ixgbe_media_type_copper:
+               if (hw->device_id == IXGBE_DEV_ID_X550EM_X_1G_T)
+                       break;
                if (hw->mac.type == ixgbe_mac_X550EM_a) {
                        if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||
                            hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L) {
@@ -2380,10 +2395,6 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
                /* set up for CS4227 usage */
                hw->phy.phy_semaphore_mask = IXGBE_GSSR_SHARED_I2C_SM;
                break;
-       case IXGBE_DEV_ID_X550EM_X_1G_T:
-               phy->ops.read_reg_mdi = ixgbe_read_phy_reg_mdi_22;
-               phy->ops.write_reg_mdi = ixgbe_write_phy_reg_mdi_22;
-               break;
        default:
                break;
        }
@@ -2565,10 +2576,9 @@ mac_reset_top:
        status = hw->mac.ops.acquire_swfw_sync(hw, swfw_mask);
        if (status != IXGBE_SUCCESS) {
                ERROR_REPORT2(IXGBE_ERROR_CAUTION,
-                               "semaphore failed with %d", status);
+                       "semaphore failed with %d", status);
                return IXGBE_ERR_SWFW_SYNC;
        }
-
        ctrl |= IXGBE_READ_REG(hw, IXGBE_CTRL);
        IXGBE_WRITE_REG(hw, IXGBE_CTRL, ctrl);
        IXGBE_WRITE_FLUSH(hw);