From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 752FB309F1D for ; Tue, 18 Nov 2025 08:51:42 +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=1763455904; cv=none; b=Mu/oWkQDM9UQUpaa5qIt61CgPE/LE7DsDtSt13MqiOiAn/WsOl8nnPSLWVoa4CKnaFy8CRgO9fNRDyeyPx0TxTqvoFxmm9B+LeH4QoZT4Rsw34OqU9sf4SWcnCEbN3qjjpjV955ZJeJ/qwxbT3G3UMdzneQWLvPqrwjpnAD1D8E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763455904; c=relaxed/simple; bh=9A5anEH53GnLLVd9MMQtmEBnjJez85XhahSgwIYwj+o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DJvWd+txKW7AtccCcbhw3D/E2WhS49Tb+ajsbH8Bx09wrnNzUprx0or0BexG4lF4dHG1rxDzfvfE2QeBybF/s7Shyla4mI6YVsotOjk83lKeMyQgtAqkpH16wNOH1h/RGwVH0T9q77fixqhL1ilfojgWanbf5/+5orgg/+cK1N0= 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=kG6MWYFm; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=W/9P7Cnp; 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="kG6MWYFm"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="W/9P7Cnp" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5AI6iAl6384611 for ; Tue, 18 Nov 2025 08:51:41 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= Rlajs93xW44KTRN0rgVj9S8DZUtP1T558SNf4fvM8c4=; b=kG6MWYFm56FyS/dY diVBK7hBFx8rRM4vKOd/gDWtBy5atPPXqh736uHfkgPth0FtmszfkkNkx1Al1Ctz hn/znHNRxvEpkE7EVk9/tEtpMINtxH4qN/WQHA+oWq5VzVWYilZ8j88RssNxzy7W LQeouQChS/YLGHmgDxJd6lUPl98Pc1+GvDWy9jUyAFVcbh2YZDgtB+vP/0bFAeOs 4uqf/7o3HkLwGcGtfa1yeEYTW02L3HXzEBLplDER9cjVE2ZVj0QmRNmwumGkjL2U zbSKkQ7CzNI5S/wLh+rf/i4WumDKsKNUTCNyTCSmOBpMG/DUOhtgALIi0LfklkFO PrerhA== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4agag8hsxf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 18 Nov 2025 08:51:41 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-295952a4dd6so81282435ad.1 for ; Tue, 18 Nov 2025 00:51:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1763455901; x=1764060701; darn=lists.linux.dev; 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=Rlajs93xW44KTRN0rgVj9S8DZUtP1T558SNf4fvM8c4=; b=W/9P7CnpyDwYRmKFGK47NbdZ9APq/MsbaetAh/eLQPukrzGEepL+KT08lblKdL9XfX n2KzJDeh3xcMzbnouyc1Klkh7TcDaoo1SLOD5gwziPskyo95hpBG6t8ftVBJJbNki+sa /5SFhwGg0aALfBRrSiC+oNAIgxhlV2UDMjoM5PyPjIEjNYs9lDgVlyI1NRw4k/1J16id GdHlzBcTgRnA8RuoHvyPRpspvMj3KSHPKQRAk8jLH7GE6VpLyY+3z6bY5jI0amF/4JGb ALUGaJynLP5gyIDp1UbtyHe4MKEG/q7DOCxJs1t/Kl+IOc2yW3KiYwd/ObR8zfMuhtUq KXPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763455901; x=1764060701; 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=Rlajs93xW44KTRN0rgVj9S8DZUtP1T558SNf4fvM8c4=; b=EcRpbMU6NiyzS05930a43AcBtv713W3R++pSfuklYvBAx6mFHJLOVIdEGQW5MlnXwi TqpLhCFFdWYWWHnAYj8BDVjKcyoTm4FH1NS7DrI73XxYwUf0UOBilYky5TfwA4QHYZzC DiOhbdJeHP3dVL+TnXUiEBsxfTDCNhVqM5Q10owbkaSMR3qv4X9VII8ybIIQNKh6DGY1 87582Rc95ZR60maBCIO2cezjbKxcPJdpgjy1kMIekidEUlSpRSj7hZQQLzzaz2OqJSST 380b0dxgz2QBi+iVv96VtK5dJ8Nmy9WYgKy4YuyqAJewg5aZYOCw6EOEhR2NNSknnDET xoVw== X-Forwarded-Encrypted: i=1; AJvYcCUMyEri/ddBWUqoAGz6qBHzo/EN5oDpRNP5kW/QNbv6cMmE0l26qNGgHPPoMFqpM/MVfD5qmg==@lists.linux.dev X-Gm-Message-State: AOJu0YzscGKa+ThcMDQNjXdokGs0EhtT3HvVL5BUbsWggcPotgb2nV9t b7EKDAKN46q4h/3c+J/IGanpXKV0ITpoB5eP/mCJrLkc/bT5Sld6Ao6MVvTsMOTYTte4nnQx/08 VMIRGLo1APBDhe61s+if3x5N933RbDzkoP334HnI4cA66fWrgQcEG5BonCQ== X-Gm-Gg: ASbGncv7QVZ98udQ4TXVDZ5tYPFeHX9V6er6lOCwJKwx37hjE8F1xSk/C1Lb5oW2lQ+ YAV/0JrN8us5bBWjjobPoeQSCtbbdX3jjhG00jvbbcyzFfAFeA5iNrFZT8r8UiNLZtl+m0Kg974 Eq2o6iBPzgiwfcooVEEE6TaPgS8ybb9DVH9NY+iyQfDwRouIfVL368ZgKcm4cD6vsADS/lQ4WEs Jxv6I+nUi/ZNqaGZGoqwumwivKa0JlDfsWQDljDKndaVIi98dPexafYpQiud7o8JLVdTaylCHg/ +RcWlPpUiuH0RFLgNZ4yOL4pXgJk8V5MZy6MTHLnm/J35WA7oHKyvAGczJBqS5CGR3M5eJUTX8W 2oQgFincRyNJnf4JmFUzjOAw= X-Received: by 2002:a17:903:2c0d:b0:282:2c52:508e with SMTP id d9443c01a7336-299f55124b9mr25185115ad.8.1763455900695; Tue, 18 Nov 2025 00:51:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IGCsVUT/gyxi19V6NNcgQ1Bhhk7hd0QU8Q3IwF4m63Apgo8HYRSB6+A4jdvCpbIXf22MBDTag== X-Received: by 2002:a17:903:2c0d:b0:282:2c52:508e with SMTP id d9443c01a7336-299f55124b9mr25184705ad.8.1763455900192; Tue, 18 Nov 2025 00:51:40 -0800 (PST) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c2568c1sm162910695ad.47.2025.11.18.00.51.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 00:51:39 -0800 (PST) From: Akhil P Oommen Date: Tue, 18 Nov 2025 14:20:30 +0530 Subject: [PATCH v4 03/22] drm/msm/a6xx: Fix the gemnoc workaround Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251118-kaana-gpu-support-v4-3-86eeb8e93fb6@oss.qualcomm.com> References: <20251118-kaana-gpu-support-v4-0-86eeb8e93fb6@oss.qualcomm.com> In-Reply-To: <20251118-kaana-gpu-support-v4-0-86eeb8e93fb6@oss.qualcomm.com> To: Rob Clark , Bjorn Andersson , Konrad Dybcio , Sean Paul , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Jonathan Marek , Jordan Crouse , Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Connor Abbott Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, Akhil P Oommen , Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1763455868; l=1590; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=9A5anEH53GnLLVd9MMQtmEBnjJez85XhahSgwIYwj+o=; b=GKVy5XYk8J2atz7vVd9cbq8c445N4UJwCVBFzNslb6yr289XyqRF14cJW4/UDx5T1sgwFfTBe gLOlQU5BxT6CV9lRW2Re59yEwx79W/9ih/7ktY1yUUPaQPppV5gcEHU X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Proofpoint-GUID: p0_37HXJohFcH_2WgkD-sj5ekU3osd15 X-Proofpoint-ORIG-GUID: p0_37HXJohFcH_2WgkD-sj5ekU3osd15 X-Authority-Analysis: v=2.4 cv=G6sR0tk5 c=1 sm=1 tr=0 ts=691c339d cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=twmNDnkDfZCprR7-lykA:9 a=QEXdDO2ut3YA:10 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE4MDA2OSBTYWx0ZWRfX3tsut1RLsr9c 2YTpVZlhvqHcdlq40BRx0g7x3Ox7+igDSM3OUG/bW1J+FP3lGadfDptbDqWtjodOuohu7mKS2v2 KMdUhLxJHWQnyf8LTte1Vpo1r2SW5RGHtRSb8r0sL1qiyKC+GItdPP288hufn/Bo92w+eRhd4Tr VPjbUD3RiuXbDq7WsShJPJakNW3k3XBHVF4R4cSd4s6M9LSNxjzvv39ZrN4D5R17Me6LTsl2f5k YG648zo8lJYTG4965OtHbALyYPgLU8fB3qxCGkzdtAti/A3A/BnyNEOvMiDtpwifasHHwE8Fv8Q WgJZRbIxGkUEdtN/8Zm6z1HAmef/t6RCPVH+NhWXAUVrEcHVq7QTIOSCYsUZB4njzWffwE9NkGF hPXWYPqAZppWGCOGaqz9cVt0NmAEdw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-17_04,2025-11-13_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 malwarescore=0 adultscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511180069 Correct the register offset and enable this workaround for all A7x and newer GPUs to match the recommendation. Also, downstream does this w/a after moving the fence to allow mode. So do the same. Fixes: dbfbb376b50c ("drm/msm/a6xx: Add A621 support") Reviewed-by: Konrad Dybcio Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 72cd4fe0905c..52653ad376fc 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -511,8 +511,9 @@ static void a6xx_gemnoc_workaround(struct a6xx_gmu *gmu) * in the power down sequence not being fully executed. That in turn can * prevent CX_GDSC from collapsing. Assert Qactive to avoid this. */ - if (adreno_is_a621(adreno_gpu) || adreno_is_7c3(adreno_gpu)) - gmu_write(gmu, REG_A6XX_GMU_AO_AHB_FENCE_CTRL, BIT(0)); + if (adreno_is_a7xx(adreno_gpu) || (adreno_is_a621(adreno_gpu) || + adreno_is_7c3(adreno_gpu))) + gmu_write(gmu, REG_A6XX_GPU_GMU_CX_GMU_CX_FALNEXT_INTF, BIT(0)); } /* Let the GMU know that we are about to go into slumber */ @@ -548,10 +549,9 @@ static int a6xx_gmu_notify_slumber(struct a6xx_gmu *gmu) } out: - a6xx_gemnoc_workaround(gmu); - /* Put fence into allow mode */ gmu_write(gmu, REG_A6XX_GMU_AO_AHB_FENCE_CTRL, 0); + a6xx_gemnoc_workaround(gmu); return ret; } -- 2.51.0