| Message ID | 20200129105251.12466-4-stanley.chu@mediatek.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5a244e0ea67b293abb1d26c825db2ddde5f2862f |
| Headers | show |
| Series | MediaTek UFS vendor implemenation part III and Auto-Hibern8 fix | expand |
On 1/29/2020 2:52 AM, Stanley Chu wrote: > Auto-Hibern8 may be disabled by some vendors or sysfs > in runtime even if Auto-Hibern8 capability is supported > by host. If Auto-Hibern8 capability is supported by host > but not actually enabled, Auto-Hibern8 error shall not happen. > > To fix this, provide a way to detect if Auto-Hibern8 is > actually enabled first, and bypass Auto-Hibern8 disabling > case in ufshcd_is_auto_hibern8_error(). > > Fixes: 821744403913 ("scsi: ufs: Add error-handling of Auto-Hibernate") > Cc: stable@vger.kernel.org > Signed-off-by: Stanley Chu <stanley.chu@mediatek.com> > Reviewed-by: Bean Huo <beanhuo@micron.com> > --- Reviewed-by: Asutosh Das <asutoshd@codeaurora.org> > drivers/scsi/ufs/ufshcd.c | 3 ++- > drivers/scsi/ufs/ufshcd.h | 6 ++++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index abd0e6b05f79..214a3f373dd8 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -5479,7 +5479,8 @@ static irqreturn_t ufshcd_update_uic_error(struct ufs_hba *hba) > static bool ufshcd_is_auto_hibern8_error(struct ufs_hba *hba, > u32 intr_mask) > { > - if (!ufshcd_is_auto_hibern8_supported(hba)) > + if (!ufshcd_is_auto_hibern8_supported(hba) || > + !ufshcd_is_auto_hibern8_enabled(hba)) > return false; > > if (!(intr_mask & UFSHCD_UIC_HIBERN8_MASK)) > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h > index 2ae6c7c8528c..81c71a3e3474 100644 > --- a/drivers/scsi/ufs/ufshcd.h > +++ b/drivers/scsi/ufs/ufshcd.h > @@ -55,6 +55,7 @@ > #include <linux/clk.h> > #include <linux/completion.h> > #include <linux/regulator/consumer.h> > +#include <linux/bitfield.h> > #include "unipro.h" > > #include <asm/irq.h> > @@ -773,6 +774,11 @@ static inline bool ufshcd_is_auto_hibern8_supported(struct ufs_hba *hba) > return (hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT); > } > > +static inline bool ufshcd_is_auto_hibern8_enabled(struct ufs_hba *hba) > +{ > + return FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, hba->ahit) ? true : false; > +} > + > #define ufshcd_writel(hba, val, reg) \ > writel((val), (hba)->mmio_base + (reg)) > #define ufshcd_readl(hba, reg) \ >
On 2020-01-29 18:52, Stanley Chu wrote: > Auto-Hibern8 may be disabled by some vendors or sysfs > in runtime even if Auto-Hibern8 capability is supported > by host. If Auto-Hibern8 capability is supported by host > but not actually enabled, Auto-Hibern8 error shall not happen. > > To fix this, provide a way to detect if Auto-Hibern8 is > actually enabled first, and bypass Auto-Hibern8 disabling > case in ufshcd_is_auto_hibern8_error(). > > Fixes: 821744403913 ("scsi: ufs: Add error-handling of Auto-Hibernate") > Cc: stable@vger.kernel.org > Signed-off-by: Stanley Chu <stanley.chu@mediatek.com> > Reviewed-by: Bean Huo <beanhuo@micron.com> > --- Reviewed-by: Can Guo <cang@codeaurora.org> > drivers/scsi/ufs/ufshcd.c | 3 ++- > drivers/scsi/ufs/ufshcd.h | 6 ++++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index abd0e6b05f79..214a3f373dd8 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -5479,7 +5479,8 @@ static irqreturn_t > ufshcd_update_uic_error(struct ufs_hba *hba) > static bool ufshcd_is_auto_hibern8_error(struct ufs_hba *hba, > u32 intr_mask) > { > - if (!ufshcd_is_auto_hibern8_supported(hba)) > + if (!ufshcd_is_auto_hibern8_supported(hba) || > + !ufshcd_is_auto_hibern8_enabled(hba)) > return false; > > if (!(intr_mask & UFSHCD_UIC_HIBERN8_MASK)) > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h > index 2ae6c7c8528c..81c71a3e3474 100644 > --- a/drivers/scsi/ufs/ufshcd.h > +++ b/drivers/scsi/ufs/ufshcd.h > @@ -55,6 +55,7 @@ > #include <linux/clk.h> > #include <linux/completion.h> > #include <linux/regulator/consumer.h> > +#include <linux/bitfield.h> > #include "unipro.h" > > #include <asm/irq.h> > @@ -773,6 +774,11 @@ static inline bool > ufshcd_is_auto_hibern8_supported(struct ufs_hba *hba) > return (hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT); > } > > +static inline bool ufshcd_is_auto_hibern8_enabled(struct ufs_hba *hba) > +{ > + return FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, hba->ahit) ? true : > false; > +} > + > #define ufshcd_writel(hba, val, reg) \ > writel((val), (hba)->mmio_base + (reg)) > #define ufshcd_readl(hba, reg) \
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index abd0e6b05f79..214a3f373dd8 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -5479,7 +5479,8 @@ static irqreturn_t ufshcd_update_uic_error(struct ufs_hba *hba) static bool ufshcd_is_auto_hibern8_error(struct ufs_hba *hba, u32 intr_mask) { - if (!ufshcd_is_auto_hibern8_supported(hba)) + if (!ufshcd_is_auto_hibern8_supported(hba) || + !ufshcd_is_auto_hibern8_enabled(hba)) return false; if (!(intr_mask & UFSHCD_UIC_HIBERN8_MASK)) diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 2ae6c7c8528c..81c71a3e3474 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -55,6 +55,7 @@ #include <linux/clk.h> #include <linux/completion.h> #include <linux/regulator/consumer.h> +#include <linux/bitfield.h> #include "unipro.h" #include <asm/irq.h> @@ -773,6 +774,11 @@ static inline bool ufshcd_is_auto_hibern8_supported(struct ufs_hba *hba) return (hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT); } +static inline bool ufshcd_is_auto_hibern8_enabled(struct ufs_hba *hba) +{ + return FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, hba->ahit) ? true : false; +} + #define ufshcd_writel(hba, val, reg) \ writel((val), (hba)->mmio_base + (reg)) #define ufshcd_readl(hba, reg) \
Auto-Hibern8 may be disabled by some vendors or sysfs in runtime even if Auto-Hibern8 capability is supported by host. If Auto-Hibern8 capability is supported by host but not actually enabled, Auto-Hibern8 error shall not happen. To fix this, provide a way to detect if Auto-Hibern8 is actually enabled first, and bypass Auto-Hibern8 disabling case in ufshcd_is_auto_hibern8_error(). Fixes: 821744403913 ("scsi: ufs: Add error-handling of Auto-Hibernate") Cc: stable@vger.kernel.org Signed-off-by: Stanley Chu <stanley.chu@mediatek.com> Reviewed-by: Bean Huo <beanhuo@micron.com> --- drivers/scsi/ufs/ufshcd.c | 3 ++- drivers/scsi/ufs/ufshcd.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-)