From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B289ED637A7 for ; Thu, 14 Nov 2024 12:20:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7AB644042E; Thu, 14 Nov 2024 12:20:52 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id m6l35S56JJJL; Thu, 14 Nov 2024 12:20:51 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B27C540698 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1731586851; bh=A71GzPL3pTAkzA94WzSQEpM5HRcOwroRy8DhE+1DQ24=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=cdHNsOQpHUo85729fsnyBrGxxWODlQ/WmmLTfV7X7ICr2klm91Z8wLsUzyz0wiRMU 2SsgiCF9nXoM6qXcDT5JbVzEM/f4aj8Is8ywW2sBwsvYyUTxaqE6+QD/ryU9t/9mkO N5IBf/qOAjIlKVyPOz/OxT2HkfwxDqXktli9D5fRZ9mnsYhz074e06uPLp3qygU5CL 4SZvMO3y1S8C4NbyYEuV27pWyrDBJPwdPYtf30TLdTcJK+mmkIMp0PHnECvhFnA2oY 3skepPNj7LcIgtC98yY0r0gSRPFCpPQeAaswLmx+qxCl+cofzH9T9R6A4m7clXY04h upt3JBqmMwhkQ== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id B27C540698; Thu, 14 Nov 2024 12:20:51 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists1.osuosl.org (Postfix) with ESMTP id D6208BF for ; Thu, 14 Nov 2024 12:20:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B726D406C1 for ; Thu, 14 Nov 2024 12:20:49 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id V2yWGlX3G37i for ; Thu, 14 Nov 2024 12:20:49 +0000 (UTC) Received-SPF: None (mailfrom) identity=mailfrom; client-ip=192.198.163.7; helo=mgamail.intel.com; envelope-from=michal.swiatkowski@linux.intel.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org CB2DC406BF DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CB2DC406BF Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by smtp4.osuosl.org (Postfix) with ESMTPS id CB2DC406BF for ; Thu, 14 Nov 2024 12:20:48 +0000 (UTC) X-CSE-ConnectionGUID: SVdH7k98TWCBGz1StweYxg== X-CSE-MsgGUID: UTaIGhFCRGWHaH4jzlAIiw== X-IronPort-AV: E=McAfee;i="6700,10204,11255"; a="56916950" X-IronPort-AV: E=Sophos;i="6.12,154,1728975600"; d="scan'208";a="56916950" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2024 04:20:49 -0800 X-CSE-ConnectionGUID: 6HqYvtMKS2eGunEJVM2dAw== X-CSE-MsgGUID: 1TxixY83S56hDbZ4rbY69A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="93136248" Received: from gk3153-dr2-r750-36946.igk.intel.com ([10.102.20.192]) by orviesa003.jf.intel.com with ESMTP; 14 Nov 2024 04:20:44 -0800 From: Michal Swiatkowski To: intel-wired-lan@lists.osuosl.org Date: Thu, 14 Nov 2024 13:18:40 +0100 Message-ID: <20241114122009.97416-9-michal.swiatkowski@linux.intel.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20241114122009.97416-1-michal.swiatkowski@linux.intel.com> References: <20241114122009.97416-1-michal.swiatkowski@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731586849; x=1763122849; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uSfGMC7MpvLcsmrYMIC/KjTjHJL8kyUCy9g8i5xca0k=; b=IJ+QZaDhDbH+xWk6gwfSaTuOYIk0+Z7nWj/PUq+JrYpBRgHWnYBhEEgA mXZq8QLo7vLUxhmdC+jwEqAJUhFXcjS8GjI3wb89QWsqsEJoUMPai9L/C t/hb03I4fpmO7oFe1OWfH7HkUyII0+/T+HfVglk3PqJbyTg96FzqevSim AgK6is9GbTLeBXKqjHKNmEnbvaZpDKZVTdk3TjCj4c32krjHS+cqoqozA WmnCAQpPn+734Lbv1gggM6x+Z/7O6ahuLSQPYWeolocGphqzwG32S6exE sMK3jDk69jb1l2pnskyO8h1G0G9/jcHCPDtRJsesEk1h1FiVny6Qj/cLI g==; X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=none (p=none dis=none) header.from=linux.intel.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=IJ+QZaDh Subject: [Intel-wired-lan] [PATCH 8/8] ice: init flow director before RDMA X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pmenzel@molgen.mpg.de, wojciech.drewek@intel.com, marcin.szycik@intel.com, netdev@vger.kernel.org, rafal.romanowski@intel.com, konrad.knitter@intel.com, pawel.chmielewski@intel.com, horms@kernel.org, David.Laight@ACULAB.COM, nex.sw.ncis.nat.hpm.dev@intel.com, pio.raczynski@gmail.com, sridhar.samudrala@intel.com, jacob.e.keller@intel.com, jiri@resnulli.us, przemyslaw.kitszel@intel.com Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Flow director needs only one MSI-X. Load it before RDMA to save MSI-X for it. Reviewed-by: Jacob Keller 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 a6f586f9bfd1..b6997481fd42 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.42.0