Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee5f1042 authored by Stanley Chu's avatar Stanley Chu Committed by Martin K. Petersen
Browse files

scsi: ufs: Introduce ufshcd_is_auto_hibern8_supported() 



The checking of Auto-Hibernation support is used in many places in the
driver, thus re-factor it as ufshcd_is_auto_hibern8_supported() to make
code more clean.

Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: default avatarAvri Altman <Avri.Altman@wdc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a1b6fb94

drivers/scsi/ufs/ufs-sysfs.c

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit) 
{

	unsigned long flags;



	if (!(hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT))

	if (!ufshcd_is_auto_hibern8_supported(hba))

		return;



	spin_lock_irqsave(hba->host->host_lock, flags);
@@ -164,7 +164,7 @@ static ssize_t auto_hibern8_show(struct device *dev, 
{

	struct ufs_hba *hba = dev_get_drvdata(dev);



	if (!(hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT))

	if (!ufshcd_is_auto_hibern8_supported(hba))

		return -EOPNOTSUPP;



	return snprintf(buf, PAGE_SIZE, "%d\n", ufshcd_ahit_to_us(hba->ahit));
@@ -177,7 +177,7 @@ static ssize_t auto_hibern8_store(struct device *dev, 
	struct ufs_hba *hba = dev_get_drvdata(dev);

	unsigned int timer;



	if (!(hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT))

	if (!ufshcd_is_auto_hibern8_supported(hba))

		return -EOPNOTSUPP;



	if (kstrtouint(buf, 0, &timer))

drivers/scsi/ufs/ufshcd.c

+2 −2
Original line number Diff line number Diff line
@@ -3907,7 +3907,7 @@ static void ufshcd_auto_hibern8_enable(struct ufs_hba *hba) 
{

	unsigned long flags;



	if (!(hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT) || !hba->ahit)

	if (!ufshcd_is_auto_hibern8_supported(hba) || !hba->ahit)

		return;



	spin_lock_irqsave(hba->host->host_lock, flags);
@@ -8312,7 +8312,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) 
						UIC_LINK_HIBERN8_STATE);



	/* Set the default auto-hiberate idle timer value to 150 ms */

	if (hba->capabilities & MASK_AUTO_HIBERN8_SUPPORT) {

	if (ufshcd_is_auto_hibern8_supported(hba)) {

		hba->ahit = FIELD_PREP(UFSHCI_AHIBERN8_TIMER_MASK, 150) |

			    FIELD_PREP(UFSHCI_AHIBERN8_SCALE_MASK, 3);

	}

drivers/scsi/ufs/ufshcd.h

+5 −0
Original line number Diff line number Diff line
@@ -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);

}



#define ufshcd_writel(hba, val, reg)	\

	writel((val), (hba)->mmio_base + (reg))

#define ufshcd_readl(hba, reg)	\