diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2020-09-15 18:24:32 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2020-09-15 18:36:40 +0300 |
| commit | 02f7415054d7054955fd3c43902ad79437b09fbc (patch) | |
| tree | 87a7def48bbe373a820109805b974b53b1d382fa /drivers/scsi/ufs/ufshcd.h | |
| parent | 2de7649cff445ec35a6c5ee1a8e19be186d890fc (diff) | |
| parent | 244359c99fd90f1c61c3944f93250f8219435c75 (diff) | |
| download | linux-02f7415054d7054955fd3c43902ad79437b09fbc.tar.xz | |
Merge branch '5.9/scsi-fixes' into 5.10/scsi-ufs
Resolve UFS discrepancies between fixes and queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/ufs/ufshcd.h')
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 8011fdc89fb1..47eb1430274c 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -532,9 +532,16 @@ enum ufshcd_quirks { UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR = 1 << 10, /* + * This quirk needs to be enabled if the host controller has + * auto-hibernate capability but it doesn't work. + */ + UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8 = 1 << 11, + + /* * This quirk needs to disable manual flush for write booster */ - UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL = 1 << 11, + UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL = 1 << 12, + }; enum ufshcd_caps { @@ -824,7 +831,8 @@ return true; static inline bool ufshcd_is_auto_hibern8_supported(struct ufs_hba *hba) { - return (hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT); + return (hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT) && + !(hba->quirks & UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8); } static inline bool ufshcd_is_auto_hibern8_enabled(struct ufs_hba *hba) |