[PATCH] drm/xe/uc: Fix and start using xe_uc_fw_sanitize()

[Ghimiray, Himal Prasad]

On 13-06-2024 21:04, Michal Wajdeczko wrote:
> Helper xe_uc_fw_sanitize() was defined but never used. First fix
> it by properly exiting also from the LOAD_FAIL state, then use it
> in GuC and HuC sanitize code.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Cc: Matthew Brost <matthew.brost at intel.com>
> ---
>   drivers/gpu/drm/xe/xe_guc.c   | 2 +-
>   drivers/gpu/drm/xe/xe_huc.c   | 4 +---
>   drivers/gpu/drm/xe/xe_uc_fw.h | 2 +-
>   3 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
> index 0bf6e01b8910..0e1a5674ef13 100644
> --- a/drivers/gpu/drm/xe/xe_guc.c
> +++ b/drivers/gpu/drm/xe/xe_guc.c
> @@ -1094,7 +1094,7 @@ void xe_guc_irq_handler(struct xe_guc *guc, const u16 iir)
>   
>   void xe_guc_sanitize(struct xe_guc *guc)
>   {
> -	xe_uc_fw_change_status(&guc->fw, XE_UC_FIRMWARE_LOADABLE);
> +	xe_uc_fw_sanitize(&guc->fw);
>   	xe_guc_ct_disable(&guc->ct);
>   	guc->submission_state.enabled = false;
>   }
> diff --git a/drivers/gpu/drm/xe/xe_huc.c b/drivers/gpu/drm/xe/xe_huc.c
> index b039ff49341b..6238fb354914 100644
> --- a/drivers/gpu/drm/xe/xe_huc.c
> +++ b/drivers/gpu/drm/xe/xe_huc.c
> @@ -295,9 +295,7 @@ int xe_huc_auth(struct xe_huc *huc, enum xe_huc_auth_types type)
>   
>   void xe_huc_sanitize(struct xe_huc *huc)
>   {
> -	if (!xe_uc_fw_is_loadable(&huc->fw))
> -		return;
> -	xe_uc_fw_change_status(&huc->fw, XE_UC_FIRMWARE_LOADABLE);
> +	xe_uc_fw_sanitize(&huc->fw);
>   }
>   
>   void xe_huc_print_info(struct xe_huc *huc, struct drm_printer *p)
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.h b/drivers/gpu/drm/xe/xe_uc_fw.h
> index 35078038797e..c108e9d08e70 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.h
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.h
> @@ -158,7 +158,7 @@ static inline bool xe_uc_fw_is_overridden(const struct xe_uc_fw *uc_fw)
>   
>   static inline void xe_uc_fw_sanitize(struct xe_uc_fw *uc_fw)
>   {
> -	if (xe_uc_fw_is_loaded(uc_fw))
> +	if (xe_uc_fw_is_loadable(uc_fw))
>   		xe_uc_fw_change_status(uc_fw, XE_UC_FIRMWARE_LOADABLE);

LGTM
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>

>   }
>