From nobody Fri Oct 3 03:19:13 2025 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 49A232EB5C6 for ; Mon, 8 Sep 2025 08:27:42 +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=1757320064; cv=none; b=YMOkX5NOIIT8q7OWJrhqXN0DzqvaOkBMwTm78ZdaLghEM+SYiuV0Ub0kXyPxA9bT3xW6UOa32RBK3/HZ86TypXQbNSLB97AXqalyDt0p9I0xyOc1pCnGOrHwYsGmrl4P4coP4S+ZABfVmKQpbiYFT93VuKW+FmLLLI7lQKmdc98= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757320064; c=relaxed/simple; bh=giC1WMM/22jbsYABWcvDAeFCcEWVS1OnTn0KmBBmmok=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WU4IsT57vxCwhkQSWlmYRv78hycNiottaJ6SPEAKkP4YDYY9mTWdrjs8b9gZdbssg0jwS3JaEoym+qX6W6bvDoIPjzckP7xYdlSFwZH3OR600JqoaNoCtn3/TYZvmLryb63bNk1CYOp+e1f+/UaOikgbZV+hq4pZzVlLn58CPdA= 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=mWI9YHWL; 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="mWI9YHWL" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 587MxUrB006860 for ; Mon, 8 Sep 2025 08:27: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= jzazIGzZ/t3zV87a3OBQ5k2i0Hby+qyQ7WI+u2m4iEY=; b=mWI9YHWLpV1tGAtZ o4n5P0TIcdd8Dy0MGJu9kjUPiyp+vmmhe9xD0KbnlVX6XBEPOVYuJSi6Xxl0yS7a yLGEO2LMl4q7K+gPB7FaNWtssafnHdWxze4fGlh6MdwbBpnRkenr9eBrmEt8l1On Y+EMMFP0EAWFrCdLrhC9oKXSVT3KhWIEObmSFoC/GgqtWOitn3DTnHB3ecrh6XE5 AIVjPkg0lmbM+d7PUHhM08azLGseMMeta/KQQk6nB7M3Uf5+x0jXNHm6RGEUU5z9 TlxWsnSgkzFyvQTKz+Jxdgs9GjC9wtJk+aVNZyKo1albDt+ktUMImG3z29AZP/Zo +DlvLg== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 490db8btq0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 08 Sep 2025 08:27:41 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-7724877cd7cso4775897b3a.1 for ; Mon, 08 Sep 2025 01:27:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757320060; x=1757924860; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jzazIGzZ/t3zV87a3OBQ5k2i0Hby+qyQ7WI+u2m4iEY=; b=RieJlBONIEiGQnLsQvQUMjhtATYIOytjiCfUIDVFahFR6357LUSMBZzo/MNNUajZ66 xY8HzZj5fnI30vA2s3m7P8i+YN+fBIeWgaSjy6tOIAc0zQaoLxcU9AqZKyyYQco4KeZp 3ZCov1j1I18uPWSMVdwjDlX/639Bp4OyykIhr3Ds68CaU5Evd/6wTn7swDpWUvopveON GZa3l5nUVwOShU70lnz+UVPSabIp/T9ZRVg7ofdRCIbT/VzbCsTx0JY9dxy6JB9A8klV oxAiuFYzNeoZmnRk4jsvoKyeOAE0nIJANjjqkr071ES0D8WOdRIUYf1ZhJtxWf0LmpUO uMWA== X-Forwarded-Encrypted: i=1; AJvYcCVGP/0XcCzyJP8TvTW/Wm4JpjJ6AUt6MdKi3Lhy1m+4ZsJ98NEMh+18K1THOnHSBSsKWzNpauzF12236CI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9eRQUA1YlL4syYnKMp9u689dagdXNZbReePnJ0jcandAZK7jL bZk4h2MxtSljplUj80NWPSjfKKpGijHX+oMS2NuF2l5mA4+j/oBt3LiW+68NLBnNmbJ6kBrHa3V Ni0ePXNvlQG9aNjk8V2yiRzFFL5FqDngXDagrKIa/rZz0mx4+e0lzzeIyRf/kL+mXkU8= X-Gm-Gg: ASbGncscUwN5VPupzWWCjbBCXlRxjxUTuCf9htcCCCJNKR8qCFnBAMP4fFddONATgfU IGZuszuseosg9WK2/iG8JwiV6eBNuGCuuORL10TjKwveeBPpegYwYFqBJuldVBn1NDxD+PY8i+t 17AFMDfW5k71wwiBHHQz5GJXHBUae40McU1ddLQlIozoMQPyvvSIj8cRw9rcACjA99TDyqvo4Po aDU1GZGPChPjlDrPLXPWXPEKBSpp9cdKrnnxDzlGsDx4TElvtsK2AFsvm3pST61CTAJ4UpuWNXO Vh92VOFsr5rdrX+WWe/VwM1le87iM9/HqiqAK/lB8i5wTCvWVaXB4r3evTdAxoU8 X-Received: by 2002:a05:6a00:13a0:b0:770:579a:bb84 with SMTP id d2e1a72fcca58-7742dca7eb8mr7517551b3a.5.1757320059720; Mon, 08 Sep 2025 01:27:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsPuW308JspzsiBLsT9VDk94w9AdRmHL4vZNlbS733C/aU1uZfvEcmFy4pBw35K0EQ8R8XEw== X-Received: by 2002:a05:6a00:13a0:b0:770:579a:bb84 with SMTP id d2e1a72fcca58-7742dca7eb8mr7517523b3a.5.1757320059121; Mon, 08 Sep 2025 01:27:39 -0700 (PDT) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7722a26bc9csm29157523b3a.18.2025.09.08.01.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Sep 2025 01:27:38 -0700 (PDT) From: Akhil P Oommen Date: Mon, 08 Sep 2025 13:56:57 +0530 Subject: [PATCH v2 04/16] drm/msm/a6xx: Fix PDC sleep sequence 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: <20250908-ifpc-support-v2-4-631b1080bf91@oss.qualcomm.com> References: <20250908-ifpc-support-v2-0-631b1080bf91@oss.qualcomm.com> In-Reply-To: <20250908-ifpc-support-v2-0-631b1080bf91@oss.qualcomm.com> To: Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Antonino Maniscalco , Neil Armstrong Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Akhil P Oommen , stable@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1757320036; l=4096; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=giC1WMM/22jbsYABWcvDAeFCcEWVS1OnTn0KmBBmmok=; b=Tb5Zcomn1I+DstzVX10EQ5FnDJHdOVbMDBWYloXfnfItaUHkTGKpcpE4K3t4PP6tKwRxxju3G JYCJ5GOSGTTCayUcml6GNRYQLBeM/t+yZ0BwdS03XPaBqow4gw9U6UI X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTA2MDAzMSBTYWx0ZWRfX2ThuqsKmP+w/ ExTDMI52SiOAci+0LPgtjgjm7Qtp6ZflUmSMV3ayOjswBo8s0WjXvBgw142DGWlFsaJkye35pb7 wvs0eDUxGylX5EcLPWQpijsUjWMGO3bhbkErFZlC0hBEeCDBW0Ano//jfa4F4Ym8Mj5V/Oj4+aN ehi49XlhO3w1OQu0OXBChqug4GLryFy5MSgMzaOtas6Ybp3orD+oAu65G/Y1zxNNdDzCsAk4Pmy avDLVMoLLF58CbJQsuli/LeopP/+UV5M2RwF6S/CwxSueI2v2ky57cNmWrgu1zouI2MCzOkjjD5 6UJPSiFwANdbv96WOE6nm3SO6v6ujRJQQWr6db4iLgT2MyyhstcKzExyXMlspzpIDhyuy2iCtuF oICal9r7 X-Proofpoint-ORIG-GUID: tzPjFFTmNOZgi_3VuOVI2h1FOUKQS5Hh X-Proofpoint-GUID: tzPjFFTmNOZgi_3VuOVI2h1FOUKQS5Hh X-Authority-Analysis: v=2.4 cv=VIDdn8PX c=1 sm=1 tr=0 ts=68be937d cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=R1CZgRJynTePKTnkIkwA:9 a=QEXdDO2ut3YA:10 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-08_02,2025-09-08_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 spamscore=0 suspectscore=0 bulkscore=0 phishscore=0 adultscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2509060031 Since the PDC resides out of the GPU subsystem and cannot be reset in case it enters bad state, utmost care must be taken to trigger the PDC wake/sleep routines in the correct order. The PDC wake sequence can be exercised only after a PDC sleep sequence. Additionally, GMU firmware should initialize a few registers before the KMD can trigger a PDC sleep sequence. So PDC sleep can't be done if the GMU firmware has not initialized. Track these dependencies using a new status variable and trigger PDC sleep/wake sequences appropriately. Cc: stable@vger.kernel.org Fixes: 4b565ca5a2cb ("drm/msm: Add A6XX device support") Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 28 +++++++++++++++++----------- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 6 ++++++ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gmu.c index 06870f6596a7cb045deecaff3c95fba32ee84d52..ba593ccfe3c6a2f3a2ea0db3a14= 35d0668ed7bf2 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -279,6 +279,8 @@ static int a6xx_gmu_start(struct a6xx_gmu *gmu) if (ret) DRM_DEV_ERROR(gmu->dev, "GMU firmware initialization timed out\n"); =20 + set_bit(GMU_STATUS_FW_START, &gmu->status); + return ret; } =20 @@ -525,6 +527,9 @@ static int a6xx_rpmh_start(struct a6xx_gmu *gmu) int ret; u32 val; =20 + if (!test_and_clear_bit(GMU_STATUS_PDC_SLEEP, &gmu->status)) + return 0; + gmu_write(gmu, REG_A6XX_GMU_RSCC_CONTROL_REQ, BIT(1)); =20 ret =3D gmu_poll_timeout(gmu, REG_A6XX_GMU_RSCC_CONTROL_ACK, val, @@ -552,6 +557,9 @@ 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)) + return; + gmu_write(gmu, REG_A6XX_GMU_RSCC_CONTROL_REQ, 1); =20 ret =3D gmu_poll_timeout_rscc(gmu, REG_A6XX_GPU_RSCC_RSC_STATUS0_DRV0, @@ -560,6 +568,8 @@ static void a6xx_rpmh_stop(struct a6xx_gmu *gmu) DRM_DEV_ERROR(gmu->dev, "Unable to power off the GPU RSC\n"); =20 gmu_write(gmu, REG_A6XX_GMU_RSCC_CONTROL_REQ, 0); + + set_bit(GMU_STATUS_PDC_SLEEP, &gmu->status); } =20 static inline void pdc_write(void __iomem *ptr, u32 offset, u32 value) @@ -688,8 +698,6 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu) /* ensure no writes happen before the uCode is fully written */ wmb(); =20 - a6xx_rpmh_stop(gmu); - err: if (!IS_ERR_OR_NULL(pdcptr)) iounmap(pdcptr); @@ -849,19 +857,15 @@ static int a6xx_gmu_fw_start(struct a6xx_gmu *gmu, un= signed int state) else gmu_write(gmu, REG_A6XX_GMU_GENERAL_7, 1); =20 - if (state =3D=3D GMU_WARM_BOOT) { - ret =3D a6xx_rpmh_start(gmu); - if (ret) - return ret; - } else { + ret =3D a6xx_rpmh_start(gmu); + if (ret) + return ret; + + if (state =3D=3D GMU_COLD_BOOT) { if (WARN(!adreno_gpu->fw[ADRENO_FW_GMU], "GMU firmware is not loaded\n")) return -ENOENT; =20 - ret =3D a6xx_rpmh_start(gmu); - if (ret) - return ret; - ret =3D a6xx_gmu_fw_load(gmu); if (ret) return ret; @@ -1046,6 +1050,8 @@ static void a6xx_gmu_force_off(struct a6xx_gmu *gmu) =20 /* Reset GPU core blocks */ a6xx_gpu_sw_reset(gpu, true); + + a6xx_rpmh_stop(gmu); } =20 static void a6xx_gmu_set_initial_freq(struct msm_gpu *gpu, struct a6xx_gmu= *gmu) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h b/drivers/gpu/drm/msm/ad= reno/a6xx_gmu.h index d1ce11131ba6746056b3314dccdc3612cf982306..069a8c9474e8beb4ebe84d1609a= 8d38b44314125 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h @@ -117,6 +117,12 @@ struct a6xx_gmu { =20 struct qmp *qmp; struct a6xx_hfi_msg_bw_table *bw_table; + +/* To check if we can trigger sleep seq at PDC. Cleared in a6xx_rpmh_stop(= ) */ +#define GMU_STATUS_FW_START 0 +/* To track if PDC sleep seq was done */ +#define GMU_STATUS_PDC_SLEEP 1 + unsigned long status; }; =20 static inline u32 gmu_read(struct a6xx_gmu *gmu, u32 offset) --=20 2.50.1