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 8838932AAC6 for ; Fri, 22 May 2026 10:01:25 +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=1779444087; cv=none; b=iCHM6HGFS3+as/uk6yRN1rMsbOLMTz8SgonQqjJ1AEgm8i7LGT7o72k/pXNM+ybvynxxxJ+OzFsD62AN7fYyR0JuPBj+xbpOuf+AzwNkxwI6jvKM2T0Vb6IdaNAbXaRQuFLqzBBtyxH/X2W4tQGNbEr3YPrHl2awTXivoIbVoxs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779444087; c=relaxed/simple; bh=BhFCU11Vli0eY4peRB1YT42TDHVLDyHFog9G3pGgq0Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UDZbBk79XbIAJOfZC2YV+Z5viTDvGfAvy2x1QgtRbcaxgFo42bsBuzy3mpp826tJfB3yzqtzkI3tFftrXa1/A6Dnqntg+5R9Wkz21wgla+Eqsj8MCEEQ5tr2xJNU7a3SURK5YdLWwHW1pJiCTcyiOCUJMsVDbMdjClp5r7cQw8Q= 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=RgzlyxGB; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=f4aQfsgI; 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="RgzlyxGB"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="f4aQfsgI" 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 64M5sXNT777027 for ; Fri, 22 May 2026 10:01:24 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= P+6QIFUay/hg2xkAFLiW+meafenw/9VGhbxcOU+YUEk=; b=RgzlyxGB94tPSA5n VmceMUIf6T/pLYNQQdcpkxCalmE7Lg26vv2WwJqGcuj4W7nHxcjpcLM1mBh+iXE+ 72/xMMGiPCSy7eXlSFdyXhFM5lU2AVcEYijhJ3Pvwg8nESKOBXpZmVgkT4GMycdv ic8HSEjmbIz0XqwzDPbrZirpSCFDLRtUNlBVker1EaBUd4nnlU7n8EjkQSNIJLS4 8Z+eaVoJpuyr42ZlyZia5YePGd9O5XuqnE9GP7ajY929j37pU30rk4XZMrBPB8KH 5TmBdinMtcQfwbL69AJe9yj5FeSUdPjKDOny2ntiBeYmvcT8iiep0pyxYhJKlwvw VQ3lWg== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ea94h2xjb-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 22 May 2026 10:01:24 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-83f24cd00f8so3887490b3a.0 for ; Fri, 22 May 2026 03:01:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779444083; x=1780048883; 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=P+6QIFUay/hg2xkAFLiW+meafenw/9VGhbxcOU+YUEk=; b=f4aQfsgIMef3SiBknHfadiM5Nq9zyv0FFfVjVDmXaMfT7Ar01ufma5xf7Eq0G9djDi jZ2hsDEw2h12kmd0SZDrcPLDq7duxVe9UA59IKgskOI4sQZpcwYaLCc9TgY67Ux7xRus yljGHNnNmxowlUKaeQGuGDUdDpvL6XvyoUeoa/xSpJpXvDcvAlixbMeM9qdxI2mCsUq9 4p/CeGYm1jVy7MbjLLJyxN1NerDZ6w2QzpXhn1RaiMUgoaMYsftOLxjpiU+8YB6DBcD0 lha55/sPdstYlMJWAuylGikZ2g5Le+RYl1dLwvj/AWTzt8h3EuFsGzKHuRYL90ceIW4T uXbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779444083; x=1780048883; 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=P+6QIFUay/hg2xkAFLiW+meafenw/9VGhbxcOU+YUEk=; b=VSmTP2XXaxjXu5HLoGs45N8vGz1X3B4a/pYYO4J/viLA/IiWAMGSW16BXnJPIZYTY9 YjKhFFBn1l67snHg42id3IrtYG7XB746xsm5gDniVnfbez560baGmg5VpjRcL1PYDgyu vQNTmp1Kh7x6ZI2H+AXRGvpgUuopZcCXkwUhd2bhWlO4HXzfMQNE+K0yuvElOYgiSrPI hsrC8RVlthbPMKjMEoqbTAgsrtjeVkPooDZWm/DSoc8gGebWXyvvKhsI9jreANjYDVDe Us+T+TJ8Xx2sNsyXvpTsobDGk+Ci1TUFF0Ibn5SVrrpKmlE7ZAshTDVIcHUwPIz7TAJz 60pw== X-Forwarded-Encrypted: i=1; AFNElJ+zsWdFdLF1lq8POLjIweKLL0BAeutisJ16kqiYYgduyajAMV3PGECHp8OzSWLTGh0jWQQfq5AajEYCHJM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywokoc/lWG238izuAXaOzUBoOOBBJcPf9rzBMlZ3iXC8cgto0bP Whpi2BPtd+DTS6tthmDa6ZUxiSIqERgRm0bRTOA2DwmXQLUqCFHf5KSxsu5nBelDEXlNbDd6e7j 5mXAClsDIgaTTDVJ8Q/FmUIxTk8/uG6BYwsv+MkWeldnvP2T1RfjvrLPqX+y9K6TR2pk= X-Gm-Gg: Acq92OE+ouz2ftEDP7DBoLfQIpXjqWfcQX6wYyCN6SZL6qtvsWcI7LJirvwyXxe3aDd XtHPfJPqzH+kOJhKm9oW4AXisGZPmr//iV74XhVKes3wMcyrOz591CV8DChK3g55zMZiNsq3A9k Cqswe3Epezemr21/CYKV+EHdL/cRgf3jgMXYhkYltiQ1GUh4A6xIlaCPBQpv+JGNxmUaZ9IyDmy XBA+npPPsLhCOJD3xzb1m09aPUQPa1QihvQgbsM6N4hFBl8qHuvPCOvY8x1etbUDDnxCPNrhbQo OYtp4WPeBTOaNmK+Ui3Vcp8jaMOB781whAqVCjwtB65pMNJwKjC1fP9enwucd9PPjVSvb6Huwks 0IfUgSVxgvJfb8ZILrhP7jbShrnDiPPWivz/98bVG1fgLc/h7igkHP1Ud X-Received: by 2002:a05:6a00:438b:b0:82c:9f7e:518c with SMTP id d2e1a72fcca58-8415f32e17amr3015032b3a.25.1779444083208; Fri, 22 May 2026 03:01:23 -0700 (PDT) X-Received: by 2002:a05:6a00:438b:b0:82c:9f7e:518c with SMTP id d2e1a72fcca58-8415f32e17amr3014968b3a.25.1779444082645; Fri, 22 May 2026 03:01:22 -0700 (PDT) Received: from hu-krichai-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84164ac9b74sm1516641b3a.3.2026.05.22.03.01.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 03:01:22 -0700 (PDT) From: Krishna Chaitanya Chundru Date: Fri, 22 May 2026 15:30:35 +0530 Subject: [PATCH v2 4/6] net: qrtr: Hold runtime PM during active data path operations 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: <20260522-mhi_runtimepm-v2-4-fbebf41a82bb@oss.qualcomm.com> References: <20260522-mhi_runtimepm-v2-0-fbebf41a82bb@oss.qualcomm.com> In-Reply-To: <20260522-mhi_runtimepm-v2-0-fbebf41a82bb@oss.qualcomm.com> To: Manivannan Sadhasivam , Jeff Hugo , Carl Vanderlip , Oded Gabbay , Jeff Johnson , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Loic Poulain , Sergey Ryazanov , Johannes Berg Cc: mhi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, netdev@vger.kernel.org, mayank.rana@oss.qualcomm.com, quic_vbadigan@quicinc.com, vivek.pernamitta@oss.qualcomm.com, Krishna Chaitanya Chundru X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1779444039; l=5157; i=krishna.chundru@oss.qualcomm.com; s=20230907; h=from:subject:message-id; bh=BhFCU11Vli0eY4peRB1YT42TDHVLDyHFog9G3pGgq0Q=; b=UVBS6HbShn+y5fJQr2GY5SAYIopHLLknf3feWh42YxN8Cfo16vZuvf1XVAOydKz7dA3b3K6eD /OQhLOIVtQKBDTOurt56nsyDbIEnzo5jjzEyQsOPqQr9m2m8ymwcde3 X-Developer-Key: i=krishna.chundru@oss.qualcomm.com; a=ed25519; pk=10CL2pdAKFyzyOHbfSWHCD0X0my7CXxj8gJScmn1FAg= X-Proofpoint-GUID: xgTUtB2TCb2y1UuTkWvZBTuFQJLF2951 X-Authority-Analysis: v=2.4 cv=QblWeMbv c=1 sm=1 tr=0 ts=6a102974 cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=mqvsnErzViNTL7-QoTgA:9 a=QEXdDO2ut3YA:10 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-ORIG-GUID: xgTUtB2TCb2y1UuTkWvZBTuFQJLF2951 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIyMDA5OSBTYWx0ZWRfX9loEwg/rDE/7 WS7h/JjNBUgRIgUVO4kB4O99Y67xOwCkOvgQd95PwGe2gBc1z1x0NVode7xcIRt60hQrc/pQFM+ Qk6jSl+pXy4AV9m+5E4H8k/UXSXGFycOzwo/gfrPdL+CVkPuD5mHl218D9d+NeqCMzCLVJLIY5U aFaGueXP3TtRG7gFNkHqQ4At3HCAaYvM43TrqP9CrUvmJy38ULP5/8BIqVtTKtoRz/sBTZ2Abai OlghcD7aLTm+OZ8nY52ESclCDZVYQcnQH2Mbb2PnjswJrIW6RT6KXAenv845Wpg0TnEwLsNAwYZ tssQNvzn9xoA4ZsD5pGriuBvIbvetgx6l0CFGaaHvMUWSsIaUJ/AbUOkTnKtmnZRyksuv6HqGF1 xW6Z3wh3NRNO+D9Tsu2vlVd7DZXh6nl4NIkiM0j9PwiQ1iFlXsyrbyKCRzkGVbbXPkl5DwEyYwf KGsl1LQPZ/lnMHAVMoQ== 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-05-22_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 suspectscore=0 adultscore=0 clxscore=1015 priorityscore=1501 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605220099 The QRTR MHI transport driver does not coordinate with runtime PM, which allows the underlying MHI controller to be runtime-suspended while transmit, receive, or RX buffer refill operations are in progress. This can lead to stalled transfers or failed buffer queueing once runtime PM is enabled in the MHI core. Add runtime PM reference counting around TX, RX, and buffer management operations to keep the controller active for the duration of each critical section. Enable runtime PM during probe and take explicit references around these data path operations. Signed-off-by: Krishna Chaitanya Chundru --- net/qrtr/mhi.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/net/qrtr/mhi.c b/net/qrtr/mhi.c index 80e341d2f8a4..cba7a5daf7a4 100644 --- a/net/qrtr/mhi.c +++ b/net/qrtr/mhi.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -38,11 +39,20 @@ static void qcom_mhi_qrtr_dl_callback(struct mhi_device *mhi_dev, if (rc == -EINVAL) dev_err(qdev->dev, "invalid ipcrouter packet\n"); + rc = pm_runtime_get(&qdev->mhi_dev->dev); + if (rc < 0 && rc != -EINPROGRESS) { + dev_err(&mhi_dev->dev, "pm_runtime_get failed %d\n", rc); + pm_runtime_put_noidle(&qdev->mhi_dev->dev); + return; + } + /* Done with the buffer, now recycle it for future use */ rc = mhi_queue_buf(mhi_dev, DMA_FROM_DEVICE, mhi_res->buf_addr, mhi_dev->mhi_cntrl->buffer_len, MHI_EOT); if (rc) dev_err(&mhi_dev->dev, "Failed to recycle the buffer: %d\n", rc); + + pm_runtime_put(&mhi_dev->dev); } /* From QRTR to MHI */ @@ -54,6 +64,8 @@ static void qcom_mhi_qrtr_ul_callback(struct mhi_device *mhi_dev, if (skb->sk) sock_put(skb->sk); consume_skb(skb); + + pm_runtime_put(&mhi_dev->dev); } /* Send data over MHI */ @@ -69,13 +81,21 @@ static int qcom_mhi_qrtr_send(struct qrtr_endpoint *ep, struct sk_buff *skb) if (rc) goto free_skb; + rc = pm_runtime_resume_and_get(&qdev->mhi_dev->dev); + if (rc) { + dev_err(&qdev->mhi_dev->dev, "pm_runtime_resume_and_get failed %d\n", rc); + goto free_skb; + } + rc = mhi_queue_skb(qdev->mhi_dev, DMA_TO_DEVICE, skb, skb->len, MHI_EOT); if (rc) - goto free_skb; + goto runtime_put; return rc; +runtime_put: + pm_runtime_put(&qdev->mhi_dev->dev); free_skb: if (skb->sk) sock_put(skb->sk); @@ -90,20 +110,30 @@ static int qcom_mhi_qrtr_queue_dl_buffers(struct mhi_device *mhi_dev) void *buf; int ret; + ret = pm_runtime_resume_and_get(&mhi_dev->dev); + if (ret) { + dev_err(&mhi_dev->dev, "pm_runtime_resume_and_get failed %d\n", ret); + return ret; + } + free_desc = mhi_get_free_desc_count(mhi_dev, DMA_FROM_DEVICE); while (free_desc--) { buf = devm_kmalloc(&mhi_dev->dev, mhi_dev->mhi_cntrl->buffer_len, GFP_KERNEL); - if (!buf) + if (!buf) { + pm_runtime_put(&mhi_dev->dev); return -ENOMEM; + } ret = mhi_queue_buf(mhi_dev, DMA_FROM_DEVICE, buf, mhi_dev->mhi_cntrl->buffer_len, MHI_EOT); if (ret) { dev_err(&mhi_dev->dev, "Failed to queue buffer: %d\n", ret); + pm_runtime_put(&mhi_dev->dev); return ret; } } + pm_runtime_put(&mhi_dev->dev); return 0; } @@ -121,12 +151,22 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev, qdev->dev = &mhi_dev->dev; qdev->ep.xmit = qcom_mhi_qrtr_send; + pm_runtime_no_callbacks(&mhi_dev->dev); + rc = devm_pm_runtime_set_active_enabled(&mhi_dev->dev); + if (rc) + return rc; + + rc = pm_runtime_resume_and_get(&mhi_dev->dev); + if (rc) { + dev_err(&mhi_dev->dev, "pm_runtime_resume_and_get failed %d\n", rc); + return rc; + } dev_set_drvdata(&mhi_dev->dev, qdev); /* start channels */ rc = mhi_prepare_for_transfer(mhi_dev); if (rc) - return rc; + goto runtime_put; rc = qrtr_endpoint_register(&qdev->ep, QRTR_EP_NID_AUTO); if (rc) @@ -138,12 +178,15 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev, dev_dbg(qdev->dev, "Qualcomm MHI QRTR driver probed\n"); + pm_runtime_put(&mhi_dev->dev); return 0; err_unregister: qrtr_endpoint_unregister(&qdev->ep); err_unprepare: mhi_unprepare_from_transfer(mhi_dev); +runtime_put: + pm_runtime_put(&mhi_dev->dev); return rc; } @@ -151,10 +194,18 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev, static void qcom_mhi_qrtr_remove(struct mhi_device *mhi_dev) { struct qrtr_mhi_dev *qdev = dev_get_drvdata(&mhi_dev->dev); + int err; + + err = pm_runtime_resume_and_get(&mhi_dev->dev); + if (err) + dev_err(&mhi_dev->dev, "pm_runtime_resume_and_get failed %d\n", err); qrtr_endpoint_unregister(&qdev->ep); mhi_unprepare_from_transfer(mhi_dev); dev_set_drvdata(&mhi_dev->dev, NULL); + + if (!err) + pm_runtime_put(&mhi_dev->dev); } static const struct mhi_device_id qcom_mhi_qrtr_id_table[] = { -- 2.34.1