From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 EF2F93AE713 for ; Thu, 9 Jul 2026 06:00:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783576811; cv=none; b=YFguAicwkeeqwPlOwCw3VY1KxWyUT8V/xtUIcsaLJMZa+MWEsvzPT1I2tvrDZexCI++gZkuGkHQb3p5EFqcxhMZHUVDL0WPmpWygxyf8YmsGDPJ0Cy2sw/N8FYs+ZIZN1pd/W3ldD07lSuqPma5HHUAlfKjJxzYMbCJQNf3JGXQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783576811; c=relaxed/simple; bh=IAMjpAROrbIxgKLXNKMtTjoTS5BkaDQyk/j9B8rbF60=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=c2WPWw3kNQCWismbxyIHs/sCxhoKO/In3Kml+kQkIbBMfT8F8e7TeeaUYVSY/i7tnUJ2YiHf4Bs8uF7GnYaglGstnmxEp5B98peFo0t9eDH2/FejQDA8YDxgabTBkScrJtfp7rfUdRDnn7u/oqptbO67hUCisHobClzhvJM4bDk= 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=W18p0KLO; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=dyfV0tcu; arc=none smtp.client-ip=205.220.180.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="W18p0KLO"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="dyfV0tcu" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 668N8xbj038248 for ; Thu, 9 Jul 2026 06:00:09 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=KVejRE01iSJ9Cu8Vv9/R1+qSCrCIqHbYQPC pZLTjswY=; b=W18p0KLOMqGgiuhbsBZ44PvbjZxW6wgKHH4ebgV7ChQ5lzGfKw4 jKV9zTj/d3hG+ns1/8t6yRA9n1rNkjzW4Xmeb+mKP8WU7IMj1z6nSiQ0qV8cSg6d 75ZsBmvDJfqz/zoSbxbH/SV+arwQcmJfIY8GRqcbkbFuQk4zGkMluvFFbCRpOkcj 9oAUklE8k3iJbJKkkvJpxUFMfm8sB8cCXVdHbOmrvj80LV/XmMNFAQ4yxJ31IiNH U+YcFj/r6Q/1otLfYS1CoNYbx66HWYu6M4u9qvHPJSBp+HjPluJ+M9DTp8xPAcmt 19aIauhynvKLn79unjY0DeyJB55v5YA6+bA== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f9ug6j4gj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 09 Jul 2026 06:00:08 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2cc7e86e7c5so29022405ad.3 for ; Wed, 08 Jul 2026 23:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1783576808; x=1784181608; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=KVejRE01iSJ9Cu8Vv9/R1+qSCrCIqHbYQPCpZLTjswY=; b=dyfV0tcuCBScPAhUp3SJ9DbgdpZuz/SZLCQTcvUiW9SumH6jsXUubCEJw52uaIk97p B/R0XPSf49dOA8TfhUOr/EV4+H6gXcmnNfC0koZjCY+WafoVZ0kQ9FusP7DI6kscFk8L XHYYkc5nuYT3HlJFjnjDnej8oHT5tINq5So74eYDtGyX876/MjYuHe9W+hPv5gBi9DdX 4z+hv44s6XbpDuRTAxKW/zRrqwluPHOhdpScT7RXvQIqfjHMbrmVGSSbPW05n4S0k35J W4bupeGnPNgPhc743MOy3fFN81h6Ij9em5RvNjzZuxMCtmB2ngcHE3MZvgrl43GRoDY2 nuew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783576808; x=1784181608; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=KVejRE01iSJ9Cu8Vv9/R1+qSCrCIqHbYQPCpZLTjswY=; b=LZMqJM/rAjNfhUucqPGFzNCw5H81Kcuxiq5PCqqXU5Q2Ucw/SSyDMswpGuP1jvMqkR hut1tiJO29nzQ+NAc5WrSSXSQYRRkx/7miOBMKVENu6yF/+wMP4JyYRyVrgFYNJIY98N XqdYAWZv6iorDN1DUupwWD+xcz1MgXQJzNigq88OVC4ioFmoiWylJXoAJ85p+O/I8JSM Q4Rtv0jMH0w/QYk0D7QBt5gJ8FPnt6K84Kyof8C79fYpMYhn+dApakvr3LopoDtTnevG ETF2BiN+Sxm3bBUr3kO4u1a+8T9vVixLLMmhgvc7VNHiKDhatg+RFJVJ/cD0Ec4vgnw6 T59A== X-Forwarded-Encrypted: i=1; AHgh+RrtIFpP49ZFqQQh1S/4QQo1cvzwjRJIQHTPfaNu/FqGmndqm73lAJxP0fhI10CdvP7DDzWhkXeHm9Svsgc=@vger.kernel.org X-Gm-Message-State: AOJu0YyecOC6tT0tjOvTIvr6GlRZAyoGDw6flN4ujLAy9SJdstcdL1dy cMGHGcAYP0opZzO4iPYF1ZEJzW8pqpgL69JtlUB3yFDqio3Vir/M3qY5QRZ/caLjD+xN5bBnXk7 9eHLSjnBspHp618EofJAFfkAGO2lUrp3Ocg01x5oXPgHrC7tot8Ah4XwJqqcFfuQ2RDY= X-Gm-Gg: AfdE7cnvf1WCT9q+UyeMUaJEn1boJvjeV4Dp32DL27434IiT3qAwV10ZDZevvCuu8oX KnqK+Rlg+UxxnUdCqjBOzrMXcrYbEl2GlzEyZDDTU4wb+oxz4KHgc22pMNh0oiCc44OKzefZgBU GkpiaRFIYjO+b0cwMAPJsdEgF3Q7zfbvNNrMl1WBOunSJRLWxd4mJSZgFJghBhGfCBlYEGLUKba f+eOICj6EE/Mj+qckOhWLmhdl5dCh7M0oWZjRoBGOhFhvZ+BcpaHjlEuLnzc4m3GyFNjSAAiR1j sJkGKvi89pEQoRbAAMriXYuAlGdO5GX4Mg066zP0Dz3SLPLcDjUFCuiL/uldctHniIucoy5f8sH Yw//Oi1biNHRmL0hUzH4rxNkUPhgOHC7l8wL0fRHl8atiiQ== X-Received: by 2002:a17:903:22ca:b0:2cc:777f:d67d with SMTP id d9443c01a7336-2ccea42ca48mr61321545ad.30.1783576807298; Wed, 08 Jul 2026 23:00:07 -0700 (PDT) X-Received: by 2002:a17:903:22ca:b0:2cc:777f:d67d with SMTP id d9443c01a7336-2ccea42ca48mr61320405ad.30.1783576806265; Wed, 08 Jul 2026 23:00:06 -0700 (PDT) Received: from hu-arandive-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d5c361sm37864555ad.80.2026.07.08.23.00.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 23:00:05 -0700 (PDT) From: Aniket Randive To: mukesh.savaliya@oss.qualcomm.com, viken.dadhaniya@oss.qualcomm.com, andi.shyti@kernel.org, sumit.semwal@linaro.org, christian.koenig@amd.com Cc: linux-i2c@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, naresh.maramaina@oss.qualcomm.com, aniket.randive@oss.qualcomm.com Subject: [PATCH v2] i2c: qcom-geni: Add dynamic transfer timeout based on transfer length and frequency Date: Thu, 9 Jul 2026 11:29:58 +0530 Message-Id: <20260709055958.4089039-1-aniket.randive@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Info: AW1haW4tMjYwNzA5MDA1NCBTYWx0ZWRfX2DG2rPgfMmRs Oo5hTowTgp7cCMgBTK0mH+dF1Jv/v/E2VZIMuXdeEvqH3QVeduDJlBRj7idM2cgMjekJW6Go+9n UMPWVexzjno9I4wh5ZRqd2UxcoEKf9I= X-Proofpoint-GUID: 6H5xYSAqTE8_2gjsnptl4yLuMtKpcV56 X-Authority-Analysis: v=2.4 cv=cL3QdFeN c=1 sm=1 tr=0 ts=6a4f38e8 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=ThEsosvJOpkTSRB3RXoA:9 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-ORIG-GUID: 6H5xYSAqTE8_2gjsnptl4yLuMtKpcV56 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzA5MDA1NCBTYWx0ZWRfX0p0oMsvW7kx8 IzSldcqen+H7rm978hBNJbZvp+0y28/yaUsiT86q4XI8PyOcLxvkhCFsp3xNXlPWPmZEV2fjPNM bcg/unPSWx7WarnMIsJYoRpAzddIX9NEGyE3YGX/L/vVOCCm4OOmoav6WyJlpAi3c4TqUwf2reC VhQHZK5azQD18dvjZAnX2Jou1KdK931mw6hUa714FGLIJQIEdbONPnxxgBK26wBNd6oOPO56lFG +xAKiaJ+VtPTw4mNvX/R/2MDfIQtS6RCKskgzk8Sq6Il3kNLHMHguWcHlrmvX0qiNFhXwmVLDCa uzm12F3DMOuSjjZSoUCXkgDble74Ly5oIo3WUz/PwUDe7UzohFfqFlTxl/Ltb+vspm57gIf4gUA NtUo3NdzSI5/na2pMIRBRis0MUWjMp6CxDD2TOQ/5qhdoRNqtjIaQLotp+cMJm4vvA5zhDzCMpL 0WyMvZaVN3zgoCds8vw== 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-08_05,2026-07-08_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 suspectscore=0 adultscore=0 spamscore=0 phishscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607090054 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. Compute the timeout dynamically from message length and bus frequency with a 10x safety margin over the theoretical wire time and a 300ms floor. For GPI multi-descriptor transfers, use the maximum message length across all queued messages as the per-completion timeout. Signed-off-by: Aniket Randive --- drivers/i2c/busses/i2c-qcom-geni.c | 45 +++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index 96dbf04138be..d43db77b3678 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -74,9 +74,12 @@ 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, 300ms floor */ +#define I2C_TIMEOUT_SAFETY_COEFFICIENT 10 +#define I2C_TIMEOUT_MIN_USEC 300000 + struct geni_i2c_desc { bool no_dma_support; unsigned int tx_fifo_depth; @@ -204,6 +207,16 @@ static int geni_i2c_clk_map_idx(struct geni_i2c_dev *gi2c) return -EINVAL; } +static unsigned long geni_i2c_xfer_timeout(struct geni_i2c_dev *gi2c, size_t len) +{ + size_t bit_cnt = len * 9; + size_t bit_usec = (bit_cnt * USEC_PER_SEC) / gi2c->clk_freq_out; + size_t xfer_max_usec = (bit_usec * I2C_TIMEOUT_SAFETY_COEFFICIENT) + + I2C_TIMEOUT_MIN_USEC; + + return usecs_to_jiffies(xfer_max_usec); +} + static int qcom_geni_i2c_conf(struct geni_se *se, unsigned long freq) { struct geni_i2c_dev *gi2c = dev_get_drvdata(se->dev); @@ -445,7 +458,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, u32 m_param) { dma_addr_t rx_dma = 0; - unsigned long time_left; + unsigned long time_left, timeout; void *dma_buf; struct geni_se *se = &gi2c->se; size_t len = msg->len; @@ -470,8 +483,9 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, gi2c->dma_buf = dma_buf; } + timeout = geni_i2c_xfer_timeout(gi2c, len); cur = gi2c->cur; - time_left = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT); + time_left = wait_for_completion_timeout(&gi2c->done, timeout); if (!time_left) geni_i2c_abort_xfer(gi2c); @@ -484,7 +498,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, u32 m_param) { dma_addr_t tx_dma = 0; - unsigned long time_left; + unsigned long time_left, timeout; void *dma_buf; struct geni_se *se = &gi2c->se; size_t len = msg->len; @@ -512,8 +526,9 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, if (!dma_buf) /* Get FIFO IRQ */ writel_relaxed(1, se->base + SE_GENI_TX_WATERMARK_REG); + timeout = geni_i2c_xfer_timeout(gi2c, len); cur = gi2c->cur; - time_left = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT); + time_left = wait_for_completion_timeout(&gi2c->done, timeout); if (!time_left) geni_i2c_abort_xfer(gi2c); @@ -591,7 +606,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 +616,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 +627,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 +751,16 @@ 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) { + unsigned long timeout; + 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); + + timeout = geni_i2c_xfer_timeout(gi2c, max_len); ret = geni_i2c_gpi_multi_xfer_timeout_handler(gi2c->se.dev, gi2c_gpi_xfer, - XFER_TIMEOUT, &gi2c->done); + timeout, &gi2c->done); if (ret) { dev_err(gi2c->se.dev, "I2C multi write msg transfer timeout: %d\n", @@ -851,8 +874,10 @@ static int geni_i2c_gpi_xfer(struct geni_i2c_dev *gi2c, struct i2c_msg msgs[], i } if (!gi2c->is_tx_multi_desc_xfer) { + unsigned long timeout = geni_i2c_xfer_timeout(gi2c, msgs[i].len); + dma_async_issue_pending(gi2c->tx_c); - time_left = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT); + time_left = wait_for_completion_timeout(&gi2c->done, timeout); if (!time_left) { dev_err(gi2c->se.dev, "%s:I2C timeout\n", __func__); gi2c->err = -ETIMEDOUT; -- 2.34.1