From nobody Fri Dec 19 13:29:05 2025 Received: from mail-m3298.qiye.163.com (mail-m3298.qiye.163.com [220.197.32.98]) (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 17FFB4C81; Sat, 6 Dec 2025 15:02:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.32.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765033350; cv=none; b=HpjH/b4TCKiXazIR5uwoAAJ+k8qu/esErMehuS3PbPHs0oz/RdKVLzRIEH+sdMtjevT0wUu3EZfw39jdJlPFPTFTX+lAHIRtTjShh/JnDLmLi2aveNKbrR3wedum5gL9Ht+iYGxjlzKYDnlTkxDAQsT72+m14cFWR0jRWmttWs0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765033350; c=relaxed/simple; bh=1CJ19Jg+woksabWb5XtLozeGdxdd9MQkH7jE9FAz8j8=; h=From:To:Cc:Subject:Date:Message-Id; b=Eqc5Jij481T1MetkKaPGSFF0OOMPqvoGTvlkLsf9YO6YusWeAH7v+zKi+hAPSCbZ+DlDM5Hgbl5Zhlyi6KeVwwHmPobr4VQiaFN8PPkV79KXkGjrXND4eOaWzBWJl5UBQT/z4ZG6RV4t4dc2CiaB63D8o4dWbena/Rbu3mFREV0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sangfor.com.cn; spf=pass smtp.mailfrom=sangfor.com.cn; arc=none smtp.client-ip=220.197.32.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sangfor.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sangfor.com.cn Received: from localhost.localdomain (unknown [113.92.158.29]) by smtp.qiye.163.com (Hmail) with ESMTP id 2c3ac3254; Sat, 6 Dec 2025 21:46:33 +0800 (GMT+08:00) From: Ding Hui To: anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, jacob.e.keller@intel.com, intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ding Hui Subject: [Patch net v2] ice: Fix incorrect timeout ice_release_res() Date: Sat, 6 Dec 2025 21:46:09 +0800 Message-Id: <20251206134609.10565-1-dinghui@sangfor.com.cn> X-Mailer: git-send-email 2.17.1 X-HM-Tid: 0a9af3ea0cab09d9kunm9ddc210f18cfd28 X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFITzdXWS1ZQUlXWQ8JGhUIEh9ZQVlCS0MZVkJOGhlNTxlNH0IaH1YVFAkWGhdVEwETFh oSFyQUDg9ZV1kYEgtZQVlKSkhVQklVSk5DVUlCWVdZFhoPEhUdFFlBWU9LSFVKS0lPT09IVUpLS1 VKQktLWQY+ Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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_d= one timeout") Signed-off-by: Ding Hui Reviewed-by: Simon Horman Reviewed-by: Aleksandr Loktionov Reviewed-by: Jacob Keller Reviewed-by: Paul Menzel --- 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/ethe= rnet/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_r= es_ids res) /* there are some rare cases when trying to release the resource * results in an admin queue timeout, so handle them correctly */ - timeout =3D jiffies + 10 * ICE_CTL_Q_SQ_CMD_TIMEOUT; + timeout =3D jiffies + 10 * usecs_to_jiffies(ICE_CTL_Q_SQ_CMD_TIMEOUT); do { status =3D ice_aq_release_res(hw, res, 0, NULL); if (status !=3D -EIO) --=20 2.17.1