[PATCH 1/8] drm/xe/guc: Add more KLV helper macros

[Piotr Piórkowski]

Michal Wajdeczko <michal.wajdeczko at intel.com> wrote on pon [2024-maj-06 15:38:07 +0200]:
> In upcoming patches we will want to generate some of the KLV keys
> from other macros. Add MAKE_GUC_KLV_{KEY|LEN} macros for that and
> make sure they will correctly expand provided TAG parameter. Also
> fix PREP_GUC_KLV_TAG to also work correctly within other macros.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_guc_klv_helpers.h | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_klv_helpers.h b/drivers/gpu/drm/xe/xe_guc_klv_helpers.h
> index b835e0ebe6db..c676d21c173b 100644
> --- a/drivers/gpu/drm/xe/xe_guc_klv_helpers.h
> +++ b/drivers/gpu/drm/xe/xe_guc_klv_helpers.h
> @@ -6,6 +6,7 @@
>  #ifndef _XE_GUC_KLV_HELPERS_H_
>  #define _XE_GUC_KLV_HELPERS_H_
>  
> +#include <linux/args.h>
>  #include <linux/types.h>
>  
>  struct drm_printer;
> @@ -37,6 +38,18 @@ int xe_guc_klv_count(const u32 *klvs, u32 num_dwords);
>  	(FIELD_PREP_CONST(GUC_KLV_0_KEY, (key)) | \
>  	 FIELD_PREP_CONST(GUC_KLV_0_LEN, (len)))
>  
> +/**
> + * MAKE_GUC_KLV_KEY - Prepare KLV KEY name based on unique KLV definition tag.
> + * @TAG: unique tag of the KLV definition
> + */
> +#define MAKE_GUC_KLV_KEY(TAG) CONCATENATE(CONCATENATE(GUC_KLV_, TAG), _KEY)
> +
> +/**
> + * MAKE_GUC_KLV_LEN - Prepare KLV LEN name based on unique KLV definition tag.
> + * @TAG: unique tag of the KLV definition
> + */
> +#define MAKE_GUC_KLV_LEN(TAG) CONCATENATE(CONCATENATE(GUC_KLV_, TAG), _LEN)
> +
>  /**
>   * PREP_GUC_KLV_TAG - Prepare KLV header value based on unique KLV definition tag.
>   * @TAG: unique tag of the KLV definition
> @@ -46,6 +59,6 @@ int xe_guc_klv_count(const u32 *klvs, u32 num_dwords);
>   * Return: value of the KLV header (u32).
>   */
>  #define PREP_GUC_KLV_TAG(TAG) \
> -	PREP_GUC_KLV_CONST(GUC_KLV_##TAG##_KEY, GUC_KLV_##TAG##_LEN)
> +	PREP_GUC_KLV_CONST(MAKE_GUC_KLV_KEY(TAG), MAKE_GUC_KLV_LEN(TAG))
>  
>  #endif

LGTM:
Reviewed-by: Piotr Piórkowski <piotr.piorkowski at intel.com>


> -- 
> 2.43.0
> 

--