Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2235027/?format=api
{ "id": 2235027, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2235027/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260508124208.11622-7-przemyslaw.kitszel@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/1.2/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": "<20260508124208.11622-7-przemyslaw.kitszel@intel.com>", "list_archive_url": null, "date": "2026-05-08T12:41:59", "name": "[iwl-next,v1,06/15] ice: rename ICE_MAX_RSS_QS_PER_VF to ICE_MAX_QS_PER_VF_VCV1", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "3d990a3d09a2e05d9509b2526fa03052aa3093ad", "submitter": { "id": 85252, "url": "http://patchwork.ozlabs.org/api/1.2/people/85252/?format=api", "name": "Przemek Kitszel", "email": "przemyslaw.kitszel@intel.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260508124208.11622-7-przemyslaw.kitszel@intel.com/mbox/", "series": [ { "id": 503388, "url": "http://patchwork.ozlabs.org/api/1.2/series/503388/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=503388", "date": "2026-05-08T12:41:53", "name": "devlink, mlx5, iavf, ice: XLVF for iavf", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/503388/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2235027/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2235027/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@legolas.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256\n header.s=default header.b=p2Vi8A2d;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4gBq36329tz1yCg\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 08 May 2026 23:00:02 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 2B90040F62;\n\tFri, 8 May 2026 12:59:56 +0000 (UTC)", "from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id CwdZSTm9zaPu; Fri, 8 May 2026 12:59:55 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 3F04041068;\n\tFri, 8 May 2026 12:59:55 +0000 (UTC)", "from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n by lists1.osuosl.org (Postfix) with ESMTP id 251E2317\n for <intel-wired-lan@lists.osuosl.org>; Fri, 8 May 2026 12:59:53 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp4.osuosl.org (Postfix) with ESMTP id 0ADFA40F2F\n for <intel-wired-lan@lists.osuosl.org>; Fri, 8 May 2026 12:59:53 +0000 (UTC)", "from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id 9O-1z6wxxtph for <intel-wired-lan@lists.osuosl.org>;\n Fri, 8 May 2026 12:59:52 +0000 (UTC)", "from mgamail.intel.com (mgamail.intel.com [198.175.65.17])\n by smtp4.osuosl.org (Postfix) with ESMTPS id 01EA540FAC\n for <intel-wired-lan@lists.osuosl.org>; Fri, 8 May 2026 12:59:51 +0000 (UTC)", "from fmviesa005.fm.intel.com ([10.60.135.145])\n by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 08 May 2026 05:59:52 -0700", "from irvmail002.ir.intel.com ([10.43.11.120])\n by fmviesa005.fm.intel.com with ESMTP; 08 May 2026 05:59:46 -0700", "from vecna.igk.intel.com (vecna.igk.intel.com [10.123.220.17])\n by irvmail002.ir.intel.com (Postfix) with ESMTP id 353482FC42;\n Fri, 8 May 2026 13:59:44 +0100 (IST)" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3F04041068", "OpenDKIM Filter v2.11.0 smtp4.osuosl.org 01EA540FAC" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1778245195;\n\tbh=/ksOojcXei/TfXFipAqDYeI+OI2GxXRjLV3fr5Yuc44=;\n\th=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id:\n\t List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\t From;\n\tb=p2Vi8A2dX4zaKkMY6fRVyGuhv+tc45PqexFTuCyl2ffa12xTV4671kvNKg5MrW/MB\n\t kN5Z+vJFUyzrVHhi2BIyFlyjxMDppnUMuT+iFEx3hJWGhm6n1+F5urwPqqTOT7u/7S\n\t ngGGRbdNXclFuAescajDIco33DDtFpaZLSFCBLcLHE28GdUekJRZT09AKVXsXu4Vg8\n\t TwTHupHlsrZ5iHxA+nZ5mTfFTEjsrI8lIec0Ac3vS+avzLIq0SsU2h4f49ZK1H7y/a\n\t +51mR/y+NIDZDWsC7FW3edDIgrL6hFok+QJHuGuvqlZJUsyN2Q7uMxXJ+0HGgvqcE2\n\t /Sj1WGeJW+xmw==", "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=198.175.65.17;\n helo=mgamail.intel.com; envelope-from=przemyslaw.kitszel@intel.com;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp4.osuosl.org 01EA540FAC", "X-CSE-ConnectionGUID": [ "bJvLj2AVTEi37aygXWpwDA==", "mKpDa3eOSfGXvqL8lWXsbQ==" ], "X-CSE-MsgGUID": [ "m5yP7j6pScqdLgb2/sRzhA==", "k7a48ddlTS+z24AiWJ4EGg==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11779\"; a=\"79199908\"", "E=Sophos;i=\"6.23,223,1770624000\"; d=\"scan'208\";a=\"79199908\"", "E=Sophos;i=\"6.23,223,1770624000\"; d=\"scan'208\";a=\"241730122\"" ], "X-ExtLoop1": "1", "From": "Przemek Kitszel <przemyslaw.kitszel@intel.com>", "To": "intel-wired-lan@lists.osuosl.org, Michal Schmidt <mschmidt@redhat.com>,\n Jakub Kicinski <kuba@kernel.org>, Jiri Pirko <jiri@resnulli.us>", "Cc": "netdev@vger.kernel.org, Simon Horman <horms@kernel.org>,\n Tony Nguyen <anthony.l.nguyen@intel.com>,\n Michal Swiatkowski <michal.swiatkowski@linux.intel.com>,\n bruce.richardson@intel.com,\n Vladimir Medvedkin <vladimir.medvedkin@intel.com>,\n padraig.j.connolly@intel.com, ananth.s@intel.com,\n timothy.miskell@intel.com, Jacob Keller <jacob.e.keller@intel.com>,\n Lukasz Czapnik <lukasz.czapnik@intel.com>,\n Aleksandr Loktionov <aleksandr.loktionov@intel.com>,\n Andrew Lunn <andrew+netdev@lunn.ch>,\n \"David S. Miller\" <davem@davemloft.net>,\n Eric Dumazet <edumazet@google.com>, Paolo Abeni <pabeni@redhat.com>,\n Saeed Mahameed <saeedm@nvidia.com>, Leon Romanovsky <leon@kernel.org>,\n Tariq Toukan <tariqt@nvidia.com>, Mark Bloch <mbloch@nvidia.com>,\n Przemek Kitszel <przemyslaw.kitszel@intel.com>,\n Jedrzej Jagielski <jedrzej.jagielski@intel.com>", "Date": "Fri, 8 May 2026 14:41:59 +0200", "Message-Id": "<20260508124208.11622-7-przemyslaw.kitszel@intel.com>", "X-Mailer": "git-send-email 2.39.3", "In-Reply-To": "<20260508124208.11622-1-przemyslaw.kitszel@intel.com>", "References": "<20260508124208.11622-1-przemyslaw.kitszel@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1778245193; x=1809781193;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=FWfCl7UBwzOtiab25hIzZzlKGPLqepRD1UjJN8GGfV0=;\n b=OK/pJlcSHLGNTBlssPi20gVmJTQWaSs4g0JrqZyBJOa+2HuHUQ326SSo\n rob9uN6ywhhf4UXsWqXLxDNc5AXlEbpPRY+wGrguzsEGQLCay72mGF9vF\n 0QWziZDXb4EJYX8tDHOiU62BPIY6MpJgCjA099x9TPAiCZ6J5pWIyFHTv\n Zkdpp4Fa8kzQh/9zlKakybzqbYCP7sJYccXANXjR+D4ZXBYkt9MKnrPrb\n j7dHLZLSI33MSBdeoZIkvTTGX08TVGgc69h4OHyaSjU2qY0NEipKUw6gC\n s+OhbsdwK/GgoxWcteDIoG0BxGhJRafnz9wFGBDgJGD+KPVWGW6TuIIjF\n g==;", "X-Mailman-Original-Authentication-Results": [ "smtp4.osuosl.org;\n dmarc=pass (p=none dis=none)\n header.from=intel.com", "smtp4.osuosl.org;\n dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com\n header.a=rsa-sha256 header.s=Intel header.b=OK/pJlcS" ], "Subject": "[Intel-wired-lan] [PATCH iwl-next v1 06/15] ice: rename\n ICE_MAX_RSS_QS_PER_VF to ICE_MAX_QS_PER_VF_VCV1", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <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 <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Rename ICE_MAX_RSS_QS_PER_VF to ICE_MAX_QS_PER_VF_VCV1, in preparation for\nthe next patch that will extend the max to 256, using old value of 16 for\nthe \"v1\" variant of virtchnl opcodes.\n\nSuggested-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>\nSuggested-by: Jacob Keller <jacob.e.keller@intel.com>\nReviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\nSigned-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_lag.h | 2 +-\n drivers/net/ethernet/intel/ice/ice_vf_lib.h | 9 +++---\n drivers/net/ethernet/intel/ice/ice_lib.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_sriov.c | 4 +--\n drivers/net/ethernet/intel/ice/ice_vf_lib.c | 12 ++++----\n drivers/net/ethernet/intel/ice/virt/queues.c | 30 ++++++++++----------\n 6 files changed, 30 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_lag.h b/drivers/net/ethernet/intel/ice/ice_lag.h\nindex f77ebcd61042..4bfffecbdc97 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lag.h\n+++ b/drivers/net/ethernet/intel/ice/ice_lag.h\n@@ -52,7 +52,7 @@ struct ice_lag {\n \tu8 bond_lport_sec; /* lport values for secondary PF */\n \n \t/* q_home keeps track of which interface the q is currently on */\n-\tu8 q_home[ICE_MAX_SRIOV_VFS][ICE_MAX_RSS_QS_PER_VF];\n+\tu8 q_home[ICE_MAX_SRIOV_VFS][ICE_MAX_QS_PER_VF_VCV1];\n \n \t/* placeholder VSI for hanging VF queues from on secondary interface */\n \tstruct ice_vsi *sec_vf[ICE_MAX_SRIOV_VFS];\ndiff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.h b/drivers/net/ethernet/intel/ice/ice_vf_lib.h\nindex cdfc2a558732..36dbe5412336 100644\n--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h\n+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h\n@@ -19,7 +19,8 @@\n #define ICE_MAX_SRIOV_VFS\t\t256\n \n /* VF resource constraints */\n-#define ICE_MAX_RSS_QS_PER_VF\t16\n+/* for \"old\" virtchnl opcodes that accept up to 16 queues */\n+#define ICE_MAX_QS_PER_VF_VCV1\t16\n \n struct ice_pf;\n struct ice_vf;\n@@ -161,8 +162,8 @@ struct ice_vf {\n \tu8 dev_lan_addr[ETH_ALEN];\n \tu8 hw_lan_addr[ETH_ALEN];\n \tstruct ice_time_mac legacy_last_added_umac;\n-\tDECLARE_BITMAP(txq_ena, ICE_MAX_RSS_QS_PER_VF);\n-\tDECLARE_BITMAP(rxq_ena, ICE_MAX_RSS_QS_PER_VF);\n+\tDECLARE_BITMAP(txq_ena, ICE_MAX_QS_PER_VF_VCV1);\n+\tDECLARE_BITMAP(rxq_ena, ICE_MAX_QS_PER_VF_VCV1);\n \tstruct ice_vlan port_vlan_info;\t/* Port VLAN ID, QoS, and TPID */\n \tstruct virtchnl_vlan_caps vlan_v2_caps;\n \tstruct ice_mbx_vf_info mbx_info;\n@@ -205,7 +206,7 @@ struct ice_vf {\n \tu16 lldp_recipe_id;\n \tu16 lldp_rule_id;\n \n-\tstruct ice_vf_qs_bw qs_bw[ICE_MAX_RSS_QS_PER_VF];\n+\tstruct ice_vf_qs_bw qs_bw[ICE_MAX_QS_PER_VF_VCV1];\n };\n \n /* Flags for controlling behavior of ice_reset_vf */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 2de62cde14ab..09e1dcab2179 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -925,7 +925,7 @@ static void ice_vsi_set_rss_params(struct ice_vsi *vsi)\n \t\t * For VSI_LUT, LUT size should be set to 64 bytes.\n \t\t */\n \t\tvsi->rss_table_size = ICE_LUT_VSI_SIZE;\n-\t\tvsi->rss_size = ICE_MAX_RSS_QS_PER_VF;\n+\t\tvsi->rss_size = ICE_MAX_QS_PER_VF_VCV1;\n \t\tvsi->rss_lut_type = ICE_LUT_VSI;\n \t\tbreak;\n \tcase ICE_VSI_LB:\ndiff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c\nindex 8686c382404f..0482454f453b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_sriov.c\n+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c\n@@ -398,15 +398,15 @@ static int ice_set_per_vf_res(struct ice_pf *pf, u16 num_vfs)\n \t}\n \n \tnum_txq = min_t(u16, num_msix_per_vf - ICE_NONQ_VECS_VF,\n-\t\t\tICE_MAX_RSS_QS_PER_VF);\n+\t\t\tICE_MAX_QS_PER_VF_VCV1);\n \tavail_qs = ice_get_avail_txq_count(pf) / num_vfs;\n \tif (!avail_qs)\n \t\tnum_txq = 0;\n \telse if (num_txq > avail_qs)\n \t\tnum_txq = rounddown_pow_of_two(avail_qs);\n \n \tnum_rxq = min_t(u16, num_msix_per_vf - ICE_NONQ_VECS_VF,\n-\t\t\tICE_MAX_RSS_QS_PER_VF);\n+\t\t\tICE_MAX_QS_PER_VF_VCV1);\n \tavail_qs = ice_get_avail_rxq_count(pf) / num_vfs;\n \tif (!avail_qs)\n \t\tnum_rxq = 0;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c\nindex f1f437b1af1b..8e88ab8547ab 100644\n--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c\n@@ -535,8 +535,8 @@ static void ice_vf_rebuild_host_cfg(struct ice_vf *vf)\n static void ice_set_vf_state_qs_dis(struct ice_vf *vf)\n {\n \t/* Clear Rx/Tx enabled queues flag */\n-\tbitmap_zero(vf->txq_ena, ICE_MAX_RSS_QS_PER_VF);\n-\tbitmap_zero(vf->rxq_ena, ICE_MAX_RSS_QS_PER_VF);\n+\tbitmap_zero(vf->txq_ena, ICE_MAX_QS_PER_VF_VCV1);\n+\tbitmap_zero(vf->rxq_ena, ICE_MAX_QS_PER_VF_VCV1);\n \tclear_bit(ICE_VF_STATE_QS_ENA, vf->vf_states);\n }\n \n@@ -1217,13 +1217,13 @@ bool ice_is_vf_trusted(struct ice_vf *vf)\n * ice_vf_has_no_qs_ena - check if the VF has any Rx or Tx queues enabled\n * @vf: the VF to check\n *\n- * Returns true if the VF has no Rx and no Tx queues enabled and returns false\n- * otherwise\n+ * Return: true if the VF has no Rx and no Tx queues enabled and returns false\n+ * otherwise.\n */\n bool ice_vf_has_no_qs_ena(struct ice_vf *vf)\n {\n-\treturn bitmap_empty(vf->rxq_ena, ICE_MAX_RSS_QS_PER_VF) &&\n-\t\tbitmap_empty(vf->txq_ena, ICE_MAX_RSS_QS_PER_VF);\n+\treturn bitmap_empty(vf->rxq_ena, ICE_MAX_QS_PER_VF_VCV1) &&\n+\t bitmap_empty(vf->txq_ena, ICE_MAX_QS_PER_VF_VCV1);\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/ice/virt/queues.c b/drivers/net/ethernet/intel/ice/virt/queues.c\nindex 28adc24197b8..7b165ee11a90 100644\n--- a/drivers/net/ethernet/intel/ice/virt/queues.c\n+++ b/drivers/net/ethernet/intel/ice/virt/queues.c\n@@ -171,8 +171,8 @@ static int ice_vf_cfg_q_quanta_profile(struct ice_vf *vf, u16 quanta_size,\n static bool ice_vc_validate_vqs_bitmaps(struct virtchnl_queue_select *vqs)\n {\n \tif ((!vqs->rx_queues && !vqs->tx_queues) ||\n-\t vqs->rx_queues >= BIT(ICE_MAX_RSS_QS_PER_VF) ||\n-\t vqs->tx_queues >= BIT(ICE_MAX_RSS_QS_PER_VF))\n+\t vqs->rx_queues >= BIT(ICE_MAX_QS_PER_VF_VCV1) ||\n+\t vqs->tx_queues >= BIT(ICE_MAX_QS_PER_VF_VCV1))\n \t\treturn false;\n \n \treturn true;\n@@ -317,7 +317,7 @@ int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)\n \t * programmed using ice_vsi_cfg_txqs\n \t */\n \tq_map = vqs->rx_queues;\n-\tfor_each_set_bit(vf_q_id, &q_map, ICE_MAX_RSS_QS_PER_VF) {\n+\tfor_each_set_bit(vf_q_id, &q_map, ICE_MAX_QS_PER_VF_VCV1) {\n \t\tif (!ice_vc_isvalid_q_id(vsi, vf_q_id)) {\n \t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\t\tgoto error_param;\n@@ -330,7 +330,7 @@ int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)\n \t}\n \n \tq_map = vqs->tx_queues;\n-\tfor_each_set_bit(vf_q_id, &q_map, ICE_MAX_RSS_QS_PER_VF) {\n+\tfor_each_set_bit(vf_q_id, &q_map, ICE_MAX_QS_PER_VF_VCV1) {\n \t\tif (!ice_vc_isvalid_q_id(vsi, vf_q_id)) {\n \t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\t\tgoto error_param;\n@@ -461,7 +461,7 @@ int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)\n \tif (vqs->tx_queues) {\n \t\tq_map = vqs->tx_queues;\n \n-\t\tfor_each_set_bit(vf_q_id, &q_map, ICE_MAX_RSS_QS_PER_VF) {\n+\t\tfor_each_set_bit(vf_q_id, &q_map, ICE_MAX_QS_PER_VF_VCV1) {\n \t\t\tif (!ice_vc_isvalid_q_id(vsi, vf_q_id)) {\n \t\t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\t\t\tgoto error_param;\n@@ -476,7 +476,7 @@ int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)\n \n \tq_map = vqs->rx_queues;\n \tif (q_map) {\n-\t\tfor_each_set_bit(vf_q_id, &q_map, ICE_MAX_RSS_QS_PER_VF) {\n+\t\tfor_each_set_bit(vf_q_id, &q_map, ICE_MAX_QS_PER_VF_VCV1) {\n \t\t\tif (!ice_vc_isvalid_q_id(vsi, vf_q_id)) {\n \t\t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\t\t\tgoto error_param;\n@@ -519,7 +519,7 @@ ice_cfg_interrupt(struct ice_vf *vf, struct ice_vsi *vsi,\n \tq_vector->num_ring_tx = 0;\n \n \tqmap = map->rxq_map;\n-\tfor_each_set_bit(vsi_q_id_idx, &qmap, ICE_MAX_RSS_QS_PER_VF) {\n+\tfor_each_set_bit(vsi_q_id_idx, &qmap, ICE_MAX_QS_PER_VF_VCV1) {\n \t\tvsi_q_id = vsi_q_id_idx;\n \n \t\tif (!ice_vc_isvalid_q_id(vsi, vsi_q_id))\n@@ -534,7 +534,7 @@ ice_cfg_interrupt(struct ice_vf *vf, struct ice_vsi *vsi,\n \t}\n \n \tqmap = map->txq_map;\n-\tfor_each_set_bit(vsi_q_id_idx, &qmap, ICE_MAX_RSS_QS_PER_VF) {\n+\tfor_each_set_bit(vsi_q_id_idx, &qmap, ICE_MAX_QS_PER_VF_VCV1) {\n \t\tvsi_q_id = vsi_q_id_idx;\n \n \t\tif (!ice_vc_isvalid_q_id(vsi, vsi_q_id))\n@@ -658,7 +658,7 @@ int ice_vc_cfg_q_bw(struct ice_vf *vf, u8 *msg)\n \t\tgoto err;\n \t}\n \n-\tif (qbw->num_queues > ICE_MAX_RSS_QS_PER_VF ||\n+\tif (qbw->num_queues > ICE_MAX_QS_PER_VF_VCV1 ||\n \t qbw->num_queues > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) {\n \t\tdev_err(ice_pf_to_dev(vf->pf), \"VF-%d trying to configure more than allocated number of queues: %d\\n\",\n \t\t\tvf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq));\n@@ -750,7 +750,7 @@ int ice_vc_cfg_q_quanta(struct ice_vf *vf, u8 *msg)\n \t\tgoto err;\n \t}\n \n-\tif (end_qid > ICE_MAX_RSS_QS_PER_VF ||\n+\tif (end_qid > ICE_MAX_QS_PER_VF_VCV1 ||\n \t end_qid > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) {\n \t\tdev_err(ice_pf_to_dev(vf->pf), \"VF-%d trying to configure more than allocated number of queues: %d\\n\",\n \t\t\tvf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq));\n@@ -818,7 +818,7 @@ int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)\n \tif (!vsi)\n \t\tgoto error_param;\n \n-\tif (qci->num_queue_pairs > ICE_MAX_RSS_QS_PER_VF ||\n+\tif (qci->num_queue_pairs > ICE_MAX_QS_PER_VF_VCV1 ||\n \t qci->num_queue_pairs > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) {\n \t\tdev_err(ice_pf_to_dev(pf), \"VF-%d requesting more than supported number of queues: %d\\n\",\n \t\t\tvf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq));\n@@ -996,16 +996,16 @@ int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)\n \tif (!req_queues) {\n \t\tdev_err(dev, \"VF %d tried to request 0 queues. Ignoring.\\n\",\n \t\t\tvf->vf_id);\n-\t} else if (req_queues > ICE_MAX_RSS_QS_PER_VF) {\n+\t} else if (req_queues > ICE_MAX_QS_PER_VF_VCV1) {\n \t\tdev_err(dev, \"VF %d tried to request more than %d queues.\\n\",\n-\t\t\tvf->vf_id, ICE_MAX_RSS_QS_PER_VF);\n-\t\tvfres->num_queue_pairs = ICE_MAX_RSS_QS_PER_VF;\n+\t\t\tvf->vf_id, ICE_MAX_QS_PER_VF_VCV1);\n+\t\tvfres->num_queue_pairs = ICE_MAX_QS_PER_VF_VCV1;\n \t} else if (req_queues > cur_queues &&\n \t\t req_queues - cur_queues > tx_rx_queue_left) {\n \t\tdev_warn(dev, \"VF %d requested %u more queues, but only %u left.\\n\",\n \t\t\t vf->vf_id, req_queues - cur_queues, tx_rx_queue_left);\n \t\tvfres->num_queue_pairs = min_t(u16, max_allowed_vf_queues,\n-\t\t\t\t\t ICE_MAX_RSS_QS_PER_VF);\n+\t\t\t\t\t ICE_MAX_QS_PER_VF_VCV1);\n \t} else {\n \t\t/* request is successful, then reset VF */\n \t\tvf->num_req_qs = req_queues;\n", "prefixes": [ "iwl-next", "v1", "06/15" ] }