Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1129422/?format=api
{ "id": 1129422, "url": "http://patchwork.ozlabs.org/api/patches/1129422/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190708231236.20516-19-jacob.e.keller@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": "<20190708231236.20516-19-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2019-07-08T23:12:35", "name": "[18/19] fm10k: convert NON_Q_VECTORS(hw) into NON_Q_VECTORS", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b32187d9c32395dbfc03f51965d0e8ccd7bcb649", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/20190708231236.20516-19-jacob.e.keller@intel.com/mbox/", "series": [ { "id": 118423, "url": "http://patchwork.ozlabs.org/api/series/118423/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=118423", "date": "2019-07-08T23:12:19", "name": "cleanup cppcheck warnings for fm10k driver", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/118423/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1129422/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1129422/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;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "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 45jLpM4ptVz9sN4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 9 Jul 2019 09:12:59 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 729C221080;\n\tMon, 8 Jul 2019 23:12:57 +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 50kCedMWS7Eb; Mon, 8 Jul 2019 23:12:49 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 2A0BC21509;\n\tMon, 8 Jul 2019 23:12:49 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 418F81BF962\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 8 Jul 2019 23:12:43 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 39C7A85B09\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 8 Jul 2019 23:12:43 +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 SYx3g34Ckzla for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 8 Jul 2019 23:12:41 +0000 (UTC)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 5A88D85A00\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 8 Jul 2019 23:12:41 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t08 Jul 2019 16:12:41 -0700", "from jekeller-desk.amr.corp.intel.com ([10.166.244.172])\n\tby fmsmga002.fm.intel.com with ESMTP; 08 Jul 2019 16:12:41 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.63,468,1557212400\"; d=\"scan'208\";a=\"192484829\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Mon, 8 Jul 2019 16:12:35 -0700", "Message-Id": "<20190708231236.20516-19-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.22.0.214.g8dca754b1e87", "In-Reply-To": "<20190708231236.20516-1-jacob.e.keller@intel.com>", "References": "<20190708231236.20516-1-jacob.e.keller@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 18/19] fm10k: convert NON_Q_VECTORS(hw)\n\tinto NON_Q_VECTORS", "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>", "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": "The driver currently uses a macro to decide whether we should use\nNON_Q_VECTORS_PF or NON_Q_VECTORS_VF.\n\nHowever, we also define NON_Q_VECTORS_VF to the same value as\nNON_Q_VECTORS_PF. This means that the macro NON_Q_VECTORS(hw) will\nalways return the same value.\n\nLet's just remove this macro, and replace it directly with an enum value\non the enum non_q_vectors.\n\nThis was detected by cppcheck and fixes the following warnings when\nbuilding with BUILD=KERNEL\n\n[fm10k_ethtool.c:1123]: (style) Same value in both branches of ternary\noperator.\n\n[fm10k_ethtool.c:1142]: (style) Same value in both branches of ternary\noperator.\n\n[fm10k_main.c:1826]: (style) Same value in both branches of ternary\noperator.\n\n[fm10k_main.c:1849]: (style) Same value in both branches of ternary\noperator.\n\n[fm10k_main.c:1858]: (style) Same value in both branches of ternary\noperator.\n\n[fm10k_pci.c:901]: (style) Same value in both branches of ternary\noperator.\n\n[fm10k_pci.c:1040]: (style) Same value in both branches of ternary\noperator.\n\n[fm10k_pci.c:1726]: (style) Same value in both branches of ternary\noperator.\n\n[fm10k_pci.c:1763]: (style) Same value in both branches of ternary\noperator.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k.h | 10 +++-------\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 6 ++----\n drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 ++--\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 9 ++++-----\n 4 files changed, 11 insertions(+), 18 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex 7d42582ed48d..b14441944b4b 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -1,5 +1,5 @@\n /* SPDX-License-Identifier: GPL-2.0 */\n-/* Copyright(c) 2013 - 2018 Intel Corporation. */\n+/* Copyright(c) 2013 - 2019 Intel Corporation. */\n \n #ifndef _FM10K_H_\n #define _FM10K_H_\n@@ -177,14 +177,10 @@ static inline struct netdev_queue *txring_txq(const struct fm10k_ring *ring)\n #define MIN_Q_VECTORS\t1\n enum fm10k_non_q_vectors {\n \tFM10K_MBX_VECTOR,\n-#define NON_Q_VECTORS_VF NON_Q_VECTORS_PF\n-\tNON_Q_VECTORS_PF\n+\tNON_Q_VECTORS\n };\n \n-#define NON_Q_VECTORS(hw)\t(((hw)->mac.type == fm10k_mac_pf) ? \\\n-\t\t\t\t\t\tNON_Q_VECTORS_PF : \\\n-\t\t\t\t\t\tNON_Q_VECTORS_VF)\n-#define MIN_MSIX_COUNT(hw)\t(MIN_Q_VECTORS + NON_Q_VECTORS(hw))\n+#define MIN_MSIX_COUNT(hw)\t(MIN_Q_VECTORS + NON_Q_VECTORS)\n \n struct fm10k_q_vector {\n \tstruct fm10k_intfc *interface;\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 1f7e4a8f4557..c681d2d28107 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -1114,13 +1114,12 @@ static void fm10k_get_channels(struct net_device *dev,\n \t\t\t struct ethtool_channels *ch)\n {\n \tstruct fm10k_intfc *interface = netdev_priv(dev);\n-\tstruct fm10k_hw *hw = &interface->hw;\n \n \t/* report maximum channels */\n \tch->max_combined = fm10k_max_channels(dev);\n \n \t/* report info for other vector */\n-\tch->max_other = NON_Q_VECTORS(hw);\n+\tch->max_other = NON_Q_VECTORS;\n \tch->other_count = ch->max_other;\n \n \t/* record RSS queues */\n@@ -1132,14 +1131,13 @@ static int fm10k_set_channels(struct net_device *dev,\n {\n \tstruct fm10k_intfc *interface = netdev_priv(dev);\n \tunsigned int count = ch->combined_count;\n-\tstruct fm10k_hw *hw = &interface->hw;\n \n \t/* verify they are not requesting separate vectors */\n \tif (!count || ch->rx_count || ch->tx_count)\n \t\treturn -EINVAL;\n \n \t/* verify other_count has not changed */\n-\tif (ch->other_count != NON_Q_VECTORS(hw))\n+\tif (ch->other_count != NON_Q_VECTORS)\n \t\treturn -EINVAL;\n \n \t/* verify the number of channels does not exceed hardware limits */\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\nindex cf87812bdf4a..701f83325c49 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n@@ -1823,7 +1823,7 @@ static int fm10k_init_msix_capability(struct fm10k_intfc *interface)\n \tv_budget = min_t(u16, v_budget, num_online_cpus());\n \n \t/* account for vectors not related to queues */\n-\tv_budget += NON_Q_VECTORS(hw);\n+\tv_budget += NON_Q_VECTORS;\n \n \t/* At the same time, hardware can only support a maximum of\n \t * hw.mac->max_msix_vectors vectors. With features\n@@ -1855,7 +1855,7 @@ static int fm10k_init_msix_capability(struct fm10k_intfc *interface)\n \t}\n \n \t/* record the number of queues available for q_vectors */\n-\tinterface->num_q_vectors = v_budget - NON_Q_VECTORS(hw);\n+\tinterface->num_q_vectors = v_budget - NON_Q_VECTORS;\n \n \treturn 0;\n }\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 082e68354643..1dfa9eaea368 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -898,7 +898,7 @@ static void fm10k_configure_tx_ring(struct fm10k_intfc *interface,\n \n \t/* Map interrupt */\n \tif (ring->q_vector) {\n-\t\ttxint = ring->q_vector->v_idx + NON_Q_VECTORS(hw);\n+\t\ttxint = ring->q_vector->v_idx + NON_Q_VECTORS;\n \t\ttxint |= FM10K_INT_MAP_TIMER0;\n \t}\n \n@@ -1037,7 +1037,7 @@ static void fm10k_configure_rx_ring(struct fm10k_intfc *interface,\n \n \t/* Map interrupt */\n \tif (ring->q_vector) {\n-\t\trxint = ring->q_vector->v_idx + NON_Q_VECTORS(hw);\n+\t\trxint = ring->q_vector->v_idx + NON_Q_VECTORS;\n \t\trxint |= FM10K_INT_MAP_TIMER1;\n \t}\n \n@@ -1720,10 +1720,9 @@ int fm10k_mbx_request_irq(struct fm10k_intfc *interface)\n void fm10k_qv_free_irq(struct fm10k_intfc *interface)\n {\n \tint vector = interface->num_q_vectors;\n-\tstruct fm10k_hw *hw = &interface->hw;\n \tstruct msix_entry *entry;\n \n-\tentry = &interface->msix_entries[NON_Q_VECTORS(hw) + vector];\n+\tentry = &interface->msix_entries[NON_Q_VECTORS + vector];\n \n \twhile (vector) {\n \t\tstruct fm10k_q_vector *q_vector;\n@@ -1760,7 +1759,7 @@ int fm10k_qv_request_irq(struct fm10k_intfc *interface)\n \tunsigned int ri = 0, ti = 0;\n \tint vector, err;\n \n-\tentry = &interface->msix_entries[NON_Q_VECTORS(hw)];\n+\tentry = &interface->msix_entries[NON_Q_VECTORS];\n \n \tfor (vector = 0; vector < interface->num_q_vectors; vector++) {\n \t\tstruct fm10k_q_vector *q_vector = interface->q_vector[vector];\n", "prefixes": [ "18/19" ] }