{"id":2235026,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2235026/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260508124208.11622-8-przemyslaw.kitszel@intel.com/","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/1.2/projects/46/?format=json","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-8-przemyslaw.kitszel@intel.com>","list_archive_url":null,"date":"2026-05-08T12:42:00","name":"[iwl-next,v1,07/15] ice: bump to 256qs for VF","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9575802d440aca1dc1c231b56d5ee801ed942814","submitter":{"id":85252,"url":"http://patchwork.ozlabs.org/api/1.2/people/85252/?format=json","name":"Przemek Kitszel","email":"przemyslaw.kitszel@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260508124208.11622-8-przemyslaw.kitszel@intel.com/mbox/","series":[{"id":503388,"url":"http://patchwork.ozlabs.org/api/1.2/series/503388/?format=json","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/2235026/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2235026/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=N+48k6M5;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.138; helo=smtp1.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 4gBq345P1vz1yKm\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 08 May 2026 23:00:00 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id DF17C8237C;\n\tFri,  8 May 2026 12:59:58 +0000 (UTC)","from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id V2zaqpMjm5Hc; Fri,  8 May 2026 12:59:56 +0000 (UTC)","from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id DA46582681;\n\tFri,  8 May 2026 12:59:56 +0000 (UTC)","from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])\n by lists1.osuosl.org (Postfix) with ESMTP id 5D66E358\n for <intel-wired-lan@lists.osuosl.org>; Fri,  8 May 2026 12:59:55 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp4.osuosl.org (Postfix) with ESMTP id 43A654106B\n for <intel-wired-lan@lists.osuosl.org>; Fri,  8 May 2026 12:59:55 +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 ZIE-QEXk1ySj for <intel-wired-lan@lists.osuosl.org>;\n Fri,  8 May 2026 12:59:54 +0000 (UTC)","from mgamail.intel.com (mgamail.intel.com [198.175.65.17])\n by smtp4.osuosl.org (Postfix) with ESMTPS id 1BDAD40F80\n for <intel-wired-lan@lists.osuosl.org>; Fri,  8 May 2026 12:59:54 +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:54 -0700","from irvmail002.ir.intel.com ([10.43.11.120])\n by fmviesa005.fm.intel.com with ESMTP; 08 May 2026 05:59:47 -0700","from vecna.igk.intel.com (vecna.igk.intel.com [10.123.220.17])\n by irvmail002.ir.intel.com (Postfix) with ESMTP id D23C12FC43;\n Fri,  8 May 2026 13:59:45 +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 smtp1.osuosl.org DA46582681","OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1BDAD40F80"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1778245196;\n\tbh=g/3aBo+qhkhHPY9pooCd8bOPIdSQZuJ3DBUWY2V3hYQ=;\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=N+48k6M5KFqHhJMayoE9eeqWDKWJWn226GYGFQacr9LrWFX93BMIiT9l7x6pWq7F3\n\t VQVv/MKQb3FdjKUVNtv8sDYTpgzROTvbLySKjQAp8LF1YyeEBSfXWCl6zQKWdXSsMg\n\t 1OYOoPf4i+yf2pCr3GPSMWHSkPtFMA4SKH6XnHQqUlJFO+PlVgkyF5uQj7DWda5Kcd\n\t JA3SMCyoEuzdOWEeToRl8Ukq9Dg9A2wSPKSWbOmW2oZeSFBaSJ9UsokOHkq9ebETjA\n\t r64MIcoO3vSbecyV5fcqMSCfxoAMU81ckN+fnyJ9ZFP9/QOkuu3Uk8YiSb6dcUjXQs\n\t O7stvJuizMyfg==","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 1BDAD40F80","X-CSE-ConnectionGUID":["VOWg5J+ISBqhnvDeb/nbjg==","FP5WnMWuRY2vboPLL5fzBQ=="],"X-CSE-MsgGUID":["uMfcm0WySByWsCDb69kfbg==","Fvg1oQeLREyFcsuil4kBhQ=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11779\"; a=\"79199921\"","E=Sophos;i=\"6.23,223,1770624000\"; d=\"scan'208\";a=\"79199921\"","E=Sophos;i=\"6.23,223,1770624000\"; d=\"scan'208\";a=\"241730127\""],"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:42:00 +0200","Message-Id":"<20260508124208.11622-8-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=1778245195; x=1809781195;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=D6sHTXOwRISUOkGFVYubhhRrI1S3E+/geB5s2+H2ZGY=;\n b=AyPKrOoR9+eF79F5W6R7PWc5iKt5USRMHnTU5KlRtD6YWqnuLieOHqTd\n 0vIe+isWai72kA0NDhqNMl0RC+K1BueFASqyUd0HF83LZ8WTgIYukdppG\n KvIe6jpr4mpHs2DyEkJPJ57+9Q3/O+37viswGfF7hSUzbf6Kme9b1ZAxK\n CUF6/mKGy8rcTOLfORsQDDRjjKfvcQwEhWsDDjCSTyzFypiTGf2xZilAY\n tlgluYRTMDoCcfJGA/AoSj9/0E8Au870QnFbZ+Pl+pSyyAoMEedCH3VSD\n L9QkS0ERbC6eoqh5+1jnPsbtXiPzvZNSUZt5HrmgUPjrika6ejSzeypQB\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=AyPKrOoR"],"Subject":"[Intel-wired-lan] [PATCH iwl-next v1 07/15] ice: bump to 256qs for\n VF","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":"Adjust all bitmaps and arrays in ice to accept 256 VF queues.\nExtend struct ice_vf::num_req_qs width to allow 256 queues.\nKeep old/legacy size for virtchnl opcodes that were designed to accept\nonly up to 16 queues.\n\nReviewed-by: Jedrzej Jagielski <jedrzej.jagielski@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  |  8 ++++----\n drivers/net/ethernet/intel/ice/virt/queues.c | 14 +++++++-------\n 6 files changed, 20 insertions(+), 19 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/ice/ice_lag.h b/drivers/net/ethernet/intel/ice/ice_lag.h\nindex 4bfffecbdc97..39f6a6cc844d 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_QS_PER_VF_VCV1];\n+\tu8 q_home[ICE_MAX_SRIOV_VFS][ICE_MAX_QS_PER_VF];\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 36dbe5412336..1b56f7150eb7 100644\n--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h\n+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h\n@@ -21,6 +21,7 @@\n /* VF resource constraints */\n /* for \"old\" virtchnl opcodes that accept up to 16 queues */\n #define ICE_MAX_QS_PER_VF_VCV1\t16\n+#define ICE_MAX_QS_PER_VF\t256\n \n struct ice_pf;\n struct ice_vf;\n@@ -162,8 +163,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_QS_PER_VF_VCV1);\n-\tDECLARE_BITMAP(rxq_ena, ICE_MAX_QS_PER_VF_VCV1);\n+\tDECLARE_BITMAP(txq_ena, ICE_MAX_QS_PER_VF);\n+\tDECLARE_BITMAP(rxq_ena, ICE_MAX_QS_PER_VF);\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@@ -185,7 +186,7 @@ struct ice_vf {\n \tDECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS);\t/* VF runtime states */\n \n \tunsigned long vf_caps;\t\t/* VF's adv. capabilities */\n-\tu8 num_req_qs;\t\t\t/* num of queue pairs requested by VF */\n+\tu16 num_req_qs;\t\t\t/* num of queue pairs requested by VF */\n \tu16 num_mac;\n \tu16 num_mac_lldp;\n \tu16 num_vf_qs;\t\t\t/* num of queue configured per VF */\n@@ -206,7 +207,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_QS_PER_VF_VCV1];\n+\tstruct ice_vf_qs_bw qs_bw[ICE_MAX_QS_PER_VF];\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 09e1dcab2179..2ac4e23f30b5 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_QS_PER_VF_VCV1;\n+\t\tvsi->rss_size = ICE_MAX_QS_PER_VF;\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 0482454f453b..28f9e68f46cd 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_QS_PER_VF_VCV1);\n+\t\t\tICE_MAX_QS_PER_VF);\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_QS_PER_VF_VCV1);\n+\t\t\tICE_MAX_QS_PER_VF);\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 8e88ab8547ab..55ad03085bc9 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_QS_PER_VF_VCV1);\n-\tbitmap_zero(vf->rxq_ena, ICE_MAX_QS_PER_VF_VCV1);\n+\tbitmap_zero(vf->txq_ena, ICE_MAX_QS_PER_VF);\n+\tbitmap_zero(vf->rxq_ena, ICE_MAX_QS_PER_VF);\n \tclear_bit(ICE_VF_STATE_QS_ENA, vf->vf_states);\n }\n \n@@ -1222,8 +1222,8 @@ bool ice_is_vf_trusted(struct ice_vf *vf)\n  */\n bool ice_vf_has_no_qs_ena(struct ice_vf *vf)\n {\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+\treturn bitmap_empty(vf->rxq_ena, ICE_MAX_QS_PER_VF) &&\n+\t       bitmap_empty(vf->txq_ena, ICE_MAX_QS_PER_VF);\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/ice/virt/queues.c b/drivers/net/ethernet/intel/ice/virt/queues.c\nindex 7b165ee11a90..1d9f69026d1b 100644\n--- a/drivers/net/ethernet/intel/ice/virt/queues.c\n+++ b/drivers/net/ethernet/intel/ice/virt/queues.c\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_QS_PER_VF_VCV1 ||\n+\tif (qbw->num_queues > ICE_MAX_QS_PER_VF ||\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_QS_PER_VF_VCV1 ||\n+\tif (end_qid > ICE_MAX_QS_PER_VF ||\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_QS_PER_VF_VCV1 ||\n+\tif (qci->num_queue_pairs > ICE_MAX_QS_PER_VF ||\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_QS_PER_VF_VCV1) {\n+\t} else if (req_queues > ICE_MAX_QS_PER_VF) {\n \t\tdev_err(dev, \"VF %d tried to request more than %d queues.\\n\",\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\t\tvf->vf_id, ICE_MAX_QS_PER_VF);\n+\t\tvfres->num_queue_pairs = ICE_MAX_QS_PER_VF;\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_QS_PER_VF_VCV1);\n+\t\t\t\t\t       ICE_MAX_QS_PER_VF);\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","07/15"]}