From nobody Mon Jun 8 07:22:48 2026 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 C1F4D3D5658 for ; Thu, 4 Jun 2026 20:10:12 +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=1780603814; cv=none; b=WejQD1WgTDTKtmaFPzjChmY+pKZ1x8UKtXoMI/nmntbzKXd6F3ue4rIEzBnxNgj+1e10wFYSBe5Ui/EaNPbQCPmEz2pYuY9l7SPhJBu2yh8AeX/lrQ52Tlbu3HNC63ULRJS6A5XBnLzF0ELKbJA5f99xnLrvgbszjL9H8qqKjDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780603814; c=relaxed/simple; bh=+zvEwI5qWeXADBSn5KQ1PAAxZHkjGUPloIsHC/SYsTA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YuRFTDcvtG9gPnfQlqoUPiRC4U1M/oZGr/yuF9+kzmdZx1fJbu57lvJzC925o1aHYcZYnSYp2ShV5IsNV/nUXivpxkh9iW9+jM/kSzKM/OAFplSC4yxDSwtxoIH++dEfJxL6GvJU5DyL/I8A8X8kaC2rAV8thwbwvse4LBIekHQ= 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=BFkww4E7; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=iWLBoyvD; 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="BFkww4E7"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="iWLBoyvD" 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 654EFlZt1132186 for ; Thu, 4 Jun 2026 20:10:12 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= mWmDJM0N9mm3A02aZeVYmXR6PbCLJg/3M0xQs4mdPe4=; b=BFkww4E76r5J+nhc RJFp1m4kVxLhSh6s+3PZc4TP7yxQng50Gc20pAM17T/QZYJEc+26nQYuImhwgI6u Wv+dz3JpjJfpasuf6kyEpSpAi+LeVoUIIN7G7/EblkUOewrWJbmKM7U2o9hR0fFX 1jhGWg1OPQY64dLohg5nASQsy1G3MvbjceED7QqAsd3uzzJ34U+q+y7n5ry7a1WM Wzc1T8+fEwsulNdqvqzgZiwhqWY7sMFJMNWBo7cFcveKYnRAuwjhrLqI2cr0HcBK uzX/A0c/Yfn1kWuiQfb2Zh52hAKBGU4hd91yIBDZrdrYLMROUlpij+ep+/+jHUF6 Jmxh0w== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ek5wsk1rc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 20:10:11 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-8422f987f2eso1809615b3a.3 for ; Thu, 04 Jun 2026 13:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780603811; x=1781208611; 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=mWmDJM0N9mm3A02aZeVYmXR6PbCLJg/3M0xQs4mdPe4=; b=iWLBoyvDoIdxN3hdK3iJCq+b6KaoJ7i+EN6NfgiOkYplo3f6yqOqZ8y3faFzhujrCv koxsW141Av3ZYLAf85y8JToaFNTD2S9mcfOhwFFGVa6sg7Ms5iaHGZrJm+95jZSbIbWk 8SHPRAbv74SK+DT3LxQ1C2swIt07IKWN9QLqW6g0LZkMjlHj51I2cAjTRttUlhGOfXyZ XQFLzWt2Ob6yY9o/b8Bk/QtnGkEeQRukK8/dNFTSVa+tEVaE427ddcCtWRIgDPQv+rZp u7Sx4JYVcacvekZDPrGCNyOHUwtGxZPiHYEArVKsYflV393e/QVwEYZ1MWML8fD8Tcav ahEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780603811; x=1781208611; 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=mWmDJM0N9mm3A02aZeVYmXR6PbCLJg/3M0xQs4mdPe4=; b=W1n9eq5R2XfCC3+N16tkHt87ayaXULD6VBP7US1yGA4XohGIF0nK36icjTKYfgcDLS r2qmlFsHo8pjpSjTMeOO19f8XqSFI2Ue7Fal4QtRwsP3bcZC6sQGERsbsrYzVCZWqsho MGezKBZbgfPvQYHRS9Ez/VEpoOK/bz3QJK9j72dR1MLGjGawhnZX4/uB1VkkQ4FV9ADV PvegJ6k9+7TM1LtcUgvxZKBzazEsBQ4J1aMnNJCVyZL6gwHba228YCjcyt1Vv1GKBeOU xxbJASFNOiAXBBDgdKMxrf5XB7BXCxejHok7hQhLK9f+2Ru0p3nF0ahckpThht8dYPiq hBUA== X-Forwarded-Encrypted: i=1; AFNElJ8FHlfbTqKsGcN/oNIl7GChvixEvO+7nqyYMgxEYtybr5hyu62M9fVwdOfrwyzrU2t39JxFy7UQNkpjfIM=@vger.kernel.org X-Gm-Message-State: AOJu0YwhwB2uljXvH9Md8CMSpQh5zsge+u8p809wHMKB2v0t34UtobdE sm8iGfXyQx4F8ETKD7htXt9MDWaliG+yRx4HuT3/LBqqlTvJDkBF7vrsG/5zrSmHlsFS5m3jKAB VTxa3dNTLABIcUQSdbTgauZXRF9k7+4vOxWLAv369rr4WnT1/wYsM2m9pPg5rb8JHevs= X-Gm-Gg: Acq92OH9kMXT11N17VXx/GA2WPb/wa49F8aK5fXzopEXjmwqmYLh/RbWPda6k2Pucb7 gP1qjCF5sKJVgkEWDEohZLLgP0SsCtuXzstCsvFXdrqcQSPiF5n7XraiIq+wdX1EKUQw4Bw6KwP ZcZKXE+nbbSG6hSZ7YvBgGrQXdcxKZGUEkEZI8HLJNXyxwIoC2/dyyO0Uy8HjKdmj/TaJfNKhrE S5Xb+g7kNLfDPuhTVos1xC+fQkEdeGtHkfm02xmYjO1jsEYZ0teSQrzunfbeRYUd5ldtlr4LZia 3eASHNz/5HUFQL2Y9ZZFznQhGfQ1I7cwRnbUV04+xurQfvldfhI0WaRzmRybp+DK9D9V2RcF/An FJfR6PweWsMTBkXo66KalRYZFSjmDWQXc4EeUajL86xBWsUcMHxyOJOEd X-Received: by 2002:a05:6a00:2449:b0:842:38d2:a358 with SMTP id d2e1a72fcca58-842b0e3c6c8mr236276b3a.26.1780603810766; Thu, 04 Jun 2026 13:10:10 -0700 (PDT) X-Received: by 2002:a05:6a00:2449:b0:842:38d2:a358 with SMTP id d2e1a72fcca58-842b0e3c6c8mr236248b3a.26.1780603810290; Thu, 04 Jun 2026 13:10:10 -0700 (PDT) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8428290067dsm6721425b3a.53.2026.06.04.13.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 13:10:10 -0700 (PDT) From: Akhil P Oommen Date: Fri, 05 Jun 2026 01:38:17 +0530 Subject: [PATCH 1/6] drm/msm/a6xx: Fix stale rpmh votes after suspend 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: <20260605-assorted-fixes-june-v1-1-2caa04f7287c@oss.qualcomm.com> References: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> In-Reply-To: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> To: Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Puranam V G Tejaswi , Jie Zhang , =?utf-8?q?Ma=C3=ADra_Canal?= Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Akhil P Oommen , Shivam Rawat X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780603799; l=1319; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=vnWI9LofjIKiQz+B1zHq69+BxcnVku90YJ6k3gZAcg4=; b=mWPf5hC9/oifI5qgbqsc0PZQgowmTz6CJSuJvIDfT1BB//5T/7oslABaYdw2Y3DCO9W56FEwj JVNTsphmWo3BmF1WMmk0jVcmEqbG5VAHnu2f81rVewBv3Xuzl1wESbj X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Proofpoint-GUID: P4FBAd1jTeiRXnHT3E-ShxGzwZMCjqcp X-Proofpoint-ORIG-GUID: P4FBAd1jTeiRXnHT3E-ShxGzwZMCjqcp X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDE5NyBTYWx0ZWRfX3gg1MtiWR//4 rZ/KDyaEq+reKoEgglkeqX0Hf2Oldkox5WcihjprujzuyutzZlnNIcGqyrVcT4l4lyXS12qq/Ze 5PECLaAfLH0XNLz7yDPY4q1nAaL8v37Uuc3SIdttfKYxhinq4TiQlUttYxqVovvTEdobmYFmUC9 o66kVIdSvRyTyIgaJ01qbDPUWB94B2rmqK0GBMg9uEmqs+Q0zX7158bY5R6V0a5EnGzhU+OWv1j 2iFK+l0C3az73Du3ECuOBwshlFgfa5QrD+3Q7bK1Kmpc+pqV7SedAv02EOJ6m85UBSjX753v7Oe uQe+ASt6BlX6bF95ggBz6gXZB63TRvjLeARZq5YO1KFggN+LqazNyyK1/4kv8lhxulJP97drrii jjGMCqAYZrNpf951WOpXKk2hi/GicPtDzWvbbyDZ51ODxaBI8E9rq6+bZQiXdrKTw3ZK5NICpe+ slcpU0lon6MiqCKSyMA== X-Authority-Analysis: v=2.4 cv=POc/P/qC c=1 sm=1 tr=0 ts=6a21dba3 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=oU5QhpEZILUeHJGd72wA:9 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-04_05,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 malwarescore=0 clxscore=1015 bulkscore=0 impostorscore=0 priorityscore=1501 spamscore=0 adultscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040197 From: Shivam Rawat There are stale RPMH votes (BCM votes) observed after GMU suspend. This is because the rpmh stop sequences are skipped during gmu suspend. Fix this and also move GMU to reset state to avoid any further activity. Fixes: f248d5d5159a ("drm/msm/a6xx: Fix PDC sleep sequence") Signed-off-by: Shivam Rawat Signed-off-by: Akhil P Oommen Reviewed-by: Dmitry Baryshkov Tested-by: Neil Armstrong # on SM8650-HDK --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gmu.c index 2e5d7b53a0c3..a2f6918c4f7f 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -642,7 +642,7 @@ static void a6xx_rpmh_stop(struct a6xx_gmu *gmu) int ret; u32 val; =20 - if (test_and_clear_bit(GMU_STATUS_FW_START, &gmu->status)) + if (!test_and_clear_bit(GMU_STATUS_FW_START, &gmu->status)) return; =20 if (adreno_is_a840(adreno_gpu)) @@ -1465,6 +1465,9 @@ static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu) /* Stop the interrupts and mask the hardware */ a6xx_gmu_irq_disable(gmu); =20 + /* Halt the gmu cm3 core */ + gmu_write(gmu, REG_A6XX_GMU_CM3_SYSRESET, 1); + /* Tell RPMh to power off the GPU */ a6xx_rpmh_stop(gmu); =20 --=20 2.51.0 From nobody Mon Jun 8 07:22:48 2026 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 3AA7633C502 for ; Thu, 4 Jun 2026 20:10:18 +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=1780603819; cv=none; b=ZIs+pNdm6JgaeRPgGueOB/X9TshREtlDj+Ax8SkfTuhzjoE8oahmf6hQ84bTechU6n71AIRXKkdwLRXBdqxYI4keXjvbkeCVKJHpvfn7FHVw/pIq+Yt1BxbjYS/8JYyfzAAkCskErfDMINXFk5uQlRq92pNZAL7vHhZgUwUtvpg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780603819; c=relaxed/simple; bh=EVHNeRZOgXVAU+U68Pm5LEIL/hpQq55cLxn5qLgvDcU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qXgmeMIi5Oulzf2sTBbNj+JO+9J/pydnvPhA6Oqdg4emZJGcWr2GQjLHzr5yBzS4R9J+zdVmjTxy8/AMbJENkvlgN1e5KVn4wmVYIcSm//JeRFKjZG6y9CxxNPKJjPhrF01fj4GXqi0Yck38xx9nl9xPUo94axhH6+jWjFqPgds= 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=Vh/Hkonu; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=EpgWgyk4; 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="Vh/Hkonu"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="EpgWgyk4" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 654EUTnt141926 for ; Thu, 4 Jun 2026 20:10:17 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= ilxmFuDlZLO8catcEmMGA/pntCC0AnEtroDNREYCuIg=; b=Vh/HkonuWet9ZMa1 vZ90B1nQn4A3WwXoc+N+wGPagdxZzVZe+CP5DC12bSCEDNcHXcwH99K9Ii7SWkEk GDKVJbnmchm/DH32w4tveLMTsj9Yo4SW23vCP+F6L1iXuolt2P+EMRqTk8jCS+I0 INe3n1dB7qZqQW4nC+TzrmfznLhPi2R9pr2qQ+cXM8LpctQknLs3WXSFLtg7hYwf D60W4kVKRQ6HchOVecl9IrHYCwJmsVRq4+4F/JvRHMfabuQKPGlntuH1KaQPQEVP oUBu3Y9bxwB9rqPbprERVcI16P1cEB9j0DJCH8tZzthJOPlnQv1krjyhclHh6q7/ BN5phg== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ejyencfqg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 20:10:17 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-8425a9979e1so724883b3a.2 for ; Thu, 04 Jun 2026 13:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780603816; x=1781208616; 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=ilxmFuDlZLO8catcEmMGA/pntCC0AnEtroDNREYCuIg=; b=EpgWgyk4IYy15jGXXle8COwIp4Nxb5RMnxQ4keuBxHRgnCDEL2djauZq2N8JyXSGN0 Di5FuD+vENu7pR9FUKoQ0T+2UkC/StFbXEC2XDNRu/2h0vcSzjUWuBdMJ8qiIerBs31j 4b5FWfObrUiSnUey+R3L1vngLaM3g2HSw7ZNtUy0c9odBONXph4xypc6qX7fG0V2Zo+B ub/stb+kwkY2zkMcxOlZPuMdQbbOQKIvVRqJLKnrXNcoB5u3h64NIyZvu4JjfVCj8a2E fbFIffBqaDVnMkv5wrV4r1CnzQ9020H9+hYim+7vMb3G6EVuPR0UR3LXLhr6eF8t/ozz Unew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780603816; x=1781208616; 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=ilxmFuDlZLO8catcEmMGA/pntCC0AnEtroDNREYCuIg=; b=RMPySZFyg1Dgetg8zoGQmsNWhpROcLCtojZN2Aay/JkWLCaVc5/1ERV31p8M6rrm4c uzcV8O8OjlDgW5ioKNDqqQ3J6BGsdVF5bxF5XPy1iBB1n5nwrU8vLqJNYSAnu3DtG0Wp s6Ejh8GF8ZuPRdVOCaTedaE8AiOGBdGAC0Bu492OtKC59i7ml21Ax3aOt6LIT6MdnPeC YaZRWWkkunnsHGGLYwC0WGcEBs87qx62vjC31I4LZE5Zb8xNwiCwdt1RSxImfXrvYvK+ kqkusRcmDNueG7iBsjLW/z2p6zKNvM6CbdPl93Ls81NHW7CVjgsP2s7MuXI/B8oKf17y /Lxg== X-Forwarded-Encrypted: i=1; AFNElJ8vYLtgbXP6akNrJkNCuTimonyM5P/QrDQjJtckgVHRV1SW10KI7YTEj/k6NDtN7FD5s0lXT4YNNVvpfCk=@vger.kernel.org X-Gm-Message-State: AOJu0YwKK2255fko729E0OMm2Me9Zg4ROBYaU2CDcYqC/qNYKeDwNExQ HmMJCtReqTY8ba231pso68EkcgPhnq1SHutm5a7UWCRsB6QVezTKrD7Upi/Q0KRxAr7wZsfgBXj vnmwgdCnMXc7Dgp0sYmB3ggtArK/stb7oO4P1Q4vaDGaqL6uO1OuVtVYrFSOtCY8qQfsNi8rMn+ o= X-Gm-Gg: Acq92OGs+dBzBWQQr5zPSauGuC55HZMQQ0/tNF+qJTsS3xQSoPBbP9mJv4/Ib0XDaRY cW8PGa+2L5jLar7G+Wsl6H+JE8Qzxi6zReu9dOzUFjfMcaORuqwnUFcZhUamBnS32K8JsHNedkP vyb/KFjuF+oMSHff7FySc909Z3gGnYPApxsSaNiGqsIwJiLaHOCVY5jr5DU9+21SYpmtG6hMMbi iKVR9zDf+rYbSP0Ow6gZDN0m/wAjpR5ZLXwQfn8Q904is/JtCZ7VjKHS+pogVQOV4+WJ1CWrVF3 zgbVkFWt5KZlu2aGpaK7uDY1+DfKqIlhkebxAxst6CQvWfybFymgSXMeyBLc7aNhY297fGWXNKk pkcXIh6pTO+WOHQvoNu3hygjZ2jJ7ZIrCP0wf6FhMdQ9k8us34WE2Te+u X-Received: by 2002:a05:6a00:bc81:b0:842:5a18:9af4 with SMTP id d2e1a72fcca58-842b0efb8fbmr208269b3a.18.1780603816370; Thu, 04 Jun 2026 13:10:16 -0700 (PDT) X-Received: by 2002:a05:6a00:bc81:b0:842:5a18:9af4 with SMTP id d2e1a72fcca58-842b0efb8fbmr208229b3a.18.1780603815857; Thu, 04 Jun 2026 13:10:15 -0700 (PDT) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8428290067dsm6721425b3a.53.2026.06.04.13.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 13:10:15 -0700 (PDT) From: Akhil P Oommen Date: Fri, 05 Jun 2026 01:38:18 +0530 Subject: [PATCH 2/6] drm/msm: Recover HW before retire hung submit 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: <20260605-assorted-fixes-june-v1-2-2caa04f7287c@oss.qualcomm.com> References: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> In-Reply-To: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> To: Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Puranam V G Tejaswi , Jie Zhang , =?utf-8?q?Ma=C3=ADra_Canal?= Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Akhil P Oommen , Jie Zhang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780603799; l=1149; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=sCyhvltmN32cvMyVIs4m/if40/Cj5ebIU1UMeNNMVWo=; b=dhPyHwxuQ2yTZzxERFHZWt8Iw4FNwVHUnlfxMyfMHEXDatrPKhl7skcv2878t4g440BzWIJnX QyOLU9xFtMOD3PE8zqUgAeW7aobGJ82pjOLAe/74FKjjRAR/v7NKWPv X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Authority-Analysis: v=2.4 cv=JaSMa0KV c=1 sm=1 tr=0 ts=6a21dba9 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=-HvVqG6-LJ5utcurNgEA:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-ORIG-GUID: 2jSVJzzCVjmaaST9XUFowFMJdxrS6D5m X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDE5NyBTYWx0ZWRfX9YS4tjADo2vX gXugnQE7Fc/AGG8Gc4AxA/F7pDSKqpAvXXzNnu7O7Nlri73gLP7OsbhKj9To0fHti/Ho+gQu4+A rmwRt3TQiQ27BDTMLlm1JiSvX4HcUD+wqJH9yGL6S5FxZZzIABzRUdbOE6fqG/y8sb7z1ZWoVj3 B+TcqXG+hLa3ZHCKB9A4e9DPqPDJvbySytAGzL/86mj433SCYY1DkIPIXHcZ+LeUwaJeXNNdsCP NRv8gxM/Z394Rx8eDFIAdH0cgjM17Ld6VEJZS0sEdymlppI3VNYgR0hZyk1lPiDHkGwkSLmmBq4 vta+3xOmepGuevstlrq848qvab0DNxmkOv6q7IoLYi1jVuVxMJk1NhB03q+ocRZTiIRswIadPNP NN5R4C3LHFlPpC/ZKvZ0n64GRKP5p8qhKgxThjHkJaZVxmoC/EqvO4XNbsmgWQ0UQ/b9IbY5QhE 2xXLaogpFMrc7YkROdg== X-Proofpoint-GUID: 2jSVJzzCVjmaaST9XUFowFMJdxrS6D5m X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-04_05,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 bulkscore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040197 From: Jie Zhang During recovery, it is not safe to retire the hung submit before we recover the GPU. Retiring the submit triggers BO free and that can result in GPU pagefaults since the GPU may be actively accessing those BOs. To fix this, retire the submits after gpu recovery is complete in recover_worker(). Fixes: 1a370be9ac51 ("drm/msm: restart queued submits after hang") Signed-off-by: Jie Zhang Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/msm_gpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 18ed00e5f143..9ac7740a87f0 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -552,11 +552,11 @@ static void recover_worker(struct kthread_work *work) msm_update_fence(ring->fctx, fence); } =20 + gpu->funcs->recover(gpu); + /* retire completed submits, plus the one that hung: */ retire_submits(gpu); =20 - gpu->funcs->recover(gpu); - /* * Replay all remaining submits starting with highest priority * ring --=20 2.51.0 From nobody Mon Jun 8 07:22:48 2026 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 EA48834214A for ; Thu, 4 Jun 2026 20:10:23 +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=1780603825; cv=none; b=N701eG/sOZz5J3SzI3vP+MJmzYvcYYssHDFDLfXT+lLbnfJ/RPaQ8PyGDO1jJi+L1T3fBNtkSDrXcKflE4Z/MqXisK5kRpu6yJLcIPFS84MTHR0VNwmYGmO+g0ve+eBDqVEt94lUAWgd21if+UI6muNjpNaSteMUXNmsFTCBDTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780603825; c=relaxed/simple; bh=ELnhKuOwZgtCAxie8qqIfGWsgvW5Dz1MZaoEWQu71zk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rGdmYBkwahp/wBsEZu9M0xwu43UYGIyVyhr3N3huk2vnzAcgh2+noUeJwO8P5Wg8q8atrYYMH03SVAl2jCiRmex14gGbEN0dIOqmiq8sx8fxO8iHEVKjaqN4bpr4v0SG8/ws1j38iKuaA60JvOH6Hk49OJotn/HJ28t9i5lGbdU= 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=ku6mCb1F; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Y673HOC7; 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="ku6mCb1F"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Y673HOC7" 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 654EIcjZ1132197 for ; Thu, 4 Jun 2026 20:10: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= tEzM6aI+gFSdEXjQV7bYfKRnP6YjGvJAld8/hhWOkMA=; b=ku6mCb1FuOl28hAl gXZA/z+m6ewRQE8YxjrQFrxWVvGYyhBLov7sH1v8wyA7yO11mUd+pzM1/cPgzlL7 JvgfoVImsBioqXt1KDbJCHPWFAYYzB4Uruxcfkz0YbN4dmoUtCDspdOv3kaL5NEm uowT0PnP+OY49rCiLI08Y3MeSxes1iTWuD5AMEI8Ww26nuZpGV908O6F9FBECMU5 944aslBMxtvQb2QJzaMA03pb3clb5b+UOP9Zco+Ksy8E+IIG4qW4te3AWN66g0Ud yztDXLtMql79wBej+tDCAxC8932UPKYjcxY3F3xv4E82h7is8Eg16pzYELn1opRk lZ6cow== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ek5wsk1sr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 20:10:22 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-c85dcdbe502so913637a12.2 for ; Thu, 04 Jun 2026 13:10:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780603822; x=1781208622; 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=tEzM6aI+gFSdEXjQV7bYfKRnP6YjGvJAld8/hhWOkMA=; b=Y673HOC7VTKxSZJ6o6tE0r9fbpBNvRtGqTSUKN2eREBKhbqRp/qWN9aB2JEAY0uUIB X/q64N4ilWcvQYRITBpw9LxhTgLqXFcvQ++fat0qllhjFKIXWdozaKAgw/Xs8Vh01/+Q bQg82C2qIiTMupcVvoCBF0cYxvhO8Xaej4/S/TvSO+cok75m3/8a+FCooURt7U9hjCdy TulMD2FrKaCG01f8S9CEf5RGp4WQGwIxTBQzFeL/qP4HWSr9p1ZxBKPVxWFAnEVGtup7 VWqqn8KP8JszvTEYt2n4NwezHvfcT7qGBOKwLa983VmrUKXmeGrylQGcbBMHUaupEpSg A3BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780603822; x=1781208622; 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=tEzM6aI+gFSdEXjQV7bYfKRnP6YjGvJAld8/hhWOkMA=; b=HNigbWS0yb76Ph4CgrbscIyeVJnpW5Qmf42fl6SfoU+7ixd3Cc5r29swxJ+u1LO2hX myyMBn1+9v/rln2hxhDMoiYHhqo+XTkAIv8MTZ9ebCVxaQyJKZnVD4sxWZ9ftQVbG7an DnDSZgaTK5DMdvc4ghIR30uc+5vfSQweBPvUlEYxikBiEpRpaP59kmQL3kGOkLomQ1Wz ivw9BTo1ZkHs60O8PcFOU2LbX0vSNBlREe+72+Y3L3LfsWto6uMqrrMTpGVuG4KQSuiM vHcgl6ofdYqbNpg/Wk9+BlATQgyXTg/xauAK5u1xvUbU/e5FCUaCbkgF2963KCuPvrUr 77Zw== X-Forwarded-Encrypted: i=1; AFNElJ8mPPxEMD/GSBiHcriwLl8VI047eDlp170wd+h22xl1O09v+MGB3Rh/cA29pGsajk3WUGe4UhJJwqoodCo=@vger.kernel.org X-Gm-Message-State: AOJu0YzTgrtOmJlSKrH575zimZba80Uxl2MqIqKzlZoEwiUWD45bwXF6 s2mMJ+ErVWE9t8y0QTOBSMUgRNBjPbv3lvDoEz9kluBxWlDv4O3rVecbnlorEZjOIBZsu+TDtjS 0mt46MFzE+8g9PgRfk4idStkUE9d8wB+jjvGo2jaorcGxmbUCzSa/EXy+6/I9aQhPwxU= X-Gm-Gg: Acq92OEPJzXm+zMEl72ZVQfF1xNfBP63Qi/KWgkxgaLQItNKP8paA9ebK2bssXcjWVo bdr+8J/P3aiLhDk+4GYygEw0sWzhw2O23EXphlXQdOyoq+jpbFS09RloJBENkYPGBX16BYG9V1Q KxaM+9qPjWiwuqEEQnpdH6rfycdWqIjYV+7R8NsWiDJ5tZuNxkrSAuau2Znt/SnKFwNNS3zK9s5 nNPAARWYhXp8SNiHhKjGKlyTvwhjowJTV8F2pczU0e++tiAKi9iw2synUoIZjlHfO8mOQK/RSbD UbjzJ2vWBfwRCPzBtBK+soTPKuePCaZwqZc6M3bqg2bUUXv3npOjgw+g1J8Dx2W/QUh1Sf2Zgjk 5EBH/Qw/cr3xFvdFqwnvLeSLmahPzrrqfWHU5OxeNQATCV8OQEFq6OMca X-Received: by 2002:a05:6a00:2d07:b0:842:4387:34c2 with SMTP id d2e1a72fcca58-842b0f1eb81mr219318b3a.10.1780603821689; Thu, 04 Jun 2026 13:10:21 -0700 (PDT) X-Received: by 2002:a05:6a00:2d07:b0:842:4387:34c2 with SMTP id d2e1a72fcca58-842b0f1eb81mr219304b3a.10.1780603821243; Thu, 04 Jun 2026 13:10:21 -0700 (PDT) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8428290067dsm6721425b3a.53.2026.06.04.13.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 13:10:20 -0700 (PDT) From: Akhil P Oommen Date: Fri, 05 Jun 2026 01:38:19 +0530 Subject: [PATCH 3/6] drm/msm/a6xx: Fix A663 GPUCC register list for state capture 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: <20260605-assorted-fixes-june-v1-3-2caa04f7287c@oss.qualcomm.com> References: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> In-Reply-To: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> To: Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Puranam V G Tejaswi , Jie Zhang , =?utf-8?q?Ma=C3=ADra_Canal?= Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Akhil P Oommen , Jie Zhang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780603799; l=1196; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=KD6o6YqvRymUJjmyXkRq8JL7HBh95pEmuexIqWDOoFY=; b=Rf+OoZSBSB83ESsduxAX+IGD/p3hwH9STY3omijSLj0gNynys7t/XryrP6/hBWdeyjo5+Id8o kUaTfr/Oh7ZA3kAaz3Sk7IqLthdGnFo8kzXzEXLXyyOOIpn/NAFc86+ X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Proofpoint-GUID: We1vE58sX1CsnFbIKU98HI-uvS9Yc_fz X-Proofpoint-ORIG-GUID: We1vE58sX1CsnFbIKU98HI-uvS9Yc_fz X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDE5NyBTYWx0ZWRfX/5H7u/SDRTE6 kbv2Fm/I3Vw16s1Z8FPbV2qye8IyJp0iDzgfxcONvkjDOGkEXri+WrpTXwRU9NRb1dRdKuqNBkO j0TLcoRuNus4LRuwZewj68qejvocisoMS5WhsDacqpaFvtvCutp5SO2K2GvihI9bj0wuaa/+1Ed 27RrPRTZ22LitWXVeGb1OC9sgDv9d5K7NbmPT/b2aki53lgzqQbsawYm+8exQyik9WsZooINwTj kTGsRrThsDVzNDqbWbKfM508XC2+7TN1L3cJJZPAAQosTvXrgwIlbAM2fWyRhCLn8jJXS9CtYK7 4H+8LufCiluYOZMsmGl7RZeWw4URZv7o5ZvF5ayo9RIDzOtjrQ+76eQDM0lsBNuy2IbWgT/8l3G r58V6MzbR2xDoVMzDgmr0ILDIQT9rZ/JxvXF1iRFY4kX8ZNbFDisykCcfto5hI5NW3GC0D06zDz /e4q7UaHcjij/e9Mibw== X-Authority-Analysis: v=2.4 cv=POc/P/qC c=1 sm=1 tr=0 ts=6a21dbae cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=oU5QhpEZILUeHJGd72wA:9 a=QEXdDO2ut3YA:10 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-04_05,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 malwarescore=0 clxscore=1015 bulkscore=0 impostorscore=0 priorityscore=1501 spamscore=0 adultscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040197 From: Jie Zhang The GPUCC register list for A663 is incorrect, which can cause out-of-bounds register access during GPU state capture. Update it to use the correct register ranges. Fixes: 5773cce8615c ("drm/msm/a6xx: Add support for A663") Signed-off-by: Jie Zhang Signed-off-by: Akhil P Oommen Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index 166365359fa6..2a62a22077f9 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -1244,7 +1244,9 @@ static void a6xx_get_gmu_registers(struct msm_gpu *gp= u, _a6xx_get_gmu_registers(gpu, a6xx_state, &a6xx_gmu_reglist[1], &a6xx_state->gmu_registers[1], true); =20 - if (adreno_is_a621(adreno_gpu) || adreno_is_a623(adreno_gpu)) + if (adreno_is_a621(adreno_gpu) || + adreno_is_a623(adreno_gpu) || + adreno_is_a663(adreno_gpu)) _a6xx_get_gmu_registers(gpu, a6xx_state, &a621_gpucc_reg, &a6xx_state->gmu_registers[2], false); else --=20 2.51.0 From nobody Mon Jun 8 07:22:48 2026 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 44C5F34214A for ; Thu, 4 Jun 2026 20:10:29 +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=1780603830; cv=none; b=GKtm/48xHXtRsdR0XsVfI+LI/ljFmEOMb3vudi3VS/uAs9YGJgAqgL94dhF8ppQh35C8U7bNrh0ykcgvZAeQGbDdQ3/n9KhoYa3XjflLRIY4OTHvqd4xWOcszKMxk3TLvbcrs9LQjx9iOkRVjp4FsAPQip1iejVHVEYvG2UvxZQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780603830; c=relaxed/simple; bh=0JtUaQvboU3d5FZGjs2lXGu+/oyb3FPNWrHbhX/nIu8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pf1Yr5/XRhlM8F14TOcOXl28N1QoMAzEQQ0OBhnJMD8FFjjx/zdfDcsQMpJfS9obC91vGGAu1ScVM0YaE9ylo9nq27NpRatafBtTNWiqaZcwgsm3ut4LpibXQGZ3fFwPEK+v+2OFdGPB4SmjZF2vX14fwFDHV4PsWcjw/NiT4DE= 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=DAcVTu/Z; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=U+di4EAy; 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="DAcVTu/Z"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="U+di4EAy" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 654G6rMj1957400 for ; Thu, 4 Jun 2026 20:10:28 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= d1LOKmeWCklvB1wmRVCwZ81uqYX7Kq6ssXn3ZHjkSh0=; b=DAcVTu/Z9OlhPpun 94V4DwJbaIGHP/fLh1hipVBMmcLRLxBXvfdQt3hnj+jvjwIkApN+yOxICE3ISDtv djyL12gvDf5Na7wT6SQFbX7IawSsJEwfVKt8DzdoNLRIAFrapqweMH6r2Jl2Fo+N P5TERCMynl0eC+T5X4CCYArbosk+4nr7S/2+Z5mUmW7ysF9qfAezur27SKnwLbwb PwE7cr7PVkqTDhHzWEpVavYxDDiTcYqw8huIkDW2J29dC3DP5cn3h+Dnsg+KPKQu tKsSKvqF6/zz4C3VK9CJLGLNsRQOpjGsEBY+2Tgr5f/yDHWuYReFexiPFLiL6Dlx XOu6Ow== Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ekckps5fe-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 20:10:28 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-c857fa2706aso572410a12.2 for ; Thu, 04 Jun 2026 13:10:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780603827; x=1781208627; 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=d1LOKmeWCklvB1wmRVCwZ81uqYX7Kq6ssXn3ZHjkSh0=; b=U+di4EAyJXxeOTZr8skk9P4bPz5vgzIkCm9xPDRBmiLSjmDCsJ5lQy1XcLY5gJDVqo J370EMHLqWljv93hF3aPRwm8n7fND6tfXB8yOJuO9fqCK/Lgni5QT5di9NKc3bn3GS0C IGk/sq8vZjR4gGiH3tRujkoN+pNCq7NDS0LeFKt3Nb/tYA2JaLBvuJGjYMdFcxZZdHt/ oJIpJecGMcqoSaUA4qyD3E9bdksga0ph6QLBhW1vnwxjNwkWq/0gv92bllJvXOkjaQou BD/c82yosg1dPqabvFn3kgbvPRpZEUfduSLQyxZTGHNsXncfGVis0EBAX9OLC1ESwxbu EtHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780603827; x=1781208627; 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=d1LOKmeWCklvB1wmRVCwZ81uqYX7Kq6ssXn3ZHjkSh0=; b=N33zUt0IbWvx8v3yhFwvhKOM9uLpytYvNT6nzAQexiX0jYI8SPywp7ue/qTdgnjJMk rPEOTdVfQdbV5lI8RZdSRu2QxFi0PicEh9WkcvQST0qUv/+hRZJNhSlawr/NcqeH8eXO aj017UcwFH7xZjz8y1ewH/q6ZsxAAZqvFYP+iTY0IQGeFbSXaun+dfTmSIFSY80YFZUm 22iN29hNrF3/qV3EgeENSe4EaruU4zUb6+19Wksg9hkMJZSowJA3+zruzVHwL3uzlaZw fO6dQgX0TYf0+aBEXBWiuRA07UUyuooCrZMgg+liWB0JydatW+VwhBLmRCnKBZDlUZwH zQmw== X-Forwarded-Encrypted: i=1; AFNElJ+HjO7UaPwz+lt7Co/UYbLyR7db5RQB3B2RLq4SgLjWN6vp0tFlcSa6U0J37aZCeAW5tpHg1m0OPBC/eds=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4ZGhM/VZOwPYPHvkmt5n8hCwYhT4HyekdRZPSEvKfw+1XpJ3M 8CO+9qCk6q4e47TOQeQudk0O8eV722/CSMFjxxpugpYlc+r+QHIQ3NQh6kAt5UfzWnptjdZuZH1 bgHhHrrrWVk5MCSKayhV82S2U16B58LTI4PJEIXQifsU4snimqHVQCO0470dSrobpEng= X-Gm-Gg: Acq92OGIep/SqJBpthdfaoKL25GGNg+F5BW99uTMSTiEJNAxCbeM3CKi4eQHHT3NJQG 31gCixrNaQQ5toBWMxKVB56g0M7g+ylEZdlpdOJu/nMuJpmAK46RPlStnjoKTRQZoCkAM4DMlOa I4q8A5Orfh16EjhRv+CcN0mtY1l9rqaQVPM6sf6JH9qlBBwejoUJOrq6LGk87qRiCx53yT6qC4T m4HT4u3h1RtH5s67Wu5K8TZaauUppTGFlK7t4b7IwpazOxGizdnZohCSIuhIvnA3qCZpgKKIZmQ vyFFJ9rXTvtBinq5C9DTNeFszrZ9zDwc3zk5FNa4arzOKYlKFVe2wI/Rap5mWgI+al/Advx/I5W NPzrE2eSNKNrjPoVScVQyfAQPqgYZYf22C24lLfXZ3Wa+WaqxL6VroGz2 X-Received: by 2002:a05:6a00:4390:b0:842:6a3b:60ea with SMTP id d2e1a72fcca58-842b0fbbb03mr218435b3a.40.1780603827127; Thu, 04 Jun 2026 13:10:27 -0700 (PDT) X-Received: by 2002:a05:6a00:4390:b0:842:6a3b:60ea with SMTP id d2e1a72fcca58-842b0fbbb03mr218394b3a.40.1780603826637; Thu, 04 Jun 2026 13:10:26 -0700 (PDT) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8428290067dsm6721425b3a.53.2026.06.04.13.10.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 13:10:26 -0700 (PDT) From: Akhil P Oommen Date: Fri, 05 Jun 2026 01:38:20 +0530 Subject: [PATCH 4/6] drm/msm/a6xx: Fix A621 GPUCC register list for state capture 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: <20260605-assorted-fixes-june-v1-4-2caa04f7287c@oss.qualcomm.com> References: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> In-Reply-To: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> To: Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Puranam V G Tejaswi , Jie Zhang , =?utf-8?q?Ma=C3=ADra_Canal?= Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Akhil P Oommen , Jie Zhang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780603799; l=3134; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=tSqg6MXJBXS7dUIh0h2uqjrVYJ/YB9NP37NGGPXAuYY=; b=6PwCHeX/RE9aoAgTAtoWXZ2Zk7LDsArqadG9cXOU0KlksNYRsDwRIrOwz4MDZ0LQcHMOqdGqP M6QWCLhg6pTDw6BSMoNDfyadY/C5BK4iuY0lk9A+DSeJb8FqRyJSamN X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Proofpoint-GUID: 9T7-Q3vFv2zAMzqX1vknDVFRi2y9P3Z_ X-Proofpoint-ORIG-GUID: 9T7-Q3vFv2zAMzqX1vknDVFRi2y9P3Z_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDE5NyBTYWx0ZWRfXw5HGuZQgk5S7 NMeOnkPMuuSpwrka2NtsI8N9hTrZ1hjT9rrD12u04ZjEOOMykqzrt5gMbtOMmDNsQ8YyiXXwBJp tMt4MHzZzXwAW53m9HKr3No+WNK8BloOsWzcFAmNpAOZIaVROXR7u5kwuZlTeG0K4l68MyXJH/5 SpqiE/+lAq884HH7CN4XYEFb8Lb1osVBx+i92egaCZRZ3Q33qtJu+KTvPcJtklwIfLXYQA159ma 2pxzhAHY6c+D6oR28Oe+DTZ71VmBEJw397AGg1yvb3MFtdxTehen8Iew0TaTO9uUArSNQ58CPzo z3ci4JWmx+jgeXMwQfdpde4BgeBpYz6sK5eTSpQxRDchruG/ledi8SkIdvKvKZM0ZsO7CNf1g2M JbCDhZazvWN3/bcLh9R+KoqZyvqA5dLE6fZsj1MRxAZHREk9VzkWz27zwraDPd0CtF6W54MNP/z bLF8hBZ+MRIG9MZ5F0w== X-Authority-Analysis: v=2.4 cv=H9jrBeYi c=1 sm=1 tr=0 ts=6a21dbb4 cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=PA11-Dht09vKeR9g0aoA:9 a=QEXdDO2ut3YA:10 a=bFCP_H2QrGi7Okbo017w:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-04_05,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040197 From: Jie Zhang A621 uses an incorrect GPUCC register list during state capture. The existing list matches A623/A663. Rename it accordingly and add a dedicated A621 GPUCC register list. Fixes: 11cdb81b3c1b ("drm/msm/a6xx: Fix gpucc register block for A621") Signed-off-by: Jie Zhang Signed-off-by: Akhil P Oommen Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 7 ++++--- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 12 ++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index 2a62a22077f9..3ea8ff8c7404 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -1244,11 +1244,12 @@ static void a6xx_get_gmu_registers(struct msm_gpu *= gpu, _a6xx_get_gmu_registers(gpu, a6xx_state, &a6xx_gmu_reglist[1], &a6xx_state->gmu_registers[1], true); =20 - if (adreno_is_a621(adreno_gpu) || - adreno_is_a623(adreno_gpu) || - adreno_is_a663(adreno_gpu)) + if (adreno_is_a621(adreno_gpu)) _a6xx_get_gmu_registers(gpu, a6xx_state, &a621_gpucc_reg, &a6xx_state->gmu_registers[2], false); + else if (adreno_is_a623(adreno_gpu) || adreno_is_a663(adreno_gpu)) + _a6xx_get_gmu_registers(gpu, a6xx_state, &a623_gpucc_reg, + &a6xx_state->gmu_registers[2], false); else _a6xx_get_gmu_registers(gpu, a6xx_state, &a6xx_gpucc_reg, &a6xx_state->gmu_registers[2], false); diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.h index b49d8427b59e..0a13a65f89ac 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h @@ -377,6 +377,17 @@ static const u32 a6xx_gmu_gpucc_registers[] =3D { }; =20 static const u32 a621_gmu_gpucc_registers[] =3D { + /* GPU CC */ + 0x24000, 0x2400e, 0x24400, 0x2440e, 0x24800, 0x24805, 0x24c00, 0x24cff, + 0x25800, 0x25804, 0x25c00, 0x25c04, 0x26000, 0x26004, 0x26400, 0x26405, + 0x26414, 0x2641d, 0x2642a, 0x26430, 0x26432, 0x26432, 0x26441, 0x26455, + 0x26466, 0x26468, 0x26478, 0x2647a, 0x26489, 0x2648a, 0x2649c, 0x2649e, + 0x264a0, 0x264a3, 0x264b3, 0x264b5, 0x264c5, 0x264c7, 0x264d6, 0x264d8, + 0x264e8, 0x264e9, 0x264f9, 0x264fc, 0x2650b, 0x2650c, 0x2651c, 0x2651e, + 0x26540, 0x26570, 0x26600, 0x26616, 0x26620, 0x2662d, +}; + +static const u32 a623_gmu_gpucc_registers[] =3D { /* GPU CC */ 0x24000, 0x2400e, 0x24400, 0x2440e, 0x25800, 0x25804, 0x25c00, 0x25c04, 0x26000, 0x26004, 0x26400, 0x26405, 0x26414, 0x2641d, 0x2642a, 0x26430, @@ -402,6 +413,7 @@ static const struct a6xx_registers a6xx_gmu_reglist[] = =3D { =20 static const struct a6xx_registers a6xx_gpucc_reg =3D REGS(a6xx_gmu_gpucc_= registers, 0, 0); static const struct a6xx_registers a621_gpucc_reg =3D REGS(a621_gmu_gpucc_= registers, 0, 0); +static const struct a6xx_registers a623_gpucc_reg =3D REGS(a623_gmu_gpucc_= registers, 0, 0); =20 static u32 a6xx_get_cp_roq_size(struct msm_gpu *gpu); static u32 a7xx_get_cp_roq_size(struct msm_gpu *gpu); --=20 2.51.0 From nobody Mon Jun 8 07:22:48 2026 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 8A7053AD503 for ; Thu, 4 Jun 2026 20:10:34 +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=1780603836; cv=none; b=LIL25CImEOGm9nOA+jo+qiljkNRujiZmKaKh2eHQ1HunKNwcfwbu53WjotcIe3o6gBJ+oZJGvo+J+QGOxrYjqt5RB3KWkWVHi6WhjCCiFF15z2g9bJ8sVtpClrDc3yJnwpd1pgeMB80UJieJF4ob124xdEyILV13CkEzRJZKNl4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780603836; c=relaxed/simple; bh=wHoGXQU9dFdgruL7hvn5v4jzjH/vWWmhkuYCdF2Uji4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ttdTMxrh+PN08cRoMu/XyDPvn3OmPLUWmuIyklcKFS8h5OeQZik/oEGl6qiqEJFMNH2xtuE7e1qdPf6M0qYwdtp1QtIT9/dh9eY+qTL6sxjO82FH06nj9VIyUMoD2oUWJDYOzxblM6QmT6aJQufxZnhcVEvOkPQHxhy9BzZ7zd8= 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=EtvjZ67U; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=gkCqmE+l; 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="EtvjZ67U"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="gkCqmE+l" 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 654IQQF81814137 for ; Thu, 4 Jun 2026 20:10:33 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= DRR+DEsprtUEBKuBcsLnY2CFiQ0q3UugCfTWP5lB0eI=; b=EtvjZ67UmwfmuA+P l62GxnULxz8Pff/OAWdONMrbm8Qm868J57GU6ZUhKDVyaCkElO14hCfrDgalIQWa cW8dMGp/0L5piu1IJWYDXY3FYGe5fpgKzDWp+MfsZHYv0SQICX4OjMbU0ejriint tR6qFyX361w5cbw9ArX1WkKdocTcS70Ac/JSYF6Ro0n+DxzgTp02yBH9PAerh9po a2hQ/NvMqDbYjsw+rO3V7yq/KaWOyg3IDX6UpR/Cgr9a6sU0Z8LmHFV8yCz6q7oQ rdUVwsWiRNnAmM6WaF7FuMHO3daLJAFcpxNZ8YLIsMVUNCX4NOBZOtKSMPWqlCGp uF4YkA== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eken00dh7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 20:10:33 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-36d99181eaaso1514540a91.3 for ; Thu, 04 Jun 2026 13:10:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780603832; x=1781208632; 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=DRR+DEsprtUEBKuBcsLnY2CFiQ0q3UugCfTWP5lB0eI=; b=gkCqmE+lh42O7QRHCZsPbjIQZZr7HWpqnZmzIguHo6/JKoKaNLYUj6lU/1cE7GG3gw J2VtTFPEuedRbOFZkitOI1LV0jNKwJL+3RpEXuikPiWmz6FR51oCgmzhKqhaFjQxsdgA ZJugAxBFS7x0bDqY770Rgya6citMI3BM2pl4dJ8rbhIq5/LffHfwFBzseFqHZZXA5kkq UKBSUcNd9wj4SPTV0+skINmq3jpcs1YgH4aNlNLbkzeoegtZJ/Kn+/NZzgyZy9H9dEOO 6iiDDyVuNi6vVB1dLJlaCwZt7aN+s8xqqMufAdDpKVWTC/7MEE1TwT4IyFeHv19VNhvc iQPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780603832; x=1781208632; 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=DRR+DEsprtUEBKuBcsLnY2CFiQ0q3UugCfTWP5lB0eI=; b=StMnzmbq1awfCqwEduRpuSi+Q+IISn9iGWxs0s6P9K5tw7VHMxFEjYInNWzudvC6GI fXdN31WlxvZAqBrgCt3xYtRF25A5lKutOVuqMXo8R29OFBKfmYgA2j768CtZFmKsVwFi ULMZ8zMsSxLVEoSmG+LhvcAb7JrdenNefOKRXOzAUzilFZOPAWe5G3+/0G6oLE4IjDBh XnXuxQ2FWcR9EPWyVIAT84qNDYsIHmP3fHgLXJ1ykibATYRx6m+IwcUf2h/pNOowVZXj IAjPJNNM42KfwG4ZzZ604iscmcGw34JAds64bgbwwSFZo0ACbCNHS7JVEQKWuQxDJGdl D5bg== X-Forwarded-Encrypted: i=1; AFNElJ/MLQCkrPDMO9Lo2AKvvunifb0dChiaLv9IOM7FGzgLPTlDzltAsVR8TYnWtRZklq1RdK2E6e4G2oVZAQ4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5eK9MAV0uTsy2BBY5KN0X9BgVimojPw17KXMFdWT9S19LZRbk bME+1x0tvNyfJ9VhVT0Z6NQ0Ib+0IJVRIPwxGgpjJthZ6b+olIRC5HY3ej8La6+xbSVlo7R98yM BRTW67EHDmBAzgk61tCsOjVBa3XWl6UavvJC4UZZXLkMj9gw2UfA7xWUUz1/7IocK6xA= X-Gm-Gg: Acq92OExci4NPA1vubzK3x2rs+KYCOQZMXPdxt2sLdf2pWOB2HCSlpRJIQt76IRJddF ExsaJx7jR7RlV1aHGq0E/jzGh+3I/Cq+bGbQ67Df31S+vjrSlNkGMPmc6eUQ1cnfChQzEHtzDKK yoRYqMIU9NxtsPHmaluncHlc15AK902t2xspBjJm1b86XxTF9croYYPlZA0AWIHmR0nJUpRAvvl Tw6kM4oA/NrWkwN4gDNW1eURECA5tdzKb3CoxvWb6kWmqy8urvKNW3PSCu+10hiBN/Cpk8qa/L/ K4YvQj1fpWxPzOLFzAY1ctFtLer9gQPCpKqWIvjL8lYZlGWPE7LD3JgNwsnM++v8xqugTxnio0x G/cWvSlrNY9otMOpxlxMyvOdJRqXRjNtbPuCalNszzK6wdbTE0oTbROiE X-Received: by 2002:a05:6a21:103:b0:3b4:b275:c5b1 with SMTP id adf61e73a8af0-3b4ccf5e49fmr579419637.26.1780603832560; Thu, 04 Jun 2026 13:10:32 -0700 (PDT) X-Received: by 2002:a05:6a21:103:b0:3b4:b275:c5b1 with SMTP id adf61e73a8af0-3b4ccf5e49fmr579390637.26.1780603832039; Thu, 04 Jun 2026 13:10:32 -0700 (PDT) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8428290067dsm6721425b3a.53.2026.06.04.13.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 13:10:31 -0700 (PDT) From: Akhil P Oommen Date: Fri, 05 Jun 2026 01:38:21 +0530 Subject: [PATCH 5/6] drm/msm/a6xx: Fix IRQ storm during msm_recovery test 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: <20260605-assorted-fixes-june-v1-5-2caa04f7287c@oss.qualcomm.com> References: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> In-Reply-To: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> To: Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Puranam V G Tejaswi , Jie Zhang , =?utf-8?q?Ma=C3=ADra_Canal?= Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Akhil P Oommen , Jie Zhang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780603799; l=3392; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=GwZLyTIP4u6tN+9squk0q6Z3W6Z4ioTBobufFLsa2P8=; b=C3/9ME743B0Lm0FCKaGp0Gd5+Ja4JNQooQqlM5wA8ze9CDAbYXpQc+igMT6uAcMJrOFxQWaMv K16zIciLA+/DuGvDYLk25lzrxjPB/JJ47Z0G/e+r+9geen0PHobjunP X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDE5NyBTYWx0ZWRfX7YBDbz7LWfAa SRRjz/WNql8EVGcofPIItmNgUdVRu1AotweNWKfxIjOstdy9nZSt1n/qBVDyBtuKWpVG2LW4LSI GDaqZU55/Vd1dMM7ty6gtaUfRndAmgfC0CVBpsnRRCkzZLF9pM0d0aMcIni5A7Gs9CwkV78yMBD UtwXlIVEXUAewyQM63UIwKE2psTvmu2hSHN9s62RnsEDon4y/uDA2jcuVPj40Vz9nzU1auGNrbY S3I4hx0RhjZNCqGHafpYEns7faod7oKdVezSb6xgcBOM148taWhdM3rxbXlGijUOnRtkuwc9nEF BF8NSWl3mEb+gkkLU1q0Sf+13MKa3hFtUjM2nSzce1tJ3C/Vvs97Cnh5XC3qCF2ZGx3x9+QOlYN Kfjuw3mNi2YAr+CuGXZP8OksweZ1PtNt6qjLSVx4HCYlv6FCbKEIM72QU0WfDXS1xTvl7B2tLPY KGXyUFm/kA/XB0OBp9g== X-Proofpoint-ORIG-GUID: 27WF-rlYQjdKCmPgxd6ltQE9ZxrXLAST X-Proofpoint-GUID: 27WF-rlYQjdKCmPgxd6ltQE9ZxrXLAST X-Authority-Analysis: v=2.4 cv=B96JFutM c=1 sm=1 tr=0 ts=6a21dbb9 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=Tlt2A13xodhnW1EGk4cA:9 a=QEXdDO2ut3YA:10 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-04_05,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 spamscore=0 malwarescore=0 adultscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 suspectscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040197 From: Jie Zhang Once a hang is triggered by the msm_recovery test, the gpu error irq remains asserted and triggers an interrupt storm. In the worst case, this IRQ storm lands on the CPU core where the hangcheck timer is scheduled, blocking it from running. This eventually leads to CPU watchdog timeouts. To fix this, mask the gpu error irqs during msm_recovery test and enable them back during the recovery. Fixes: 5edf2750d998 ("drm/msm: Add debugfs to disable hw err handling") Signed-off-by: Jie Zhang Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 5 +++++ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 5 ++++- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 5 ++++- drivers/gpu/drm/msm/msm_gpu.c | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a5xx_gpu.c index 2c0bbac43c52..f1df2514c613 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -1275,6 +1275,11 @@ static irqreturn_t a5xx_irq(struct msm_gpu *gpu) status & ~A5XX_RBBM_INT_0_MASK_RBBM_AHB_ERROR); =20 if (priv->disable_err_irq) { + /* Turn off interrupts to avoid interrupt storm */ + gpu_write(gpu, REG_A5XX_RBBM_INT_0_MASK, + A5XX_RBBM_INT_0_MASK_CP_CACHE_FLUSH_TS | + A5XX_RBBM_INT_0_MASK_CP_SW); + status &=3D A5XX_RBBM_INT_0_MASK_CP_CACHE_FLUSH_TS | A5XX_RBBM_INT_0_MASK_CP_SW; } diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index 8b3bb2fd433b..9a4f9d0e1780 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -1911,8 +1911,11 @@ static irqreturn_t a6xx_irq(struct msm_gpu *gpu) =20 gpu_write(gpu, REG_A6XX_RBBM_INT_CLEAR_CMD, status); =20 - if (priv->disable_err_irq) + if (priv->disable_err_irq) { + /* Turn off interrupts to avoid interrupt storm */ + gpu_write(gpu, REG_A6XX_RBBM_INT_0_MASK, A6XX_RBBM_INT_0_MASK_CP_CACHE_F= LUSH_TS); status &=3D A6XX_RBBM_INT_0_MASK_CP_CACHE_FLUSH_TS; + } =20 if (status & A6XX_RBBM_INT_0_MASK_RBBM_HANG_DETECT) a6xx_fault_detect_irq(gpu); diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index 9e44fd1ae634..0f6fd35bd587 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -1211,8 +1211,11 @@ irqreturn_t a8xx_irq(struct msm_gpu *gpu) =20 gpu_write(gpu, REG_A8XX_RBBM_INT_CLEAR_CMD, status); =20 - if (priv->disable_err_irq) + if (priv->disable_err_irq) { + /* Turn off interrupts to avoid interrupt storm */ + gpu_write(gpu, REG_A8XX_RBBM_INT_0_MASK, A6XX_RBBM_INT_0_MASK_CP_CACHE_F= LUSH_TS); status &=3D A6XX_RBBM_INT_0_MASK_CP_CACHE_FLUSH_TS; + } =20 if (status & A6XX_RBBM_INT_0_MASK_RBBM_HANG_DETECT) a8xx_fault_detect_irq(gpu); diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 9ac7740a87f0..48ac51f4119b 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -552,6 +552,8 @@ static void recover_worker(struct kthread_work *work) msm_update_fence(ring->fctx, fence); } =20 + priv->disable_err_irq =3D false; + gpu->funcs->recover(gpu); =20 /* retire completed submits, plus the one that hung: */ --=20 2.51.0 From nobody Mon Jun 8 07:22:48 2026 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 38BC53AD503 for ; Thu, 4 Jun 2026 20:10:39 +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=1780603841; cv=none; b=qNXk5acRKc0Z+HBmrNcpCANv4ZgQbJhFMyqPcXyoeMNTnv58rdNQ6d6lFC6BHMdC+p0AoRpRZsZIJ7HInANahr1vVoosDEgGZvN2di3N4Z0LQkjjHKInkZCPL+1jWaKaV5xiU59q3E0NK5Syo0VuvouwxfTOpjDO2ef/TdgoQcY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780603841; c=relaxed/simple; bh=ijwte7kFHE+i9nN4DbulJEUNnaV+CYGDPB3sho5jNd8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TeA4G4ELtZjiTiJQCwWhTbDtNICHE3cgEJgfoUYcGGKwkPwUUqAyA63Eso/EwIjg6YlmFu+amaeHMENzEiHNyVygeo4RUAN92ajaiiT/CxJp8sZfEEGLq8IGrygX//Bg8/72SRim2kcC5e3CUx6KlwdSUKu/JEghbrE99FkaxFc= 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=ie40GLMB; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bBqBzsnP; 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="ie40GLMB"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bBqBzsnP" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 654EpcK0528633 for ; Thu, 4 Jun 2026 20:10:39 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= Ia1skyxQmkO7JqYCXK2wWQZtv88kEi4DeIduMmc3/kc=; b=ie40GLMBF0ujDd3p BkqF8GTZz62fxeG+88YY67NZbwf/mcH5U9+rj3nUvRkatHit1GoP3kmGyVH/QCsh Nt5LV6o0iIy/MK9iwucC3Zmez96CNPkPSoFrSP1QCspMT+lE3+PSzsF4HR1rTeZh ABNRkbDyWQqiTxUW5gH49nbcZRnHCAIE0Ahp5SRzZ5iH4nOpHYTEsxTb/mbu6VHC zy93nUrCZe/Fc93pZ7gW5pn/mQ8McLsQ/1p/p2v+ZnrlGdEQHXGLYOB2Eau33Ujl 6gB2R25Ao7AIB7bnAPjbbJwA20y3B/mY7wA8SZGJ9zY0Sma/bZFcIjjeLm4jecnZ ElzZZg== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ekbgdshp5-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 20:10:39 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-8422b544a4bso689913b3a.3 for ; Thu, 04 Jun 2026 13:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780603838; x=1781208638; 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=Ia1skyxQmkO7JqYCXK2wWQZtv88kEi4DeIduMmc3/kc=; b=bBqBzsnPwOjPlcvSHhSFrbcEXgB+eQnaA/nzDaReaC76hBdrucIUcZxGfBodAYXy5e CcnV0royQR7OYVur/R93GgwkGcxPV8SD94KqPp9jaq5eef/dtyeisFumfIwpf9LfeLqv f1ASv7W3qBIH+LcdFWIg9NS0qzVZ7nPd9usuqKnFEuM0twju1VLdHzW+2JEYVlZrknGG F/KIL0fT5hdydj6q2QUp3fVY/341Sl1nKJ8B9Yq1TcD/NgEZ8rFzpPxJpSRP8i7rfPZO pjpGedys0WabFT/atzinX9nSzogSqeIFKrTluqt8XJpFgwKsPL4Q03RrYiAbGbryO75+ vwsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780603838; x=1781208638; 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=Ia1skyxQmkO7JqYCXK2wWQZtv88kEi4DeIduMmc3/kc=; b=Y9P4ARSr9P6Wl7HngfnTCWifZH1fCscJne0nJzeu4QjeDSsp7uepXia4mTDgOb7hmm C6hbmm4acI67cMUet9HYIJfdVugnnd8fOtaJxIUifBCMZhTlC/iS/XkiAheUWoKQwWgp VwOgY7PH1BQ0YPKALPnMbFfRIRNeZ3KCZJGb4Z37j0Iy4vHt7bxYrDbECCSHjz/KxIP3 bkyyQaOXEiEk81HfDx1YNezinC8w4SfbgIVrgPKhzv7sX0JD8nhY29LLfH4SdzxJ/6Gc dA3LZQcPq0PPbweENHqRodYIW25ZESpeuU8mlXDXqcIN3qBo4VuYRWWRu2Vk1CY9h6fg eg4Q== X-Forwarded-Encrypted: i=1; AFNElJ9n3Zm+qDAw65dBuVF12FztOd9jFss6nO5Eyz6wexoRwa3Q4+o2rat5ZFPxgOYsXFw94i0//P6HsOTcQXE=@vger.kernel.org X-Gm-Message-State: AOJu0Ywg6I9BBpFFsYHHbN9pNLAzY+8ijLwgtsq2svI0cpk3bx9soGRn 91ncJxqy813Un2P68UmkX2DMcphDv6atILU/fEFZBDW3zEpx57m/l0eazABhRUS1N8Pm9dhxyWg z30SVnubxXSzSsZAYLbEcBj5UHUJduxnakNSGxDuyK9oE9Zcefjscuw3SdlbivFbDUKg= X-Gm-Gg: Acq92OEQ/jgjJ1vNGZajpDdeNufxUsltRlRF0BvDb4b54G9GM2YhVG1g2hcVNLkoK+T a9bDgLOiX46uxojyHd7+KJ6hwW+3vukJdEFjHyGIN94DMWUhjpiZlpo3PC4gvo/kGkG2fyuuuk3 udEtoG2mg0yq/g+FxVHqlPcS3Yfi5lHHBdzrg6KLe8rPooDkseHvePozhwgz5m+aY+iyE7WVz05 UDMa3F+TKH5kixr4Gli8/JpPBdj3fS6SGfM0nvjlZUTcyzqWaDaVHuy1rNcGBG98tVQlY4l4hn+ XvKhCqNe3TNYEsKsAI3JFuu1iW26HfN7e1fX9BPpr69AX14AOgfpcNRTrSgo13YgDu8k4850d63 ICebF13/69jYGM3U0POdexzMgXUyHc4nhBdmQZMz0DR3OpoV/+91AAxPl X-Received: by 2002:a05:6a00:4008:b0:83f:2568:d466 with SMTP id d2e1a72fcca58-842b1007fe4mr217713b3a.31.1780603838120; Thu, 04 Jun 2026 13:10:38 -0700 (PDT) X-Received: by 2002:a05:6a00:4008:b0:83f:2568:d466 with SMTP id d2e1a72fcca58-842b1007fe4mr217695b3a.31.1780603837668; Thu, 04 Jun 2026 13:10:37 -0700 (PDT) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8428290067dsm6721425b3a.53.2026.06.04.13.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 13:10:37 -0700 (PDT) From: Akhil P Oommen Date: Fri, 05 Jun 2026 01:38:22 +0530 Subject: [PATCH 6/6] drm/msm: Fix task_struct reference leak in recover_worker 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: <20260605-assorted-fixes-june-v1-6-2caa04f7287c@oss.qualcomm.com> References: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> In-Reply-To: <20260605-assorted-fixes-june-v1-0-2caa04f7287c@oss.qualcomm.com> To: Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Puranam V G Tejaswi , Jie Zhang , =?utf-8?q?Ma=C3=ADra_Canal?= Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Akhil P Oommen , Jie Zhang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780603799; l=904; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=X3vJeCumKhjjotRl6yk2pCMRTx61cAms8ve5tuXIPwI=; b=MNquq63XpQbBR4dEKjskl1CiKb+qtEacdlCYU32SnWmRLXACBNuc6h1X9R0rKCo68B1hhUVxJ WYHWX94jP+iAQ1SQJHj1Bzo8lcKhms0Svb6GrNBRovKuhfK4w0WGYZ5 X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Proofpoint-GUID: rfzu35iCgX5obOXtUOneDiJWPQ8_CeN_ X-Proofpoint-ORIG-GUID: rfzu35iCgX5obOXtUOneDiJWPQ8_CeN_ X-Authority-Analysis: v=2.4 cv=a8cAM0SF c=1 sm=1 tr=0 ts=6a21dbbf cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=nKn9kxNhn4xvKzSdCgcA:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDE5NyBTYWx0ZWRfX3TRTeZpXWuMe kdVm/D4Fy2bhS2WkYIxtnqBjwUEG+hHov+WqBB0QMZ38UqLIZauzbnpZuYVUP8cImX0ROcAupri 1/uJOG3mTLIruqv2qsnThuQaarURQUcx7c3DLI/eBUOC84cb29/Ljl0xL9EwkvfZT63IA4JBZz3 7OihRNVpVlrfGg3e06pGvjENRt8GiBkX5scPCiuufdivOWFud6sLQQysNWIpuv6h0sv8Hy5lMyE yh92mZLhr/20QHMRXGweeDDWX1S/jkJx4gfG0O+BCXuqch9nB6k2znKThNHgbLYjcri9dITrQ7u CePLSzBDOdsg+t/XnR/EOXW9FCmiU5UVwbZYJVwwGyRIq+7xw7rBw5z3FBQI6qEWRn/U0/smLKv DIPin2WSjUeOSAwJHjYes3mH16FIj+GN5Fu97gsQf4rQR2deMWekD+rYiQXV0nJ2E00436Nk3uw FKoukEiWV5stxjmsrFg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-04_05,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040197 From: Jie Zhang get_pid_task() increments the task reference count, but the corresponding put_task_struct() was missing in the else branch, leaking a reference on every GPU hang recovery. Fixes: 25654a1756a4 ("drm/msm: Update global fault counter when faulty proc= ess has already ended") Signed-off-by: Jie Zhang Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/msm_gpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 48ac51f4119b..03c057856065 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -505,6 +505,8 @@ static void recover_worker(struct kthread_work *work) */ if (!vm->managed) msm_gem_vm_unusable(submit->vm); + + put_task_struct(task); } =20 noreclaim_flag =3D memalloc_noreclaim_save(); --=20 2.51.0