Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/532400/?format=api
{ "id": 532400, "url": "http://patchwork.ozlabs.org/api/patches/532400/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445269924-26739-1-git-send-email-jarod@redhat.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": "<1445269924-26739-1-git-send-email-jarod@redhat.com>", "list_archive_url": null, "date": "2015-10-19T15:52:04", "name": "[v2] igb: improve handling of disconnected adapters", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1d1fdbf40f05136657f8c6bf150088c805deae05", "submitter": { "id": 1153, "url": "http://patchwork.ozlabs.org/api/people/1153/?format=api", "name": "Jarod Wilson", "email": "jarod@redhat.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/1445269924-26739-1-git-send-email-jarod@redhat.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/532400/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/532400/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 (smtp2.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id 81F731402C4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 20 Oct 2015 02:52:21 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id C63F28A3FE;\n\tMon, 19 Oct 2015 15:52:20 +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 ar2vCExKWyOa; Mon, 19 Oct 2015 15:52:20 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3EE9189CFF;\n\tMon, 19 Oct 2015 15:52:20 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 3CBFC1C11F4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 19 Oct 2015 15:52:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3611789EB6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 19 Oct 2015 15:52:19 +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 iaqb0oSKYu5t for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 19 Oct 2015 15:52:17 +0000 (UTC)", "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 5D09E89CFF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 19 Oct 2015 15:52:17 +0000 (UTC)", "from int-mx10.intmail.prod.int.phx2.redhat.com\n\t(int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])\n\tby mx1.redhat.com (Postfix) with ESMTPS id B7147157748;\n\tMon, 19 Oct 2015 15:52:16 +0000 (UTC)", "from hp-dl360pgen8-07.khw.lab.eng.bos.redhat.com\n\t(hp-dl360pgen8-07.khw.lab.eng.bos.redhat.com [10.16.184.47])\n\tby int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with\n\tESMTP id t9JFqFat032681; Mon, 19 Oct 2015 11:52:15 -0400" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "From": "Jarod Wilson <jarod@redhat.com>", "To": "linux-kernel@vger.kernel.org", "Date": "Mon, 19 Oct 2015 11:52:04 -0400", "Message-Id": "<1445269924-26739-1-git-send-email-jarod@redhat.com>", "In-Reply-To": "<1444716624.2870.14.camel@intel.com>", "References": "<1444716624.2870.14.camel@intel.com>", "X-Scanned-By": "MIMEDefang 2.68 on 10.5.11.23", "Cc": "netdev@vger.kernel.org, Jarod Wilson <jarod@redhat.com>,\n\tintel-wired-lan@lists.osuosl.org", "Subject": "[Intel-wired-lan] [PATCH v2] igb: improve handling of disconnected\n\tadapters", "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": "Clean up array_rd32 so that it uses igb_rd32 the same as rd32, per the\nsuggestion of Alexander Duyck, and use io_addr in more places, so that\nwe don't have the need to call E1000_REMOVED (which simply looks for a\nnull hw_addr) nearly as much.\n\nCC: Mark Rustad <mark.d.rustad@intel.com>\nCC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\nCC: Alexander Duyck <alexander.duyck@gmail.com>\nCC: intel-wired-lan@lists.osuosl.org\nCC: netdev@vger.kernel.org\nAcked-by: Alexander Duyck <aduyck@mirantis.com>\nSigned-off-by: Jarod Wilson <jarod@redhat.com>\n---\nNote: this patch is rebased on Jeff's next-queue/dev-queue branch, which\nalready had an earlier revision of this applied, so I've essentially\nreverted a2675ab and applied the revised version of this, squashed them\ntogether, and here is the end result, which matches the version Alex acked.\n\n drivers/net/ethernet/intel/igb/e1000_regs.h | 3 +--\n drivers/net/ethernet/intel/igb/igb_main.c | 15 ++-------------\n 2 files changed, 3 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h\nindex 0fdcd4d..21d9d02 100644\n--- a/drivers/net/ethernet/intel/igb/e1000_regs.h\n+++ b/drivers/net/ethernet/intel/igb/e1000_regs.h\n@@ -386,8 +386,7 @@ do { \\\n #define array_wr32(reg, offset, value) \\\n \twr32((reg) + ((offset) << 2), (value))\n \n-#define array_rd32(reg, offset) \\\n-\t(readl(hw->hw_addr + reg + ((offset) << 2)))\n+#define array_rd32(reg, offset) (igb_rd32(hw, reg + ((offset) << 2)))\n \n /* DMA Coalescing registers */\n #define E1000_PCIEMISC\t0x05BB8 /* PCIE misc config register */\ndiff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex 044a23e..68006a5 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -954,17 +954,12 @@ static int igb_request_msix(struct igb_adapter *adapter)\n \tif (err)\n \t\tgoto err_out;\n \n-\tif (E1000_REMOVED(hw->hw_addr)) {\n-\t\terr = -EIO;\n-\t\tgoto err_free;\n-\t}\n-\n \tfor (i = 0; i < adapter->num_q_vectors; i++) {\n \t\tstruct igb_q_vector *q_vector = adapter->q_vector[i];\n \n \t\tvector++;\n \n-\t\tq_vector->itr_register = hw->hw_addr + E1000_EITR(vector);\n+\t\tq_vector->itr_register = adapter->io_addr + E1000_EITR(vector);\n \n \t\tif (q_vector->rx.ring && q_vector->tx.ring)\n \t\t\tsprintf(q_vector->name, \"%s-TxRx-%u\", netdev->name,\n@@ -1206,9 +1201,6 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,\n \tif (txr_count > 1 || rxr_count > 1)\n \t\treturn -ENOMEM;\n \n-\tif (E1000_REMOVED(adapter->hw.hw_addr))\n-\t\treturn -EIO;\n-\n \tring_count = txr_count + rxr_count;\n \tsize = sizeof(struct igb_q_vector) +\n \t (sizeof(struct igb_ring) * ring_count);\n@@ -1238,7 +1230,7 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,\n \tq_vector->tx.work_limit = adapter->tx_work_limit;\n \n \t/* initialize ITR configuration */\n-\tq_vector->itr_register = adapter->hw.hw_addr + E1000_EITR(0);\n+\tq_vector->itr_register = adapter->io_addr + E1000_EITR(0);\n \tq_vector->itr_val = IGB_START_ITR;\n \n \t/* initialize pointer to rings */\n@@ -3281,9 +3273,6 @@ void igb_configure_tx_ring(struct igb_adapter *adapter,\n \tu64 tdba = ring->dma;\n \tint reg_idx = ring->reg_idx;\n \n-\tif (E1000_REMOVED(adapter->io_addr))\n-\t\treturn;\n-\n \t/* disable the queue */\n \twr32(E1000_TXDCTL(reg_idx), 0);\n \twrfl();\n", "prefixes": [ "v2" ] }