Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/459051/?format=api
{ "id": 459051, "url": "http://patchwork.ozlabs.org/api/patches/459051/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1428450342-48517-3-git-send-email-catherine.sullivan@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": "<1428450342-48517-3-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-04-07T23:45:32", "name": "[net-next,S3,03/13] i40evf: remove aq_pending", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a215c6ad665f95bcd45de6e2bfe39214d215a250", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@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/1428450342-48517-3-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/459051/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/459051/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 silver.osuosl.org (silver.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id CDC6D140187\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 8 Apr 2015 09:42:27 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 2C0EE33427;\n\tTue, 7 Apr 2015 23:42:27 +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 SUaSY0yZ7daE; Tue, 7 Apr 2015 23:42:25 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id BF08E3341D;\n\tTue, 7 Apr 2015 23:42:25 +0000 (UTC)", "from whitealder.osuosl.org (whitealder.osuosl.org\n\t[140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id DCFC11C265F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Apr 2015 23:42:23 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C691C90D90\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Apr 2015 23:42:23 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 9vCR2hKN9CoW for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Apr 2015 23:42:23 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 110318C49B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 7 Apr 2015 23:42:23 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga103.jf.intel.com with ESMTP; 07 Apr 2015 16:42:23 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 07 Apr 2015 16:42:22 -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.11,540,1422950400\"; d=\"scan'208\";a=\"477975345\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 7 Apr 2015 19:45:32 -0400", "Message-Id": "<1428450342-48517-3-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1428450342-48517-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1428450342-48517-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [net-next S3 03/13] i40evf: remove aq_pending", "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": "From: Mitch Williams <mitch.a.williams@intel.com>\n\nThe aq_pending field in the adapter structure is actually redundant with\nthe current_op field. Remove the aq_pending field and expunge all traces\nof it from the official record. This simplifies the code significantly,\nespecially in the virtual channel completion routine.\n\nSigned-off-by: Mitch Williams <mitch.a.williams@intel.com>\nChange-ID: Ib2957c8c19882bd0cecc6fcd133912c24b46a1ff\n---\n drivers/net/ethernet/intel/i40evf/i40evf.h | 1 -\n drivers/net/ethernet/intel/i40evf/i40evf_main.c | 7 +---\n .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 42 ++++++----------------\n 3 files changed, 12 insertions(+), 38 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h\nindex 34c8565..1b98c25 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h\n@@ -225,7 +225,6 @@ struct i40evf_adapter {\n #define I40E_FLAG_RX_CSUM_ENABLED I40EVF_FLAG_RX_CSUM_ENABLED\n \t/* flags for admin queue service task */\n \tu32 aq_required;\n-\tu32 aq_pending;\n #define I40EVF_FLAG_AQ_ENABLE_QUEUES\t\t(u32)(1)\n #define I40EVF_FLAG_AQ_DISABLE_QUEUES\t\t(u32)(1 << 1)\n #define I40EVF_FLAG_AQ_ADD_MAC_FILTER\t\t(u32)(1 << 2)\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\nindex a31bfd1..7c53aca 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -1008,7 +1008,6 @@ void i40evf_down(struct i40evf_adapter *adapter)\n \t adapter->state != __I40EVF_RESETTING) {\n \t\t/* cancel any current operation */\n \t\tadapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;\n-\t\tadapter->aq_pending = 0;\n \t\t/* Schedule operations to close down the HW. Don't wait\n \t\t * here for this to complete. The watchdog is still running\n \t\t * and it will take care of this.\n@@ -1335,7 +1334,6 @@ static void i40evf_watchdog_task(struct work_struct *work)\n \t\t\t */\n \t\t\treturn;\n \t\t}\n-\t\tadapter->aq_pending = 0;\n \t\tadapter->aq_required = 0;\n \t\tadapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;\n \t\tgoto watchdog_done;\n@@ -1355,7 +1353,6 @@ static void i40evf_watchdog_task(struct work_struct *work)\n \t\tadapter->flags |= I40EVF_FLAG_RESET_PENDING;\n \t\tdev_err(&adapter->pdev->dev, \"Hardware reset detected\\n\");\n \t\tschedule_work(&adapter->reset_task);\n-\t\tadapter->aq_pending = 0;\n \t\tadapter->aq_required = 0;\n \t\tadapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;\n \t\tgoto watchdog_done;\n@@ -1364,7 +1361,7 @@ static void i40evf_watchdog_task(struct work_struct *work)\n \t/* Process admin queue tasks. After init, everything gets done\n \t * here so we don't race on the admin queue.\n \t */\n-\tif (adapter->aq_pending) {\n+\tif (adapter->current_op) {\n \t\tif (!i40evf_asq_done(hw)) {\n \t\t\tdev_dbg(&adapter->pdev->dev, \"Admin queue timeout\\n\");\n \t\t\ti40evf_send_api_ver(adapter);\n@@ -2249,7 +2246,6 @@ static void i40evf_shutdown(struct pci_dev *pdev)\n \t/* Prevent the watchdog from running. */\n \tadapter->state = __I40EVF_REMOVE;\n \tadapter->aq_required = 0;\n-\tadapter->aq_pending = 0;\n \n #ifdef CONFIG_PM\n \tpci_save_state(pdev);\n@@ -2467,7 +2463,6 @@ static void i40evf_remove(struct pci_dev *pdev)\n \t/* Shut down all the garbage mashers on the detention level */\n \tadapter->state = __I40EVF_REMOVE;\n \tadapter->aq_required = 0;\n-\tadapter->aq_pending = 0;\n \ti40evf_request_reset(adapter);\n \tmsleep(20);\n \t/* If the FW isn't responding, kick it once, but only once. */\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c\nindex 4240a49..61e0905 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c\n@@ -250,7 +250,6 @@ void i40evf_configure_queues(struct i40evf_adapter *adapter)\n \t\tvqpi++;\n \t}\n \n-\tadapter->aq_pending |= I40EVF_FLAG_AQ_CONFIGURE_QUEUES;\n \tadapter->aq_required &= ~I40EVF_FLAG_AQ_CONFIGURE_QUEUES;\n \ti40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES,\n \t\t\t (u8 *)vqci, len);\n@@ -277,7 +276,6 @@ void i40evf_enable_queues(struct i40evf_adapter *adapter)\n \tvqs.vsi_id = adapter->vsi_res->vsi_id;\n \tvqs.tx_queues = (1 << adapter->num_active_queues) - 1;\n \tvqs.rx_queues = vqs.tx_queues;\n-\tadapter->aq_pending |= I40EVF_FLAG_AQ_ENABLE_QUEUES;\n \tadapter->aq_required &= ~I40EVF_FLAG_AQ_ENABLE_QUEUES;\n \ti40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_ENABLE_QUEUES,\n \t\t\t (u8 *)&vqs, sizeof(vqs));\n@@ -303,7 +301,6 @@ void i40evf_disable_queues(struct i40evf_adapter *adapter)\n \tvqs.vsi_id = adapter->vsi_res->vsi_id;\n \tvqs.tx_queues = (1 << adapter->num_active_queues) - 1;\n \tvqs.rx_queues = vqs.tx_queues;\n-\tadapter->aq_pending |= I40EVF_FLAG_AQ_DISABLE_QUEUES;\n \tadapter->aq_required &= ~I40EVF_FLAG_AQ_DISABLE_QUEUES;\n \ti40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_DISABLE_QUEUES,\n \t\t\t (u8 *)&vqs, sizeof(vqs));\n@@ -354,7 +351,6 @@ void i40evf_map_queues(struct i40evf_adapter *adapter)\n \tvimi->vecmap[v_idx].txq_map = 0;\n \tvimi->vecmap[v_idx].rxq_map = 0;\n \n-\tadapter->aq_pending |= I40EVF_FLAG_AQ_MAP_VECTORS;\n \tadapter->aq_required &= ~I40EVF_FLAG_AQ_MAP_VECTORS;\n \ti40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP,\n \t\t\t (u8 *)vimi, len);\n@@ -415,7 +411,6 @@ void i40evf_add_ether_addrs(struct i40evf_adapter *adapter)\n \t\t\tf->add = false;\n \t\t}\n \t}\n-\tadapter->aq_pending |= I40EVF_FLAG_AQ_ADD_MAC_FILTER;\n \tadapter->aq_required &= ~I40EVF_FLAG_AQ_ADD_MAC_FILTER;\n \ti40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_ADD_ETHER_ADDRESS,\n \t\t\t (u8 *)veal, len);\n@@ -476,7 +471,6 @@ void i40evf_del_ether_addrs(struct i40evf_adapter *adapter)\n \t\t\tkfree(f);\n \t\t}\n \t}\n-\tadapter->aq_pending |= I40EVF_FLAG_AQ_DEL_MAC_FILTER;\n \tadapter->aq_required &= ~I40EVF_FLAG_AQ_DEL_MAC_FILTER;\n \ti40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_DEL_ETHER_ADDRESS,\n \t\t\t (u8 *)veal, len);\n@@ -537,7 +531,6 @@ void i40evf_add_vlans(struct i40evf_adapter *adapter)\n \t\t\tf->add = false;\n \t\t}\n \t}\n-\tadapter->aq_pending |= I40EVF_FLAG_AQ_ADD_VLAN_FILTER;\n \tadapter->aq_required &= ~I40EVF_FLAG_AQ_ADD_VLAN_FILTER;\n \ti40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_ADD_VLAN, (u8 *)vvfl, len);\n \tkfree(vvfl);\n@@ -598,7 +591,6 @@ void i40evf_del_vlans(struct i40evf_adapter *adapter)\n \t\t\tkfree(f);\n \t\t}\n \t}\n-\tadapter->aq_pending |= I40EVF_FLAG_AQ_DEL_VLAN_FILTER;\n \tadapter->aq_required &= ~I40EVF_FLAG_AQ_DEL_VLAN_FILTER;\n \ti40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_DEL_VLAN, (u8 *)vvfl, len);\n \tkfree(vvfl);\n@@ -720,9 +712,6 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,\n \t\t\t__func__, v_retval, v_opcode);\n \t}\n \tswitch (v_opcode) {\n-\tcase I40E_VIRTCHNL_OP_VERSION:\n-\t\t/* no action, but also not an error */\n-\t\tbreak;\n \tcase I40E_VIRTCHNL_OP_GET_STATS: {\n \t\tstruct i40e_eth_stats *stats =\n \t\t\t(struct i40e_eth_stats *)msg;\n@@ -740,39 +729,30 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,\n \t\tadapter->current_stats = *stats;\n \t\t}\n \t\tbreak;\n-\tcase I40E_VIRTCHNL_OP_ADD_ETHER_ADDRESS:\n-\t\tadapter->aq_pending &= ~(I40EVF_FLAG_AQ_ADD_MAC_FILTER);\n-\t\tbreak;\n-\tcase I40E_VIRTCHNL_OP_DEL_ETHER_ADDRESS:\n-\t\tadapter->aq_pending &= ~(I40EVF_FLAG_AQ_DEL_MAC_FILTER);\n-\t\tbreak;\n-\tcase I40E_VIRTCHNL_OP_ADD_VLAN:\n-\t\tadapter->aq_pending &= ~(I40EVF_FLAG_AQ_ADD_VLAN_FILTER);\n-\t\tbreak;\n-\tcase I40E_VIRTCHNL_OP_DEL_VLAN:\n-\t\tadapter->aq_pending &= ~(I40EVF_FLAG_AQ_DEL_VLAN_FILTER);\n-\t\tbreak;\n \tcase I40E_VIRTCHNL_OP_ENABLE_QUEUES:\n-\t\tadapter->aq_pending &= ~(I40EVF_FLAG_AQ_ENABLE_QUEUES);\n \t\t/* enable transmits */\n \t\ti40evf_irq_enable(adapter, true);\n \t\tnetif_tx_start_all_queues(adapter->netdev);\n \t\tnetif_carrier_on(adapter->netdev);\n \t\tbreak;\n \tcase I40E_VIRTCHNL_OP_DISABLE_QUEUES:\n-\t\tadapter->aq_pending &= ~(I40EVF_FLAG_AQ_DISABLE_QUEUES);\n \t\ti40evf_free_all_tx_resources(adapter);\n \t\ti40evf_free_all_rx_resources(adapter);\n \t\tbreak;\n-\tcase I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES:\n-\t\tadapter->aq_pending &= ~(I40EVF_FLAG_AQ_CONFIGURE_QUEUES);\n-\t\tbreak;\n+\tcase I40E_VIRTCHNL_OP_VERSION:\n+\tcase I40E_VIRTCHNL_OP_GET_VF_RESOURCES:\n \tcase I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP:\n-\t\tadapter->aq_pending &= ~(I40EVF_FLAG_AQ_MAP_VECTORS);\n+\t\t/* Don't display an error if we get these out of sequence.\n+\t\t * If the firmware needed to get kicked, we'll get these and\n+\t\t * it's no problem.\n+\t\t */\n+\t\tif (v_opcode != adapter->current_op)\n+\t\t\treturn;\n \t\tbreak;\n \tdefault:\n-\t\tdev_info(&adapter->pdev->dev, \"Received unexpected message %d from PF\\n\",\n-\t\t\t v_opcode);\n+\t\tif (v_opcode != adapter->current_op)\n+\t\t\tdev_warn(&adapter->pdev->dev, \"Expected response %d from PF, received %d\\n\",\n+\t\t\t\t adapter->current_op, v_opcode);\n \t\tbreak;\n \t} /* switch v_opcode */\n \tadapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;\n", "prefixes": [ "net-next", "S3", "03/13" ] }