Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1086838/?format=api
{ "id": 1086838, "url": "http://patchwork.ozlabs.org/api/patches/1086838/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/155548879651.3454.13167784936351314661.stgit@buzz/", "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": "<155548879651.3454.13167784936351314661.stgit@buzz>", "list_archive_url": null, "date": "2019-04-17T08:13:16", "name": "[1/2] Revert \"e1000e: fix cyclic resets at link up with active tx\"", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "7474d4104c84b52c15252face76a39936dc06420", "submitter": { "id": 65606, "url": "http://patchwork.ozlabs.org/api/people/65606/?format=api", "name": "Konstantin Khlebnikov", "email": "khlebnikov@yandex-team.ru" }, "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/155548879651.3454.13167784936351314661.stgit@buzz/mbox/", "series": [ { "id": 103219, "url": "http://patchwork.ozlabs.org/api/series/103219/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=103219", "date": "2019-04-17T08:13:16", "name": "[1/2] Revert \"e1000e: fix cyclic resets at link up with active tx\"", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/103219/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1086838/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1086838/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;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.136; helo=silver.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=yandex-team.ru", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=yandex-team.ru header.i=@yandex-team.ru\n\theader.b=\"eDOFkQw2\"; dkim-atps=neutral", "mxbackcorp1j.mail.yandex.net;\n\tdkim=pass header.i=@yandex-team.ru" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 44kZtv5kv8z9s3Z\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Apr 2019 18:20:55 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 73DF023335;\n\tWed, 17 Apr 2019 08:20:53 +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 Ur8iZR-xn1b6; Wed, 17 Apr 2019 08:20:50 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id A782222DC7;\n\tWed, 17 Apr 2019 08:20:50 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 937BC1BF2AF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 08:20:49 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 9073A86CDC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 08:20:49 +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 3z0GbUwwIcE2 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 08:20:45 +0000 (UTC)", "from forwardcorp1o.mail.yandex.net (forwardcorp1o.mail.yandex.net\n\t[95.108.205.193])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0A36186CF0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 08:20:45 +0000 (UTC)", "from mxbackcorp1j.mail.yandex.net (mxbackcorp1j.mail.yandex.net\n\t[IPv6:2a02:6b8:0:1619::162])\n\tby forwardcorp1o.mail.yandex.net (Yandex) with ESMTP id 8F64C2E146A; \n\tWed, 17 Apr 2019 11:13:19 +0300 (MSK)", "from smtpcorp1o.mail.yandex.net (smtpcorp1o.mail.yandex.net\n\t[2a02:6b8:0:1a2d::30])\n\tby mxbackcorp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id\n\tDjTnSs4Kr0-DGMW1YLO; Wed, 17 Apr 2019 11:13:19 +0300", "from dynamic-red.dhcp.yndx.net (dynamic-red.dhcp.yndx.net\n\t[2a02:6b8:0:40c:f5ec:9361:ed45:768f])\n\tby smtpcorp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id\n\trHSB8NUiqu-DGYGUY2o; Wed, 17 Apr 2019 11:13:16 +0300\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (Client certificate not present)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "from auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru;\n\ts=default; \n\tt=1555488799; bh=nU/UyANuJr7HaL5b4DzuWw7Mi4MpXvT5ArjGHc26ZUU=;\n\th=Message-ID:Date:To:From:Subject:Cc;\n\tb=eDOFkQw2KbaFmgJC4QJ8beBbcBd6cjadfmrWNd5Ld3mE8SPeO0Md+UhRZaccZ9unE\n\tXl0LMS19Nd6euyFVBPUd3zsFCYNf3DiphdLWHQzi0wuIARaUKQ6qv1BZs+YMDtLYo5\n\tkGmCP4+fto5Y6uoKT1sW34LjDVgflUT+fHH6DEXc=", "From": "Konstantin Khlebnikov <khlebnikov@yandex-team.ru>", "To": "netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org,\n\tlinux-kernel@vger.kernel.org, Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "Date": "Wed, 17 Apr 2019 11:13:16 +0300", "Message-ID": "<155548879651.3454.13167784936351314661.stgit@buzz>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 1/2] Revert \"e1000e: fix cyclic resets at\n\tlink up with active tx\"", "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": "Sasha Levin <sashal@kernel.org>, e1000-devel@lists.sourceforge.net,\n\tJoseph Yasi <joe.yasi@gmail.com>", "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": "This reverts commit 0f9e980bf5ee1a97e2e401c846b2af989eb21c61.\n\nThat change cased false-positive warning about hardware hang:\n\ne1000e: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx\nIPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready\ne1000e 0000:00:1f.6 eth0: Detected Hardware Unit Hang:\n TDH <0>\n TDT <1>\n next_to_use <1>\n next_to_clean <0>\nbuffer_info[next_to_clean]:\n time_stamp <fffba7a7>\n next_to_watch <0>\n jiffies <fffbb140>\n next_to_watch.status <0>\nMAC Status <40080080>\nPHY Status <7949>\nPHY 1000BASE-T Status <0>\nPHY Extended Status <3000>\nPCI Status <10>\ne1000e: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx\n\nBesides warning everything works fine.\nOriginal issue will be fixed property in following patch.\n\nSigned-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>\nReported-by: Joseph Yasi <joe.yasi@gmail.com>\nLink: https://bugzilla.kernel.org/show_bug.cgi?id=203175\n---\n drivers/net/ethernet/intel/e1000e/netdev.c | 15 +++++++++------\n 1 file changed, 9 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex 7acc61e4f645..ba96e52aa8d1 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -5309,13 +5309,8 @@ static void e1000_watchdog_task(struct work_struct *work)\n \t\t\t/* 8000ES2LAN requires a Rx packet buffer work-around\n \t\t\t * on link down event; reset the controller to flush\n \t\t\t * the Rx packet buffer.\n-\t\t\t *\n-\t\t\t * If the link is lost the controller stops DMA, but\n-\t\t\t * if there is queued Tx work it cannot be done. So\n-\t\t\t * reset the controller to flush the Tx packet buffers.\n \t\t\t */\n-\t\t\tif ((adapter->flags & FLAG_RX_NEEDS_RESTART) ||\n-\t\t\t e1000_desc_unused(tx_ring) + 1 < tx_ring->count)\n+\t\t\tif (adapter->flags & FLAG_RX_NEEDS_RESTART)\n \t\t\t\tadapter->flags |= FLAG_RESTART_NOW;\n \t\t\telse\n \t\t\t\tpm_schedule_suspend(netdev->dev.parent,\n@@ -5338,6 +5333,14 @@ static void e1000_watchdog_task(struct work_struct *work)\n \tadapter->gotc_old = adapter->stats.gotc;\n \tspin_unlock(&adapter->stats64_lock);\n \n+\t/* If the link is lost the controller stops DMA, but\n+\t * if there is queued Tx work it cannot be done. So\n+\t * reset the controller to flush the Tx packet buffers.\n+\t */\n+\tif (!netif_carrier_ok(netdev) &&\n+\t (e1000_desc_unused(tx_ring) + 1 < tx_ring->count))\n+\t\tadapter->flags |= FLAG_RESTART_NOW;\n+\n \t/* If reset is necessary, do it outside of interrupt context. */\n \tif (adapter->flags & FLAG_RESTART_NOW) {\n \t\tschedule_work(&adapter->reset_task);\n", "prefixes": [ "1/2" ] }