[PATCH 2/5] drm/amdkfd: restore debugger additional info for gfx v9_4_3

[Kim, Jonathan]

[AMD Official Use Only - General]

> -----Original Message-----
> From: Huang, JinHuiEric <JinHuiEric.Huang at amd.com>
> Sent: Wednesday, July 5, 2023 6:57 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Kim, Jonathan <Jonathan.Kim at amd.com>; Kim, Jonathan
> <Jonathan.Kim at amd.com>; Kasiviswanathan, Harish
> <Harish.Kasiviswanathan at amd.com>; Lin, Amber <Amber.Lin at amd.com>;
> Huang, JinHuiEric <JinHuiEric.Huang at amd.com>
> Subject: [PATCH 2/5] drm/amdkfd: restore debugger additional info for gfx
> v9_4_3
>
> From: Jonathan Kim <jonathan.kim at amd.com>
>
> The additional information that the KFD reports to the debugger was
> destroyed when the following commit was merged:
> "drm/amdkfd: convert switches to IP version checking"
>
> Signed-off-by: Jonathan Kim <jonathan.kim at amd.com>
> Reviewed-by: Harish Kasiviswanathan <Harish.Kasiviswanathan at amd.com>
> Signed-off-by: Jonathan Kim <jonathan.kim at amd.com>
> Acked-by: Amber Lin <amber.lin at amd.com>
> Signed-off-by: Eric Huang <jinhuieric.huang at amd.com>

This patch is Reviewed-by: Jonathan Kim <jonathan.kim at amd.com>

> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 ++++++++--
>  drivers/gpu/drm/amd/amdkfd/kfd_topology.h |  3 +++
>  2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> index 61fc62f3e003..1a4cdee86759 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> @@ -1932,8 +1932,14 @@ static void kfd_topology_set_capabilities(struct
> kfd_topology_device *dev)
>
>       HSA_CAP_TRAP_DEBUG_WAVE_LAUNCH_MODE_SUPPORTED;
>
>       if (KFD_GC_VERSION(dev->gpu) < IP_VERSION(10, 0, 0)) {
> -             dev->node_props.debug_prop |=
> HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX9 |
> -
>       HSA_DBG_WATCH_ADDR_MASK_HI_BIT;
> +             if (KFD_GC_VERSION(dev->gpu) == IP_VERSION(9, 4, 3))
> +                     dev->node_props.debug_prop |=
> +
>       HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX9_4_3 |
> +
>       HSA_DBG_WATCH_ADDR_MASK_HI_BIT_GFX9_4_3;
> +             else
> +                     dev->node_props.debug_prop |=
> +                             HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX9
> |
> +                             HSA_DBG_WATCH_ADDR_MASK_HI_BIT;
>
>               if (KFD_GC_VERSION(dev->gpu) < IP_VERSION(9, 4, 2))
>                       dev->node_props.debug_prop |=
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
> b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
> index cba2cd5ed9d1..dea32a9e5506 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
> @@ -32,9 +32,12 @@
>  #define KFD_TOPOLOGY_PUBLIC_NAME_SIZE 32
>
>  #define HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX9  6
> +#define HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX9_4_3 7
>  #define HSA_DBG_WATCH_ADDR_MASK_LO_BIT_GFX10 7
>  #define HSA_DBG_WATCH_ADDR_MASK_HI_BIT  \
>                       (29 << HSA_DBG_WATCH_ADDR_MASK_HI_BIT_SHIFT)
> +#define HSA_DBG_WATCH_ADDR_MASK_HI_BIT_GFX9_4_3 \
> +                     (30 << HSA_DBG_WATCH_ADDR_MASK_HI_BIT_SHIFT)
>
>  struct kfd_node_properties {
>       uint64_t hive_id;
> --
> 2.34.1