On 12/6/2025 5:46 AM, Ding Hui wrote:
> The commit 5f6df173f92e ("ice: implement and use rd32_poll_timeout for
> ice_sq_done timeout") converted ICE_CTL_Q_SQ_CMD_TIMEOUT from jiffies
> to microseconds.
>
> But the ice_release_res() function was missed, and its logic still
> treats ICE_CTL_Q_SQ_CMD_TIMEOUT as a jiffies value.
>
> So correct the issue by usecs_to_jiffies().
>
> Found by inspection of the DDP downloading process.
> Compile and modprobe tested only.
>
> Fixes: 5f6df173f92e ("ice: implement and use rd32_poll_timeout for
> ice_sq_done timeout")
> Signed-off-by: Ding Hui <[email protected]>
> Reviewed-by: Simon Horman <[email protected]>
> Reviewed-by: Aleksandr Loktionov <[email protected]>
> ---Thanks for catching this! Reviewed-by: Jacob Keller <[email protected]> > drivers/net/ethernet/intel/ice/ice_common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- > v1->v2: rebase to net branch and add commit log. > > diff --git a/drivers/net/ethernet/intel/ice/ice_common.c > b/drivers/net/ethernet/intel/ice/ice_common.c > index 046bc9c65c51..785bf5cc1b25 100644 > --- a/drivers/net/ethernet/intel/ice/ice_common.c > +++ b/drivers/net/ethernet/intel/ice/ice_common.c > @@ -2251,7 +2251,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 > */ > - timeout = jiffies + 10 * ICE_CTL_Q_SQ_CMD_TIMEOUT; > + timeout = jiffies + 10 * usecs_to_jiffies(ICE_CTL_Q_SQ_CMD_TIMEOUT); > do { > status = ice_aq_release_res(hw, res, 0, NULL); > if (status != -EIO)
OpenPGP_signature.asc
Description: OpenPGP digital signature
