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 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: 7bit 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/adreno/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); 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 &= 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/adreno/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) gpu_write(gpu, REG_A6XX_RBBM_INT_CLEAR_CMD, status); - 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_FLUSH_TS); status &= A6XX_RBBM_INT_0_MASK_CP_CACHE_FLUSH_TS; + } 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/adreno/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) gpu_write(gpu, REG_A8XX_RBBM_INT_CLEAR_CMD, status); - 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_FLUSH_TS); status &= A6XX_RBBM_INT_0_MASK_CP_CACHE_FLUSH_TS; + } 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); } + priv->disable_err_irq = false; + gpu->funcs->recover(gpu); /* retire completed submits, plus the one that hung: */ -- 2.51.0