From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8B83526B0B6; Tue, 27 May 2025 17:07:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365674; cv=none; b=ooWajbfhEtmVHtPZYjEqRGS2Xw4PgO+88YFOUKooR90yRCzhG5OZLSDTI67ROya2JSc7Iro1g3d37VKV7vBuJ61vbl28I1IusS2TeWbqNFOUcnAZlvJha6GQVa8S51fFFqdXrdt8z5BI+QS5NUeJs47/meF8nBNz9jdq3ugwe+E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748365674; c=relaxed/simple; bh=16+dalavoMjWarF6e0vHWx3rWo37K1RXMCocE/6h6fs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NUT7P/CrfNBbsPcCh5Vzv/k8cENr/pPkCgFk+2WoYklV5y61F8SIXWO7ZYFu/Ni4lhi1BWz+q5qUEqy4PTh7gJSiu84sqAItVXedshxXPJPec9mIR/8mccEz1V8ybW5UPer07csW4xO44iEQeeYha3XgYzwng0pRMCTKggIweFM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ROgAG2TW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ROgAG2TW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16B49C4CEE9; Tue, 27 May 2025 17:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748365674; bh=16+dalavoMjWarF6e0vHWx3rWo37K1RXMCocE/6h6fs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ROgAG2TW5QSXYTyhabieT0OSMRZXm+VppnvfyoBB/tMguOkBr1Gas/9EArPVj0B0r yLxZu8PijkRRIgoMgYbDmI+Hi9JnkrPsf/8cVVOCE34pGEOThG+ciBGDRROD7xA2lB MZrP/NPKt8vZRJX9EmVXLiN7uRUFNSHeTAVx3NqQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jacob Keller , Pucha Himasekhar Reddy , Michal Swiatkowski , Tony Nguyen , Sasha Levin Subject: [PATCH 6.12 453/626] ice: init flow director before RDMA Date: Tue, 27 May 2025 18:25:46 +0200 Message-ID: <20250527162503.404897986@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162445.028718347@linuxfoundation.org> References: <20250527162445.028718347@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michal Swiatkowski [ Upstream commit d67627e7b53203ca150e54723abbed81a0716286 ] Flow director needs only one MSI-X. Load it before RDMA to save MSI-X for it. Reviewed-by: Jacob Keller Tested-by: Pucha Himasekhar Reddy Signed-off-by: Michal Swiatkowski Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index ca707dfcb286e..63d2105fce933 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5175,11 +5175,12 @@ int ice_load(struct ice_pf *pf) ice_napi_add(vsi); + ice_init_features(pf); + err = ice_init_rdma(pf); if (err) goto err_init_rdma; - ice_init_features(pf); ice_service_task_restart(pf); clear_bit(ICE_DOWN, pf->state); @@ -5187,6 +5188,7 @@ int ice_load(struct ice_pf *pf) return 0; err_init_rdma: + ice_deinit_features(pf); ice_tc_indir_block_unregister(vsi); err_tc_indir_block_register: ice_unregister_netdev(vsi); @@ -5210,8 +5212,8 @@ void ice_unload(struct ice_pf *pf) devl_assert_locked(priv_to_devlink(pf)); - ice_deinit_features(pf); ice_deinit_rdma(pf); + ice_deinit_features(pf); ice_tc_indir_block_unregister(vsi); ice_unregister_netdev(vsi); ice_devlink_destroy_pf_port(pf); -- 2.39.5