| Message ID | 20230412081929.173220-4-mschmidt@redhat.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ice: lower CPU usage with GNSS | expand |
>From: Michal Schmidt <mschmidt@redhat.com> >Sent: Wednesday, April 12, 2023 10:19 AM > >sq_cmd_timeout is initialized to ICE_CTL_Q_SQ_CMD_TIMEOUT and never >changed, so just use the constant directly. > >Suggested-by: Simon Horman <simon.horman@corigine.com> >Signed-off-by: Michal Schmidt <mschmidt@redhat.com> >--- > drivers/net/ethernet/intel/ice/ice_common.c | 2 +- > drivers/net/ethernet/intel/ice/ice_controlq.c | 5 +---- > drivers/net/ethernet/intel/ice/ice_controlq.h | 1 - > 3 files changed, 2 insertions(+), 6 deletions(-) > >diff --git a/drivers/net/ethernet/intel/ice/ice_common.c >b/drivers/net/ethernet/intel/ice/ice_common.c >index c2fda4fa4188..f4c256563248 100644 >--- a/drivers/net/ethernet/intel/ice/ice_common.c >+++ b/drivers/net/ethernet/intel/ice/ice_common.c >@@ -2000,7 +2000,7 @@ void ice_release_res(struct ice_hw *hw, enum >ice_aq_res_ids res) > /* there are some rare cases when trying to release the resource > * results in an admin queue timeout, so handle them correctly > */ >- while ((status == -EIO) && (total_delay < hw->adminq.sq_cmd_timeout)) >{ >+ while ((status == -EIO) && (total_delay < ICE_CTL_Q_SQ_CMD_TIMEOUT)) >{ > mdelay(1); > status = ice_aq_release_res(hw, res, 0, NULL); > total_delay++; >diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c >b/drivers/net/ethernet/intel/ice/ice_controlq.c >index 6bcfee295991..c8fb10106ec3 100644 >--- a/drivers/net/ethernet/intel/ice/ice_controlq.c >+++ b/drivers/net/ethernet/intel/ice/ice_controlq.c >@@ -637,9 +637,6 @@ static int ice_init_ctrlq(struct ice_hw *hw, enum >ice_ctl_q q_type) > return -EIO; > } > >- /* setup SQ command write back timeout */ >- cq->sq_cmd_timeout = ICE_CTL_Q_SQ_CMD_TIMEOUT; >- > /* allocate the ATQ */ > ret_code = ice_init_sq(hw, cq); > if (ret_code) >@@ -1066,7 +1063,7 @@ ice_sq_send_cmd(struct ice_hw *hw, struct >ice_ctl_q_info *cq, > > udelay(ICE_CTL_Q_SQ_CMD_USEC); > total_delay++; >- } while (total_delay < cq->sq_cmd_timeout); >+ } while (total_delay < ICE_CTL_Q_SQ_CMD_TIMEOUT); > > /* if ready, copy the desc back to temp */ > if (ice_sq_done(hw, cq)) { >diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.h >b/drivers/net/ethernet/intel/ice/ice_controlq.h >index c07e9cc9fc6e..e790b2f4e437 100644 >--- a/drivers/net/ethernet/intel/ice/ice_controlq.h >+++ b/drivers/net/ethernet/intel/ice/ice_controlq.h >@@ -87,7 +87,6 @@ struct ice_ctl_q_info { > enum ice_ctl_q qtype; > struct ice_ctl_q_ring rq; /* receive queue */ > struct ice_ctl_q_ring sq; /* send queue */ >- u32 sq_cmd_timeout; /* send queue cmd write back timeout */ > u16 num_rq_entries; /* receive queue depth */ > u16 num_sq_entries; /* send queue depth */ > u16 rq_buf_size; /* receive queue buffer size */ >-- >2.39.2 Looks good, thank you Michal! Reviewed-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
On Wed, Apr 12, 2023 at 10:19:26AM +0200, Michal Schmidt wrote: > sq_cmd_timeout is initialized to ICE_CTL_Q_SQ_CMD_TIMEOUT and never > changed, so just use the constant directly. > > Suggested-by: Simon Horman <simon.horman@corigine.com> > Signed-off-by: Michal Schmidt <mschmidt@redhat.com> LGTM, thanks. Reviewed-by: Simon Horman <simon.horman@corigine.com>
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Michal Schmidt > Sent: Wednesday, April 12, 2023 1:19 AM > To: intel-wired-lan@lists.osuosl.org > Cc: Andrew Lunn <andrew@lunn.ch>; netdev@vger.kernel.org; Brandeburg, Jesse <jesse.brandeburg@intel.com>; Kolacinski, Karol <karol.kolacinski@intel.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>; Simon Horman <simon.horman@corigine.com> > Subject: [Intel-wired-lan] [PATCH net-next v2 3/6] ice: remove ice_ctl_q_info::sq_cmd_timeout > > sq_cmd_timeout is initialized to ICE_CTL_Q_SQ_CMD_TIMEOUT and never changed, so just use the constant directly. > > Suggested-by: Simon Horman <simon.horman@corigine.com> > Signed-off-by: Michal Schmidt <mschmidt@redhat.com> > --- > drivers/net/ethernet/intel/ice/ice_common.c | 2 +- > drivers/net/ethernet/intel/ice/ice_controlq.c | 5 +---- drivers/net/ethernet/intel/ice/ice_controlq.h | 1 - > 3 files changed, 2 insertions(+), 6 deletions(-) > Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index c2fda4fa4188..f4c256563248 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c @@ -2000,7 +2000,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res) /* there are some rare cases when trying to release the resource * results in an admin queue timeout, so handle them correctly */ - while ((status == -EIO) && (total_delay < hw->adminq.sq_cmd_timeout)) { + while ((status == -EIO) && (total_delay < ICE_CTL_Q_SQ_CMD_TIMEOUT)) { mdelay(1); status = ice_aq_release_res(hw, res, 0, NULL); total_delay++; diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c index 6bcfee295991..c8fb10106ec3 100644 --- a/drivers/net/ethernet/intel/ice/ice_controlq.c +++ b/drivers/net/ethernet/intel/ice/ice_controlq.c @@ -637,9 +637,6 @@ static int ice_init_ctrlq(struct ice_hw *hw, enum ice_ctl_q q_type) return -EIO; } - /* setup SQ command write back timeout */ - cq->sq_cmd_timeout = ICE_CTL_Q_SQ_CMD_TIMEOUT; - /* allocate the ATQ */ ret_code = ice_init_sq(hw, cq); if (ret_code) @@ -1066,7 +1063,7 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq, udelay(ICE_CTL_Q_SQ_CMD_USEC); total_delay++; - } while (total_delay < cq->sq_cmd_timeout); + } while (total_delay < ICE_CTL_Q_SQ_CMD_TIMEOUT); /* if ready, copy the desc back to temp */ if (ice_sq_done(hw, cq)) { diff --git a/drivers/net/ethernet/intel/ice/ice_controlq.h b/drivers/net/ethernet/intel/ice/ice_controlq.h index c07e9cc9fc6e..e790b2f4e437 100644 --- a/drivers/net/ethernet/intel/ice/ice_controlq.h +++ b/drivers/net/ethernet/intel/ice/ice_controlq.h @@ -87,7 +87,6 @@ struct ice_ctl_q_info { enum ice_ctl_q qtype; struct ice_ctl_q_ring rq; /* receive queue */ struct ice_ctl_q_ring sq; /* send queue */ - u32 sq_cmd_timeout; /* send queue cmd write back timeout */ u16 num_rq_entries; /* receive queue depth */ u16 num_sq_entries; /* send queue depth */ u16 rq_buf_size; /* receive queue buffer size */
sq_cmd_timeout is initialized to ICE_CTL_Q_SQ_CMD_TIMEOUT and never changed, so just use the constant directly. Suggested-by: Simon Horman <simon.horman@corigine.com> Signed-off-by: Michal Schmidt <mschmidt@redhat.com> --- drivers/net/ethernet/intel/ice/ice_common.c | 2 +- drivers/net/ethernet/intel/ice/ice_controlq.c | 5 +---- drivers/net/ethernet/intel/ice/ice_controlq.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-)