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 DF2FB25C6EC; Tue, 27 May 2025 17:46:45 +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=1748368006; cv=none; b=lvrw5zUPjLothccRIqS+Rif2C5ENmavalcxrqzTWrYNwb7UeqnUg+imleorPuONeN4h6MQMtSRJdo6IrejrJfFYxctNdAil8pUuCbOvDaPKCuZEhtvWs8qwN3q4mCOAHwlDXnqLy5Hwuab4BShNRF10AET1JJ+93aB1drMut7u0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748368006; c=relaxed/simple; bh=M6OHXbRIqlxEUwbL2fWEDpj6rSG7p5+vYD8KdnHfCNs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ryO+BqTv8p8y1wBEuFmYjITilOC+jnvLoAOlJ4s+niXTH0FoEi7An/Fn24CtxrDctVdzCuD7WcoRe6wTD4HZjZRP8yBGFZihSwtrMl92qly36Z+m0cN5szMUFt5rGOh2Aes4ZvZsABb6iYO/NVbgHV6tVeFVpMx13b85ktG98D0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AcI6wsx2; 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="AcI6wsx2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71BC5C4CEE9; Tue, 27 May 2025 17:46:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748368005; bh=M6OHXbRIqlxEUwbL2fWEDpj6rSG7p5+vYD8KdnHfCNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AcI6wsx2EUMpAzuQ/0zXPsKHzW83rbuj4P/HAFt9qEDUQpbLWWA39sZz9vUN4KRPk u6TuTO41ETJ2FccwgYCv6svEWaiBLgEzUTiZWYxur1DbOAuiFul4Zs8lKyTDjm6f4l LwAYZSMisGNNo5U4lQAq/9ZTP7F4VYyDmypsYIlA= 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.14 568/783] ice: init flow director before RDMA Date: Tue, 27 May 2025 18:26:05 +0200 Message-ID: <20250527162536.274194588@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162513.035720581@linuxfoundation.org> References: <20250527162513.035720581@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-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 e13bd5a6cb6c4..d24d46b24e371 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -5186,11 +5186,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); @@ -5198,6 +5199,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); @@ -5221,8 +5223,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