[PATCH v2] drm/amdkfd: Fix L2 cache size reporting in GFX9.4.3

[Joshi, Mukul]

[AMD Official Use Only - General]

Reviewed-by: Mukul Joshi <mukul.joshi at amd.com>

> -----Original Message-----
> From: Russell, Kent <Kent.Russell at amd.com>
> Sent: Tuesday, February 6, 2024 4:32 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Joshi, Mukul <Mukul.Joshi at amd.com>; Russell, Kent
> <Kent.Russell at amd.com>
> Subject: [PATCH v2] drm/amdkfd: Fix L2 cache size reporting in GFX9.4.3
>
> Its currently incorrectly multiplied by number of XCCs in the partition
>
> Fixes: 6b537864925e ("drm/amdkfd: Update cache info for GFX 9.4.3")
> Signed-off-by: Kent Russell <kent.russell at amd.com>
> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> index 3df2a8ad86fb..533b8292b136 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> @@ -1640,12 +1640,10 @@ static int fill_in_l2_l3_pcache(struct
> kfd_cache_properties **props_ext,
>               else
>                       mode = UNKNOWN_MEMORY_PARTITION_MODE;
>
> -             if (pcache->cache_level == 2)
> -                     pcache->cache_size =
> pcache_info[cache_type].cache_size * num_xcc;
> -             else if (mode)
> -                     pcache->cache_size =
> pcache_info[cache_type].cache_size / mode;
> -             else
> -                     pcache->cache_size =
> pcache_info[cache_type].cache_size;
> +             pcache->cache_size = pcache_info[cache_type].cache_size;
> +             /* Partition mode only affects L3 cache size */
> +             if (mode && pcache->cache_level == 3)
> +                     pcache->cache_size /= mode;
>
>               if (pcache_info[cache_type].flags &
> CRAT_CACHE_FLAGS_DATA_CACHE)
>                       pcache->cache_type |= HSA_CACHE_TYPE_DATA;
> --
> 2.34.1