Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1204340/?format=api
{ "id": 1204340, "url": "http://patchwork.ozlabs.org/api/patches/1204340/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/ef7b98c8-0ce4-4f84-989d-28b5a29d4831@EXC04-ATKLA.omicron.at/", "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": "<ef7b98c8-0ce4-4f84-989d-28b5a29d4831@EXC04-ATKLA.omicron.at>", "list_archive_url": null, "date": "2019-12-04T10:40:26", "name": "igb: Fix SGMII SFP module discovery for 100FX/LX.", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8f72c2fe49564ab5ecf4d733618aa2915de5afbb", "submitter": { "id": 77256, "url": "http://patchwork.ozlabs.org/api/people/77256/?format=api", "name": "Manfred Rudigier", "email": "manfred.rudigier@omicronenergy.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/ef7b98c8-0ce4-4f84-989d-28b5a29d4831@EXC04-ATKLA.omicron.at/mbox/", "series": [ { "id": 146533, "url": "http://patchwork.ozlabs.org/api/series/146533/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=146533", "date": "2019-12-04T10:40:26", "name": "igb: Fix SGMII SFP module discovery for 100FX/LX.", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/146533/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1204340/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1204340/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.137;\n\thelo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dmarc=fail (p=none dis=none)\n\theader.from=omicronenergy.com", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=omicronenergy.com header.i=@omicronenergy.com\n\theader.b=\"NKsvp7mA\"; dkim-atps=neutral" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 47Sp5X6jvQz9s4Y\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 5 Dec 2019 05:58:08 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5C5A885485;\n\tWed, 4 Dec 2019 18:58:07 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id PV8TX7ToYpNz; Wed, 4 Dec 2019 18:58:05 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 842188506E;\n\tWed, 4 Dec 2019 18:58:05 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id E10251BF312\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 4 Dec 2019 10:52:39 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id DB0EB22264\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 4 Dec 2019 10:52:39 +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 VirspJZsSLsk for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 4 Dec 2019 10:52:37 +0000 (UTC)", "from ns.omicron.at (ns.omicron.at [212.183.10.25])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 9772020394\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 4 Dec 2019 10:52:37 +0000 (UTC)", "from MGW02-ATKLA.omicron.at ([172.25.62.35])\n\tby ns.omicron.at (8.15.2/8.15.2) with ESMTPS id xB4AfAco019657\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=FAIL)\n\tfor <intel-wired-lan@lists.osuosl.org>; Wed, 4 Dec 2019 11:41:10 +0100", "from MGW02-ATKLA.omicron.at (localhost [127.0.0.1])\n\tby MGW02-ATKLA.omicron.at (Postfix) with ESMTP id A4F28A010D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 4 Dec 2019 11:41:10 +0100 (CET)", "from MGW01-ATKLA.omicron.at (unknown [172.25.62.34])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby MGW02-ATKLA.omicron.at (Postfix) with ESMTPS id A3364A010C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 4 Dec 2019 11:41:10 +0100 (CET)", "from EXC04-ATKLA.omicron.at ([172.22.100.189])\n\tby MGW01-ATKLA.omicron.at with ESMTP id xB4AfAGx014102-xB4AfAH1014102\n\t(version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=CAFAIL);\n\tWed, 4 Dec 2019 11:41:10 +0100", "from manrud11.omicron.at (172.22.24.34) by EXC04-ATKLA.omicron.at\n\t(172.22.100.189) with Microsoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5;\n\tWed, 4 Dec 2019 11:41:06 +0100" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "delayed 00:11:23 by SQLgrey-1.7.6", "DKIM-Filter": "OpenDKIM Filter v2.11.0 ns.omicron.at xB4AfAco019657", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=omicronenergy.com;\n\ts=default; t=1575456070;\n\tbh=ukI/cX93/kHMVo4B48kFJfdHSp1u4sCSTmqVqM4D+iw=;\n\th=From:To:CC:Subject:Date:From;\n\tb=NKsvp7mAlJTLYSuZ7PkhGwADIYmAV6mfCXlD6W3T0iWLECjTBVPsplq/mqGzl3MJe\n\tCosPd25Q3M7SCLQxyz9ZGoUc7KD80l4rjej/CnJikZ8xtve0SSf4AENd4bdCO82C5d\n\tsYR0b2K4ZdlNpNHxw1GF9V+gmaFWOBU1LG4tO+UI=", "From": "Manfred Rudigier <manfred.rudigier@omicronenergy.com>", "To": "<jeffrey.t.kirsher@intel.com>", "Date": "Wed, 4 Dec 2019 11:40:26 +0100", "X-Mailer": "git-send-email 2.24.0", "MIME-Version": "1.0", "X-Originating-IP": "[172.22.24.34]", "X-ClientProxiedBy": "EXC04-ATKLA.omicron.at (172.22.100.189) To\n\tEXC04-ATKLA.omicron.at (172.22.100.189)", "Message-ID": "<ef7b98c8-0ce4-4f84-989d-28b5a29d4831@EXC04-ATKLA.omicron.at>", "X-Mailman-Approved-At": "Wed, 04 Dec 2019 18:58:03 +0000", "Subject": "[Intel-wired-lan] [PATCH] igb: Fix SGMII SFP module discovery for\n\t100FX/LX.", "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>", "Cc": "Manfred Rudigier <manfred.rudigier@omicronenergy.com>,\n\tintel-wired-lan@lists.osuosl.org", "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": "Changing the link mode should also be done for 100BaseFX SGMII modules,\notherwise they just don't work when the default link mode in CTRL_EXT\ncoming from the EEPROM is SERDES.\n\nAdditionally 100Base-LX SGMII SFP modules are also supported now, which\nwas not the case before.\n\nTested with an i210 using Flexoptix S.1303.2M.G 100FX and\nS.1303.10.G 100LX SGMII SFP modules.\n\nSigned-off-by: Manfred Rudigier <manfred.rudigier@omicronenergy.com>\n---\n drivers/net/ethernet/intel/igb/e1000_82575.c | 8 ++------\n drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +-\n 2 files changed, 3 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c\nindex 614130a6ba1f..30e77f5406cf 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_82575.c\n+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c\n@@ -530,7 +530,7 @@ static s32 igb_set_sfp_media_type_82575(struct e1000_hw *hw)\n \t\tdev_spec->module_plugged = true;\n \t\tif (eth_flags->e1000_base_lx || eth_flags->e1000_base_sx) {\n \t\t\thw->phy.media_type = e1000_media_type_internal_serdes;\n-\t\t} else if (eth_flags->e100_base_fx) {\n+\t\t} else if (eth_flags->e100_base_fx || eth_flags->e100_base_lx) {\n \t\t\tdev_spec->sgmii_active = true;\n \t\t\thw->phy.media_type = e1000_media_type_internal_serdes;\n \t\t} else if (eth_flags->e1000_base_t) {\n@@ -657,14 +657,10 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)\n \t\t\tbreak;\n \t\t}\n \n-\t\t/* do not change link mode for 100BaseFX */\n-\t\tif (dev_spec->eth_flags.e100_base_fx)\n-\t\t\tbreak;\n-\n \t\t/* change current link mode setting */\n \t\tctrl_ext &= ~E1000_CTRL_EXT_LINK_MODE_MASK;\n \n-\t\tif (hw->phy.media_type == e1000_media_type_copper)\n+\t\tif (dev_spec->sgmii_active)\n \t\t\tctrl_ext |= E1000_CTRL_EXT_LINK_MODE_SGMII;\n \t\telse\n \t\t\tctrl_ext |= E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES;\ndiff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c\nindex 5acf3b743876..50954e444985 100644\n--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c\n+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c\n@@ -181,7 +181,7 @@ static int igb_get_link_ksettings(struct net_device *netdev,\n \t\t\t\tadvertising &= ~ADVERTISED_1000baseKX_Full;\n \t\t\t}\n \t\t}\n-\t\tif (eth_flags->e100_base_fx) {\n+\t\tif (eth_flags->e100_base_fx || eth_flags->e100_base_lx) {\n \t\t\tsupported |= SUPPORTED_100baseT_Full;\n \t\t\tadvertising |= ADVERTISED_100baseT_Full;\n \t\t}\n", "prefixes": [] }