igc: Remove copper fiber switch control

i225 device support copper mode only
PHY signal detect indication for copper fiber switch
not applicable to i225 part

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h
index 40d6f557079b32a87bc5764b0577a38585974102..42fe4d75cc0df9ef54ac5a098dd9755bad47924b 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_defines.h
+++ b/drivers/net/ethernet/intel/igc/igc_defines.h
@@ -91,8 +91,6 @@
 #define IGC_CTRL_RFCE          0x08000000  /* Receive Flow Control enable */
 #define IGC_CTRL_TFCE          0x10000000  /* Transmit flow control enable */
 
-#define IGC_CONNSW_AUTOSENSE_EN        0x1
-
 /* As per the EAS the maximum supported size is 9.5KB (9728 bytes) */
 #define MAX_JUMBO_FRAME_SIZE   0x2600
 

diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 800268da0834e23eb7f058017fd97a3d03d679df..44366c1bec19d0c1414e9c70cccf75727accdc87 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -4033,7 +4033,6 @@ static void igc_watchdog_task(struct work_struct *work)
        struct igc_hw *hw = &adapter->hw;
        struct igc_phy_info *phy = &hw->phy;
        u16 phy_data, retry_count = 20;
-       u32 connsw;
        u32 link;
        int i;
 
@@ -4046,14 +4045,6 @@ static void igc_watchdog_task(struct work_struct *work)
                        link = false;
        }
 
-       /* Force link down if we have fiber to swap to */
-       if (adapter->flags & IGC_FLAG_MAS_ENABLE) {
-               if (hw->phy.media_type == igc_media_type_copper) {
-                       connsw = rd32(IGC_CONNSW);
-                       if (!(connsw & IGC_CONNSW_AUTOSENSE_EN))
-                               link = 0;
-               }
-       }
        if (link) {
                /* Cancel scheduled suspend requests. */
                pm_runtime_resume(netdev->dev.parent);