Aside from some nits - see below, looks fine.
Thanks,
Avri
> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
> index ecfa898b9ccc..994d73d03207 100644
> --- a/drivers/scsi/ufs/ufshcd.h
> +++ b/drivers/scsi/ufs/ufshcd.h
> @@ -740,6 +740,11 @@ return true;
> #endif
> }
>
> +static inline bool ufshcd_is_auto_hibern8_supported(struct ufs_hba *hba)
> +{
> + return (hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT);
> +}
Maybe use it elsewhere in the driver, preferable in a preparatory patch,
Instead of patch #3.
> diff --git a/drivers/scsi/ufs/ufshci.h b/drivers/scsi/ufs/ufshci.h
> index 6fa889de5ee5..4bcb205f2077 100644
> --- a/drivers/scsi/ufs/ufshci.h
> +++ b/drivers/scsi/ufs/ufshci.h
> @@ -148,6 +148,9 @@ enum {
> UIC_HIBERNATE_EXIT |\
> UIC_POWER_MODE)
>
> +#define UFSHCD_UIC_AH8_ERROR_MASK (UIC_HIBERNATE_ENTER |\
> + UIC_HIBERNATE_EXIT)
So maybe update UFSHCD_UIC_PWR_MASK above
