From: Akhil P Oommen <akhilpo@codeaurora.org>
To: Jonathan Marek <jonathan@marek.ca>, freedreno@lists.freedesktop.org
Cc: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Jordan Crouse <jordan@cosmicpenguin.net>,
Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>,
Eric Anholt <eric@anholt.net>,
Sharat Masetty <smasetty@codeaurora.org>,
Douglas Anderson <dianders@chromium.org>,
"open list:DRM DRIVER FOR MSM ADRENO GPU"
<linux-arm-msm@vger.kernel.org>,
"open list:DRM DRIVER FOR MSM ADRENO GPU"
<dri-devel@lists.freedesktop.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 4/8] drm/msm/a6xx: update/fix CP_PROTECT initialization
Date: Mon, 31 May 2021 13:39:03 +0530 [thread overview]
Message-ID: <71d2a36c-1a83-9735-4063-e693ed0ca29c@codeaurora.org> (raw)
In-Reply-To: <20210513171431.18632-5-jonathan@marek.ca>
On 5/13/2021 10:43 PM, Jonathan Marek wrote:
> Update CP_PROTECT register programming based on downstream.
>
> A6XX_PROTECT_RW is renamed to A6XX_PROTECT_NORDWR to make things aligned
> and also be more clear about what it does.
>
> Signed-off-by: Jonathan Marek <jonathan@marek.ca>
> ---
> drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 143 +++++++++++++++++++-------
> drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +-
> 2 files changed, 109 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> index 45a6a0fce7d7..909e3ff08f89 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> @@ -462,6 +462,113 @@ static void a6xx_set_hwcg(struct msm_gpu *gpu, bool state)
> gpu_write(gpu, REG_A6XX_RBBM_CLOCK_CNTL, state ? clock_cntl_on : 0);
> }
>
> +/* For a615, a616, a618, A619, a630, a640 and a680 */
> +static const u32 a6xx_protect[] = {
> + A6XX_PROTECT_RDONLY(0x00000, 0x04ff),
> + A6XX_PROTECT_RDONLY(0x00501, 0x0005),
> + A6XX_PROTECT_RDONLY(0x0050b, 0x02f4),
> + A6XX_PROTECT_NORDWR(0x0050e, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00510, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00534, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00800, 0x0082),
> + A6XX_PROTECT_NORDWR(0x008a0, 0x0008),
> + A6XX_PROTECT_NORDWR(0x008ab, 0x0024),
> + A6XX_PROTECT_RDONLY(0x008d0, 0x00bc),
> + A6XX_PROTECT_NORDWR(0x00900, 0x004d),
> + A6XX_PROTECT_NORDWR(0x0098d, 0x0272),
> + A6XX_PROTECT_NORDWR(0x00e00, 0x0001),
> + A6XX_PROTECT_NORDWR(0x00e03, 0x000c),
> + A6XX_PROTECT_NORDWR(0x03c00, 0x00c3),
> + A6XX_PROTECT_RDONLY(0x03cc4, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x08630, 0x01cf),
> + A6XX_PROTECT_NORDWR(0x08e00, 0x0000),
> + A6XX_PROTECT_NORDWR(0x08e08, 0x0000),
> + A6XX_PROTECT_NORDWR(0x08e50, 0x001f),
> + A6XX_PROTECT_NORDWR(0x09624, 0x01db),
> + A6XX_PROTECT_NORDWR(0x09e70, 0x0001),
> + A6XX_PROTECT_NORDWR(0x09e78, 0x0187),
> + A6XX_PROTECT_NORDWR(0x0a630, 0x01cf),
> + A6XX_PROTECT_NORDWR(0x0ae02, 0x0000),
> + A6XX_PROTECT_NORDWR(0x0ae50, 0x032f),
> + A6XX_PROTECT_NORDWR(0x0b604, 0x0000),
> + A6XX_PROTECT_NORDWR(0x0be02, 0x0001),
> + A6XX_PROTECT_NORDWR(0x0be20, 0x17df),
> + A6XX_PROTECT_NORDWR(0x0f000, 0x0bff),
> + A6XX_PROTECT_RDONLY(0x0fc00, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x11c00, 0x0000), /* note: infinite range */
> +};
> +
> +/* These are for a620 and a650 */
> +static const u32 a650_protect[] = {
> + A6XX_PROTECT_RDONLY(0x00000, 0x04ff),
> + A6XX_PROTECT_RDONLY(0x00501, 0x0005),
> + A6XX_PROTECT_RDONLY(0x0050b, 0x02f4),
> + A6XX_PROTECT_NORDWR(0x0050e, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00510, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00534, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00800, 0x0082),
> + A6XX_PROTECT_NORDWR(0x008a0, 0x0008),
> + A6XX_PROTECT_NORDWR(0x008ab, 0x0024),
> + A6XX_PROTECT_RDONLY(0x008d0, 0x00bc),
> + A6XX_PROTECT_NORDWR(0x00900, 0x004d),
> + A6XX_PROTECT_NORDWR(0x0098d, 0x0272),
> + A6XX_PROTECT_NORDWR(0x00e00, 0x0001),
> + A6XX_PROTECT_NORDWR(0x00e03, 0x000c),
> + A6XX_PROTECT_NORDWR(0x03c00, 0x00c3),
> + A6XX_PROTECT_RDONLY(0x03cc4, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x08630, 0x01cf),
> + A6XX_PROTECT_NORDWR(0x08e00, 0x0000),
> + A6XX_PROTECT_NORDWR(0x08e08, 0x0000),
> + A6XX_PROTECT_NORDWR(0x08e50, 0x001f),
> + A6XX_PROTECT_NORDWR(0x08e80, 0x027f),
> + A6XX_PROTECT_NORDWR(0x09624, 0x01db),
> + A6XX_PROTECT_NORDWR(0x09e60, 0x0011),
> + A6XX_PROTECT_NORDWR(0x09e78, 0x0187),
> + A6XX_PROTECT_NORDWR(0x0a630, 0x01cf),
> + A6XX_PROTECT_NORDWR(0x0ae02, 0x0000),
> + A6XX_PROTECT_NORDWR(0x0ae50, 0x032f),
> + A6XX_PROTECT_NORDWR(0x0b604, 0x0000),
> + A6XX_PROTECT_NORDWR(0x0b608, 0x0007),
> + A6XX_PROTECT_NORDWR(0x0be02, 0x0001),
> + A6XX_PROTECT_NORDWR(0x0be20, 0x17df),
> + A6XX_PROTECT_NORDWR(0x0f000, 0x0bff),
> + A6XX_PROTECT_RDONLY(0x0fc00, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x18400, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x1a800, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x1f400, 0x0443),
> + A6XX_PROTECT_RDONLY(0x1f844, 0x007b),
> + A6XX_PROTECT_NORDWR(0x1f887, 0x001b),
> + A6XX_PROTECT_NORDWR(0x1f8c0, 0x0000), /* note: infinite range */
> +};
> +
> +static void a6xx_set_cp_protect(struct msm_gpu *gpu)
> +{
> + struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
> + const u32 *regs = a6xx_protect;
> + unsigned i, count = ARRAY_SIZE(a6xx_protect), count_max = 32;
> +
> + BUILD_BUG_ON(ARRAY_SIZE(a6xx_protect) > 32);
> + BUILD_BUG_ON(ARRAY_SIZE(a650_protect) > 48);
> +
> + if (adreno_is_a650(adreno_gpu)) {
> + regs = a650_protect;
> + count = ARRAY_SIZE(a650_protect);
> + count_max = 48;
> + }
> +
> + /*
> + * Enable access protection to privileged registers, fault on an access
> + * protect violation and select the last span to protect from the start
> + * address all the way to the end of the register address space
> + */
> + gpu_write(gpu, REG_A6XX_CP_PROTECT_CNTL, BIT(0) | BIT(1) | BIT(3));
> +
> + for (i = 0; i < count - 1; i++)
> + gpu_write(gpu, REG_A6XX_CP_PROTECT(i), regs[i]);
> + /* last CP_PROTECT to have "infinite" length on the last entry */
> + gpu_write(gpu, REG_A6XX_CP_PROTECT(count_max - 1), regs[i]);
> +}
> +
> static void a6xx_set_ubwc_config(struct msm_gpu *gpu)
> {
> struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
> @@ -776,41 +883,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu)
> }
>
> /* Protect registers from the CP */
> - gpu_write(gpu, REG_A6XX_CP_PROTECT_CNTL, 0x00000003);
> -
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(0),
> - A6XX_PROTECT_RDONLY(0x600, 0x51));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(1), A6XX_PROTECT_RW(0xae50, 0x2));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(2), A6XX_PROTECT_RW(0x9624, 0x13));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(3), A6XX_PROTECT_RW(0x8630, 0x8));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(4), A6XX_PROTECT_RW(0x9e70, 0x1));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(5), A6XX_PROTECT_RW(0x9e78, 0x187));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(6), A6XX_PROTECT_RW(0xf000, 0x810));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(7),
> - A6XX_PROTECT_RDONLY(0xfc00, 0x3));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(8), A6XX_PROTECT_RW(0x50e, 0x0));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(9), A6XX_PROTECT_RDONLY(0x50f, 0x0));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(10), A6XX_PROTECT_RW(0x510, 0x0));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(11),
> - A6XX_PROTECT_RDONLY(0x0, 0x4f9));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(12),
> - A6XX_PROTECT_RDONLY(0x501, 0xa));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(13),
> - A6XX_PROTECT_RDONLY(0x511, 0x44));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(14), A6XX_PROTECT_RW(0xe00, 0xe));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(15), A6XX_PROTECT_RW(0x8e00, 0x0));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(16), A6XX_PROTECT_RW(0x8e50, 0xf));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(17), A6XX_PROTECT_RW(0xbe02, 0x0));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(18),
> - A6XX_PROTECT_RW(0xbe20, 0x11f3));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(19), A6XX_PROTECT_RW(0x800, 0x82));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(20), A6XX_PROTECT_RW(0x8a0, 0x8));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(21), A6XX_PROTECT_RW(0x8ab, 0x19));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(22), A6XX_PROTECT_RW(0x900, 0x4d));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(23), A6XX_PROTECT_RW(0x98d, 0x76));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(24),
> - A6XX_PROTECT_RDONLY(0x980, 0x4));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(25), A6XX_PROTECT_RW(0xa630, 0x0));
> + a6xx_set_cp_protect(gpu);
>
> /* Enable expanded apriv for targets that support it */
> if (gpu->hw_apriv) {
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
> index ce0610c5256f..bb544dfe5737 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
> @@ -44,7 +44,7 @@ struct a6xx_gpu {
> * REG_CP_PROTECT_REG(n) - this will block both reads and writes for _len
> * registers starting at _reg.
> */
> -#define A6XX_PROTECT_RW(_reg, _len) \
> +#define A6XX_PROTECT_NORDWR(_reg, _len) \
> ((1 << 31) | \
> (((_len) & 0x3FFF) << 18) | ((_reg) & 0x3FFFF))
>
>
Reviewed-by: Akhil P Oommen <akhilpo@codeaurora.org>
-Akhil
WARNING: multiple messages have this Message-ID (diff)
From: Akhil P Oommen <akhilpo@codeaurora.org>
To: Jonathan Marek <jonathan@marek.ca>, freedreno@lists.freedesktop.org
Cc: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>,
David Airlie <airlied@linux.ie>,
"open list:DRM DRIVER FOR MSM ADRENO GPU"
<linux-arm-msm@vger.kernel.org>,
Sharat Masetty <smasetty@codeaurora.org>,
Douglas Anderson <dianders@chromium.org>,
"open list:DRM DRIVER FOR MSM ADRENO GPU"
<dri-devel@lists.freedesktop.org>,
Jordan Crouse <jordan@cosmicpenguin.net>,
Sean Paul <sean@poorly.run>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 4/8] drm/msm/a6xx: update/fix CP_PROTECT initialization
Date: Mon, 31 May 2021 13:39:03 +0530 [thread overview]
Message-ID: <71d2a36c-1a83-9735-4063-e693ed0ca29c@codeaurora.org> (raw)
In-Reply-To: <20210513171431.18632-5-jonathan@marek.ca>
On 5/13/2021 10:43 PM, Jonathan Marek wrote:
> Update CP_PROTECT register programming based on downstream.
>
> A6XX_PROTECT_RW is renamed to A6XX_PROTECT_NORDWR to make things aligned
> and also be more clear about what it does.
>
> Signed-off-by: Jonathan Marek <jonathan@marek.ca>
> ---
> drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 143 +++++++++++++++++++-------
> drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +-
> 2 files changed, 109 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> index 45a6a0fce7d7..909e3ff08f89 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> @@ -462,6 +462,113 @@ static void a6xx_set_hwcg(struct msm_gpu *gpu, bool state)
> gpu_write(gpu, REG_A6XX_RBBM_CLOCK_CNTL, state ? clock_cntl_on : 0);
> }
>
> +/* For a615, a616, a618, A619, a630, a640 and a680 */
> +static const u32 a6xx_protect[] = {
> + A6XX_PROTECT_RDONLY(0x00000, 0x04ff),
> + A6XX_PROTECT_RDONLY(0x00501, 0x0005),
> + A6XX_PROTECT_RDONLY(0x0050b, 0x02f4),
> + A6XX_PROTECT_NORDWR(0x0050e, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00510, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00534, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00800, 0x0082),
> + A6XX_PROTECT_NORDWR(0x008a0, 0x0008),
> + A6XX_PROTECT_NORDWR(0x008ab, 0x0024),
> + A6XX_PROTECT_RDONLY(0x008d0, 0x00bc),
> + A6XX_PROTECT_NORDWR(0x00900, 0x004d),
> + A6XX_PROTECT_NORDWR(0x0098d, 0x0272),
> + A6XX_PROTECT_NORDWR(0x00e00, 0x0001),
> + A6XX_PROTECT_NORDWR(0x00e03, 0x000c),
> + A6XX_PROTECT_NORDWR(0x03c00, 0x00c3),
> + A6XX_PROTECT_RDONLY(0x03cc4, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x08630, 0x01cf),
> + A6XX_PROTECT_NORDWR(0x08e00, 0x0000),
> + A6XX_PROTECT_NORDWR(0x08e08, 0x0000),
> + A6XX_PROTECT_NORDWR(0x08e50, 0x001f),
> + A6XX_PROTECT_NORDWR(0x09624, 0x01db),
> + A6XX_PROTECT_NORDWR(0x09e70, 0x0001),
> + A6XX_PROTECT_NORDWR(0x09e78, 0x0187),
> + A6XX_PROTECT_NORDWR(0x0a630, 0x01cf),
> + A6XX_PROTECT_NORDWR(0x0ae02, 0x0000),
> + A6XX_PROTECT_NORDWR(0x0ae50, 0x032f),
> + A6XX_PROTECT_NORDWR(0x0b604, 0x0000),
> + A6XX_PROTECT_NORDWR(0x0be02, 0x0001),
> + A6XX_PROTECT_NORDWR(0x0be20, 0x17df),
> + A6XX_PROTECT_NORDWR(0x0f000, 0x0bff),
> + A6XX_PROTECT_RDONLY(0x0fc00, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x11c00, 0x0000), /* note: infinite range */
> +};
> +
> +/* These are for a620 and a650 */
> +static const u32 a650_protect[] = {
> + A6XX_PROTECT_RDONLY(0x00000, 0x04ff),
> + A6XX_PROTECT_RDONLY(0x00501, 0x0005),
> + A6XX_PROTECT_RDONLY(0x0050b, 0x02f4),
> + A6XX_PROTECT_NORDWR(0x0050e, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00510, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00534, 0x0000),
> + A6XX_PROTECT_NORDWR(0x00800, 0x0082),
> + A6XX_PROTECT_NORDWR(0x008a0, 0x0008),
> + A6XX_PROTECT_NORDWR(0x008ab, 0x0024),
> + A6XX_PROTECT_RDONLY(0x008d0, 0x00bc),
> + A6XX_PROTECT_NORDWR(0x00900, 0x004d),
> + A6XX_PROTECT_NORDWR(0x0098d, 0x0272),
> + A6XX_PROTECT_NORDWR(0x00e00, 0x0001),
> + A6XX_PROTECT_NORDWR(0x00e03, 0x000c),
> + A6XX_PROTECT_NORDWR(0x03c00, 0x00c3),
> + A6XX_PROTECT_RDONLY(0x03cc4, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x08630, 0x01cf),
> + A6XX_PROTECT_NORDWR(0x08e00, 0x0000),
> + A6XX_PROTECT_NORDWR(0x08e08, 0x0000),
> + A6XX_PROTECT_NORDWR(0x08e50, 0x001f),
> + A6XX_PROTECT_NORDWR(0x08e80, 0x027f),
> + A6XX_PROTECT_NORDWR(0x09624, 0x01db),
> + A6XX_PROTECT_NORDWR(0x09e60, 0x0011),
> + A6XX_PROTECT_NORDWR(0x09e78, 0x0187),
> + A6XX_PROTECT_NORDWR(0x0a630, 0x01cf),
> + A6XX_PROTECT_NORDWR(0x0ae02, 0x0000),
> + A6XX_PROTECT_NORDWR(0x0ae50, 0x032f),
> + A6XX_PROTECT_NORDWR(0x0b604, 0x0000),
> + A6XX_PROTECT_NORDWR(0x0b608, 0x0007),
> + A6XX_PROTECT_NORDWR(0x0be02, 0x0001),
> + A6XX_PROTECT_NORDWR(0x0be20, 0x17df),
> + A6XX_PROTECT_NORDWR(0x0f000, 0x0bff),
> + A6XX_PROTECT_RDONLY(0x0fc00, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x18400, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x1a800, 0x1fff),
> + A6XX_PROTECT_NORDWR(0x1f400, 0x0443),
> + A6XX_PROTECT_RDONLY(0x1f844, 0x007b),
> + A6XX_PROTECT_NORDWR(0x1f887, 0x001b),
> + A6XX_PROTECT_NORDWR(0x1f8c0, 0x0000), /* note: infinite range */
> +};
> +
> +static void a6xx_set_cp_protect(struct msm_gpu *gpu)
> +{
> + struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
> + const u32 *regs = a6xx_protect;
> + unsigned i, count = ARRAY_SIZE(a6xx_protect), count_max = 32;
> +
> + BUILD_BUG_ON(ARRAY_SIZE(a6xx_protect) > 32);
> + BUILD_BUG_ON(ARRAY_SIZE(a650_protect) > 48);
> +
> + if (adreno_is_a650(adreno_gpu)) {
> + regs = a650_protect;
> + count = ARRAY_SIZE(a650_protect);
> + count_max = 48;
> + }
> +
> + /*
> + * Enable access protection to privileged registers, fault on an access
> + * protect violation and select the last span to protect from the start
> + * address all the way to the end of the register address space
> + */
> + gpu_write(gpu, REG_A6XX_CP_PROTECT_CNTL, BIT(0) | BIT(1) | BIT(3));
> +
> + for (i = 0; i < count - 1; i++)
> + gpu_write(gpu, REG_A6XX_CP_PROTECT(i), regs[i]);
> + /* last CP_PROTECT to have "infinite" length on the last entry */
> + gpu_write(gpu, REG_A6XX_CP_PROTECT(count_max - 1), regs[i]);
> +}
> +
> static void a6xx_set_ubwc_config(struct msm_gpu *gpu)
> {
> struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
> @@ -776,41 +883,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu)
> }
>
> /* Protect registers from the CP */
> - gpu_write(gpu, REG_A6XX_CP_PROTECT_CNTL, 0x00000003);
> -
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(0),
> - A6XX_PROTECT_RDONLY(0x600, 0x51));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(1), A6XX_PROTECT_RW(0xae50, 0x2));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(2), A6XX_PROTECT_RW(0x9624, 0x13));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(3), A6XX_PROTECT_RW(0x8630, 0x8));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(4), A6XX_PROTECT_RW(0x9e70, 0x1));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(5), A6XX_PROTECT_RW(0x9e78, 0x187));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(6), A6XX_PROTECT_RW(0xf000, 0x810));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(7),
> - A6XX_PROTECT_RDONLY(0xfc00, 0x3));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(8), A6XX_PROTECT_RW(0x50e, 0x0));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(9), A6XX_PROTECT_RDONLY(0x50f, 0x0));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(10), A6XX_PROTECT_RW(0x510, 0x0));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(11),
> - A6XX_PROTECT_RDONLY(0x0, 0x4f9));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(12),
> - A6XX_PROTECT_RDONLY(0x501, 0xa));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(13),
> - A6XX_PROTECT_RDONLY(0x511, 0x44));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(14), A6XX_PROTECT_RW(0xe00, 0xe));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(15), A6XX_PROTECT_RW(0x8e00, 0x0));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(16), A6XX_PROTECT_RW(0x8e50, 0xf));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(17), A6XX_PROTECT_RW(0xbe02, 0x0));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(18),
> - A6XX_PROTECT_RW(0xbe20, 0x11f3));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(19), A6XX_PROTECT_RW(0x800, 0x82));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(20), A6XX_PROTECT_RW(0x8a0, 0x8));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(21), A6XX_PROTECT_RW(0x8ab, 0x19));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(22), A6XX_PROTECT_RW(0x900, 0x4d));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(23), A6XX_PROTECT_RW(0x98d, 0x76));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(24),
> - A6XX_PROTECT_RDONLY(0x980, 0x4));
> - gpu_write(gpu, REG_A6XX_CP_PROTECT(25), A6XX_PROTECT_RW(0xa630, 0x0));
> + a6xx_set_cp_protect(gpu);
>
> /* Enable expanded apriv for targets that support it */
> if (gpu->hw_apriv) {
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
> index ce0610c5256f..bb544dfe5737 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h
> @@ -44,7 +44,7 @@ struct a6xx_gpu {
> * REG_CP_PROTECT_REG(n) - this will block both reads and writes for _len
> * registers starting at _reg.
> */
> -#define A6XX_PROTECT_RW(_reg, _len) \
> +#define A6XX_PROTECT_NORDWR(_reg, _len) \
> ((1 << 31) | \
> (((_len) & 0x3FFF) << 18) | ((_reg) & 0x3FFFF))
>
>
Reviewed-by: Akhil P Oommen <akhilpo@codeaurora.org>
-Akhil
next prev parent reply other threads:[~2021-05-31 8:09 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 17:13 [PATCH v2 0/8] drm/msm/a6xx: add support for Adreno 660 GPU Jonathan Marek
2021-05-13 17:13 ` Jonathan Marek
2021-05-13 17:13 ` [PATCH v2 1/8] drm/msm: remove unused icc_path/ocmem_icc_path Jonathan Marek
2021-05-13 17:13 ` Jonathan Marek
2021-05-31 7:26 ` Akhil P Oommen
2021-05-31 7:26 ` Akhil P Oommen
2021-05-13 17:13 ` [PATCH v2 2/8] drm/msm/a6xx: use AOP-initialized PDC for a650 Jonathan Marek
2021-05-13 17:13 ` Jonathan Marek
2021-05-31 7:24 ` Akhil P Oommen
2021-05-31 7:24 ` Akhil P Oommen
2021-06-08 15:54 ` Jonathan Marek
2021-06-08 15:54 ` Jonathan Marek
2021-05-13 17:13 ` [PATCH v2 3/8] drm/msm/a6xx: fix incorrectly set uavflagprd_inv field for A650 Jonathan Marek
2021-05-13 17:13 ` Jonathan Marek
2021-05-31 7:33 ` Akhil P Oommen
2021-05-31 7:33 ` Akhil P Oommen
2021-05-13 17:13 ` [PATCH v2 4/8] drm/msm/a6xx: update/fix CP_PROTECT initialization Jonathan Marek
2021-05-13 17:13 ` Jonathan Marek
2021-05-31 8:09 ` Akhil P Oommen [this message]
2021-05-31 8:09 ` Akhil P Oommen
2021-05-13 17:14 ` [PATCH v2 5/8] drm/msm/a6xx: avoid shadow NULL reference in failure path Jonathan Marek
2021-05-13 17:14 ` Jonathan Marek
2021-05-31 9:25 ` Akhil P Oommen
2021-05-31 9:25 ` Akhil P Oommen
2021-05-13 17:14 ` [PATCH v2 6/8] drm/msm/a6xx: add support for Adreno 660 GPU Jonathan Marek
2021-05-13 17:14 ` Jonathan Marek
2021-05-31 15:05 ` Akhil P Oommen
2021-05-31 15:05 ` Akhil P Oommen
2021-06-08 16:53 ` Jonathan Marek
2021-06-08 16:53 ` Jonathan Marek
2021-05-13 17:14 ` [PATCH v2 7/8] drm/msm/a6xx: update a6xx_ucode_check_version for a660 Jonathan Marek
2021-05-13 17:14 ` Jonathan Marek
2021-05-31 15:06 ` Akhil P Oommen
2021-05-31 15:06 ` Akhil P Oommen
2021-05-13 17:14 ` [PATCH v2 8/8] drm/msm/a6xx: add a660 hwcg table Jonathan Marek
2021-05-13 17:14 ` Jonathan Marek
2021-05-31 15:10 ` Akhil P Oommen
2021-05-31 15:10 ` Akhil P Oommen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=71d2a36c-1a83-9735-4063-e693ed0ca29c@codeaurora.org \
--to=akhilpo@codeaurora.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=freedreno@lists.freedesktop.org \
--cc=jonathan@marek.ca \
--cc=jordan@cosmicpenguin.net \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=saiprakash.ranjan@codeaurora.org \
--cc=sean@poorly.run \
--cc=smasetty@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.