From nobody Thu Apr 9 09:36:45 2026 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 BF9EC3D3339 for ; Tue, 10 Mar 2026 04:09:23 +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=1773115765; cv=none; b=OIvM+CA4i/yhlmfuoy423nZxcuWUAGFy+hBrkKfBJyPHutmrSe1JOUHBMQzzyMGeFKpAYyBBCIyILCY0ydJmeJrXP6Cw37xy36RTLJV/3RrgQ7f7LjybGbyOd70IjYoIwVYsKDX1vLCtIbTW4q2lEHebArgTfJIRDL0pROwFRX8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773115765; c=relaxed/simple; bh=h2oKxNLijxlRhbdRVtX8BZAv0v6kEm7MVydl023ItP8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UYMdPk/wo+N8qK+k23Q1BMY03kk+Ww852ScJ5BKdkUTq0xAsOvI0vQ9lQq1bQIekMzPgNponMPVEEfkFetvEiAajYlvKQ91z0N+EmjH2Ndcok8t2gjiMNuTXeDz4M+2Y9yi2HKMnHHejye9r0m4un1B4rwXxglFBmlR7MlM44fI= 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=NSuhjOcr; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=g0Po3PHO; 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="NSuhjOcr"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="g0Po3PHO" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62A2EQ6x2460666 for ; Tue, 10 Mar 2026 04:09:23 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= Mpp/AuYmqB1cFf9TxqAzMz1PfHGCSXuKCzmcpuL4E/8=; b=NSuhjOcr50+VbsHu JWHP7wE3J8O365RvV6BpbliBbkvOeR7pqvR0XNa9w7erip70or0GK4eGYlPZ25DV CPosKxFdqCT95GcLR6810nLlWuH6SG/7pY8iX2e8l8EUp5eWOe03UxHSqKynSKQI JSESs0BR1QU+XY/LPBC29EZ2vkOq/M2jjFWpRZ+uRg6ziP+KgZI6y9QcBCssO8sM XFpglVTmp8Oi7LcO5hEXk3sZOI9iOA5PlUnjGc4x5Ej+PEWi9njhhloAkaY0ir/X o4Ija1BPT7qdTUdn4oslCBONIY+dQXT4O6feXq0YMC2nQb0dnk//BWzJaHxlO1Y/ slTNGQ== Received: from mail-oa1-f69.google.com (mail-oa1-f69.google.com [209.85.160.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4csyv1aga0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 10 Mar 2026 04:09:23 +0000 (GMT) Received: by mail-oa1-f69.google.com with SMTP id 586e51a60fabf-40a4d2264abso59045184fac.2 for ; Mon, 09 Mar 2026 21:09:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773115762; x=1773720562; 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=Mpp/AuYmqB1cFf9TxqAzMz1PfHGCSXuKCzmcpuL4E/8=; b=g0Po3PHOOZ9Gb8a+l/ESTynhjVzVOz4xYtqqBHBvF6CBWZjyT74spdcWvZvIYh2DzV /Iu0JwcuIE44F17isEevgiP6SeN3yCDMSIHV+NcGYmv4NOMGIrHxDCHlczc/RH5KLcso l1eSd3szOg/gR1/aohtOaiuDuKtWLsMyaowiOAdQXHasw0+dHrH5qsWO5P1aYSLwQfpf qcqJPNddXhxb5JAIV1+xoq696dZY85q3LA0pZoVUyS476pi0ZLSnMWKua083T4apTffB XkzYVA2/eYVhfVH+jNRflBHk3vuNKKcNT/TpfVAyZfWEqIBS1zjdkBC22aHXQWH9fLnY oXNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773115762; x=1773720562; 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=Mpp/AuYmqB1cFf9TxqAzMz1PfHGCSXuKCzmcpuL4E/8=; b=uSYuo1F3IfDcZUUFHzNYAGG+TncRrm809O+k2f9oNRG8grvGBbcjNwiHCvlIO3jURB 2MwAzJFywqxay/2UVXKEtLiocSj66jilUoQ26i+SKjIfSj8kBL2pdsVCdG/O6sTCgsz1 g/LE6xNpZIY9VJ0p7JWbwKu6pvQxIBdh+jcMdEuLNxZcr6kJp3P2WvOJdkrh56UP8DmM 5ofwd0IzsJkb2amQL7N1oz2W9C73vFE1S5sKPGF/Z5hre7N9R15G8UVfZ0gLRzKpfjAy FK0lzqTiDct6e99lpuxvmCIn8OdWBTkFFa4OojPN3K+tNZQ0FGYjl/TD4B1ZXH9IDkzb Dz0w== X-Forwarded-Encrypted: i=1; AJvYcCXYQLH8agXLx6BAqSUM4rvhR9MvZR3S1o0ahEmscqSs8BO+PT19zYLUllFL1pVSkQlH/E9g9ggRLnd8keE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+5C09D/WPPkTERUn4qdKeXjGGcTJ2u2Zz+/pmivzTq151l0GE q7OkFGOtZrMta4xMKIQfHf6pAPAl89g01GwB65GfBw4m+HL1G9Cs4SvDlIxjtadqYY6JS73h+Ri 5ZDg4xF226c+jJ+u00a1XF7Dwh0fjnNlzkpUHok8wHXwTk4rmK1sbzcXudK4GIlAbTxw= X-Gm-Gg: ATEYQzyLM/yICMHQohsQxw5BzJHhyvY31y8HqKjn+gvH9P12Y9n4OamDmcXSbhvnGrP ivkVodfcuzC6QBybUKOFxVS9n920DIt4qQ6cPe3WHq5p78tRIXHvAp8giMb2GqvZYjmE0EHwnUv GhDn95n2u7MXa78tM+VbJvnHyUfNtCbjeaKDpEuMkql+DteKuwbLBG6URDMufvi0ZnspUFyNyW1 tIY1zoPhuj7De7jh7e5KNeJY1UN3k63BUxo0oefAalH4oIWPBrDv1t5mZIZDlYMJAmmKR3DpJ9A 6OdKq3VntWXCrcoa63Y0abNKvTdGMgGMUmuRXyzITTKYau6A4mDt8rG5IQ2ghAnDJHjNW0iR5r4 JjWPycXEJoNu95GKlS3WDZqQs3asNvMyrJ7MBalvfrzc= X-Received: by 2002:a05:6870:4e89:b0:417:1534:3c86 with SMTP id 586e51a60fabf-417153495bbmr5126138fac.15.1773115762282; Mon, 09 Mar 2026 21:09:22 -0700 (PDT) X-Received: by 2002:a05:6870:4e89:b0:417:1534:3c86 with SMTP id 586e51a60fabf-417153495bbmr5126126fac.15.1773115761869; Mon, 09 Mar 2026 21:09:21 -0700 (PDT) Received: from [192.168.86.59] ([104.57.184.186]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-41756e24c39sm1595685fac.20.2026.03.09.21.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 21:09:21 -0700 (PDT) From: Bjorn Andersson Date: Mon, 09 Mar 2026 23:09:08 -0500 Subject: [PATCH 7/7] slimbus: qcom-ngd-ctrl: Avoid ABBA on tx_lock/ctrl->lock 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: quoted-printable Message-Id: <20260309-slim-ngd-dev-v1-7-5843e3ed62a3@oss.qualcomm.com> References: <20260309-slim-ngd-dev-v1-0-5843e3ed62a3@oss.qualcomm.com> In-Reply-To: <20260309-slim-ngd-dev-v1-0-5843e3ed62a3@oss.qualcomm.com> To: Srinivas Kandagatla , Greg Kroah-Hartman , Vinod Koul , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Andersson , stable@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2713; i=bjorn.andersson@oss.qualcomm.com; h=from:subject:message-id; bh=h2oKxNLijxlRhbdRVtX8BZAv0v6kEm7MVydl023ItP8=; b=owEBgwJ8/ZANAwAKAQsfOT8Nma3FAcsmYgBpr5lpNWX7vFLIrpfa6+l2c2eP0Ku9eWvHQge+Z FG1Wu67ZPqJAkkEAAEKADMWIQQF3gPMXzXqTwlm1SULHzk/DZmtxQUCaa+ZaRUcYW5kZXJzc29u QGtlcm5lbC5vcmcACgkQCx85Pw2ZrcWjbxAAlaO0beJsT+uPbh5rqq3vZrOVofupsj6DRP8uD8Z XCZKje3vXw6NgoQG4a0DLhNLazfOyacrHarVcvdrvsGZvX/ZJGVTabNZ5QYVkXWrR5eOGRvOGM9 Avw0oQ6oXo6hdhD/A7WupVSl6EItLRsM6wJ0k6YnmXsjz3qibNcH5Xl6otQOK7sHEEnmljCDM5Z mApKUEhD/QqVnZNcAqfPEfcm5zdCeEwNtjkGXm3xae9kHyfRzOl+pmgWyU4pfo8Mic6udemF+ku KSL0kmP/TBNCXInYYIkyUk3qYl2jIymHyY2gEQsjRqiHlvNC6X2iTkLZ8/jbU9N44c8TJPj+yfm 69o4tvekxQcVWe2ZepykzV1j+r94hnxefzeJeUUIJbowt27lka2u2J9SX/Yzi/GajJudKlgWzZ9 Ufp/6lRANogpjkl9NpKG8YiWa+CCHKR91gym2ksCItPs5SBVGUHBm0Aq6ZTZHy5I6SECct6oCD6 dW4BhgH6Vbb5nKeO3SeAT+ty4igkMjrdHS8ohc702PhWdNC7bVIk0BR3EDBm08vMpC6MPQemb2a BbAD3k/aV/NSiLhpBY1iTb/1Menkha/GUQaTjmnDj5ejlqXUmpBaUTHh87hKkhgZXsB+rr9CT5v 5d7fFRJ0F3gu3HXeJ4DJgmOekv8wMYNQJ3yTBjxIXFwE= X-Developer-Key: i=bjorn.andersson@oss.qualcomm.com; a=openpgp; fpr=05DE03CC5F35EA4F0966D5250B1F393F0D99ADC5 X-Proofpoint-GUID: vUHKc3pBTpwUJo06Jfij82dTMiI2VsIG X-Proofpoint-ORIG-GUID: vUHKc3pBTpwUJo06Jfij82dTMiI2VsIG X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEwMDAzMSBTYWx0ZWRfX8EuCiwCxBVne 0u9ebLR5mA3178iGdmm3JqHPfGOF1P0KeXwTBoc6KFB7mIVXwmbPQ2gRmJ0b11bnmNvTBGy2yqw h9KNQb5JEDFjo1tO1kDaTO9Gtr9FdSvVttdYPc9fV5VPgY2yvMw3OTCf8VI5uEMmXVMQlba1UUI 3h4/+LmfMDrSwm5VbrdlKvLa64tR29yJJRsxFUFIhBmeU39wMwheHexBmtWGgRf6H4I0x2oM85k ecYM5fYzNkdJ2dvldfQwOezSIRDYEc2KQvDj46zvYROG2H7bxPV/6Wg0G5efQOVNwBvwcHDydUd 5uFQ1Wdn0Lu9fRbYLFzIvcg2YoZZ1krlojdzTSyJzWZx1cCKGGBCph2YlXyN7kznEfTQgdBjk+Z NkOHem6hLl2wsjX3fy42zUPQzpWViO16KkOKJK+PHCxSheE9zr+BYCguNGKHKAG6d6VLteYQhXG 0/FDQY+blX6u1fXk9qg== X-Authority-Analysis: v=2.4 cv=Cuays34D c=1 sm=1 tr=0 ts=69af9973 cx=c_pps a=zPxD6eHSjdtQ/OcAcrOFGw==:117 a=DaeiM5VmU20ml6RIjrOvYw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=YEP7kvCIQ0LacLc3HpEA:9 a=QEXdDO2ut3YA:10 a=y8BKWJGFn5sdPF1Y92-H:22 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-03-10_01,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 spamscore=0 adultscore=0 priorityscore=1501 phishscore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603100031 During the SSR/PDR down notification the tx_lock is taken with the intent to provide synchronization with active DMA transfers. But during this period qcom_slim_ngd_down() is invoked, which ends up in slim_report_absent(), which takes the slim_controller lock. In multiple other codepaths these two locks are taken in the opposite order (i.e. slim_controller then tx_lock). The result is a lockdep splat, and a possible deadlock: rprocctl/449 is trying to acquire lock: ffff00009793e620 (&ctrl->lock){+.+.}-{4:4}, at: slim_report_absent (drive= rs/slimbus/core.c:322) slimbus but task is already holding lock: ffff00009793fb50 (&ctrl->tx_lock){+.+.}-{4:4}, at: qcom_slim_ngd_ssr_pdr_= notify (drivers/slimbus/qcom-ngd-ctrl.c:1475) slim_qcom_ngd_ctrl which lock already depends on the new lock. Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(&ctrl->tx_lock); lock(&ctrl->lock); lock(&ctrl->tx_lock); lock(&ctrl->lock); The assumption is that the comment refers to the desire to not call qcom_slim_ngd_exit_dma() while we have an ongoing DMA TX transaction. But any such transaction is initiated and completed within a single qcom_slim_ngd_xfer_msg(). Prior to calling qcom_slim_ngd_exit_dma() the slim_controller is torn down, all child devices are notified that the slimbus is gone and the child devices are removed. Stop taking the tx_lock in qcom_slim_ngd_ssr_pdr_notify() to avoid the deadlock. Fixes: a899d324863a ("slimbus: qcom-ngd-ctrl: add Sub System Restart suppor= t") Cc: stable@vger.kernel.org Signed-off-by: Bjorn Andersson --- drivers/slimbus/qcom-ngd-ctrl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctr= l.c index 54a4c6ee1e71fe55794f09575979826d9aa5be9f..75d70de0909a8d17e2410d30f78= 11f32d5eebea3 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1471,15 +1471,12 @@ static int qcom_slim_ngd_ssr_pdr_notify(struct qcom= _slim_ngd_ctrl *ctrl, switch (action) { case QCOM_SSR_BEFORE_SHUTDOWN: case SERVREG_SERVICE_STATE_DOWN: - /* Make sure the last dma xfer is finished */ - mutex_lock(&ctrl->tx_lock); if (ctrl->state !=3D QCOM_SLIM_NGD_CTRL_DOWN) { pm_runtime_get_noresume(ctrl->ctrl.dev); ctrl->state =3D QCOM_SLIM_NGD_CTRL_DOWN; qcom_slim_ngd_down(ctrl); qcom_slim_ngd_exit_dma(ctrl); } - mutex_unlock(&ctrl->tx_lock); break; case QCOM_SSR_AFTER_POWERUP: case SERVREG_SERVICE_STATE_UP: --=20 2.51.0