From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4BA33E1D11 for ; Fri, 8 May 2026 12:59:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778245198; cv=none; b=nncQrvTHMtKLvfvmzEbKWIwAR2VRlw5X819cHsSslKZEzVRpy3ijtdsjclIrxHSYXcbU6uXjbALz+NIDvQKoeWqvoXuuHFn8EFm5rwcyIlknCWxoNWO1ATu1Cz6M8TBNo71UEyJdT54K9JBbGSTuUqnZsm507AfQJB9SA/mwkZ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778245198; c=relaxed/simple; bh=U19BHlQABQeeNKYlry41jP17qo38AAR90WkyJf5T5Xg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CqI2mldrzTqQv6W8c1+eNCKfUNuRQbR/I+7LHS9PPlAtGIieIjf/Kj/3KeR7e0/TF/0psTCdvga+9O8N5X7flkBE6guCwX3k2N/PXns3OX70BNXKJlyxwkjIKs9OEOEky7nbiX7A99EImxy8Wt04QB5/Y4b4D3fjgfa1fMInB6Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=bjg6F/in; arc=none smtp.client-ip=198.175.65.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="bjg6F/in" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778245197; x=1809781197; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U19BHlQABQeeNKYlry41jP17qo38AAR90WkyJf5T5Xg=; b=bjg6F/inzsScWCd7713JSZxqzOLWCouLbz14I/gqy57/zPXwnyFdkkzX cpQz5rAAJ2RLM3K/ioEPEDSlTqTmBfrXXPME2L/3ldjMKirmuoq539Hky zwHN/8P7tz4oGYlNLK+M3xLeRuSbp3VP07yorA33CnN3hCSKfTckvPw0t 52iug4gyyTWrXuT/HGIOXO96BpPF5VvYNNMMfkxTvYbFp1EKyRDqTCJ9V jo5suDz8hmi+wUi0sbqpQBbTqEq24tlGaeU6qgrJvr1BW84vrLcaY9Ip3 o/bS+k3yZF4Ha17sE5ldMbNDiEqXEbWojDSS2FFJN9Ud4sJfOOPI//7CL Q==; X-CSE-ConnectionGUID: H+1pcgwDQMur653h/4VsZg== X-CSE-MsgGUID: kD7R4FLXSB+k9mVO5tkdkg== X-IronPort-AV: E=McAfee;i="6800,10657,11779"; a="79199939" X-IronPort-AV: E=Sophos;i="6.23,223,1770624000"; d="scan'208";a="79199939" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2026 05:59:57 -0700 X-CSE-ConnectionGUID: Wfv2VeHsRcepDejBX8GOJg== X-CSE-MsgGUID: N9b3MJ2cT3emGS1eQERK3A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,223,1770624000"; d="scan'208";a="241730138" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by fmviesa005.fm.intel.com with ESMTP; 08 May 2026 05:59:51 -0700 Received: from vecna.igk.intel.com (vecna.igk.intel.com [10.123.220.17]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 0E40D2FC40; Fri, 8 May 2026 13:59:49 +0100 (IST) From: Przemek Kitszel To: intel-wired-lan@lists.osuosl.org, Michal Schmidt , Jakub Kicinski , Jiri Pirko Cc: netdev@vger.kernel.org, Simon Horman , Tony Nguyen , Michal Swiatkowski , bruce.richardson@intel.com, Vladimir Medvedkin , padraig.j.connolly@intel.com, ananth.s@intel.com, timothy.miskell@intel.com, Jacob Keller , Lukasz Czapnik , Aleksandr Loktionov , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , Przemek Kitszel , Jedrzej Jagielski Subject: [PATCH iwl-next v1 09/15] iavf: temporary rename of IAVF_MAX_REQ_QUEUES to IAVF_MAX_REQ_QUEUES_VCV1 Date: Fri, 8 May 2026 14:42:02 +0200 Message-Id: <20260508124208.11622-10-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> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Rename IAVF_MAX_REQ_QUEUES to IAVF_MAX_REQ_QUEUES_VCV1, in preparation for the next patch that will extend the max to 256, using old value of 16 for the "v1" variant of virtchnl opcodes. Suggested-by: Jedrzej Jagielski Suggested-by: Jacob Keller Reviewed-by: Aleksandr Loktionov Signed-off-by: Przemek Kitszel --- drivers/net/ethernet/intel/iavf/iavf.h | 3 ++- drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h index d97f0fd2cd0a..a0c42f2357fb 100644 --- a/drivers/net/ethernet/intel/iavf/iavf.h +++ b/drivers/net/ethernet/intel/iavf/iavf.h @@ -87,7 +87,8 @@ struct iavf_vsi { #define IAVF_TX_DESC(R, i) (&(((struct iavf_tx_desc *)((R)->desc))[i])) #define IAVF_TX_CTXTDESC(R, i) \ (&(((struct iavf_tx_context_desc *)((R)->desc))[i])) -#define IAVF_MAX_REQ_QUEUES 16 +/* for "old" virtchnl opcodes that accept up to 16 queues */ +#define IAVF_MAX_REQ_QUEUES_VCV1 16 #define IAVF_HKEY_ARRAY_SIZE ((IAVF_VFQF_HKEY_MAX_INDEX + 1) * 4) #define IAVF_HLUT_ARRAY_SIZE ((IAVF_VFQF_HLUT_MAX_INDEX + 1) * 4) diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index 1f9fcb82ddcb..8149b01ae24a 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -5362,7 +5362,7 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pci_set_master(pdev); netdev = alloc_etherdev_mq(sizeof(struct iavf_adapter), - IAVF_MAX_REQ_QUEUES); + IAVF_MAX_REQ_QUEUES_VCV1); if (!netdev) { err = -ENOMEM; goto err_alloc_etherdev; diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c index 7a97fc76420f..d3b5398b6130 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c @@ -260,19 +260,19 @@ int iavf_send_vf_ptp_caps_msg(struct iavf_adapter *adapter) **/ static void iavf_validate_num_queues(struct iavf_adapter *adapter) { - if (adapter->vf_res->num_queue_pairs > IAVF_MAX_REQ_QUEUES) { + if (adapter->vf_res->num_queue_pairs > IAVF_MAX_REQ_QUEUES_VCV1) { struct virtchnl_vsi_resource *vsi_res; int i; dev_info(&adapter->pdev->dev, "Received %d queues, but can only have a max of %d\n", adapter->vf_res->num_queue_pairs, - IAVF_MAX_REQ_QUEUES); + IAVF_MAX_REQ_QUEUES_VCV1); dev_info(&adapter->pdev->dev, "Fixing by reducing queues to %d\n", - IAVF_MAX_REQ_QUEUES); - adapter->vf_res->num_queue_pairs = IAVF_MAX_REQ_QUEUES; + IAVF_MAX_REQ_QUEUES_VCV1); + adapter->vf_res->num_queue_pairs = IAVF_MAX_REQ_QUEUES_VCV1; for (i = 0; i < adapter->vf_res->num_vsis; i++) { vsi_res = &adapter->vf_res->vsi_res[i]; - vsi_res->num_queue_pairs = IAVF_MAX_REQ_QUEUES; + vsi_res->num_queue_pairs = IAVF_MAX_REQ_QUEUES_VCV1; } } } -- 2.39.3