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 64D5F3BB690 for ; Wed, 8 Jul 2026 06:15:32 +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=1783491336; cv=none; b=UC0lTa+xQBotYkUE8WEzqyPInH2zyW6ofXIZRXX/wm8ifiie8yVV31RRYZ/gSK/WYz+hPDQdEwTnuVDbJhZRi8bAh99xt+eAeqhbnlRVmiXEcsPVX5XfO3UhlxXVKynRl9GrevI98+AQdx1Rsye5cy0bt6Srj8h2nwnzlGP0xdA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783491336; c=relaxed/simple; bh=AJr4tXEwpWIFZ9uohJ8aIXrS0/0noMhGeGnbh8GMRTU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QhDCm0dsGkvNA0GAiBCp4MoFbxi/iIEd1uxZoIjqQ30X/EMtWzX0NSnqoMwcoGpk3BL87Pz/WOSel6FF5KLvxqgJ7u0H8xC/gN1sYqbVS7wPB8+ElTkhp/dwLieqIoqScUdJcmSHLAbFbnjVQUWY+3t9kpCTx+sMWF89eLI8nuY= 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=QR5hyZKZ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=WusdPgVq; 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="QR5hyZKZ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="WusdPgVq" 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 6685mguN1760975 for ; Wed, 8 Jul 2026 06:15:31 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= 6YqCzIIsJslLxIfUnnI9mEywo1c/jx/Ea+gq4LbmjlI=; b=QR5hyZKZ8l1adJQF k+Ge5467h2hok2o2gQV2yCBEqXlYCjXgb0aEodf7qr9mkZ4Z9zCEHzRKpo0FKQ43 EgMz40f3nKCMjlrEAF8Znegk8OrN4r9FftWjgQwPKyIndgAH/fTVZgug73FLR2Cw 41QX8HNtQPkqS09ctriJwTUTqxAl/7odZa3eIXiFDtguU1d4nOfWnZZNZ0SYnaWh bxQc70dk9o9UiUPDrm+XV2SLHm2TMhDFBq5SwYWqBiVQWMUNWdEW3l0VVwGBb6jr YwJihjKxYLCgWazMtKOE6wEG4bn8oOE3SNct6w8lHIyQy6WP+BhmzW+DFZJrtIuf E8p6vg== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f9gqw8361-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 08 Jul 2026 06:15:31 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2ccb6823efcso4026515ad.0 for ; Tue, 07 Jul 2026 23:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1783491330; x=1784096130; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6YqCzIIsJslLxIfUnnI9mEywo1c/jx/Ea+gq4LbmjlI=; b=WusdPgVqnczbtCb7nefXIYWF+DJF8tYUMzD5ew+M+k9bne+yn/PH2xgvTadnELy/3o tk//lXz63V5kr8dJs0rNydkKxZ0jwBZtGnK8Qo0t6Al55kAwzLISPJsGybMfAy03NRax YGDzwxAYQ9hub1eWFYsGZjaf6lCAR44VbrDbXBh+A609L6RclfwS2KV6A+dky1ZjFHRT CI8kMWafBIgtno8NPaYZ84kUbSC/Qy50YbqFFsR1w6V+Hv8ZGTqIGHEbXonUt6puqNR2 oJOxsp7mGLDknjZSU/1+0HFex8wU+0yS2cRJmHTs8F+iFHXjWDuEodqg18VJIAKc1Wgc Oc9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783491330; x=1784096130; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=6YqCzIIsJslLxIfUnnI9mEywo1c/jx/Ea+gq4LbmjlI=; b=KbmkqsGat+Se1aajkXD3xrH3eJ3FATAXSrLXZ84xUXPLDk+HoyoPcsS2Bj00QHDnBM HLe40hDWHi5RH3ICNBFb6mtjwU2xrgOwH62Hw7jJhgsm+ln5/jFTrx1oeXFz+qebbrZL PMSc4GwF+zcjGKhpxgfaQHHdSZssu7KTRzP9pLL9M4twSU7QGYoWNhqaKxFykeZQjoBN HUto4A/9V9BljChozl4yOWqMlnXX3HgImdsdYR3J9v8y+F8eU6AstQxe20KTCirdv8EX 81mkVii+r/RNparwr96d7ilp4fPMZA3ota9rpYxLkC7AuGWE+NEogL3HWgy8P7oixy/J k6bQ== X-Forwarded-Encrypted: i=1; AHgh+RoMqHChs/9V2gcd83jSOQstgMFOj0v4yS0c2tjVIdl7JWh+UMEMBv0a2KuhhdeAyu11+1XzNSIj4vvlhLs=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8MxP4rba/WK197SJA7ChF0tjp51Rmyi/c9DlSzp0vpmNpYKBo M3I4IhLy0BYaCTcxFaiiX9FzuWryFcuMwh09kAEG93xH7NP0EwhuCFJmNkbZn3U6bavN3Yf9xJY FVTleIB4CQoP4GEFoy6tRGfdrpqwpd48qTuuIhyHkcoSGC6k7T+7mTf9SWuYO503EM/4= X-Gm-Gg: AfdE7ckS/bEXByAIMkEMfbXlGe3A04SwoYVIbj4UCnLlxaFn/mq/6LbZ12CU98R/n1R Wmn/9LWrrA6S178jW1SZlHoW6T1e3xN/PdRb8OS4KFdJ6uzQQj3jkE+O6T+5/wsAlvkBhJELxg/ Y2QkmT4X1w7OikwYW6AMMYV9DSVSsu9GPwy9GbqJY5L6QINhh1Y4jiB6m+nBzZ9QzzVK0Iik/Lz Cmmd0GnGOC0mXlgSjAFnepQ1ADpYV8BnTO0NOR1exR+bmfrwmxpSnbU94cyXjRKI4T2iSskcQbn jFmMwZBmbPU/1K4QbzuWv33c6wYzTaACTrOMGtLxEjN5Xx82DzeId9Gai2gKRY91QA3p7pWZ5Q0 Cyh2ePgUMuxHmFmdapz3owYXyJiRvgBTmWG14cTL8+7oZ X-Received: by 2002:a17:902:d481:b0:2ca:d818:61e5 with SMTP id d9443c01a7336-2ccea4646f0mr12450625ad.26.1783491330264; Tue, 07 Jul 2026 23:15:30 -0700 (PDT) X-Received: by 2002:a17:902:d481:b0:2ca:d818:61e5 with SMTP id d9443c01a7336-2ccea4646f0mr12450275ad.26.1783491329644; Tue, 07 Jul 2026 23:15:29 -0700 (PDT) Received: from hu-ptalari-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9bdb9bbsm23011555ad.4.2026.07.07.23.15.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 23:15:29 -0700 (PDT) From: Praveen Talari Date: Wed, 08 Jul 2026 11:45:21 +0530 Subject: [PATCH 1/3] i2c: qcom-geni: use cancel command before abort on transfer timeout 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: <20260708-fix_cancel_sequence_on_failure_for_i2c-v1-1-dd8f841f36a2@oss.qualcomm.com> References: <20260708-fix_cancel_sequence_on_failure_for_i2c-v1-0-dd8f841f36a2@oss.qualcomm.com> In-Reply-To: <20260708-fix_cancel_sequence_on_failure_for_i2c-v1-0-dd8f841f36a2@oss.qualcomm.com> To: Mukesh Kumar Savaliya , Viken Dadhaniya , Andi Shyti Cc: linux-arm-msm@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Praveen Talari , Naresh Maramaina X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1783491323; l=3536; i=praveen.talari@oss.qualcomm.com; s=20251114; h=from:subject:message-id; bh=AJr4tXEwpWIFZ9uohJ8aIXrS0/0noMhGeGnbh8GMRTU=; b=kmFGJ4UFjcSZh/hDd84DbNqU7F2gcgsrHTRsNxHsY0Q1xI+2EUbi2wxOM/lcuCTYfCMIcxlrk 9NTkSciBF//BSaB7hLGQanrOuyBANI63gnY+TPMNawQSi2IKAm7ikZ9 X-Developer-Key: i=praveen.talari@oss.qualcomm.com; a=ed25519; pk=NGK/88fjyHXgfhIKwag7+uIytOmyOypvZ/hDFaYPEss= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzA4MDA1NyBTYWx0ZWRfXycnSqHxZfYFk 2lRptFklwTcbSSvrJONgoGI++PINzrT8wmck+Ar9VwHwLyFKnSsfVZo+vkSmE/ACFIXi21b1id7 2E+2DUPlI6To4t6RhshU76INmEAp6rEL9joumcSkhV72H9h7W+dEurD9gXSREeMK1MHAziqPF5q iYdrOd6n4xDgxIY3/XX830TteGixnTZWcICv3xB42A2Zrf/VgWoQRK6YThjWAKMvl1JuTNso9QY taYtUF6/2N+3BH7gqgsNA3b38K7dFhxenJODnrLWHVM8QrbvcJ/3zaOgnWThGF0Pl/DAJcrAn7M LXyOigt5iWZuuDGNo4Ub5XZgMsQa0H0NYSpA1hBgPwHJFRcBqEtFqb8KHiEMG0CzmVIg038vATz S7xoeL6ZCLXFXz1mCgfA2ZVIAp2BUFugH6pOj2CbL7jv1axtS8qj1iuuf02l9W1LDQcBAG/rGAo fIRtf18Jj6fkwWvmcUQ== X-Proofpoint-GUID: 0NbMXKcBeinWJSdl4LsVq2BmA7avAUkH X-Proofpoint-Spam-Info: AW1haW4tMjYwNzA4MDA1NyBTYWx0ZWRfX0k484Thy2PCh JlH2FS9dQn13mauO+Gu8Xp8JPSpUFAeBj1WOdLSSI69iU5WiB5F+l0GJtGov0+3zXHZQqbzYnQU RsEV4GIFVKNMSvxCVGl5L4TmjZlrLNw= X-Proofpoint-ORIG-GUID: 0NbMXKcBeinWJSdl4LsVq2BmA7avAUkH X-Authority-Analysis: v=2.4 cv=Wf88rUhX c=1 sm=1 tr=0 ts=6a4deb03 cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=HIFZfxgX9pW5VpyTZ0YA:9 a=QEXdDO2ut3YA:10 a=GvdueXVYPmCkWapjIL-Q:22 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-07_06,2026-07-06_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 bulkscore=0 impostorscore=0 malwarescore=0 spamscore=0 priorityscore=1501 adultscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607080057 The GENI I2C driver currently invokes geni_se_abort_m_cmd() directly when a transfer times out. However, the GENI hardware command cancellation flow requires a cancel command to be issued first. An abort should only be used as a fallback when the cancel operation itself fails to complete. Introduce a dedicated cancel_done completion that is signalled on M_CMD_CANCEL_EN. The timeout recovery path waits for cancel completion and escalates to geni_i2c_abort_xfer() only if the cancel command does not complete within the expected time. Co-developed-by: Naresh Maramaina Signed-off-by: Naresh Maramaina Signed-off-by: Praveen Talari --- drivers/i2c/busses/i2c-qcom-geni.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index 96dbf04138be..15403edb355a 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -74,6 +74,7 @@ enum geni_i2c_err_code { #define PACKING_BYTES_PW 4 #define ABORT_TIMEOUT HZ +#define CANCEL_TIMEOUT HZ #define XFER_TIMEOUT HZ #define RST_TIMEOUT HZ @@ -112,6 +113,7 @@ struct geni_i2c_dev { int err; struct i2c_adapter adap; struct completion done; + struct completion cancel_done; struct i2c_msg *cur; int cur_wr; int cur_rd; @@ -361,6 +363,8 @@ static irqreturn_t geni_i2c_irq(int irq, void *dev) dm_tx_st & TX_DMA_DONE || dm_tx_st & TX_RESET_DONE || dm_rx_st & RX_DMA_DONE || dm_rx_st & RX_RESET_DONE) complete(&gi2c->done); + if (m_stat & M_CMD_CANCEL_EN) + complete(&gi2c->cancel_done); spin_unlock(&gi2c->lock); @@ -387,6 +391,27 @@ static void geni_i2c_abort_xfer(struct geni_i2c_dev *gi2c) dev_err(gi2c->se.dev, "Timeout abort_m_cmd\n"); } +static void geni_i2c_cancel_xfer(struct geni_i2c_dev *gi2c) +{ + unsigned long time_left = msecs_to_jiffies(CANCEL_TIMEOUT); + unsigned long flags; + + reinit_completion(&gi2c->cancel_done); + + spin_lock_irqsave(&gi2c->lock, flags); + if (!gi2c->err) + geni_i2c_err(gi2c, GENI_TIMEOUT); + gi2c->cur = NULL; + geni_se_cancel_m_cmd(&gi2c->se); + spin_unlock_irqrestore(&gi2c->lock, flags); + + time_left = wait_for_completion_timeout(&gi2c->cancel_done, time_left); + if (!time_left) { + dev_err(gi2c->se.dev, "Timeout cancel_m_cmd\n"); + geni_i2c_abort_xfer(gi2c); + } +} + static void geni_i2c_rx_fsm_rst(struct geni_i2c_dev *gi2c) { u32 val; @@ -473,7 +498,7 @@ 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); if (!time_left) - geni_i2c_abort_xfer(gi2c); + geni_i2c_cancel_xfer(gi2c); geni_i2c_rx_msg_cleanup(gi2c, cur); @@ -515,7 +540,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, cur = gi2c->cur; time_left = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT); if (!time_left) - geni_i2c_abort_xfer(gi2c); + geni_i2c_cancel_xfer(gi2c); geni_i2c_tx_msg_cleanup(gi2c, cur); @@ -1107,6 +1132,7 @@ static int geni_i2c_probe(struct platform_device *pdev) gi2c->adap.algo = &geni_i2c_algo; init_completion(&gi2c->done); + init_completion(&gi2c->cancel_done); spin_lock_init(&gi2c->lock); platform_set_drvdata(pdev, gi2c); -- 2.34.1