[PATCH 2/3] drm/xe/guc: Release GuC v70.29.2 for LNL, BMG

[Cavitt, Jonathan]

> 
> -----Original Message-----
From: Intel-xe <intel-xe-bounces at lists.freedesktop.org> On Behalf Of Julia Filipchuk
Sent: Thursday, August 1, 2024 1:34 PM
To: intel-xe at lists.freedesktop.org
Cc: Filipchuk, Julia <julia.filipchuk at intel.com>
Subject: [PATCH 2/3] drm/xe/guc: Release GuC v70.29.2 for LNL, BMG
> 
> The VF API version for this release is 1.13.4
> 
> Released version is set as recommended and minimum.
> 
> Add comparable version macro to xe_uc_fw.

I think the new macros could be separated out into a new patch.  I can see how they'd
be useful for scalability, but it doesn't seem related to updating the GuC release for LNL
and BMG.

Not blocking, just something to consider.
Reviewed-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
-Jonathan Cavitt

> 
> Signed-off-by: Julia Filipchuk <julia.filipchuk at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_guc.h   |  3 +++
>  drivers/gpu/drm/xe/xe_uc_fw.c | 11 +++++++----
>  drivers/gpu/drm/xe/xe_uc_fw.h |  6 ++++++
>  3 files changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc.h b/drivers/gpu/drm/xe/xe_guc.h
> index e0bbf98f849d..9a0b9123dce0 100644
> --- a/drivers/gpu/drm/xe/xe_guc.h
> +++ b/drivers/gpu/drm/xe/xe_guc.h
> @@ -11,6 +11,9 @@
>  #include "xe_hw_engine_types.h"
>  #include "xe_macros.h"
>  
> +#define GUC_SUBMIT_VER(guc)   MAKE_VER_STRUCT((guc)->fw.versions.found[XE_UC_FW_VER_COMPATIBILITY])
> +#define GUC_FIRMWARE_VER(guc) MAKE_VER_STRUCT((guc)->fw.versions.found[XE_UC_FW_VER_RELEASE])
> +
>  struct drm_printer;
>  
>  void xe_guc_comm_init_early(struct xe_guc *guc);
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
> index 5b70d23724c4..89bea1461d20 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.c
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c
> @@ -15,6 +15,7 @@
>  #include "xe_gsc.h"
>  #include "xe_gt.h"
>  #include "xe_gt_printk.h"
> +#include "xe_guc.h"
>  #include "xe_map.h"
>  #include "xe_mmio.h"
>  #include "xe_module.h"
> @@ -105,7 +106,8 @@ struct fw_blobs_by_type {
>  };
>  
>  #define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver)			\
> -	fw_def(LUNARLAKE,	major_ver(xe,	guc,	lnl,	70, 19, 2))	\
> +	fw_def(BATTLEMAGE,	major_ver(xe,	guc,	bmg,	70, 29, 2))	\
> +	fw_def(LUNARLAKE,	major_ver(xe,	guc,	lnl,	70, 29, 2))	\
>  	fw_def(METEORLAKE,	major_ver(i915,	guc,	mtl,	70, 19, 2))	\
>  	fw_def(DG2,		major_ver(i915,	guc,	dg2,	70, 19, 2))	\
>  	fw_def(DG1,		major_ver(i915,	guc,	dg1,	70, 19, 2))	\
> @@ -304,14 +306,15 @@ static void uc_fw_fini(struct drm_device *drm, void *arg)
>  static int guc_read_css_info(struct xe_uc_fw *uc_fw, struct uc_css_header *css)
>  {
>  	struct xe_gt *gt = uc_fw_to_gt(uc_fw);
> +	struct xe_guc *guc = container_of(uc_fw, struct xe_guc, fw);
>  	struct xe_uc_fw_version *release = &uc_fw->versions.found[XE_UC_FW_VER_RELEASE];
>  	struct xe_uc_fw_version *compatibility = &uc_fw->versions.found[XE_UC_FW_VER_COMPATIBILITY];
>  
>  	xe_gt_assert(gt, uc_fw->type == XE_UC_FW_TYPE_GUC);
>  
> -	/* We don't support GuC releases older than 70.19 */
> -	if (release->major < 70 || (release->major == 70 && release->minor < 19)) {
> -		xe_gt_err(gt, "Unsupported GuC v%u.%u! v70.19 or newer is required\n",
> +	/* We don't support GuC releases older than 70.29.2 */
> +	if (GUC_FIRMWARE_VER(guc) < MAKE_VER(70, 29, 2)) {
> +		xe_gt_err(gt, "Unsupported GuC v%u.%u! v70.29.2 or newer is required\n",
>  			  release->major, release->minor);
>  		return -EINVAL;
>  	}
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.h b/drivers/gpu/drm/xe/xe_uc_fw.h
> index c108e9d08e70..1b1fdd103b9c 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.h
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.h
> @@ -12,6 +12,12 @@
>  #include "xe_uc_fw_abi.h"
>  #include "xe_uc_fw_types.h"
>  
> +/* Create a comparable u64 version number. Prevent truncation from smaller types. */
> +#define MAKE_VER(maj, min, pat) \
> +	(((u64)(maj) << 32) | ((u64)(min) << 16) | (pat))
> +
> +#define MAKE_VER_STRUCT(ver) MAKE_VER((ver).major, (ver).minor, (ver).patch)
> +
>  struct drm_printer;
>  
>  int xe_uc_fw_init(struct xe_uc_fw *uc_fw);
> -- 
> 2.45.2
> 
>