From patchwork Mon Feb 3 21:09:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 13958218 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 7C29521146A; Mon, 3 Feb 2025 21:09:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738616997; cv=none; b=BQrujgpLq8cxnmGHaxXDjKhj7KChRPtnvBGFSfj6/8/m1VtLr36ySj87AtCpLb/jcZkdmnl+kq3WK2EUaGTjEN+z/eWCDzhdIywG4W+exlc73EzbfwTncaDq+4mCixllkkfcW4TWySoFexaQRYjQZ4bg6Iyzd0GIR9vxFxHhDLY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738616997; c=relaxed/simple; bh=Tz4Uu1GFRmq/iuvhjAtIzndDgoDPbLjFRtkm5sTSE6U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IRqPcnufDjlm7o86FgYCR9vGC046jwFeMsoceQa1y4IfakKN3g3vt1hiXfvSvwsXza3u3wPr9mf4ubHc/CUQiGbJM9z7X83BN7ugD8w1DUGSVnrIomKMZdyc9yV+FSH3WljQvF67zVlNAdyfM3mHJiRwhR+f9vKPE3y9c/rII4U= 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=XRnitu4J; arc=none smtp.client-ip=192.198.163.11 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="XRnitu4J" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738616995; x=1770152995; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Tz4Uu1GFRmq/iuvhjAtIzndDgoDPbLjFRtkm5sTSE6U=; b=XRnitu4JI7Zak/QGPyn4oXtBoducLCORtKyYDvlG+oJa8aYFS6IloYs3 LVLQomDDOi9XWzAlU+vWUULdeRkq48+XvvE7mVx46MK0muvTRQJ8yFC1W unuaYvqXT/gVWetJes8vDmsyG8IEccY+h8OBYhhk9huDsv7DBb0nDK9dj w1PzywPsCddNJzX2my8fJ8eNhVZ+s2/KffqhosQTyMXr5d+LFuYoH1jwf 9tTFRAumsEdR+hpSsIyrSYHJdfdyPZGRZWZw+4O0pXjBHdiFm3z/iZl6P Z5arrOYtFnt/jA7c3LBhgkuxQFbG7GqI98SxhHR0VdxXtxutmdxK25ktg w==; X-CSE-ConnectionGUID: TlhsQSNzR9aVyVKFbgyBcw== X-CSE-MsgGUID: 6pGtj7mQQvGULemD3s/c5w== X-IronPort-AV: E=McAfee;i="6700,10204,11335"; a="49735653" X-IronPort-AV: E=Sophos;i="6.13,256,1732608000"; d="scan'208";a="49735653" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2025 13:09:50 -0800 X-CSE-ConnectionGUID: IGdLCTLxRAq8tBcZ0LX16A== X-CSE-MsgGUID: zRX/zLC3Tf6CZF6mriaUSw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,256,1732608000"; d="scan'208";a="141273329" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa002.jf.intel.com with ESMTP; 03 Feb 2025 13:09:50 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Michal Swiatkowski , anthony.l.nguyen@intel.com, sridhar.samudrala@intel.com, jacob.e.keller@intel.com, pio.raczynski@gmail.com, konrad.knitter@intel.com, marcin.szycik@intel.com, nex.sw.ncis.nat.hpm.dev@intel.com, przemyslaw.kitszel@intel.com, jiri@resnulli.us, horms@kernel.org, David.Laight@ACULAB.COM, pmenzel@molgen.mpg.de, mschmidt@redhat.com, tatyana.e.nikolova@intel.com, Jason Gunthorpe , Leon Romanovsky , linux-rdma@vger.kernel.org Subject: [PATCH net-next 9/9] ice: init flow director before RDMA Date: Mon, 3 Feb 2025 13:09:38 -0800 Message-ID: <20250203210940.328608-10-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250203210940.328608-1-anthony.l.nguyen@intel.com> References: <20250203210940.328608-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Michal Swiatkowski 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 --- 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 c3a0fb97c5ee..d7037de29545 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);