Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1247873/?format=api
{ "id": 1247873, "url": "http://patchwork.ozlabs.org/api/patches/1247873/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200302202307.23260-1-sasha.neftin@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200302202307.23260-1-sasha.neftin@intel.com>", "list_archive_url": null, "date": "2020-03-02T20:23:07", "name": "[v1,1/1] igc: Remove copper fiber switch control", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "c47c134e37d0930070ff9c16cb3e11a1ca57bc6d", "submitter": { "id": 69860, "url": "http://patchwork.ozlabs.org/api/people/69860/?format=api", "name": "Sasha Neftin", "email": "sasha.neftin@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200302202307.23260-1-sasha.neftin@intel.com/mbox/", "series": [ { "id": 161985, "url": "http://patchwork.ozlabs.org/api/series/161985/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=161985", "date": "2020-03-02T20:23:07", "name": "[v1,1/1] igc: Remove copper fiber switch control", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/161985/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1247873/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1247873/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.133;\n\thelo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 48WWmh6Ldlz9sPR\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 3 Mar 2020 07:23:15 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3BAC585308;\n\tMon, 2 Mar 2020 20:23:14 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 3q5QVc6np0Kg; Mon, 2 Mar 2020 20:23:13 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id E738185061;\n\tMon, 2 Mar 2020 20:23:12 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 6CAC11BF228\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 2 Mar 2020 20:23:11 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6751120130\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 2 Mar 2020 20:23:11 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id lytD5xJIcJqD for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 2 Mar 2020 20:23:09 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 919182002B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 2 Mar 2020 20:23:09 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t02 Mar 2020 12:23:08 -0800", "from ccdlinuxdev09.iil.intel.com ([143.185.160.241])\n\tby fmsmga004.fm.intel.com with ESMTP; 02 Mar 2020 12:23:07 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.70,508,1574150400\"; d=\"scan'208\";a=\"262903536\"", "From": "Sasha Neftin <sasha.neftin@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 2 Mar 2020 22:23:07 +0200", "Message-Id": "<20200302202307.23260-1-sasha.neftin@intel.com>", "X-Mailer": "git-send-email 2.11.0", "Subject": "[Intel-wired-lan] [PATCH v1 1/1] igc: Remove copper fiber switch\n\tcontrol", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "i225 device support copper mode only\nPHY signal detect indication for copper fiber switch\nnot applicable to i225 part\n\nSigned-off-by: Sasha Neftin <sasha.neftin@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc_defines.h | 2 -\n drivers/net/ethernet/intel/igc/igc_ethtool.c | 193 +++++++++++++--------------\n drivers/net/ethernet/intel/igc/igc_main.c | 9 --\n drivers/net/ethernet/intel/igc/igc_regs.h | 1 -\n 4 files changed, 96 insertions(+), 109 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h\nindex dd0c86ce09ed..e5116337b68d 100644\n--- a/drivers/net/ethernet/intel/igc/igc_defines.h\n+++ b/drivers/net/ethernet/intel/igc/igc_defines.h\n@@ -91,8 +91,6 @@\n #define IGC_CTRL_RFCE\t\t0x08000000 /* Receive Flow Control enable */\n #define IGC_CTRL_TFCE\t\t0x10000000 /* Transmit flow control enable */\n \n-#define IGC_CONNSW_AUTOSENSE_EN\t0x1\n-\n /* As per the EAS the maximum supported size is 9.5KB (9728 bytes) */\n #define MAX_JUMBO_FRAME_SIZE\t0x2600\n \ndiff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c\nindex 69f50b8e2af3..82d0c893ed41 100644\n--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c\n+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c\n@@ -160,142 +160,141 @@ static void igc_get_regs(struct net_device *netdev,\n \tregs_buff[1] = rd32(IGC_STATUS);\n \tregs_buff[2] = rd32(IGC_CTRL_EXT);\n \tregs_buff[3] = rd32(IGC_MDIC);\n-\tregs_buff[4] = rd32(IGC_CONNSW);\n \n \t/* NVM Register */\n-\tregs_buff[5] = rd32(IGC_EECD);\n+\tregs_buff[4] = rd32(IGC_EECD);\n \n \t/* Interrupt */\n \t/* Reading EICS for EICR because they read the\n \t * same but EICS does not clear on read\n \t */\n+\tregs_buff[5] = rd32(IGC_EICS);\n \tregs_buff[6] = rd32(IGC_EICS);\n-\tregs_buff[7] = rd32(IGC_EICS);\n-\tregs_buff[8] = rd32(IGC_EIMS);\n-\tregs_buff[9] = rd32(IGC_EIMC);\n-\tregs_buff[10] = rd32(IGC_EIAC);\n-\tregs_buff[11] = rd32(IGC_EIAM);\n+\tregs_buff[7] = rd32(IGC_EIMS);\n+\tregs_buff[8] = rd32(IGC_EIMC);\n+\tregs_buff[9] = rd32(IGC_EIAC);\n+\tregs_buff[10] = rd32(IGC_EIAM);\n \t/* Reading ICS for ICR because they read the\n \t * same but ICS does not clear on read\n \t */\n+\tregs_buff[11] = rd32(IGC_ICS);\n \tregs_buff[12] = rd32(IGC_ICS);\n-\tregs_buff[13] = rd32(IGC_ICS);\n-\tregs_buff[14] = rd32(IGC_IMS);\n-\tregs_buff[15] = rd32(IGC_IMC);\n-\tregs_buff[16] = rd32(IGC_IAC);\n-\tregs_buff[17] = rd32(IGC_IAM);\n+\tregs_buff[13] = rd32(IGC_IMS);\n+\tregs_buff[14] = rd32(IGC_IMC);\n+\tregs_buff[15] = rd32(IGC_IAC);\n+\tregs_buff[16] = rd32(IGC_IAM);\n \n \t/* Flow Control */\n-\tregs_buff[18] = rd32(IGC_FCAL);\n-\tregs_buff[19] = rd32(IGC_FCAH);\n-\tregs_buff[20] = rd32(IGC_FCTTV);\n-\tregs_buff[21] = rd32(IGC_FCRTL);\n-\tregs_buff[22] = rd32(IGC_FCRTH);\n-\tregs_buff[23] = rd32(IGC_FCRTV);\n+\tregs_buff[17] = rd32(IGC_FCAL);\n+\tregs_buff[18] = rd32(IGC_FCAH);\n+\tregs_buff[19] = rd32(IGC_FCTTV);\n+\tregs_buff[20] = rd32(IGC_FCRTL);\n+\tregs_buff[21] = rd32(IGC_FCRTH);\n+\tregs_buff[22] = rd32(IGC_FCRTV);\n \n \t/* Receive */\n-\tregs_buff[24] = rd32(IGC_RCTL);\n-\tregs_buff[25] = rd32(IGC_RXCSUM);\n-\tregs_buff[26] = rd32(IGC_RLPML);\n-\tregs_buff[27] = rd32(IGC_RFCTL);\n+\tregs_buff[23] = rd32(IGC_RCTL);\n+\tregs_buff[24] = rd32(IGC_RXCSUM);\n+\tregs_buff[25] = rd32(IGC_RLPML);\n+\tregs_buff[26] = rd32(IGC_RFCTL);\n \n \t/* Transmit */\n-\tregs_buff[28] = rd32(IGC_TCTL);\n-\tregs_buff[29] = rd32(IGC_TIPG);\n+\tregs_buff[27] = rd32(IGC_TCTL);\n+\tregs_buff[28] = rd32(IGC_TIPG);\n \n \t/* Wake Up */\n \n \t/* MAC */\n \n \t/* Statistics */\n-\tregs_buff[30] = adapter->stats.crcerrs;\n-\tregs_buff[31] = adapter->stats.algnerrc;\n-\tregs_buff[32] = adapter->stats.symerrs;\n-\tregs_buff[33] = adapter->stats.rxerrc;\n-\tregs_buff[34] = adapter->stats.mpc;\n-\tregs_buff[35] = adapter->stats.scc;\n-\tregs_buff[36] = adapter->stats.ecol;\n-\tregs_buff[37] = adapter->stats.mcc;\n-\tregs_buff[38] = adapter->stats.latecol;\n-\tregs_buff[39] = adapter->stats.colc;\n-\tregs_buff[40] = adapter->stats.dc;\n-\tregs_buff[41] = adapter->stats.tncrs;\n-\tregs_buff[42] = adapter->stats.sec;\n-\tregs_buff[43] = adapter->stats.htdpmc;\n-\tregs_buff[44] = adapter->stats.rlec;\n-\tregs_buff[45] = adapter->stats.xonrxc;\n-\tregs_buff[46] = adapter->stats.xontxc;\n-\tregs_buff[47] = adapter->stats.xoffrxc;\n-\tregs_buff[48] = adapter->stats.xofftxc;\n-\tregs_buff[49] = adapter->stats.fcruc;\n-\tregs_buff[50] = adapter->stats.prc64;\n-\tregs_buff[51] = adapter->stats.prc127;\n-\tregs_buff[52] = adapter->stats.prc255;\n-\tregs_buff[53] = adapter->stats.prc511;\n-\tregs_buff[54] = adapter->stats.prc1023;\n-\tregs_buff[55] = adapter->stats.prc1522;\n-\tregs_buff[56] = adapter->stats.gprc;\n-\tregs_buff[57] = adapter->stats.bprc;\n-\tregs_buff[58] = adapter->stats.mprc;\n-\tregs_buff[59] = adapter->stats.gptc;\n-\tregs_buff[60] = adapter->stats.gorc;\n-\tregs_buff[61] = adapter->stats.gotc;\n-\tregs_buff[62] = adapter->stats.rnbc;\n-\tregs_buff[63] = adapter->stats.ruc;\n-\tregs_buff[64] = adapter->stats.rfc;\n-\tregs_buff[65] = adapter->stats.roc;\n-\tregs_buff[66] = adapter->stats.rjc;\n-\tregs_buff[67] = adapter->stats.mgprc;\n-\tregs_buff[68] = adapter->stats.mgpdc;\n-\tregs_buff[69] = adapter->stats.mgptc;\n-\tregs_buff[70] = adapter->stats.tor;\n-\tregs_buff[71] = adapter->stats.tot;\n-\tregs_buff[72] = adapter->stats.tpr;\n-\tregs_buff[73] = adapter->stats.tpt;\n-\tregs_buff[74] = adapter->stats.ptc64;\n-\tregs_buff[75] = adapter->stats.ptc127;\n-\tregs_buff[76] = adapter->stats.ptc255;\n-\tregs_buff[77] = adapter->stats.ptc511;\n-\tregs_buff[78] = adapter->stats.ptc1023;\n-\tregs_buff[79] = adapter->stats.ptc1522;\n-\tregs_buff[80] = adapter->stats.mptc;\n-\tregs_buff[81] = adapter->stats.bptc;\n-\tregs_buff[82] = adapter->stats.tsctc;\n-\tregs_buff[83] = adapter->stats.iac;\n-\tregs_buff[84] = adapter->stats.rpthc;\n-\tregs_buff[85] = adapter->stats.hgptc;\n-\tregs_buff[86] = adapter->stats.hgorc;\n-\tregs_buff[87] = adapter->stats.hgotc;\n-\tregs_buff[88] = adapter->stats.lenerrs;\n-\tregs_buff[89] = adapter->stats.scvpc;\n-\tregs_buff[90] = adapter->stats.hrmpc;\n+\tregs_buff[29] = adapter->stats.crcerrs;\n+\tregs_buff[30] = adapter->stats.algnerrc;\n+\tregs_buff[31] = adapter->stats.symerrs;\n+\tregs_buff[32] = adapter->stats.rxerrc;\n+\tregs_buff[33] = adapter->stats.mpc;\n+\tregs_buff[34] = adapter->stats.scc;\n+\tregs_buff[35] = adapter->stats.ecol;\n+\tregs_buff[36] = adapter->stats.mcc;\n+\tregs_buff[37] = adapter->stats.latecol;\n+\tregs_buff[38] = adapter->stats.colc;\n+\tregs_buff[39] = adapter->stats.dc;\n+\tregs_buff[40] = adapter->stats.tncrs;\n+\tregs_buff[41] = adapter->stats.sec;\n+\tregs_buff[42] = adapter->stats.htdpmc;\n+\tregs_buff[43] = adapter->stats.rlec;\n+\tregs_buff[44] = adapter->stats.xonrxc;\n+\tregs_buff[45] = adapter->stats.xontxc;\n+\tregs_buff[46] = adapter->stats.xoffrxc;\n+\tregs_buff[47] = adapter->stats.xofftxc;\n+\tregs_buff[48] = adapter->stats.fcruc;\n+\tregs_buff[49] = adapter->stats.prc64;\n+\tregs_buff[50] = adapter->stats.prc127;\n+\tregs_buff[51] = adapter->stats.prc255;\n+\tregs_buff[52] = adapter->stats.prc511;\n+\tregs_buff[53] = adapter->stats.prc1023;\n+\tregs_buff[54] = adapter->stats.prc1522;\n+\tregs_buff[55] = adapter->stats.gprc;\n+\tregs_buff[56] = adapter->stats.bprc;\n+\tregs_buff[57] = adapter->stats.mprc;\n+\tregs_buff[58] = adapter->stats.gptc;\n+\tregs_buff[59] = adapter->stats.gorc;\n+\tregs_buff[60] = adapter->stats.gotc;\n+\tregs_buff[61] = adapter->stats.rnbc;\n+\tregs_buff[62] = adapter->stats.ruc;\n+\tregs_buff[63] = adapter->stats.rfc;\n+\tregs_buff[64] = adapter->stats.roc;\n+\tregs_buff[65] = adapter->stats.rjc;\n+\tregs_buff[66] = adapter->stats.mgprc;\n+\tregs_buff[67] = adapter->stats.mgpdc;\n+\tregs_buff[68] = adapter->stats.mgptc;\n+\tregs_buff[69] = adapter->stats.tor;\n+\tregs_buff[70] = adapter->stats.tot;\n+\tregs_buff[71] = adapter->stats.tpr;\n+\tregs_buff[72] = adapter->stats.tpt;\n+\tregs_buff[73] = adapter->stats.ptc64;\n+\tregs_buff[74] = adapter->stats.ptc127;\n+\tregs_buff[75] = adapter->stats.ptc255;\n+\tregs_buff[76] = adapter->stats.ptc511;\n+\tregs_buff[77] = adapter->stats.ptc1023;\n+\tregs_buff[78] = adapter->stats.ptc1522;\n+\tregs_buff[79] = adapter->stats.mptc;\n+\tregs_buff[80] = adapter->stats.bptc;\n+\tregs_buff[81] = adapter->stats.tsctc;\n+\tregs_buff[82] = adapter->stats.iac;\n+\tregs_buff[83] = adapter->stats.rpthc;\n+\tregs_buff[84] = adapter->stats.hgptc;\n+\tregs_buff[85] = adapter->stats.hgorc;\n+\tregs_buff[86] = adapter->stats.hgotc;\n+\tregs_buff[87] = adapter->stats.lenerrs;\n+\tregs_buff[88] = adapter->stats.scvpc;\n+\tregs_buff[89] = adapter->stats.hrmpc;\n \n \tfor (i = 0; i < 4; i++)\n-\t\tregs_buff[91 + i] = rd32(IGC_SRRCTL(i));\n+\t\tregs_buff[90 + i] = rd32(IGC_SRRCTL(i));\n \tfor (i = 0; i < 4; i++)\n-\t\tregs_buff[95 + i] = rd32(IGC_PSRTYPE(i));\n+\t\tregs_buff[94 + i] = rd32(IGC_PSRTYPE(i));\n \tfor (i = 0; i < 4; i++)\n-\t\tregs_buff[99 + i] = rd32(IGC_RDBAL(i));\n+\t\tregs_buff[98 + i] = rd32(IGC_RDBAL(i));\n \tfor (i = 0; i < 4; i++)\n-\t\tregs_buff[103 + i] = rd32(IGC_RDBAH(i));\n+\t\tregs_buff[102 + i] = rd32(IGC_RDBAH(i));\n \tfor (i = 0; i < 4; i++)\n-\t\tregs_buff[107 + i] = rd32(IGC_RDLEN(i));\n+\t\tregs_buff[106 + i] = rd32(IGC_RDLEN(i));\n \tfor (i = 0; i < 4; i++)\n-\t\tregs_buff[111 + i] = rd32(IGC_RDH(i));\n+\t\tregs_buff[110 + i] = rd32(IGC_RDH(i));\n \tfor (i = 0; i < 4; i++)\n-\t\tregs_buff[115 + i] = rd32(IGC_RDT(i));\n+\t\tregs_buff[114 + i] = rd32(IGC_RDT(i));\n \tfor (i = 0; i < 4; i++)\n-\t\tregs_buff[119 + i] = rd32(IGC_RXDCTL(i));\n+\t\tregs_buff[118 + i] = rd32(IGC_RXDCTL(i));\n \n \tfor (i = 0; i < 10; i++)\n-\t\tregs_buff[123 + i] = rd32(IGC_EITR(i));\n+\t\tregs_buff[122 + i] = rd32(IGC_EITR(i));\n \tfor (i = 0; i < 16; i++)\n-\t\tregs_buff[139 + i] = rd32(IGC_RAL(i));\n+\t\tregs_buff[138 + i] = rd32(IGC_RAL(i));\n \tfor (i = 0; i < 16; i++)\n-\t\tregs_buff[145 + i] = rd32(IGC_RAH(i));\n+\t\tregs_buff[144 + i] = rd32(IGC_RAH(i));\n \n \tfor (i = 0; i < 4; i++)\n-\t\tregs_buff[149 + i] = rd32(IGC_TDBAL(i));\n+\t\tregs_buff[148 + i] = rd32(IGC_TDBAL(i));\n \tfor (i = 0; i < 4; i++)\n \t\tregs_buff[152 + i] = rd32(IGC_TDBAH(i));\n \tfor (i = 0; i < 4; i++)\ndiff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c\nindex d406aaea24af..47009fe0cbde 100644\n--- a/drivers/net/ethernet/intel/igc/igc_main.c\n+++ b/drivers/net/ethernet/intel/igc/igc_main.c\n@@ -4036,7 +4036,6 @@ static void igc_watchdog_task(struct work_struct *work)\n \tstruct igc_hw *hw = &adapter->hw;\n \tstruct igc_phy_info *phy = &hw->phy;\n \tu16 phy_data, retry_count = 20;\n-\tu32 connsw;\n \tu32 link;\n \tint i;\n \n@@ -4049,14 +4048,6 @@ static void igc_watchdog_task(struct work_struct *work)\n \t\t\tlink = false;\n \t}\n \n-\t/* Force link down if we have fiber to swap to */\n-\tif (adapter->flags & IGC_FLAG_MAS_ENABLE) {\n-\t\tif (hw->phy.media_type == igc_media_type_copper) {\n-\t\t\tconnsw = rd32(IGC_CONNSW);\n-\t\t\tif (!(connsw & IGC_CONNSW_AUTOSENSE_EN))\n-\t\t\t\tlink = 0;\n-\t\t}\n-\t}\n \tif (link) {\n \t\t/* Cancel scheduled suspend requests. */\n \t\tpm_runtime_resume(netdev->dev.parent);\ndiff --git a/drivers/net/ethernet/intel/igc/igc_regs.h b/drivers/net/ethernet/intel/igc/igc_regs.h\nindex 96dee3c1a5f7..79789176fc80 100644\n--- a/drivers/net/ethernet/intel/igc/igc_regs.h\n+++ b/drivers/net/ethernet/intel/igc/igc_regs.h\n@@ -11,7 +11,6 @@\n #define IGC_CTRL_EXT\t\t0x00018 /* Extended Device Control - RW */\n #define IGC_MDIC\t\t0x00020 /* MDI Control - RW */\n #define IGC_MDICNFG\t\t0x00E04 /* MDC/MDIO Configuration - RW */\n-#define IGC_CONNSW\t\t0x00034 /* Copper/Fiber switch control - RW */\n #define IGC_I225_PHPM\t\t0x00E14 /* I225 PHY Power Management */\n \n /* Internal Packet Buffer Size Registers */\n", "prefixes": [ "v1", "1/1" ] }