Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2226600/?format=api
{ "id": 2226600, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2226600/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260422155701.7420-4-khai.wen.tan@linux.intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/1.1/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": "" }, "msgid": "<20260422155701.7420-4-khai.wen.tan@linux.intel.com>", "date": "2026-04-22T15:57:01", "name": "[iwl-next,v3,3/3] igc: add support for forcing link speed without autonegotiation", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "29c938b8c5d2512667fc851d111d1c226aeda012", "submitter": { "id": 93102, "url": "http://patchwork.ozlabs.org/api/1.1/people/93102/?format=api", "name": "KhaiWenTan", "email": "khai.wen.tan@linux.intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260422155701.7420-4-khai.wen.tan@linux.intel.com/mbox/", "series": [ { "id": 501042, "url": "http://patchwork.ozlabs.org/api/1.1/series/501042/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=501042", "date": "2026-04-22T15:56:58", "name": "igc: add support for forcing link speed without autonegotiation", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/501042/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2226600/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2226600/checks/", "tags": {}, "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@legolas.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256\n header.s=default header.b=8V/uZUsE;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g14Fp2P55z1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 23 Apr 2026 02:20:30 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id B266F425EA;\n\tWed, 22 Apr 2026 16:20:28 +0000 (UTC)", "from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id Emc-fZpAnaID; Wed, 22 Apr 2026 16:20:27 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id BBF59425F7;\n\tWed, 22 Apr 2026 16:20:27 +0000 (UTC)", "from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n by lists1.osuosl.org (Postfix) with ESMTP id 39F4624D\n for <intel-wired-lan@lists.osuosl.org>; Wed, 22 Apr 2026 16:20:26 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp3.osuosl.org (Postfix) with ESMTP id 2BA4960DB0\n for <intel-wired-lan@lists.osuosl.org>; Wed, 22 Apr 2026 16:20:26 +0000 (UTC)", "from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id uYt_CrY3RFKn for <intel-wired-lan@lists.osuosl.org>;\n Wed, 22 Apr 2026 16:20:25 +0000 (UTC)", "from mgamail.intel.com (mgamail.intel.com [198.175.65.11])\n by smtp3.osuosl.org (Postfix) with ESMTPS id E5E74616E2\n for <intel-wired-lan@lists.osuosl.org>; Wed, 22 Apr 2026 16:20:24 +0000 (UTC)", "from fmviesa010.fm.intel.com ([10.60.135.150])\n by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Apr 2026 09:20:24 -0700", "from unknown (HELO localhost.png.intel.com) ([10.107.255.61])\n by fmviesa010.fm.intel.com with ESMTP; 22 Apr 2026 09:20:20 -0700" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp4.osuosl.org BBF59425F7", "OpenDKIM Filter v2.11.0 smtp3.osuosl.org E5E74616E2" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1776874827;\n\tbh=cxvoRp5zvbXU7qSt2RCE0+4PhKBDVQbPjqEplRFlUGY=;\n\th=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id:\n\t List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\t From;\n\tb=8V/uZUsEgRDynfo35F8vGAjsWXZmbMiV+h8PYGVsBf4aG3iSYeasOntRHimuFc+K8\n\t /kI7cA9OsRSXHLni4c7ArI/ySLe/M6BH0FXXot1NioTywAMZWawq9kPgqGiGuyY1nM\n\t F94dgSYZH8L2pXtQ4Ut3EhADkde8c+3gX5NBbG8ZPT2bk9AG7itmNaspl1PiQMlgr3\n\t xqqIiYl3qElHg1m80Iwuoeq3ufc8H40Phu7mJluX2+UgTLSDAXASPcGmmlTv/G21We\n\t TniBP23zpXOJyHXDZSzz6XTujlf434KHWXKqHsQDyREevdmKS7vuDpKjAz7GA0T+dN\n\t 3NWiTeOVBl5UA==", "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=198.175.65.11;\n helo=mgamail.intel.com; envelope-from=khai.wen.tan@linux.intel.com;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp3.osuosl.org E5E74616E2", "X-CSE-ConnectionGUID": [ "Nz2Jqq4GRi2UL6dQIcSpeg==", "QU2MldFqQwC3tR5L7VNMQg==" ], "X-CSE-MsgGUID": [ "MYmQwANMS/248CQLJOle/A==", "NOUj1n7zRyeAMLXEKe1rZA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11764\"; a=\"88134502\"", "E=Sophos;i=\"6.23,193,1770624000\"; d=\"scan'208\";a=\"88134502\"", "E=Sophos;i=\"6.23,193,1770624000\"; d=\"scan'208\";a=\"228052478\"" ], "X-ExtLoop1": "1", "From": "KhaiWenTan <khai.wen.tan@linux.intel.com>", "To": "anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com,\n andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,\n kuba@kernel.org, pabeni@redhat.com", "Cc": "intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,\n linux-kernel@vger.kernel.org, faizal.abdul.rahim@intel.com,\n hong.aun.looi@intel.com, khai.wen.tan@intel.com,\n Faizal Rahim <faizal.abdul.rahim@linux.intel.com>, Looi,\n KhaiWenTan <khai.wen.tan@linux.intel.com>", "Date": "Wed, 22 Apr 2026 23:57:01 +0800", "Message-ID": "<20260422155701.7420-4-khai.wen.tan@linux.intel.com>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20260422155701.7420-1-khai.wen.tan@linux.intel.com>", "References": "<20260422155701.7420-1-khai.wen.tan@linux.intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1776874825; x=1808410825;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=NK/Lc/lfCPmYBX4q+H8oO4NAENdkDcREsNw+NUz/Brg=;\n b=PXe09iLLAdIobjrTG8SNMY/sDSvzFaxCUrgP5MQhZIEA1bQD27/tMmkf\n WbTDaMMV20sAp3U1IPvdpCISZ2t73z6FPcB6i7SDmCDFDgSgFKiSNFg6S\n tutkazY8oRLLnufGv1jsaKrCgWWPDIBgjGaXCe5LHWnM9vMynBz6xwsmn\n Ilmp87OInBjpk2kcr1CYEuTrmfERx/gUjV+Esdfq1X9kvouOgEJUEvSPI\n t/yHW2U5W31i9k+dF4KERlMTeOujoTzQvQQNJJT3bXmVKZl58s1nb9nz/\n yQrKwHo6I6xphTGOWKn/s75Zob0T4kFdMpxiq8uyMOLh0rwgcSAP0A6Gu\n Q==;", "X-Mailman-Original-Authentication-Results": [ "smtp3.osuosl.org;\n dmarc=none (p=none dis=none)\n header.from=linux.intel.com", "smtp3.osuosl.org;\n dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com\n header.a=rsa-sha256 header.s=Intel header.b=PXe09iLL" ], "Subject": "[Intel-wired-lan] [PATCH iwl-next v3 3/3] igc: add support for\n forcing link speed without autonegotiation", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <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 <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Faizal Rahim <faizal.abdul.rahim@linux.intel.com>\n\nAllow users to force 10/100 Mb/s link speed and duplex via ethtool\nwhen autonegotiation is disabled. Previously, the driver rejected\nthese requests with \"Force mode currently not supported.\".\n\nForcing at 1000 Mb/s and 2500 Mb/s is not supported.\n\nReviewed-by: Looi, Hong Aun <hong.aun.looi@intel.com>\nSigned-off-by: Faizal Rahim <faizal.abdul.rahim@linux.intel.com>\nSigned-off-by: KhaiWenTan <khai.wen.tan@linux.intel.com>\n---\n drivers/net/ethernet/intel/igc/igc_base.c | 35 ++++-\n drivers/net/ethernet/intel/igc/igc_defines.h | 9 +-\n drivers/net/ethernet/intel/igc/igc_ethtool.c | 131 +++++++++++++------\n drivers/net/ethernet/intel/igc/igc_hw.h | 9 ++\n drivers/net/ethernet/intel/igc/igc_mac.c | 10 ++\n drivers/net/ethernet/intel/igc/igc_main.c | 2 +-\n drivers/net/ethernet/intel/igc/igc_phy.c | 65 ++++++++-\n drivers/net/ethernet/intel/igc/igc_phy.h | 1 +\n 8 files changed, 211 insertions(+), 51 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc_base.c b/drivers/net/ethernet/intel/igc/igc_base.c\nindex 1613b562d17c..ab9120a3127f 100644\n--- a/drivers/net/ethernet/intel/igc/igc_base.c\n+++ b/drivers/net/ethernet/intel/igc/igc_base.c\n@@ -114,11 +114,35 @@ static s32 igc_setup_copper_link_base(struct igc_hw *hw)\n \tu32 ctrl;\n \n \tctrl = rd32(IGC_CTRL);\n-\tctrl |= IGC_CTRL_SLU;\n-\tctrl &= ~(IGC_CTRL_FRCSPD | IGC_CTRL_FRCDPX);\n-\twr32(IGC_CTRL, ctrl);\n-\n-\tret_val = igc_setup_copper_link(hw);\n+\tctrl &= ~(IGC_CTRL_FRCSPD | IGC_CTRL_FRCDPX |\n+\t\t IGC_CTRL_SPEED_MASK | IGC_CTRL_FD);\n+\n+\tif (hw->mac.autoneg_enabled) {\n+\t\tctrl |= IGC_CTRL_SLU;\n+\t\twr32(IGC_CTRL, ctrl);\n+\t\tret_val = igc_setup_copper_link(hw);\n+\t} else {\n+\t\tctrl |= IGC_CTRL_SLU | IGC_CTRL_FRCSPD | IGC_CTRL_FRCDPX;\n+\n+\t\tswitch (hw->mac.forced_speed_duplex) {\n+\t\tcase IGC_FORCED_10H:\n+\t\t\tctrl |= IGC_CTRL_SPEED_10;\n+\t\t\tbreak;\n+\t\tcase IGC_FORCED_10F:\n+\t\t\tctrl |= IGC_CTRL_SPEED_10 | IGC_CTRL_FD;\n+\t\t\tbreak;\n+\t\tcase IGC_FORCED_100H:\n+\t\t\tctrl |= IGC_CTRL_SPEED_100;\n+\t\t\tbreak;\n+\t\tcase IGC_FORCED_100F:\n+\t\t\tctrl |= IGC_CTRL_SPEED_100 | IGC_CTRL_FD;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\treturn -IGC_ERR_CONFIG;\n+\t\t}\n+\t\twr32(IGC_CTRL, ctrl);\n+\t\tret_val = igc_setup_copper_link(hw);\n+\t}\n \n \treturn ret_val;\n }\n@@ -443,6 +467,7 @@ static const struct igc_phy_operations igc_phy_ops_base = {\n \t.reset\t\t\t= igc_phy_hw_reset,\n \t.read_reg\t\t= igc_read_phy_reg_gpy,\n \t.write_reg\t\t= igc_write_phy_reg_gpy,\n+\t.force_speed_duplex\t= igc_force_speed_duplex,\n };\n \n const struct igc_info igc_base_info = {\ndiff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h\nindex 9482ab11f050..3f504751c2d9 100644\n--- a/drivers/net/ethernet/intel/igc/igc_defines.h\n+++ b/drivers/net/ethernet/intel/igc/igc_defines.h\n@@ -129,10 +129,13 @@\n #define IGC_ERR_SWFW_SYNC\t\t13\n \n /* Device Control */\n+#define IGC_CTRL_FD\t\tBIT(0) /* Full Duplex */\n #define IGC_CTRL_RST\t\t0x04000000 /* Global reset */\n-\n #define IGC_CTRL_PHY_RST\t0x80000000 /* PHY Reset */\n #define IGC_CTRL_SLU\t\t0x00000040 /* Set link up (Force Link) */\n+#define IGC_CTRL_SPEED_MASK\tGENMASK(10, 8)\n+#define IGC_CTRL_SPEED_10\tFIELD_PREP(IGC_CTRL_SPEED_MASK, 0)\n+#define IGC_CTRL_SPEED_100\tFIELD_PREP(IGC_CTRL_SPEED_MASK, 1)\n #define IGC_CTRL_FRCSPD\t\t0x00000800 /* Force Speed */\n #define IGC_CTRL_FRCDPX\t\t0x00001000 /* Force Duplex */\n #define IGC_CTRL_VME\t\t0x40000000 /* IEEE VLAN mode enable */\n@@ -673,6 +676,10 @@\n #define IGC_GEN_POLL_TIMEOUT\t1920\n \n /* PHY Control Register */\n+#define MII_CR_SPEED_MASK\t(BIT(6) | BIT(13))\n+#define MII_CR_SPEED_10\t\t0x0000\t/* SSM=0, SSL=0: 10 Mb/s */\n+#define MII_CR_SPEED_100\tBIT(13)\t/* SSM=0, SSL=1: 100 Mb/s */\n+#define MII_CR_DUPLEX_EN\tBIT(8)\t/* 0 = Half Duplex, 1 = Full Duplex */\n #define MII_CR_RESTART_AUTO_NEG\t0x0200 /* Restart auto negotiation */\n #define MII_CR_POWER_DOWN\t0x0800 /* Power down */\n #define MII_CR_AUTO_NEG_EN\t0x1000 /* Auto Neg Enable */\ndiff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c\nindex cfcbf2fdad6e..6a54c7a98f39 100644\n--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c\n+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c\n@@ -1914,44 +1914,58 @@ static int igc_ethtool_get_link_ksettings(struct net_device *netdev,\n \tethtool_link_ksettings_add_link_mode(cmd, supported, TP);\n \tethtool_link_ksettings_add_link_mode(cmd, advertising, TP);\n \n-\t/* advertising link modes */\n-\tif (hw->phy.autoneg_advertised & ADVERTISE_10_HALF)\n-\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, 10baseT_Half);\n-\tif (hw->phy.autoneg_advertised & ADVERTISE_10_FULL)\n-\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, 10baseT_Full);\n-\tif (hw->phy.autoneg_advertised & ADVERTISE_100_HALF)\n-\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, 100baseT_Half);\n-\tif (hw->phy.autoneg_advertised & ADVERTISE_100_FULL)\n-\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, 100baseT_Full);\n-\tif (hw->phy.autoneg_advertised & ADVERTISE_1000_FULL)\n-\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, 1000baseT_Full);\n-\tif (hw->phy.autoneg_advertised & ADVERTISE_2500_FULL)\n-\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, 2500baseT_Full);\n-\n \t/* set autoneg settings */\n \tethtool_link_ksettings_add_link_mode(cmd, supported, Autoneg);\n-\tethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg);\n+\tif (hw->mac.autoneg_enabled) {\n+\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg);\n+\t\tcmd->base.autoneg = AUTONEG_ENABLE;\n+\n+\t\t/* advertising link modes only apply when autoneg is on */\n+\t\tif (hw->phy.autoneg_advertised & ADVERTISE_10_HALF)\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 10baseT_Half);\n+\t\tif (hw->phy.autoneg_advertised & ADVERTISE_10_FULL)\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 10baseT_Full);\n+\t\tif (hw->phy.autoneg_advertised & ADVERTISE_100_HALF)\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 100baseT_Half);\n+\t\tif (hw->phy.autoneg_advertised & ADVERTISE_100_FULL)\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 100baseT_Full);\n+\t\tif (hw->phy.autoneg_advertised & ADVERTISE_1000_FULL)\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 1000baseT_Full);\n+\t\tif (hw->phy.autoneg_advertised & ADVERTISE_2500_FULL)\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t 2500baseT_Full);\n+\n+\t\t/* Set pause flow control advertising */\n+\t\tswitch (hw->fc.requested_mode) {\n+\t\tcase igc_fc_full:\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t Pause);\n+\t\t\tbreak;\n+\t\tcase igc_fc_rx_pause:\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t Pause);\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t Asym_Pause);\n+\t\t\tbreak;\n+\t\tcase igc_fc_tx_pause:\n+\t\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n+\t\t\t\t\t\t\t Asym_Pause);\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tbreak;\n+\t\t}\n+\t} else {\n+\t\tcmd->base.autoneg = AUTONEG_DISABLE;\n+\t}\n \n-\t/* Set pause flow control settings */\n+\t/* Pause is always supported */\n \tethtool_link_ksettings_add_link_mode(cmd, supported, Pause);\n \n-\tswitch (hw->fc.requested_mode) {\n-\tcase igc_fc_full:\n-\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);\n-\t\tbreak;\n-\tcase igc_fc_rx_pause:\n-\t\tethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);\n-\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n-\t\t\t\t\t\t Asym_Pause);\n-\t\tbreak;\n-\tcase igc_fc_tx_pause:\n-\t\tethtool_link_ksettings_add_link_mode(cmd, advertising,\n-\t\t\t\t\t\t Asym_Pause);\n-\t\tbreak;\n-\tdefault:\n-\t\tbreak;\n-\t}\n-\n \tstatus = pm_runtime_suspended(&adapter->pdev->dev) ?\n \t\t 0 : rd32(IGC_STATUS);\n \n@@ -1983,7 +1997,6 @@ static int igc_ethtool_get_link_ksettings(struct net_device *netdev,\n \t\tcmd->base.duplex = DUPLEX_UNKNOWN;\n \t}\n \tcmd->base.speed = speed;\n-\tcmd->base.autoneg = AUTONEG_ENABLE;\n \n \t/* MDI-X => 2; MDI =>1; Invalid =>0 */\n \tif (hw->phy.media_type == igc_media_type_copper)\n@@ -2000,6 +2013,41 @@ static int igc_ethtool_get_link_ksettings(struct net_device *netdev,\n \treturn 0;\n }\n \n+/**\n+ * igc_handle_autoneg_disabled - Configure forced speed/duplex settings\n+ * @adapter: private driver structure\n+ * @speed: requested speed (must be SPEED_10 or SPEED_100)\n+ * @duplex: requested duplex\n+ *\n+ * Records forced speed/duplex when autoneg is disabled.\n+ * Caller must validate speed before calling this function.\n+ */\n+static void igc_handle_autoneg_disabled(struct igc_adapter *adapter, u32 speed,\n+\t\t\t\t\tu8 duplex)\n+{\n+\tstruct igc_mac_info *mac = &adapter->hw.mac;\n+\n+\tswitch (speed) {\n+\tcase SPEED_10:\n+\t\tmac->forced_speed_duplex = (duplex == DUPLEX_FULL) ?\n+\t\t\tIGC_FORCED_10F : IGC_FORCED_10H;\n+\t\tbreak;\n+\tcase SPEED_100:\n+\t\tmac->forced_speed_duplex = (duplex == DUPLEX_FULL) ?\n+\t\t\tIGC_FORCED_100F : IGC_FORCED_100H;\n+\t\tbreak;\n+\tdefault:\n+\t\tWARN_ONCE(1, \"Unsupported speed %u\\n\", speed);\n+\t\treturn;\n+\t}\n+\n+\tmac->autoneg_enabled = false;\n+\n+\t/* Half-duplex cannot support flow control per IEEE 802.3 */\n+\tif (duplex != DUPLEX_FULL)\n+\t\tadapter->hw.fc.requested_mode = igc_fc_none;\n+}\n+\n /**\n * igc_handle_autoneg_enabled - Configure autonegotiation advertisement\n * @adapter: private driver structure\n@@ -2038,6 +2086,7 @@ static void igc_handle_autoneg_enabled(struct igc_adapter *adapter,\n \t\t\t\t\t\t 10baseT_Half))\n \t\tadvertised |= ADVERTISE_10_HALF;\n \n+\thw->mac.autoneg_enabled = true;\n \thw->phy.autoneg_advertised = advertised;\n \tif (adapter->fc_autoneg)\n \t\thw->fc.requested_mode = igc_fc_default;\n@@ -2071,14 +2120,20 @@ igc_ethtool_set_link_ksettings(struct net_device *netdev,\n \t\t}\n \t}\n \n+\tif (cmd->base.autoneg == AUTONEG_DISABLE &&\n+\t cmd->base.speed != SPEED_10 && cmd->base.speed != SPEED_100) {\n+\t\tnetdev_info(dev, \"Unsupported speed for forced link\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n \twhile (test_and_set_bit(__IGC_RESETTING, &adapter->state))\n \t\tusleep_range(1000, 2000);\n \n-\tif (cmd->base.autoneg == AUTONEG_ENABLE) {\n+\tif (cmd->base.autoneg == AUTONEG_ENABLE)\n \t\tigc_handle_autoneg_enabled(adapter, cmd);\n-\t} else {\n-\t\tnetdev_info(dev, \"Force mode currently not supported\\n\");\n-\t}\n+\telse\n+\t\tigc_handle_autoneg_disabled(adapter, cmd->base.speed,\n+\t\t\t\t\t cmd->base.duplex);\n \n \t/* MDI-X => 2; MDI => 1; Auto => 3 */\n \tif (cmd->base.eth_tp_mdix_ctrl) {\ndiff --git a/drivers/net/ethernet/intel/igc/igc_hw.h b/drivers/net/ethernet/intel/igc/igc_hw.h\nindex 86ab8f566f44..62aaee55668a 100644\n--- a/drivers/net/ethernet/intel/igc/igc_hw.h\n+++ b/drivers/net/ethernet/intel/igc/igc_hw.h\n@@ -73,6 +73,13 @@ struct igc_info {\n \n extern const struct igc_info igc_base_info;\n \n+enum igc_forced_speed_duplex {\n+\tIGC_FORCED_10H,\n+\tIGC_FORCED_10F,\n+\tIGC_FORCED_100H,\n+\tIGC_FORCED_100F,\n+};\n+\n struct igc_mac_info {\n \tstruct igc_mac_operations ops;\n \n@@ -93,6 +100,8 @@ struct igc_mac_info {\n \tbool arc_subsystem_valid;\n \n \tbool get_link_status;\n+\tbool autoneg_enabled;\n+\tenum igc_forced_speed_duplex forced_speed_duplex;\n };\n \n struct igc_nvm_operations {\ndiff --git a/drivers/net/ethernet/intel/igc/igc_mac.c b/drivers/net/ethernet/intel/igc/igc_mac.c\nindex 142beb9ae557..8bbb6d5581c7 100644\n--- a/drivers/net/ethernet/intel/igc/igc_mac.c\n+++ b/drivers/net/ethernet/intel/igc/igc_mac.c\n@@ -446,6 +446,16 @@ s32 igc_config_fc_after_link_up(struct igc_hw *hw)\n \tu16 speed, duplex;\n \ts32 ret_val = 0;\n \n+\t/* When autoneg is disabled, force the MAC flow control settings\n+\t * to match the \"fc\" parameter.\n+\t */\n+\tif (!hw->mac.autoneg_enabled) {\n+\t\tret_val = igc_force_mac_fc(hw);\n+\t\tif (ret_val)\n+\t\t\thw_dbg(\"Error forcing flow control settings\\n\");\n+\t\tgoto out;\n+\t}\n+\n \t/* In auto-neg, we need to check and see if Auto-Neg has completed,\n \t * and if so, how the PHY and link partner has flow control\n \t * configured.\ndiff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c\nindex 72bc5128d8b8..437e1d1ef1e4 100644\n--- a/drivers/net/ethernet/intel/igc/igc_main.c\n+++ b/drivers/net/ethernet/intel/igc/igc_main.c\n@@ -7298,7 +7298,7 @@ static int igc_probe(struct pci_dev *pdev,\n \t/* Initialize link properties that are user-changeable */\n \tadapter->fc_autoneg = true;\n \thw->phy.autoneg_advertised = 0xaf;\n-\n+\thw->mac.autoneg_enabled = true;\n \thw->fc.requested_mode = igc_fc_default;\n \thw->fc.current_mode = igc_fc_default;\n \ndiff --git a/drivers/net/ethernet/intel/igc/igc_phy.c b/drivers/net/ethernet/intel/igc/igc_phy.c\nindex 6c4d204aecfa..4cf737fb3b21 100644\n--- a/drivers/net/ethernet/intel/igc/igc_phy.c\n+++ b/drivers/net/ethernet/intel/igc/igc_phy.c\n@@ -494,12 +494,20 @@ s32 igc_setup_copper_link(struct igc_hw *hw)\n \ts32 ret_val = 0;\n \tbool link;\n \n-\t/* Setup autoneg and flow control advertisement and perform\n-\t * autonegotiation.\n-\t */\n-\tret_val = igc_copper_link_autoneg(hw);\n-\tif (ret_val)\n-\t\tgoto out;\n+\tif (hw->mac.autoneg_enabled) {\n+\t\t/* Setup autoneg and flow control advertisement and perform\n+\t\t * autonegotiation.\n+\t\t */\n+\t\tret_val = igc_copper_link_autoneg(hw);\n+\t\tif (ret_val)\n+\t\t\tgoto out;\n+\t} else {\n+\t\tret_val = hw->phy.ops.force_speed_duplex(hw);\n+\t\tif (ret_val) {\n+\t\t\thw_dbg(\"Error Forcing Speed/Duplex\\n\");\n+\t\t\tgoto out;\n+\t\t}\n+\t}\n \n \t/* Check link status. Wait up to 100 microseconds for link to become\n \t * valid.\n@@ -778,3 +786,48 @@ u16 igc_read_phy_fw_version(struct igc_hw *hw)\n \n \treturn gphy_version;\n }\n+\n+/**\n+ * igc_force_speed_duplex - Force PHY speed and duplex settings\n+ * @hw: pointer to the HW structure\n+ *\n+ * Programs the GPY PHY control register to disable autonegotiation\n+ * and force the speed/duplex indicated by hw->mac.forced_speed_duplex.\n+ */\n+s32 igc_force_speed_duplex(struct igc_hw *hw)\n+{\n+\tstruct igc_phy_info *phy = &hw->phy;\n+\tu16 phy_ctrl;\n+\ts32 ret_val;\n+\n+\tret_val = phy->ops.read_reg(hw, PHY_CONTROL, &phy_ctrl);\n+\tif (ret_val)\n+\t\treturn ret_val;\n+\n+\tphy_ctrl &= ~(MII_CR_SPEED_MASK | MII_CR_DUPLEX_EN |\n+\t\t MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);\n+\n+\tswitch (hw->mac.forced_speed_duplex) {\n+\tcase IGC_FORCED_10H:\n+\t\tphy_ctrl |= MII_CR_SPEED_10;\n+\t\tbreak;\n+\tcase IGC_FORCED_10F:\n+\t\tphy_ctrl |= MII_CR_SPEED_10 | MII_CR_DUPLEX_EN;\n+\t\tbreak;\n+\tcase IGC_FORCED_100H:\n+\t\tphy_ctrl |= MII_CR_SPEED_100;\n+\t\tbreak;\n+\tcase IGC_FORCED_100F:\n+\t\tphy_ctrl |= MII_CR_SPEED_100 | MII_CR_DUPLEX_EN;\n+\t\tbreak;\n+\tdefault:\n+\t\treturn -IGC_ERR_CONFIG;\n+\t}\n+\n+\tret_val = phy->ops.write_reg(hw, PHY_CONTROL, phy_ctrl);\n+\tif (ret_val)\n+\t\treturn ret_val;\n+\n+\thw->mac.get_link_status = true;\n+\treturn 0;\n+}\ndiff --git a/drivers/net/ethernet/intel/igc/igc_phy.h b/drivers/net/ethernet/intel/igc/igc_phy.h\nindex 832a7e359f18..d37a89174826 100644\n--- a/drivers/net/ethernet/intel/igc/igc_phy.h\n+++ b/drivers/net/ethernet/intel/igc/igc_phy.h\n@@ -18,5 +18,6 @@ void igc_power_down_phy_copper(struct igc_hw *hw);\n s32 igc_write_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 data);\n s32 igc_read_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 *data);\n u16 igc_read_phy_fw_version(struct igc_hw *hw);\n+s32 igc_force_speed_duplex(struct igc_hw *hw);\n \n #endif\n", "prefixes": [ "iwl-next", "v3", "3/3" ] }
