From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
To: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org,
pabeni@redhat.com, edumazet@google.com
Cc: intel-wired-lan@lists.osuosl.org, jiri@nvidia.com,
anthony.l.nguyen@intel.com, alexandr.lobakin@intel.com,
sridhar.samudrala@intel.com, wojciech.drewek@intel.com,
lukasz.czapnik@intel.com, shiraz.saleem@intel.com,
jesse.brandeburg@intel.com, mustafa.ismail@intel.com,
przemyslaw.kitszel@intel.com, piotr.raczynski@intel.com,
jacob.e.keller@intel.com, david.m.ertman@intel.com,
leszek.kaliszczuk@intel.com,
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Subject: [PATCH net-next 09/13] ice: update VSI instead of init in some case
Date: Mon, 14 Nov 2022 13:57:51 +0100 [thread overview]
Message-ID: <20221114125755.13659-10-michal.swiatkowski@linux.intel.com> (raw)
In-Reply-To: <20221114125755.13659-1-michal.swiatkowski@linux.intel.com>
ice_vsi_cfg() is called from different contexts:
1) VSI exsist in HW, but it is reconfigured, because of changing queues
for example -> update instead of init should be used
2) VSI doesn't exsist, because rest has happened -> init command should
be sent
To support both cases pass boolean value which will store information
what type of command has to be sent to HW.
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
---
drivers/net/ethernet/intel/ice/ice_lib.c | 16 ++++++++++------
drivers/net/ethernet/intel/ice/ice_lib.h | 4 ++--
drivers/net/ethernet/intel/ice/ice_main.c | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 32da2da74056..bc04f2b9f8a2 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -2551,9 +2551,11 @@ static int ice_vsi_cfg_tc_lan(struct ice_pf *pf, struct ice_vsi *vsi)
* @vf: pointer to VF to which this VSI connects. This field is used primarily
* for the ICE_VSI_VF type. Other VSI types should pass NULL.
* @ch: ptr to channel
+ * @init_vsi: is this an initialization or a reconfigure of the VSI
*/
static int
-ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch)
+ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch,
+ int init_vsi)
{
struct device *dev = ice_pf_to_dev(vsi->back);
struct ice_pf *pf = vsi->back;
@@ -2580,7 +2582,7 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch)
ice_vsi_set_tc_cfg(vsi);
/* create the VSI */
- ret = ice_vsi_init(vsi, true);
+ ret = ice_vsi_init(vsi, init_vsi);
if (ret)
goto unroll_get_qs;
@@ -2694,12 +2696,14 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch)
* @vf: pointer to VF to which this VSI connects. This field is used primarily
* for the ICE_VSI_VF type. Other VSI types should pass NULL.
* @ch: ptr to channel
+ * @init_vsi: is this an initialization or a reconfigure of the VSI
*/
-int ice_vsi_cfg(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch)
+int ice_vsi_cfg(struct ice_vsi *vsi, struct ice_vf *vf, struct ice_channel *ch,
+ int init_vsi)
{
int ret;
- ret = ice_vsi_cfg_def(vsi, vf, ch);
+ ret = ice_vsi_cfg_def(vsi, vf, ch, init_vsi);
if (ret)
return ret;
@@ -2796,7 +2800,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,
return NULL;
}
- ret = ice_vsi_cfg(vsi, vf, ch);
+ ret = ice_vsi_cfg(vsi, vf, ch, ICE_VSI_FLAG_INIT);
if (ret)
goto err_vsi_cfg;
@@ -3286,7 +3290,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, int init_vsi)
prev_num_q_vectors = ice_vsi_rebuild_get_coalesce(vsi, coalesce);
ice_vsi_decfg(vsi);
- ret = ice_vsi_cfg_def(vsi, vsi->vf, vsi->ch);
+ ret = ice_vsi_cfg_def(vsi, vsi->vf, vsi->ch, init_vsi);
if (ret)
goto err_vsi_cfg;
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h
index 8905f8721a76..b76f05e1f8a3 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_lib.h
@@ -60,8 +60,6 @@ int ice_vsi_release(struct ice_vsi *vsi);
void ice_vsi_close(struct ice_vsi *vsi);
-int ice_vsi_cfg(struct ice_vsi *vsi, struct ice_vf *vf,
- struct ice_channel *ch);
int ice_ena_vsi(struct ice_vsi *vsi, bool locked);
void ice_vsi_decfg(struct ice_vsi *vsi);
@@ -75,6 +73,8 @@ ice_get_res(struct ice_pf *pf, struct ice_res_tracker *res, u16 needed, u16 id);
#define ICE_VSI_FLAG_INIT BIT(0)
#define ICE_VSI_FLAG_NO_INIT 0
int ice_vsi_rebuild(struct ice_vsi *vsi, int init_vsi);
+int ice_vsi_cfg(struct ice_vsi *vsi, struct ice_vf *vf,
+ struct ice_channel *ch, int init_vsi);
bool ice_is_reset_in_progress(unsigned long *state);
int ice_wait_for_reset(struct ice_pf *pf, unsigned long timeout);
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 49d29eb61c17..9766032e95ec 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5012,7 +5012,7 @@ int ice_load(struct ice_pf *pf)
return err;
vsi = ice_get_main_vsi(pf);
- err = ice_vsi_cfg(vsi, NULL, NULL);
+ err = ice_vsi_cfg(vsi, NULL, NULL, ICE_VSI_FLAG_INIT);
if (err)
goto err_vsi_cfg;
--
2.36.1
next prev parent reply other threads:[~2022-11-14 13:12 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-14 12:57 [PATCH net-next 00/13] resource management using devlink reload Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 01/13] ice: move RDMA init to ice_idc.c Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 02/13] ice: alloc id for RDMA using xa_array Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 03/13] ice: cleanup in VSI config/deconfig code Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 04/13] ice: split ice_vsi_setup into smaller functions Michal Swiatkowski
2022-11-15 5:08 ` Jakub Kicinski
2022-11-15 6:49 ` Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 05/13] ice: stop hard coding the ICE_VSI_CTRL location Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 06/13] ice: split probe into smaller functions Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 07/13] ice: sync netdev filters after clearing VSI Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 08/13] ice: move VSI delete outside deconfig Michal Swiatkowski
2022-11-14 12:57 ` Michal Swiatkowski [this message]
2022-11-14 12:57 ` [PATCH net-next 10/13] ice: implement devlink reinit action Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 11/13] ice: introduce eswitch capable flag Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 12/13] ice, irdma: prepare reservation of MSI-X to reload Michal Swiatkowski
2022-11-15 5:08 ` Jakub Kicinski
2022-11-15 6:49 ` Michal Swiatkowski
2022-11-14 12:57 ` [PATCH net-next 13/13] devlink, ice: add MSIX vectors as devlink resource Michal Swiatkowski
2022-11-14 15:28 ` Jiri Pirko
2022-11-14 16:03 ` Piotr Raczynski
2022-11-15 6:56 ` Michal Swiatkowski
2022-11-15 12:08 ` Jiri Pirko
2022-11-14 13:23 ` [PATCH net-next 00/13] resource management using devlink reload Leon Romanovsky
2022-11-14 15:31 ` Samudrala, Sridhar
2022-11-14 16:58 ` Keller, Jacob E
2022-11-14 17:09 ` Leon Romanovsky
2022-11-15 7:00 ` Michal Swiatkowski
2022-11-14 17:07 ` Leon Romanovsky
2022-11-15 7:12 ` Michal Swiatkowski
2022-11-15 8:11 ` Leon Romanovsky
2022-11-15 9:04 ` Michal Swiatkowski
2022-11-15 9:32 ` Leon Romanovsky
2022-11-15 10:16 ` Michal Swiatkowski
2022-11-15 12:12 ` Leon Romanovsky
2022-11-15 14:02 ` Michal Swiatkowski
2022-11-15 17:57 ` Leon Romanovsky
2022-11-16 1:59 ` Samudrala, Sridhar
2022-11-16 6:04 ` Leon Romanovsky
2022-11-16 12:04 ` Michal Swiatkowski
2022-11-16 17:59 ` Leon Romanovsky
2022-11-17 11:10 ` Michal Swiatkowski
2022-11-17 11:45 ` Leon Romanovsky
2022-11-17 13:39 ` Michal Swiatkowski
2022-11-17 17:38 ` Leon Romanovsky
2022-11-18 3:36 ` Jakub Kicinski
2022-11-18 6:20 ` Leon Romanovsky
2022-11-18 14:23 ` Saleem, Shiraz
2022-11-18 17:31 ` Leon Romanovsky
2022-11-20 22:24 ` Samudrala, Sridhar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221114125755.13659-10-michal.swiatkowski@linux.intel.com \
--to=michal.swiatkowski@linux.intel.com \
--cc=alexandr.lobakin@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=david.m.ertman@intel.com \
--cc=edumazet@google.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jacob.e.keller@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=jiri@nvidia.com \
--cc=kuba@kernel.org \
--cc=leszek.kaliszczuk@intel.com \
--cc=lukasz.czapnik@intel.com \
--cc=mustafa.ismail@intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=piotr.raczynski@intel.com \
--cc=przemyslaw.kitszel@intel.com \
--cc=shiraz.saleem@intel.com \
--cc=sridhar.samudrala@intel.com \
--cc=wojciech.drewek@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).