Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/479501/?format=api
{ "id": 479501, "url": "http://patchwork.ozlabs.org/api/patches/479501/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/5c0f5ad24e5ae3adfede0279b6fdfea4312e32da.1433253642.git.yanirx.lubetkin@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": "<5c0f5ad24e5ae3adfede0279b6fdfea4312e32da.1433253642.git.yanirx.lubetkin@intel.com>", "list_archive_url": null, "date": "2015-06-02T14:05:38", "name": "[v2,1/5] e1000e: fix flush_desc_ring implementation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "631cc40c58a66a8935f55aee6feb0f8904290b98", "submitter": { "id": 66154, "url": "http://patchwork.ozlabs.org/api/people/66154/?format=api", "name": "Yanir Lubetkin", "email": "yanirx.lubetkin@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/5c0f5ad24e5ae3adfede0279b6fdfea4312e32da.1433253642.git.yanirx.lubetkin@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/479501/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/479501/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id D61EE1412E2\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 3 Jun 2015 00:06:32 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0589A8A50D;\n\tTue, 2 Jun 2015 14:06:32 +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 LXiFnQhJKQRO; Tue, 2 Jun 2015 14:06:31 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 6CF1F8A4AE;\n\tTue, 2 Jun 2015 14:06:31 +0000 (UTC)", "from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id ADB131C0505\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 2 Jun 2015 14:06:29 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id A752EA410E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 2 Jun 2015 14:06:29 +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 omRchtAleLAY for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 2 Jun 2015 14:06:29 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 1E90DA41D2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 2 Jun 2015 14:06:29 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga102.fm.intel.com with ESMTP; 02 Jun 2015 07:06:28 -0700", "from unknown (HELO ccdpc064.localdomain.com) ([143.185.160.80])\n\tby fmsmga002.fm.intel.com with ESMTP; 02 Jun 2015 07:06:27 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.13,540,1427785200\"; d=\"scan'208\";a=\"735635811\"", "From": "Yanir Lubetkin <yanirx.lubetkin@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 2 Jun 2015 17:05:38 +0300", "Message-Id": "<5c0f5ad24e5ae3adfede0279b6fdfea4312e32da.1433253642.git.yanirx.lubetkin@intel.com>", "X-Mailer": "git-send-email 2.1.0", "Subject": "[Intel-wired-lan] [PATCH v2 1/5] e1000e: fix flush_desc_ring\n\timplementation", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.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@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "The indication that a descriptor ring flush is required was read from\nFEXTNVM7 by mistake. it should be read from the pci config space.\n\nSigned-off-by: Yanir Lubetkin <yanirx.lubetkin@intel.com>\n---\n drivers/net/ethernet/intel/e1000e/e1000.h | 2 ++\n drivers/net/ethernet/intel/e1000e/ich8lan.h | 1 -\n drivers/net/ethernet/intel/e1000e/netdev.c | 12 +++++++-----\n 3 files changed, 9 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h\nindex 0abc942..e78487a 100644\n--- a/drivers/net/ethernet/intel/e1000e/e1000.h\n+++ b/drivers/net/ethernet/intel/e1000e/e1000.h\n@@ -98,6 +98,8 @@ struct e1000_info;\n #define DEFAULT_RADV\t\t\t8\n #define BURST_RDTR\t\t\t0x20\n #define BURST_RADV\t\t\t0x20\n+#define PCICFG_DESC_RING_STATUS\t\t0xe4\n+#define FLUSH_DESC_REQUIRED\t\t0x100\n \n /* in the case of WTHRESH, it appears at least the 82571/2 hardware\n * writes back 4 descriptors when WTHRESH=5, and 3 descriptors when\ndiff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.h b/drivers/net/ethernet/intel/e1000e/ich8lan.h\nindex 6b5d116..da0454c 100644\n--- a/drivers/net/ethernet/intel/e1000e/ich8lan.h\n+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.h\n@@ -100,7 +100,6 @@\n #define E1000_FEXTNVM7_DISABLE_PB_READ\t0x00040000\n \n #define E1000_FEXTNVM7_DISABLE_SMB_PERST\t0x00000020\n-#define E1000_FEXTNVM7_NEED_DESCRING_FLUSH\t0x00000100\n #define E1000_FEXTNVM11_DISABLE_MULR_FIX\t0x00002000\n \n /* bit24: RXDCTL thresholds granularity: 0 - cache lines, 1 - descriptors */\ndiff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex b2d77a5..4f029b6 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -3867,7 +3867,7 @@ static void e1000_flush_rx_ring(struct e1000_adapter *adapter)\n \n static void e1000_flush_desc_rings(struct e1000_adapter *adapter)\n {\n-\tu32 hang_state;\n+\tu16 hang_state;\n \tu32 fext_nvm11, tdlen;\n \tstruct e1000_hw *hw = &adapter->hw;\n \n@@ -3877,13 +3877,15 @@ static void e1000_flush_desc_rings(struct e1000_adapter *adapter)\n \tew32(FEXTNVM11, fext_nvm11);\n \t/* do nothing if we're not in faulty state, or if the queue is empty */\n \ttdlen = er32(TDLEN(0));\n-\thang_state = er32(FEXTNVM7);\n-\tif (!(hang_state & E1000_FEXTNVM7_NEED_DESCRING_FLUSH) || !tdlen)\n+\tpci_read_config_word(adapter->pdev, PCICFG_DESC_RING_STATUS,\n+\t\t\t &hang_state);\n+\tif (!(hang_state & FLUSH_DESC_REQUIRED) || !tdlen)\n \t\treturn;\n \te1000_flush_tx_ring(adapter);\n \t/* recheck, maybe the fault is caused by the rx ring */\n-\thang_state = er32(FEXTNVM7);\n-\tif (hang_state & E1000_FEXTNVM7_NEED_DESCRING_FLUSH)\n+\tpci_read_config_word(adapter->pdev, PCICFG_DESC_RING_STATUS,\n+\t\t\t &hang_state);\n+\tif (hang_state & FLUSH_DESC_REQUIRED)\n \t\te1000_flush_rx_ring(adapter);\n }\n \n", "prefixes": [ "v2", "1/5" ] }