From nobody Sun Oct 5 16:20:37 2025 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 0599E1F3BBB for ; Fri, 1 Aug 2025 18:00:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754071225; cv=none; b=L3lv1SNnoyaF0bU2yVdwEqEICNOojcaxa+XwPP2xZdLz90cMm1kdGA7E92BmZSmTFkkYiYC6OiJ8IWBcwkHt8S8EhKVWuuj4Urw/JILazsSqFuWYwpGpMODmaixa2iKPs+CZ7s7SH3Tm8aCfZ94JoZtPXiOiqhTKNv+oKWGNp8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754071225; c=relaxed/simple; bh=9fs+9v5YYJG2O8rReWV91gfGQBXOKP9cTCTwMY+QlIk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uk3jGQocUVt5HZQRd2ZkIgj7UKODs6/iHQmeEK55bfrCm91/YmYm7/cD1I6R9bwcp46o9awibUEnjPrqkEz2S6XIEJrEUfr0DcOx9sFbxsg6VrOEEF/tcUCpRD+mU1CJPvPcLlWz1SBVXXN9sXdAtq/OfNDn5tD16fJYy7Yyrio= 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=kKlD83Pp; 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="kKlD83Pp" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 571Hg8E9008568 for ; Fri, 1 Aug 2025 18:00:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=c4KQRsxVztP sTBbcxsf/rU0NN9GCrtgWESCaGZHxR9Y=; b=kKlD83PpUsSxT+R9tgtLKssh7oa axtF6CJtuTg5VLR1lshYjT5/h82lbogM/aA8syWTCnGjh+JXEDBI9rsaZ0T1Iv6U JihWXcgAAaUxL5EV36kx/BSpbuyYFRxK6J0QiTt19S+87SbaeNNWOm7d0nXOr5p3 QWbz2beTVcQgppV+Ok7D4tlCyFHXAIFcNED1k9B0l+RvIoxFI4ZLxiVjVW1AUio9 haVhuAL4ZSQHHGvyWvv/oQ+/6GKE+qsfbeMFuTzgJep3tY0OknlZcBvcFzVRqlQo KZMKqEnEQIpeBtmWX+IGWLIwT6ayQiu3weljB1rfEHWIFqbBDKGuuOxOs+w== 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 487jwghc5p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 01 Aug 2025 18:00:23 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-b3f76a5ba7fso864417a12.1 for ; Fri, 01 Aug 2025 11:00:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754071222; x=1754676022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c4KQRsxVztPsTBbcxsf/rU0NN9GCrtgWESCaGZHxR9Y=; b=jFzMJog1humFp8V68gEwNjEe4Bq6Hb7+05R/CqogPFXO5mN6cpzlM3s+HWSInqv7PE OIBnga9hqyzxo0DjFS5x/P2C/bFjfv8JWN2Htyg9w/ZhIkpk6TTP79fP6KoYDZyvlWq3 Yppss90oPJby00MbXTxUDLrWuAhTvLiQVEL/CObx+Av8J+XpAmaaQhy064QfpNTirHaf i46RZ80fQj95mYNKlFsncgyd/qSfT/YojsS15+xw7nLsmmyPQHpMgqX5E1ilRHEVzrhu zYJlzA7HSCEpTxQqvypwaRjpsbPOx6nzzWe0OgTIKpX3LP1bzMtSt9d0mbAC3UWq8+Tw ppYw== X-Forwarded-Encrypted: i=1; AJvYcCUC92A9EH9HVekKgsK2BA0nFB/PLsUMEw1gz2rLJKguBoMUiimqojev9GiKSy5VrAhhduWiIidt1+xsCm8=@vger.kernel.org X-Gm-Message-State: AOJu0YyLakuadnUV6wCxXW9GD/JWtsmwogQwzYTCvOORDLoO57clw6Br h+lNTieslrUZvg8zj4b9wXiRWpDJ2ppg+TPqUa0NBp72AoHcxABq2SyUNAz7B1WcvceT8BJMnoR YO3aN6hGwlLrZtysPD1Mn+nPUPk8e61OcmQDwPbRwgB+ScQ9ur3mH5PuxKNJDS+yMxLo= X-Gm-Gg: ASbGncsNv0eiynnsIU2qvd8xhKFWpSNCgkJsgWqqE4e2Tc2OOd4mtW0kITFB/zwKDqu ciYUxjqAORVTGB08JSkDSKBOQqO4yZEFx4JUq0aRmMqrGmvuscU/16FDMCzoCUCs1fYeZoSvlRB FAHYHIlg0TKW6kspHS1m0iodaTbJ45fG8JbIjMohc+eI86/DzCEqipoZoS/hmhOiUS5qIfWX7DM 1oO7IdB1w/Q5Wji8aaGUBrxG8DvDXjZdOKgTrZdgGIPaEVVuWNUX9cOdcZbV43HD8NK5lTATcw1 9p00o3ZCczeFccUrg0ril3wvGrEomYl0y8wB3Oy9qA2kC2sshGs= X-Received: by 2002:a17:90b:1d4c:b0:312:959:dc42 with SMTP id 98e67ed59e1d1-321161f13afmr971394a91.11.1754071222043; Fri, 01 Aug 2025 11:00:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuZ5/YHyU5W5/PGpq9mfkW8lN3EVfPrvr2fz5DIS9QKgNMf1X1fXg1DmF3I6ux4H1PpGawMA== X-Received: by 2002:a17:90b:1d4c:b0:312:959:dc42 with SMTP id 98e67ed59e1d1-321161f13afmr971344a91.11.1754071221443; Fri, 01 Aug 2025 11:00:21 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b422bb0be58sm3946576a12.57.2025.08.01.11.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 11:00:20 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Akhil P Oommen , Connor Abbott , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 5/7] drm/msm: Fix a7xx debugbus read Date: Fri, 1 Aug 2025 11:00:02 -0700 Message-ID: <20250801180009.345662-6-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250801180009.345662-1-robin.clark@oss.qualcomm.com> References: <20250801180009.345662-1-robin.clark@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=WvgrMcfv c=1 sm=1 tr=0 ts=688d00b7 cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=xqWC_Br6kY4A:10 a=2OwXVqhp2XgA:10 a=EUspDBNiAAAA:8 a=aM-jV3debDdmslfU2skA:9 a=bFCP_H2QrGi7Okbo017w:22 X-Proofpoint-ORIG-GUID: Kek7M-kqQYwSWl46Niw6FqssVqUb9lBa X-Proofpoint-GUID: Kek7M-kqQYwSWl46Niw6FqssVqUb9lBa X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODAxMDEzOCBTYWx0ZWRfX0NBedZLkvrTB vIfQvgYHSaXW6On/wNwhFhGrH9pA1bO5808R7af+oSINjCH/HWq8Gk23qaL1QtnA/bxb71Cs+ob lAizX7QrAeacPfNsRWkXLPZfmV1A4rYMf4XNICoCoK5BYnizW8F/xdkO18KCoAt4Y2uNn0vF+xv Q66/ks5a47nCiT02/7lkIcXjAWqpAawsZj4b2H1zfOA65UKD92q8BiUaGzlBTaLcoSFQyYZQajP YgZ3jLksl/t/laUgKbB0lCPunHyGTSxngtgUY9oxwRzC+DB7UaHu48J+ZlCz8omRVYz1ji9mXTl b96u/woykL/YoB4p2Ja0nA2J4EEFqAPHwPRVHPnLVTabcYNz1/3/bzxqmtOg7BEvx/bAC4bFj0l ai/4prULSDTmRqWZwFYuw7eKE10OnF4LXS0sJfGDaaE1ejXXQ4XOUTw71mneKNtdQeI/46TK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-01_06,2025-08-01_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 bulkscore=0 clxscore=1015 suspectscore=0 lowpriorityscore=0 spamscore=0 mlxscore=0 impostorscore=0 adultscore=0 malwarescore=0 priorityscore=1501 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2508010138 Content-Type: text/plain; charset="utf-8" The bitfield positions changed in a7xx. v2: Don't open-code the bitfield building v3: Also fix cx_debugbus Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 32 ++++++++++++++----- drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 14 +++++++- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index 173c14f215a7..2c7a52fb0b9b 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -174,8 +174,15 @@ static int a6xx_crashdumper_run(struct msm_gpu *gpu, static int debugbus_read(struct msm_gpu *gpu, u32 block, u32 offset, u32 *data) { - u32 reg =3D A6XX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX(offset) | - A6XX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL(block); + u32 reg; + + if (to_adreno_gpu(gpu)->info->family >=3D ADRENO_7XX_GEN1) { + reg =3D A7XX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX(offset) | + A7XX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL(block); + } else { + reg =3D A6XX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX(offset) | + A6XX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL(block); + } =20 gpu_write(gpu, REG_A6XX_DBGC_CFG_DBGBUS_SEL_A, reg); gpu_write(gpu, REG_A6XX_DBGC_CFG_DBGBUS_SEL_B, reg); @@ -198,11 +205,18 @@ static int debugbus_read(struct msm_gpu *gpu, u32 blo= ck, u32 offset, readl((ptr) + ((offset) << 2)) =20 /* read a value from the CX debug bus */ -static int cx_debugbus_read(void __iomem *cxdbg, u32 block, u32 offset, +static int cx_debugbus_read(struct msm_gpu *gpu, void __iomem *cxdbg, u32 = block, u32 offset, u32 *data) { - u32 reg =3D A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_INDEX(offset) | - A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_BLK_SEL(block); + u32 reg; + + if (to_adreno_gpu(gpu)->info->family >=3D ADRENO_7XX_GEN1) { + reg =3D A7XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_INDEX(offset) | + A7XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_BLK_SEL(block); + } else { + reg =3D A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_INDEX(offset) | + A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_BLK_SEL(block); + } =20 cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_SEL_A, reg); cxdbg_write(cxdbg, REG_A6XX_CX_DBGC_CFG_DBGBUS_SEL_B, reg); @@ -315,7 +329,8 @@ static void a6xx_get_debugbus_block(struct msm_gpu *gpu, ptr +=3D debugbus_read(gpu, block->id, i, ptr); } =20 -static void a6xx_get_cx_debugbus_block(void __iomem *cxdbg, +static void a6xx_get_cx_debugbus_block(struct msm_gpu *gpu, + void __iomem *cxdbg, struct a6xx_gpu_state *a6xx_state, const struct a6xx_debugbus_block *block, struct a6xx_gpu_state_obj *obj) @@ -330,7 +345,7 @@ static void a6xx_get_cx_debugbus_block(void __iomem *cx= dbg, obj->handle =3D block; =20 for (ptr =3D obj->data, i =3D 0; i < block->count; i++) - ptr +=3D cx_debugbus_read(cxdbg, block->id, i, ptr); + ptr +=3D cx_debugbus_read(gpu, cxdbg, block->id, i, ptr); } =20 static void a6xx_get_debugbus_blocks(struct msm_gpu *gpu, @@ -526,7 +541,8 @@ static void a6xx_get_debugbus(struct msm_gpu *gpu, int i; =20 for (i =3D 0; i < nr_cx_debugbus_blocks; i++) - a6xx_get_cx_debugbus_block(cxdbg, + a6xx_get_cx_debugbus_block(gpu, + cxdbg, a6xx_state, &cx_debugbus_blocks[i], &a6xx_state->cx_debugbus[i]); diff --git a/drivers/gpu/drm/msm/registers/adreno/a6xx.xml b/drivers/gpu/dr= m/msm/registers/adreno/a6xx.xml index d860fd94feae..86fab2750ba7 100644 --- a/drivers/gpu/drm/msm/registers/adreno/a6xx.xml +++ b/drivers/gpu/drm/msm/registers/adreno/a6xx.xml @@ -594,10 +594,14 @@ by a particular renderpass/blit. - + + + + + @@ -3796,6 +3800,14 @@ by a particular renderpass/blit. =20 + + + + + + + + --=20 2.50.1