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 B79E03FB7E3 for ; Mon, 20 Jul 2026 11:41:38 +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=1784547702; cv=none; b=Il8aBT6LQ/IubqKG32/HcbVJ31Kg6hHu0aD4pvxQgUCFSBFvOKMJaj5zw/Tqwf/36P+xpCxMzSxpd7oSw2GDuQB60t/RNfQbNVeptUPm5w0OL0k293P+hpQFTFZQ4h68R7KFia9AT7jMii7TkBG9wIjlGxxPf/dUu3JHOVVFNtY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784547702; c=relaxed/simple; bh=jchbetBd13C8tpwMYHDplyU8W2EBYr6hvA/y/3aWq7I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D87vgWBFKk/RPDp++q6cxkRXtNFh+ACQqp0pMj1sy4rCpcGjhdV4ZUNFw3leSpkMjeh04e6fCoCL5sIapQzWsxrUa38JIbcnanGGmtIqIEL5ousz5PFZ7EoSUjC9WPNabMoHd53Vv2BRjkuP1iu7mX7v9kBjlh+/9swCxkFuyKE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=Q3kQFsBb; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=VJHPVwSf; 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=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="Q3kQFsBb"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="VJHPVwSf" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66KAvQOh3434601 for ; Mon, 20 Jul 2026 11:41:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= bYAcywDZPEMGMOkfGefFOa5YEZJOmG8sDGPXejEMrao=; b=Q3kQFsBbXY1N+4RR GDY38qxk/S2b/HpDY0fsqtUIMKBhMTJG1gvSHN26GRLQmBiKichgpk9rXkthRZH4 U7r3W7xPn+kuHRi+FlnL9HaNemaZ0ZEX7XMCz3SGlOeUa7fvHo6bmmZZMxWik25b u5rvdS9PU4wX/h20LaE7NM3ts51vkw6znI6wZfxwAoZ9I5NrDItakw0S0VENOlC9 Hjm5rioh+Cg8xjhEFcF9z6soYvYEqnmdAGnAk3q6+IlwKiibIJPyAuqCR0tTue8E e8soGaYqahBgzL9EitJTE/7q6QOQiclmhnhrLr0b/qK/qGDnlbmu6prHMb0Jo6qG 1W46jg== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fhfpg11wg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 20 Jul 2026 11:41:35 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-84870e7f498so10552333b3a.3 for ; Mon, 20 Jul 2026 04:41:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784547695; x=1785152495; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=bYAcywDZPEMGMOkfGefFOa5YEZJOmG8sDGPXejEMrao=; b=VJHPVwSf247z80AathXeFaIdWo9p2IFurY7XYrsQ2J/bXRRzL5zvMdpq7MznITY8pj 0Y0N/hodDzz0mif2Q+L+G8lstZxwOePud/bg/LHkt6KG/hXSXskYxXFMX++a3hM3pNOz 9hpemsGnQO02bKr+6hckKdJrCyUgsUYtSoErujzrfFRWZH78gfKx2c4FLHdZW5s3ZnbV +g6n4eGIw9Xmq8mKVE+zwXfz8hguUa1vLkAN/VL+VqXChqBZbB/P1kilWRG9sRmdJZVa JBFDzFMS0jKKcejz0fhvCMBs5A47AZsfLGnA3TtAypYcmCm35Wp7llFQnKD+p8DnZnS0 7kOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784547695; x=1785152495; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=bYAcywDZPEMGMOkfGefFOa5YEZJOmG8sDGPXejEMrao=; b=WQJBBwHhk5wliwveJniOcDd2OF6Hbu95bqpighDuqjq9hZtujr2bv2uovx9UK7m7ta wxyCOSgy7oIDsu+/SCStHWtPG4eySIFxnru4p4WmBnsBDA9aCL/2il62rf5Zg9FCRDX7 HjhLhVVVKpAhHSzExLOx6QXWgWXCHa6N5iMaTrVqtJnqT8Z74jXq27r2BW5diD5+urMP 5hswIXsrCedlCBuYFJMamBP6lXZtQGju4T2CwuS/gaWdx430ibTyJC7iaStcaKzps9EU jTL2wZHQr5/auoS7g3pQBF+nkHY8Eue4RjvE47qygorgpCwpFjlso+9RjBKGo2y9nZC+ ydMA== X-Forwarded-Encrypted: i=1; AHgh+RqAcCvjLGJmExveCEusaIsbSAC1faZV7XIU2GiPn+Zyf5yA9Qfep+88K9lMtq8ukxwHxUl+Sw2KQwdbbZE=@vger.kernel.org X-Gm-Message-State: AOJu0Ywq1u5T1RntpLNCPQIQVwasnbShByU7kjuBiS7ySZeC6fdbeDlV f1jMUvUPqAI9JopX1O6qodbjcCVn+ls44o4OzTtjsLMftiy1Jv8kPqnOjZz0nB2yWGTtLAn5g5f 3mA7Xm4XtjPoYV9XAG86wH9Et9hlIjbOZqwidOHETc4LnoFGnwhrD9yF0rbPF5TWJ9fI= X-Gm-Gg: AfdE7cnHZJijptPumeKTaM4b4+sltV5yhZm3bLT/j7Hzmv5GO46LrVKw0D7HePFQNgP /P3bS0Oj2u/e/UMlqAcnKWbzo9aQFCcHWIZowOX59tSVN9PA6egW74stVt6h6j4Q+6otI9uovRY CqhxxAiPal016N2PO2cXL1F2UxOsWMP7wgWKlmbVnChnHtpcy5DW0lc5Y8I+dbuyadTNrmS3QZA inlw7uT7Exfb9JR0EVrCx2wx+NTeiUUKiMOoIqXuiYdi9s3LpER8kWMpl9iFd8onBeMzAM2+KAe 7CdiKTzsWkbBW7S+6w74z1xWLexnxzGYMn2fraWyMC3AkAk+R/Vy42igSNVZSCI3wcSWOLu7gth 9dEnYrdP6rqiiKj97FAlQ6Y/fmKrcnbXVp98= X-Received: by 2002:a05:6a00:1a94:b0:847:770f:da4c with SMTP id d2e1a72fcca58-84c2930540cmr13432689b3a.16.1784547695096; Mon, 20 Jul 2026 04:41:35 -0700 (PDT) X-Received: by 2002:a05:6a00:1a94:b0:847:770f:da4c with SMTP id d2e1a72fcca58-84c2930540cmr13432653b3a.16.1784547694597; Mon, 20 Jul 2026 04:41:34 -0700 (PDT) Received: from hu-arandive-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84c2adfdfe9sm5450701b3a.27.2026.07.20.04.41.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 04:41:34 -0700 (PDT) From: Aniket Randive Date: Mon, 20 Jul 2026 17:11:20 +0530 Subject: [PATCH v6 2/2] i2c: qcom-geni: Add dynamic transfer timeout based on transfer length and frequency Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260720-master-v6-2-671261b05c61@oss.qualcomm.com> References: <20260720-master-v6-0-671261b05c61@oss.qualcomm.com> In-Reply-To: <20260720-master-v6-0-671261b05c61@oss.qualcomm.com> To: Andi Shyti , Mukesh Kumar Savaliya , Viken Dadhaniya Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Aniket Randive X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784547685; l=5385; i=aniket.randive@oss.qualcomm.com; s=20260325; h=from:subject:message-id; bh=jchbetBd13C8tpwMYHDplyU8W2EBYr6hvA/y/3aWq7I=; b=Gh6RVhZemNZ4QiUP98gCN2YcGrvaoFid1cnKAKNiRFA19Lb9SVceCC9I27CZNo4JpQDJpMLiQ TTE5od8goIPBD3BGDjcMJBLFa7l/s8GHGeOjRNUvuW1tl1IDDqhOFSQ X-Developer-Key: i=aniket.randive@oss.qualcomm.com; a=ed25519; pk=4o37X1ZqGbCO/T2SR8kq/HnWvq0yb1RUlFuNukovbQk= X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIwMDEzMCBTYWx0ZWRfX1JwbaW8cC+H4 Fj7spdQKJdxUV8olWjxrqqwLfNo0uxQvzgDI16ML26MNWrGM9evOCFHbhD0cAf4+vGZBddS3fd/ JkcedoZe0OAp2O/8dL3aEtTLKj1yrtY= X-Proofpoint-GUID: KSv53GmteGaPjvw9tbrUuimgeoNB6RF8 X-Proofpoint-ORIG-GUID: KSv53GmteGaPjvw9tbrUuimgeoNB6RF8 X-Authority-Analysis: v=2.4 cv=c+6bhx9l c=1 sm=1 tr=0 ts=6a5e096f cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=S_uJhbi9Giy6tt7Agy8A:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIwMDEzMCBTYWx0ZWRfX9WMN/d2ewl50 3f5dAkevLcJ1e7b/jBjafY5IfSSKTvddC8kQ6duqgzsuEVVWZbq1uDtGaW/zTvnrq/7GxX7izWo T36fnrJYbGQb3FyChNK689Eyh2wP7WwMTfSLQDU6Qh3ds7yJEiyoJ2Txs1DFmYsRIIDht4NJSzM zlYAkzlkklklK2bhQf2DVNNZTWu+ylqHHalCAvVgjffkJ/FtffYq/6rQUisCYP+Bnx0p8wNCLJ7 8I4Pwq+0m4DZl7ZQ4fvTAojSUe62vRVLQl+WN7dhd4mAi5Z9IysbjnnwcYf/4oJtcFg15SVO9+y QBK+S9aXSit1NXdRX6nJfs+rFk4WvQSL451y2HKyATIEJfGpiAFMhq6HX3c3J7P0NOTv3VUJnZK 2xvdwJVz+axNYmtTrDlZa023GU+2uHHi0exrayfFM6kYVAmuKl1zl4hZWnFb33sg+hjE0JsxtRC +d0M583/gpAjzUlNAlA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-20_02,2026-07-20_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 phishscore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607200130 The driver uses a static XFER_TIMEOUT of HZ (1 second) for all transfers regardless of message length or bus frequency, causing unnecessary delays on error paths. Use i2c_update_timeout() from i2c-core to compute the timeout dynamically from the maximum message length across the transfer batch and the bus frequency, then read adap->timeout at each wait site. The timeout is updated once per transfer batch in geni_i2c_xfer() so all internal paths (FIFO rx/tx and both GPI modes) use a consistent value. A 10x safety margin over the theoretical wire time is applied, with a 300ms floor to account for I2C clock stretching and other situations where a slave may keep SCL asserted for an extended period, including faulty devices holding the bus. Both constants remain private to this driver. Signed-off-by: Aniket Randive --- drivers/i2c/busses/i2c-qcom-geni.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index 96dbf04138be..d6fab3aa8468 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -74,9 +74,14 @@ enum geni_i2c_err_code { #define PACKING_BYTES_PW 4 #define ABORT_TIMEOUT HZ -#define XFER_TIMEOUT HZ #define RST_TIMEOUT HZ +/* 9 bits per byte (8 data + 1 ACK), 10x safety margin */ +#define I2C_TIMEOUT_SAFETY_COEFFICIENT 10 + +/* 300ms floor: budget for clock stretching; slave may hold SCL low indefinitely */ +#define I2C_TIMEOUT_MIN_USEC 300000 + struct geni_i2c_desc { bool no_dma_support; unsigned int tx_fifo_depth; @@ -471,7 +476,9 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, } cur = gi2c->cur; - time_left = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT); + i2c_update_timeout(&gi2c->adap, gi2c->clk_freq_out, len, + I2C_TIMEOUT_SAFETY_COEFFICIENT, I2C_TIMEOUT_MIN_USEC); + time_left = wait_for_completion_timeout(&gi2c->done, gi2c->adap.timeout); if (!time_left) geni_i2c_abort_xfer(gi2c); @@ -513,7 +520,9 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, writel_relaxed(1, se->base + SE_GENI_TX_WATERMARK_REG); cur = gi2c->cur; - time_left = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT); + i2c_update_timeout(&gi2c->adap, gi2c->clk_freq_out, len, + I2C_TIMEOUT_SAFETY_COEFFICIENT, I2C_TIMEOUT_MIN_USEC); + time_left = wait_for_completion_timeout(&gi2c->done, gi2c->adap.timeout); if (!time_left) geni_i2c_abort_xfer(gi2c); @@ -591,7 +600,7 @@ static void geni_i2c_gpi_multi_desc_unmap(struct geni_i2c_dev *gi2c, struct i2c_ * geni_i2c_gpi_multi_xfer_timeout_handler() - Handles multi message transfer timeout * @dev: Pointer to the corresponding dev node * @multi_xfer: Pointer to the geni_i2c_gpi_multi_desc_xfer - * @transfer_timeout_msecs: Timeout value in milliseconds + * @transfer_timeout_msecs: Per-message completion timeout in jiffies * @transfer_comp: Completion object of the transfer * * This function waits for the completion of each processed transfer messages @@ -601,7 +610,7 @@ static void geni_i2c_gpi_multi_desc_unmap(struct geni_i2c_dev *gi2c, struct i2c_ */ static int geni_i2c_gpi_multi_xfer_timeout_handler(struct device *dev, struct geni_i2c_gpi_multi_desc_xfer *multi_xfer, - u32 transfer_timeout_msecs, + unsigned long timeout_jiffies, struct completion *transfer_comp) { int i; @@ -612,7 +621,7 @@ static int geni_i2c_gpi_multi_xfer_timeout_handler(struct device *dev, if (multi_xfer->msg_idx_cnt != multi_xfer->irq_cnt) { time_left = wait_for_completion_timeout(transfer_comp, - transfer_timeout_msecs); + timeout_jiffies); if (!time_left) { dev_err(dev, "%s: Transfer timeout\n", __func__); return -ETIMEDOUT; @@ -736,8 +745,17 @@ static int geni_i2c_gpi(struct geni_i2c_dev *gi2c, struct i2c_msg msgs[], dma_async_issue_pending(gi2c->tx_c); if ((msg_idx == (gi2c->num_msgs - 1)) || flags & DMA_PREP_INTERRUPT) { + size_t max_len = 0; + int j; + + for (j = 0; j < gi2c->num_msgs; j++) + max_len = max_t(size_t, max_len, msgs[j].len); + i2c_update_timeout(&gi2c->adap, gi2c->clk_freq_out, max_len, + I2C_TIMEOUT_SAFETY_COEFFICIENT, + I2C_TIMEOUT_MIN_USEC); ret = geni_i2c_gpi_multi_xfer_timeout_handler(gi2c->se.dev, gi2c_gpi_xfer, - XFER_TIMEOUT, &gi2c->done); + gi2c->adap.timeout, + &gi2c->done); if (ret) { dev_err(gi2c->se.dev, "I2C multi write msg transfer timeout: %d\n", @@ -852,7 +870,10 @@ static int geni_i2c_gpi_xfer(struct geni_i2c_dev *gi2c, struct i2c_msg msgs[], i if (!gi2c->is_tx_multi_desc_xfer) { dma_async_issue_pending(gi2c->tx_c); - time_left = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT); + i2c_update_timeout(&gi2c->adap, gi2c->clk_freq_out, msgs[i].len, + I2C_TIMEOUT_SAFETY_COEFFICIENT, + I2C_TIMEOUT_MIN_USEC); + time_left = wait_for_completion_timeout(&gi2c->done, gi2c->adap.timeout); if (!time_left) { dev_err(gi2c->se.dev, "%s:I2C timeout\n", __func__); gi2c->err = -ETIMEDOUT; -- 2.34.1