From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-4322.protonmail.ch (mail-4322.protonmail.ch [185.70.43.22]) (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 1AD0B3DA5C2 for ; Thu, 2 Apr 2026 23:09:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.70.43.22 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775171360; cv=none; b=jUlXtV4etu3YIvTSp5GPDeK6eBPU1QnylxJm3YD+8hpKl5C73t3fFa/MuPRAuHurW+En8WZP7JUK6cXhhQBFfSGD7YmDIjF4aCAhZrQWZL1BPyp1CJQ7ypgVwDSeCiJuF3wwMLy3KrUHI6YkDdAG/kiRmxJ+97uGoTnK26EdG0Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775171360; c=relaxed/simple; bh=r9NvQ+tTvtHR3vW1GmGFpBvoLnLsxwoOUA/zJ303pqQ=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Lr1peIZi8QYnGAnGlxzlzGVdGzuhABAo9Co51wM2kEQPoreiqG7jaC7ND8mB6PUSjVWK6KbMoD51Ihq7q+NKv1WiGQb3HHk649u60OP/DBtqq60YUGXnWEFgbmbFhz7Uk6wST7jGzW2Ster3JrvfpT7OQQhelZHdUdiuYYlqQ6w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=ZBjSbFm3; arc=none smtp.client-ip=185.70.43.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="ZBjSbFm3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1775171356; x=1775430556; bh=UmDpm+W7FVeu8x9a4pmc9IkUVg7Oepx1EmXNMUY6JxA=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=ZBjSbFm3JVgN5tlkNFayJmQ0kma+8hzpSW7xFTqDoCLfdKooYnYSdjYHK5J3wOisX +xA2JGcgUvcOxbdBqUxpYd5Og3FKdjjJDsfmErz9evalTINJnB7pBS3KLQgiNoOOmE /cPk7gjoX5TOyVEi9V/yFZgE0BqUDBBTUamzR2T1PTEI92q1M3Nw/6RM1JnL1HW1Ek IsHOWTa2iHX+zC35BdDrhRv0YQWXzXhpxw6FDhaqiVpFXwldxRjQJWt+IMVfdG8NDa 8UUYTHYlJL93hrISA8jjN0wAe0BuCrENuXvFWPs6aLuNwdDLNPvL1lva95BsykB1fi yya+IPOOyfRsw== Date: Thu, 02 Apr 2026 23:09:13 +0000 To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Akhil P Oommen , Bjorn Andersson From: Alexander Koskovich Cc: Luca Weiss , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Koskovich Subject: [PATCH RFC v2 2/6] drm/msm/adreno: rename llc_mmio to cx_misc_mmio Message-ID: <20260402-adreno-810-v2-2-ce337ca87a9e@pm.me> In-Reply-To: <20260402-adreno-810-v2-0-ce337ca87a9e@pm.me> References: <20260402-adreno-810-v2-0-ce337ca87a9e@pm.me> Feedback-ID: 37836894:user:proton X-Pm-Message-ID: 114c91f44a0c387f33fd35904343927ed9746455 Precedence: bulk X-Mailing-List: linux-arm-msm@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 This region is used for more than just LLCC, it also provides access to software fuse values (raytracing, etc). Rename relevant symbols from _llc to _cx_misc for use in a follow up change that decouples this from LLCC. Signed-off-by: Alexander Koskovich --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 8 ++++---- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 16 ++++++++-------- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 14 +++++++------- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gmu.c index 916c5d99c4d1..23e5b3a22ea5 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -947,7 +947,7 @@ static int a6xx_gmu_fw_start(struct a6xx_gmu *gmu, unsi= gned int state) =20 =09/* Turn on TCM (Tightly Coupled Memory) retention */ =09if (adreno_is_a7xx(adreno_gpu)) -=09=09a6xx_llc_write(a6xx_gpu, REG_A7XX_CX_MISC_TCM_RET_CNTL, 1); +=09=09a6xx_cx_misc_write(a6xx_gpu, REG_A7XX_CX_MISC_TCM_RET_CNTL, 1); =09else if (!adreno_is_a8xx(adreno_gpu)) =09=09gmu_write(gmu, REG_A6XX_GMU_GENERAL_7, 1); =20 @@ -1215,7 +1215,7 @@ static int a6xx_gmu_secure_init(struct a6xx_gpu *a6xx= _gpu) =09=09if (!qcom_scm_is_available()) { =09=09=09dev_warn_once(gpu->dev->dev, =09=09=09=09"SCM is not available, poking fuse register\n"); -=09=09=09a6xx_llc_write(a6xx_gpu, REG_A7XX_CX_MISC_SW_FUSE_VALUE, +=09=09=09a6xx_cx_misc_write(a6xx_gpu, REG_A7XX_CX_MISC_SW_FUSE_VALUE, =09=09=09=09A7XX_CX_MISC_SW_FUSE_VALUE_RAYTRACING | =09=09=09=09A7XX_CX_MISC_SW_FUSE_VALUE_FASTBLEND | =09=09=09=09A7XX_CX_MISC_SW_FUSE_VALUE_LPAC); @@ -1236,7 +1236,7 @@ static int a6xx_gmu_secure_init(struct a6xx_gpu *a6xx= _gpu) =09=09 * firmware, find out whether that's the case. The scm call =09=09 * above sets the fuse register. =09=09 */ -=09=09fuse_val =3D a6xx_llc_read(a6xx_gpu, +=09=09fuse_val =3D a6xx_cx_misc_read(a6xx_gpu, =09=09=09=09=09 REG_A7XX_CX_MISC_SW_FUSE_VALUE); =09=09adreno_gpu->has_ray_tracing =3D =09=09=09!!(fuse_val & A7XX_CX_MISC_SW_FUSE_VALUE_RAYTRACING); @@ -1299,7 +1299,7 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu) =20 =09/* Check to see if we are doing a cold or warm boot */ =09if (adreno_is_a7xx(adreno_gpu) || adreno_is_a8xx(adreno_gpu)) { -=09=09status =3D a6xx_llc_read(a6xx_gpu, REG_A7XX_CX_MISC_TCM_RET_CNTL) = =3D=3D 1 ? +=09=09status =3D a6xx_cx_misc_read(a6xx_gpu, REG_A7XX_CX_MISC_TCM_RET_CNTL= ) =3D=3D 1 ? =09=09=09GMU_WARM_BOOT : GMU_COLD_BOOT; =09} else if (gmu->legacy) { =09=09status =3D gmu_read(gmu, REG_A6XX_GMU_GENERAL_7) =3D=3D 1 ? diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.c index e1eae6cb1e40..9847f83b92af 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2039,7 +2039,7 @@ static void a6xx_llc_activate(struct a6xx_gpu *a6xx_g= pu) =09struct msm_gpu *gpu =3D &adreno_gpu->base; =09u32 cntl1_regval =3D 0; =20 -=09if (IS_ERR(a6xx_gpu->llc_mmio)) +=09if (IS_ERR(a6xx_gpu->cx_misc_mmio)) =09=09return; =20 =09if (!llcc_slice_activate(a6xx_gpu->llc_slice)) { @@ -2078,14 +2078,14 @@ static void a6xx_llc_activate(struct a6xx_gpu *a6xx= _gpu) =09 * pagetables =09 */ =09if (!a6xx_gpu->have_mmu500) { -=09=09a6xx_llc_write(a6xx_gpu, +=09=09a6xx_cx_misc_write(a6xx_gpu, =09=09=09REG_A6XX_CX_MISC_SYSTEM_CACHE_CNTL_1, cntl1_regval); =20 =09=09/* =09=09 * Program cacheability overrides to not allocate cache =09=09 * lines on a write miss =09=09 */ -=09=09a6xx_llc_rmw(a6xx_gpu, +=09=09a6xx_cx_misc_rmw(a6xx_gpu, =09=09=09REG_A6XX_CX_MISC_SYSTEM_CACHE_CNTL_0, 0xF, 0x03); =09=09return; =09} @@ -2098,7 +2098,7 @@ static void a7xx_llc_activate(struct a6xx_gpu *a6xx_g= pu) =09struct adreno_gpu *adreno_gpu =3D &a6xx_gpu->base; =09struct msm_gpu *gpu =3D &adreno_gpu->base; =20 -=09if (IS_ERR(a6xx_gpu->llc_mmio)) +=09if (IS_ERR(a6xx_gpu->cx_misc_mmio)) =09=09return; =20 =09if (!llcc_slice_activate(a6xx_gpu->llc_slice)) { @@ -2151,15 +2151,15 @@ static void a6xx_llc_slices_init(struct platform_de= vice *pdev, =09of_node_put(phandle); =20 =09if (is_a7xx || !a6xx_gpu->have_mmu500) -=09=09a6xx_gpu->llc_mmio =3D msm_ioremap(pdev, "cx_mem"); +=09=09a6xx_gpu->cx_misc_mmio =3D msm_ioremap(pdev, "cx_mem"); =09else -=09=09a6xx_gpu->llc_mmio =3D NULL; +=09=09a6xx_gpu->cx_misc_mmio =3D NULL; =20 =09a6xx_gpu->llc_slice =3D llcc_slice_getd(LLCC_GPU); =09a6xx_gpu->htw_llc_slice =3D llcc_slice_getd(LLCC_GPUHTW); =20 =09if (IS_ERR_OR_NULL(a6xx_gpu->llc_slice) && IS_ERR_OR_NULL(a6xx_gpu->htw= _llc_slice)) -=09=09a6xx_gpu->llc_mmio =3D ERR_PTR(-EINVAL); +=09=09a6xx_gpu->cx_misc_mmio =3D ERR_PTR(-EINVAL); } =20 #define GBIF_CLIENT_HALT_MASK=09=09BIT(0) @@ -2560,7 +2560,7 @@ static int a6xx_read_speedbin(struct device *dev, str= uct a6xx_gpu *a6xx_gpu, =09=09return ret; =20 =09if (info->quirks & ADRENO_QUIRK_SOFTFUSE) { -=09=09*speedbin =3D a6xx_llc_read(a6xx_gpu, REG_A8XX_CX_MISC_SW_FUSE_FREQ_= LIMIT_STATUS); +=09=09*speedbin =3D a6xx_cx_misc_read(a6xx_gpu, REG_A8XX_CX_MISC_SW_FUSE_F= REQ_LIMIT_STATUS); =09=09*speedbin =3D A8XX_CX_MISC_SW_FUSE_FREQ_LIMIT_STATUS_FINALFREQLIMIT(= *speedbin); =09=09return 0; =09} diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h b/drivers/gpu/drm/msm/ad= reno/a6xx_gpu.h index eb431e5e00b1..648608c1c98e 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h @@ -102,7 +102,7 @@ struct a6xx_gpu { =20 =09bool has_whereami; =20 -=09void __iomem *llc_mmio; +=09void __iomem *cx_misc_mmio; =09void *llc_slice; =09void *htw_llc_slice; =09bool have_mmu500; @@ -240,19 +240,19 @@ static inline bool a6xx_has_gbif(struct adreno_gpu *g= pu) =09return true; } =20 -static inline void a6xx_llc_rmw(struct a6xx_gpu *a6xx_gpu, u32 reg, u32 ma= sk, u32 or) +static inline void a6xx_cx_misc_rmw(struct a6xx_gpu *a6xx_gpu, u32 reg, u3= 2 mask, u32 or) { -=09return msm_rmw(a6xx_gpu->llc_mmio + (reg << 2), mask, or); +=09return msm_rmw(a6xx_gpu->cx_misc_mmio + (reg << 2), mask, or); } =20 -static inline u32 a6xx_llc_read(struct a6xx_gpu *a6xx_gpu, u32 reg) +static inline u32 a6xx_cx_misc_read(struct a6xx_gpu *a6xx_gpu, u32 reg) { -=09return readl(a6xx_gpu->llc_mmio + (reg << 2)); +=09return readl(a6xx_gpu->cx_misc_mmio + (reg << 2)); } =20 -static inline void a6xx_llc_write(struct a6xx_gpu *a6xx_gpu, u32 reg, u32 = value) +static inline void a6xx_cx_misc_write(struct a6xx_gpu *a6xx_gpu, u32 reg, = u32 value) { -=09writel(value, a6xx_gpu->llc_mmio + (reg << 2)); +=09writel(value, a6xx_gpu->cx_misc_mmio + (reg << 2)); } =20 #define shadowptr(_a6xx_gpu, _ring) ((_a6xx_gpu)->shadow_iova + \ diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/ad= reno/a8xx_gpu.c index 9e6f2ed69247..8b4b022d9a6b 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -103,7 +103,7 @@ void a8xx_gpu_get_slice_info(struct msm_gpu *gpu) =09=09return; =09} =20 -=09slice_mask &=3D a6xx_llc_read(a6xx_gpu, +=09slice_mask &=3D a6xx_cx_misc_read(a6xx_gpu, =09=09=09REG_A8XX_CX_MISC_SLICE_ENABLE_FINAL); =20 =09a6xx_gpu->slice_mask =3D slice_mask; --=20 2.53.0