From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 20008347515; Wed, 29 Apr 2026 12:38:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777466332; cv=none; b=D0jtTiogI0q58D9k2i2fU3kGarVBZAsktSiebUzK0zFGyGsod6xGzGYxupiyG5IKYf7T4hevf0otXHAq4ZCyeYAJI6MlxcMs/OZZRvEQtzMhJyDRepQ5WPus04z0WYitm7eUppwrAjqcf4Dm9Xy++hjwdN6bX7TBXNGahjY5PPg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777466332; c=relaxed/simple; bh=5iqr3LhF3hl5gvStaJsnoghYhuM/axaBjPru5uTyeV0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=WwxnXAEptg9kBEX7EPm1mUBO+axPcLd3th5AmxC073IuDZQHe9NpoV4swPaEOE/pEAeE/20N2k6FFzFgeveV8agz91REhJTTr1HMlUXu5cy9me1/Pr9STkbWCryaacEBAq7ZwELMFyx5dx9JPbN4EyaeV5AZ9uBr/KszTTCzY3g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=cFLqeniB; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="cFLqeniB" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63T8qVXO2889772; Wed, 29 Apr 2026 12:38:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=MyMzVZavCGqlcEvM60cOXovs8ikLNKISClr E4RDYa48=; b=cFLqeniB9J7Z1lWjN3PeKrJ5E7bIp7Kj5uXOH9wDAGvk/zNGgGz /n6bWKh5Z4MhhQRs4TFLO/xVuBBvluuIjg4I9EbuNJDvv8FXNE6xsbSHOx3LBED0 dHA0tnVsOpB/pRQtbthAyVYZoQp/gKB8a870hJNkDwsZflfqEFJh3lHIhx3vUjx4 /pV4X7YhvBEKoMV1GNkxls9ry/rIJzinqW6DRjNzksSJRwSRuB68pcX5/6SDKplT 1i0n5zieUSU2vuEG5Y0qc+GrbU2O9kU5sSF4O1BMJVwb0PvA7aDi4KN0n03eSAv5 1o5/RmCboc6xp019hzLMCbv/oXJRjHrVoJQ== Received: from aptaippmta01.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com [103.229.16.4]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4du0wqbweu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 29 Apr 2026 12:38:28 +0000 (GMT) Received: from pps.filterd (APTAIPPMTA01.qualcomm.com [127.0.0.1]) by APTAIPPMTA01.qualcomm.com (8.18.1.7/8.18.1.7) with ESMTP id 63TCcQ4d010927; Wed, 29 Apr 2026 12:38:26 GMT Received: from pps.reinject (localhost [127.0.0.1]) by APTAIPPMTA01.qualcomm.com (PPS) with ESMTPS id 4ds69w9xdc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 29 Apr 2026 12:38:26 +0000 (GMT) Received: from APTAIPPMTA01.qualcomm.com (APTAIPPMTA01.qualcomm.com [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.1.12) with ESMTP id 63TCcP35010921; Wed, 29 Apr 2026 12:38:26 GMT Received: from shuaz-gv.ap.qualcomm.com (smtphost-taiwan.qualcomm.com [10.249.136.33]) by APTAIPPMTA01.qualcomm.com (PPS) with ESMTPS id 63TCcPVX010918 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 29 Apr 2026 12:38:25 +0000 (GMT) Received: by shuaz-gv.ap.qualcomm.com (Postfix, from userid 4467449) id BD3EB5EE; Wed, 29 Apr 2026 20:38:24 +0800 (CST) From: Shuai Zhang To: Bartosz Golaszewski , Marcel Holtmann , Luiz Augusto von Dentz Cc: linux-arm-msm@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, cheng.jiang@oss.qualcomm.com, quic_chezhou@quicinc.com, wei.deng@oss.qualcomm.com, jinwang.li@oss.qualcomm.com, mengshi.wu@oss.qualcomm.com, shuai.zhang@oss.qualcomm.com, stable@vger.kernel.org, Paul Menzel , Bartosz Golaszewski Subject: [PATCH v5] Bluetooth: hci_qca: Convert timeout from jiffies to ms Date: Wed, 29 Apr 2026 20:38:02 +0800 Message-Id: <20260429123802.1310681-1-shuai.zhang@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-GUID: VV_whwLUmFluEUcunmLcPnYy5eWLjzI_ X-Proofpoint-ORIG-GUID: VV_whwLUmFluEUcunmLcPnYy5eWLjzI_ X-Authority-Analysis: v=2.4 cv=BfDoFLt2 c=1 sm=1 tr=0 ts=69f1fbc4 cx=c_pps a=nuhDOHQX5FNHPW3J6Bj6AA==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=COk6AnOGAAAA:8 a=KKAkSRfTAAAA:8 a=YRo5sTRp44lB9WB98ZgA:9 a=TjNXssC_j7lpFel5tvFf:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDI5MDEyOCBTYWx0ZWRfX+Vgbt7uc7WuT C5s+p6v/WTOdg1jwsTBTq12ddJc4we4Xulq+yhTlGQu6GhJHzfVVLstDfP2IAhHtudjRKaMzCOt f+rcllcq9Yp7zdLKRt63vhpLRQ7B3QA+ceOoyjdmqM/jWrzWss7IhYoO32Z1JV2wRFI15d6kYb3 Astl2f0ahsZFeAnEqJ73v1yXQAQFXsRP+rkEDuBIvsxM/hZ6H0XVN6/oXE2Z/q7mW13JXfsRB1H Uepj7srG5ZgT64gxO71oPn5zke0xt3K0NQczKjU49BeW4ceA2Cus7h91JjEEYQE2Q19c9kXs3qK nQIZVGqG+Vc1LLshEGC94SQnI1AjJKUAvbC+fiJWuyyGQqFdxzSZNIfMiZLAgIZcRp9KprpqBjX ehoo0rDPn61KBVahvdnZO0U1D4zoFdlnISixAfaAFb9m2RbXVonkx/+tMNt/2N+tR5YGO7hGjpe M3f7oRVRKru5eJSZpFQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-28_05,2026-04-28_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 impostorscore=0 malwarescore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604290128 Since the timer uses jiffies as its unit rather than ms, the timeout value must be converted from ms to jiffies when configuring the timer. Otherwise, the intended 8s timeout is incorrectly set to approximately 33s. Wake timer depends on commit c347ca17d62a Cc: stable@vger.kernel.org Fixes: d841502c79e3 ("Bluetooth: hci_qca: Collect controller memory dump during SSR") Reviewed-by: Paul Menzel Acked-by: Bartosz Golaszewski Signed-off-by: Shuai Zhang --- Changes v5: - add depends on commit - Link to v4 https://lore.kernel.org/all/20260327082941.1396521-1-shuai.zhang@oss.qualcomm.com/ Changes v4: - add review-by signoff - Link to v3 https://lore.kernel.org/all/20251107033924.3707495-1-quic_shuaz@quicinc.com/ Changes v3: - add Fixes tag - Link to v2 https://lore.kernel.org/all/20251106140103.1406081-1-quic_shuaz@quicinc.com/ Changes v2: - Split timeout conversion into a separate patch. - Clarified commit messages and added test case description. - Link to v1 https://lore.kernel.org/all/20251104112601.2670019-1-quic_shuaz@quicinc.com/ --- drivers/bluetooth/hci_qca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index cd1834246..89073adec 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1607,7 +1607,7 @@ static void qca_wait_for_dump_collection(struct hci_dev *hdev) struct qca_data *qca = hu->priv; wait_on_bit_timeout(&qca->flags, QCA_MEMDUMP_COLLECTION, - TASK_UNINTERRUPTIBLE, MEMDUMP_TIMEOUT_MS); + TASK_UNINTERRUPTIBLE, msecs_to_jiffies(MEMDUMP_TIMEOUT_MS)); clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags); } -- 2.34.1