[PATCH 2/2] drm/amdkfd: Put ASIC revision into HSA capability

[Felix Kuehling]

Thank you Joe.

You can squash the two patches into one. KFD and AMDGPU are really one
component, and separating changes into separate commits is not
necessary. I'd also make amdgpu_amdkfd_get_asic_rev_id a static inline
function in amdgpu_amdkfd.h, since it's just a one-liner.

Other than that, this looks good to me.

Regards,
  Felix

Am 2020-04-16 um 3:33 p.m. schrieb Joseph Greathouse:
> In order to surface the ASIC revision to user level, we want
> to put it into the HSA topology. This can be because different
> ASIC revisions may require user-level software to do different
> things (e.g. patch code for things that are changed in later
> hardware revisions).
>
> The ASIC revision from the hardware is maximum of 4 bits at this
> time, so put it into 4 of the open bits in the HSA capability.
> Then user-level software can use this capability information to
> know -- for each ASIC -- what revision-based things must be done.
>
> Signed-off-by: Joseph Greathouse <Joseph.Greathouse at amd.com>
> Change-Id: If46b3a1864d0a7a67b95fddfc1dcd93932ca81d6
> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 ++++
>  drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 5 ++++-
>  2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> index 5db42814dd51..6e52c95ce8b0 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> @@ -1303,6 +1303,10 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
>  
>  	dev->node_props.vendor_id = gpu->pdev->vendor;
>  	dev->node_props.device_id = gpu->pdev->device;
> +	dev->node_props.capability |=
> +		((amdgpu_amdkfd_get_asic_rev_id(dev->gpu->kgd) <<
> +			HSA_CAP_ASIC_REVISION_SHIFT) &
> +			HSA_CAP_ASIC_REVISION_MASK);
>  	dev->node_props.location_id = pci_dev_id(gpu->pdev);
>  	dev->node_props.max_engine_clk_fcompute =
>  		amdgpu_amdkfd_get_max_engine_clock_in_mhz(dev->gpu->kgd);
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
> index 46eeecaf1b68..0c51bd3dcd59 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.h
> @@ -41,7 +41,6 @@
>  #define HSA_CAP_WATCH_POINTS_TOTALBITS_SHIFT	8
>  #define HSA_CAP_DOORBELL_TYPE_TOTALBITS_MASK	0x00003000
>  #define HSA_CAP_DOORBELL_TYPE_TOTALBITS_SHIFT	12
> -#define HSA_CAP_RESERVED			0xffffc000
>  
>  #define HSA_CAP_DOORBELL_TYPE_PRE_1_0		0x0
>  #define HSA_CAP_DOORBELL_TYPE_1_0		0x1
> @@ -51,6 +50,10 @@
>  #define HSA_CAP_SRAM_EDCSUPPORTED		0x00080000
>  #define HSA_CAP_MEM_EDCSUPPORTED		0x00100000
>  #define HSA_CAP_RASEVENTNOTIFY			0x00200000
> +#define HSA_CAP_ASIC_REVISION_MASK		0x03c00000
> +#define HSA_CAP_ASIC_REVISION_SHIFT		22
> +
> +#define HSA_CAP_RESERVED			0xfc078000
>  
>  struct kfd_node_properties {
>  	uint64_t hive_id;