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 DDD424A21 for ; Thu, 3 Sep 2026 16:17:35 +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=1788452258; cv=none; b=ixXtRkwg2ackTGjBzugexXFlMjGJEDg7+F8cuaVTiVW5n6nUNY97H3oCmlJyqeAl04TuMdUPxAyQpeSNQuK5KxlGMcUD1P8HiuXUzZBpvlUhMdUtEfDzd88YlpHSQhkrhgxu2Zz4+zSDVbb0STIwWsLB4XgAZlPi93nZRqSV7l0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788452258; c=relaxed/simple; bh=Haa8A6En87hF77TC/wrpbU2XUUdgWL0nxVdf9yZPJNw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=LQg4qdIJfiCxsMkaJ7ek8+ZTEeqzYlZm5GN4CaGxgKlwgA4xGPVlaVNJjmhTA2i1ToDUx4YOpA9vIOuUXxT3RgFvxejvxFnOp3n5yNjHSFjBmir+i7u4X8QFd2iOHc/gBidpFXC1cn6yab0vFvvaKnxYynutZSo0ENzZw1z2ITs= 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=owEMKQwb; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=HDWnoHqe; 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="owEMKQwb"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="HDWnoHqe" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 683G3cA5820082 for ; Thu, 3 Sep 2026 16:17:34 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= AKgy+YyPBLjA34y5uDngTiOz8D/3Yy+FxwH6+30z6V8=; b=owEMKQwbhDYhMiJS N0dFNdr2upliT9mANjkwnTB1TK0EmNYP4zLIJh9/MrcvuO45xGxTNExEm6REErCk 8F7fKiDdkZ6jGCjU049+/LJ5wHPnPNKOjq1ENtr5+40a/oHuDLXi+bkKMuskIq6a R2PhT1lycTo4rwzBularXMoZ3z8wDE81rNwEinIzYctW8vhxG1aJjMiopJoIVjHr gQtSAtKqdcqdl9MlznUQ3rfk40aD0gymo+bU6w2CoZUeDyJ2FR+HoBiukop/HMUe Gp/QmBiLA3U4Hp/FSXqyR8X1kipZ6vllD9+S0MTiyGsODpp/I5EWpzNcDih36IUf 6vPytw== Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gf82k9av1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 03 Sep 2026 16:17:34 +0000 (GMT) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-cbb20f82a0eso71644a12.0 for ; Thu, 03 Sep 2026 09:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788452254; x=1789057054; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=AKgy+YyPBLjA34y5uDngTiOz8D/3Yy+FxwH6+30z6V8=; b=HDWnoHqeU8xIIWjMTfGOMkaE97S07jtymIVI+ayJs/7aQbtw1x1xsSTBwsR74jjF+5 Pvv2EX52tVRHoh7cUtvzHdZH0G5jeYt+nen1c9gh++RwnStHxiPiYn6usrbg3Xe46muA Z2pAJRIXA23MgjKnZffEr+Wgiv7qAVjE9wpBxWcrPcBAaWqWQmjXZ+BoXiOOOo9vofa1 zbOaSdt2l+pcePHNIDWQ5kbgjtwa7BivFXDwyUlkMJaECY9w2KVXQDDHS5Gk6fPNwKxX T1hJpxUUjSZESNnTWLl9UZZ00frix6x1VTYRuaQgYwpJ2HT/vuPuZquZ30kFZHjUIhOG Xeyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788452254; x=1789057054; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=AKgy+YyPBLjA34y5uDngTiOz8D/3Yy+FxwH6+30z6V8=; b=BODMS+2f463OmcM+9EH247uphnNNfd6l6WsKjtG8dwHTd9JZgZaGqcZHiXdUZy18Oh /+MROVTefvdI82vCQGp6JR65QdZWhQR3VjPmfoR+lsZqeCqnfi3J7CNXQgV1aklP/RYV Cs/a+nJZGR1EbgR02/GHzB+zw3cgfLgDpNyJ+xMiqXNMxGMBHABVzhAWHrDhncTcpfXa dF2uTi72joaZe0YHiYIKhf1oaeT2Twst7d2yiX54gKhKrhfPeBwJuBESwsIwhtgto8rE xUVYmI9gZJdjrAB7rbdQMA8wwaATAwkfZM5hAcYLZUWEy+N8OQXXPDQbaL9xPf48Jm6+ UmQg== X-Forwarded-Encrypted: i=1; AKwUvBxWXh8W7+LvNY2WsiskYu37dGzLEaXkiv3ic4xOZWbbNFIwiwUxsWi+PsMuys0d1CS7THOFKRcX8dA=@vger.kernel.org X-Gm-Message-State: AFuF++n7E6EvXo7CuQRi9hyR2OBJitQBkGT5JyWMaZmUQ8m489rJf8V3 EkeEW1w5GTsc69nvBu2002DQ6IPUv3+nw3WCVFz7sninhJmzFQUBdNM7V6vd0owPxZtN86U4nyp ajBmduCOz8zsa6w3sEupSEL7HI/9FK0TnZ7hFVkKwT/ivTB++LKK6umAA5yWWDYI= X-Gm-Gg: AYBFou2QG577AwlLoMOWTHAjuv+DHIdlha8Ut9k6QF6gX12SnQfK41dQsvAAswoIniy Ax3H1g1VvyzSJDkUPAGDiXerW3wcZ/NLDtgMUivFnP7uiJC/XoidOVqXu4onA62mGqgRpvgZ2Yj MQ4RUd3KxWbY8Ean34XTLsPLi0PdVcpB2o3/inSFrZJ/nUBKSGIUAvde6rUofqASdW/SuI/EKP+ JHE3HHyOzgO9CaDXpqicawiUQ+IJabI2xPItKTH3mrTRjyJ/JITusQyWG3saI3z5Cvi4vjafMxO lahptLjWk1hTf9+4CH2WWR92uS66OhRSSaNythCNULT4+HyErdkcjN4BsFPDT/8q1tqy+kKfrwQ 060ebAZm2Fh9lHefXSNAvDg0bX0VPzL5zZR+Grn4xbcZb X-Received: by 2002:a17:90b:264e:b0:398:dcf6:d40e with SMTP id 98e67ed59e1d1-39aee0c16cdmr22086145a91.17.1788452253536; Thu, 03 Sep 2026 09:17:33 -0700 (PDT) X-Received: by 2002:a17:90b:264e:b0:398:dcf6:d40e with SMTP id 98e67ed59e1d1-39aee0c16cdmr22086033a91.17.1788452252895; Thu, 03 Sep 2026 09:17:32 -0700 (PDT) Received: from [192.168.1.66] ([103.172.4.43]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39ae8ccdecdsm3275395a91.2.2026.09.03.09.17.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Sep 2026 09:17:32 -0700 (PDT) Message-ID: <990a4ab8-bd03-415c-ae95-008cee7740df@oss.qualcomm.com> Date: Thu, 3 Sep 2026 21:47:26 +0530 Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 2/3] i2c: qcom-geni: Add bus recovery support for FIFO mode To: Aniket Randive , Vinod Koul , Frank Li , Mukesh Kumar Savaliya , Viken Dadhaniya , Andi Shyti Cc: linux-arm-msm@vger.kernel.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org References: <20260826-i2c_bus_recovery-v1-0-203f0ec76f84@oss.qualcomm.com> <20260826-i2c_bus_recovery-v1-2-203f0ec76f84@oss.qualcomm.com> Content-Language: en-US From: Jyothi Kumar Seerapu In-Reply-To: <20260826-i2c_bus_recovery-v1-2-203f0ec76f84@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Proofpoint-GUID: Bpezvb20uMLSHSvK2_4DiwUf33_F9Tzl X-Proofpoint-ORIG-GUID: Bpezvb20uMLSHSvK2_4DiwUf33_F9Tzl X-Authority-Analysis: v=2.4 cv=OuJ/DS/t c=1 sm=1 tr=0 ts=6a999d9e cx=c_pps a=Oh5Dbbf/trHjhBongsHeRQ==:117 a=EcXJGs5vVKLEW0aY/poVLA==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=sHvlGgFilqykHc6SfV8A:9 a=QEXdDO2ut3YA:10 a=_Vgx9l1VpLgwpw_dHYaR:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAzMDE0MiBTYWx0ZWRfXwUghaza7vPBh fShJtCP9VbMwXxcugPdZse68kS2Nhub1L15gtgLRmHgBJtWi/6WfaUSZD1I3EZRlLea9IO4Sl1H zvB+lc1DUmdnTnPibXmnoUJ1aeYZQYKV7601UwXTN+q61/g3soL6qwXaHJ2z0r1Er+JBbWzPpyB 3BaaTHy1X0/YI4tk+uyyZuTYHywSY8ggVKxJekLDlI1DEreQVsd8jeNDw6abDWzO5A1NpNgOL7s BEny07SzYyuU5avUqq4cXp2bylOkVMHWkJSdyjUAA1c77txiCUUm/03ifyVID8lrsl53YAvHtGc vkYKTDkDaGfuFxiwOOrdu5vsLEzS2Q2tDlPGUg14gkFHkE25lBoRzcbYvN40ZmfKeYo6lGZckGv SE9qYbGwRjNUkS4Nx0efnp5+pmUx5SL0luUEcTnL0rVNpZ7woeutSjZhHFfEpxwygr0Er0S9jml XS4Hw76fr1L5fx/q9bg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAzMDE0MiBTYWx0ZWRfX8/3Tu3JpG4E+ mse79yTYD3VH0iqQlRdgwd1qMbOdMHkQ5Xu3KncdEjDvJvNg1Ad/M9o0Q6hETbVnkaTa2/yIDvl A9hIIfrK5wq1QLHjSog9RYd4d5alM7c= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-03_05,2026-09-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 spamscore=0 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609030142 On 8/26/2026 3:21 PM, Aniket Randive wrote: > I2C transfers in FIFO mode can fail with -EPROTO, -ETIMEDOUT or > -EAGAIN when a target holds SDA low, leaving the bus stuck and > preventing subsequent transactions. > > Add bus recovery support using the I2C_BUS_CLEAR and I2C_STOP_ON_BUS > hardware opcodes to restore the bus to an idle state. Check the SDA > line state through SE_GENI_IOS.RX_DATA_IN and skip recovery when the > bus is already free. Trigger recovery automatically from > geni_i2c_xfer() on -EPROTO, -ETIMEDOUT and -EAGAIN (arbitration-lost) > errors, and register the recovery callback through i2c_bus_recovery_info > to allow recovery via i2c_recover_bus(). > > This adds bus recovery support for FIFO mode only. > > Signed-off-by: Aniket Randive > --- > drivers/i2c/busses/i2c-qcom-geni.c | 109 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 109 insertions(+) > > diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c > index 658636c1ee0e..9fa1a8ac400c 100644 > --- a/drivers/i2c/busses/i2c-qcom-geni.c > +++ b/drivers/i2c/busses/i2c-qcom-geni.c > @@ -138,6 +138,7 @@ struct geni_i2c_dev { > u32 num_msgs; > struct geni_i2c_gpi_multi_desc_xfer i2c_multi_desc_config; > const struct geni_i2c_desc *dev_data; > + struct i2c_bus_recovery_info rinfo; > }; > > struct geni_i2c_err_log { > @@ -956,6 +957,90 @@ static int geni_i2c_fifo_xfer(struct geni_i2c_dev *gi2c, > return num; > } > > +static int geni_i2c_fifo_bus_cmd(struct geni_i2c_dev *gi2c, u32 cmd) > +{ > + unsigned long time_left; > + unsigned long flags; > + > + /* > + * Clear cur so the IRQ handler does not attempt FIFO watermark > + * filling or draining while the recovery opcode is in flight. > + * cur and err are shared with geni_i2c_irq(), which reads cur and > + * writes err under gi2c->lock, so take the lock around this reset. > + */ > + spin_lock_irqsave(&gi2c->lock, flags); > + gi2c->cur = NULL; > + gi2c->err = 0; > + spin_unlock_irqrestore(&gi2c->lock, flags); > + geni_se_select_mode(&gi2c->se, GENI_SE_FIFO); > + reinit_completion(&gi2c->done); > + > + geni_se_setup_m_cmd(&gi2c->se, cmd, 0); > + time_left = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT); > + if (!time_left) { > + dev_err(gi2c->se.dev, "timeout waiting for bus cmd %u\n", cmd); > + gi2c->abort_done = false; > + geni_se_abort_m_cmd(&gi2c->se); > + time_left = ABORT_TIMEOUT; > + do { > + time_left = wait_for_completion_timeout(&gi2c->done, time_left); > + } while (!gi2c->abort_done && time_left); > + > + if (!time_left) > + dev_err(gi2c->se.dev, "abort timed out for bus cmd %u\n", cmd); > + > + return -ETIMEDOUT; > + } > + > + /* > + * ARB_LOST and BUS_PROTO interrupts may be reported while the bus > + * transitions from stuck to idle during the recovery sequence. > + * The opcode completed successfully so treat these as success. > + */ > + if (gi2c->err == -EAGAIN || gi2c->err == -EPROTO) > + return 0; > + > + return gi2c->err; > +} > + > +static int geni_i2c_recover_bus(struct i2c_adapter *adap) > +{ > + struct geni_i2c_dev *gi2c = i2c_get_adapdata(adap); > + int ret; > + > + ret = pm_runtime_get_sync(gi2c->se.dev); > + if (ret < 0) { > + dev_err(gi2c->se.dev, "bus recovery failed, error turning SE resources:%d\n", ret); > + pm_runtime_put_noidle(gi2c->se.dev); > + return ret; > + } > + > + /* SDA is high means bus is free */ What about SCL line ?> + if (readl_relaxed(gi2c->se.base + SE_GENI_IOS) & RX_DATA_IN) { > + pm_runtime_put_autosuspend(gi2c->se.dev); > + return 0; > + } > + > + ret = geni_i2c_fifo_bus_cmd(gi2c, I2C_BUS_CLEAR); > + if (!ret) > + ret = geni_i2c_fifo_bus_cmd(gi2c, I2C_STOP_ON_BUS); > + > + /* > + * Recovery succeeds only once the slave releases SDA, so the bus > + * state is the authority: RX_DATA_IN high means the bus is free, > + * while a clean opcode status with SDA still low is a failed > + * recovery. > + */ > + if (readl_relaxed(gi2c->se.base + SE_GENI_IOS) & RX_DATA_IN) > + ret = 0; > + else if (!ret) > + ret = -EBUSY; > + > + pm_runtime_put_autosuspend(gi2c->se.dev); > + > + return ret; > +} > + > static int geni_i2c_xfer(struct i2c_adapter *adap, > struct i2c_msg msgs[], > int num) > @@ -981,6 +1066,25 @@ static int geni_i2c_xfer(struct i2c_adapter *adap, > else > ret = geni_i2c_fifo_xfer(gi2c, msgs, num); > > + if (!gi2c->gpi_mode && > + (ret == -EPROTO || ret == -ETIMEDOUT || ret == -EAGAIN)) { > + /* > + * Only attempt recovery if SDA is stuck low. -EPROTO and > + * -ETIMEDOUT indicate bus errors where the target may be > + * holding SDA low. ARB_LOST (-EAGAIN) on a single-controller > + * bus indicates a stuck target, not a real arbitration loss. > + * GPI DMA mode extends this trigger separately. > + */ > + if (!(readl_relaxed(gi2c->se.base + SE_GENI_IOS) & RX_DATA_IN)) { > + int recovery_ret = i2c_recover_bus(adap); > + > + if (recovery_ret) > + dev_err(gi2c->se.dev, > + "bus recovery failed: %d (xfer error: %d)\n", > + recovery_ret, ret); > + } Can we move this to a helper function like "geni_i2c_need_bus_recovery" ?> + } > + > pm_runtime_put_autosuspend(gi2c->se.dev); > gi2c->cur = NULL; > gi2c->err = 0; > @@ -1188,6 +1292,11 @@ static int geni_i2c_probe(struct platform_device *pdev) > if (ret < 0) > return ret; > > + if (!gi2c->gpi_mode) { > + gi2c->rinfo.recover_bus = geni_i2c_recover_bus; > + gi2c->adap.bus_recovery_info = &gi2c->rinfo; > + } In geni_i2c_xfer(), geni_i2c_recover_bus() is invoked directly, then why do we need this ?> + > ret = i2c_add_adapter(&gi2c->adap); > if (ret) > return dev_err_probe(dev, ret, "Error adding i2c adapter\n"); >