Commit 8da76f71 authored by Adrian Hunter's avatar Adrian Hunter Committed by Martin K. Petersen
Browse files

scsi: ufs-pci: Add quirk for broken auto-hibernate for Intel EHL 

Intel EHL UFS host controller advertises auto-hibernate capability but it
does not work correctly. Add a quirk for that.

[mkp: checkpatch fix]

Link: https://lore.kernel.org/r/20200810141024.28859-1-adrian.hunter@intel.com


Fixes: 8c09d752 ("scsi: ufshdc-pci: Add Intel PCI IDs for EHL")
Acked-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 215d3267

drivers/scsi/ufs/ufshcd-pci.c

+14 −2
Original line number Diff line number Diff line
@@ -44,11 +44,23 @@ static int ufs_intel_link_startup_notify(struct ufs_hba *hba, 
	return err;

}



static int ufs_intel_ehl_init(struct ufs_hba *hba)

{

	hba->quirks |= UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8;

	return 0;

}



static struct ufs_hba_variant_ops ufs_intel_cnl_hba_vops = {

	.name                   = "intel-pci",

	.link_startup_notify	= ufs_intel_link_startup_notify,

};



static struct ufs_hba_variant_ops ufs_intel_ehl_hba_vops = {

	.name                   = "intel-pci",

	.init			= ufs_intel_ehl_init,

	.link_startup_notify	= ufs_intel_link_startup_notify,

};



#ifdef CONFIG_PM_SLEEP

/**

 * ufshcd_pci_suspend - suspend power management function
@@ -177,8 +189,8 @@ static const struct dev_pm_ops ufshcd_pci_pm_ops = { 
static const struct pci_device_id ufshcd_pci_tbl[] = {

	{ PCI_VENDOR_ID_SAMSUNG, 0xC00C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

	{ PCI_VDEVICE(INTEL, 0x9DFA), (kernel_ulong_t)&ufs_intel_cnl_hba_vops },

	{ PCI_VDEVICE(INTEL, 0x4B41), (kernel_ulong_t)&ufs_intel_cnl_hba_vops },

	{ PCI_VDEVICE(INTEL, 0x4B43), (kernel_ulong_t)&ufs_intel_cnl_hba_vops },

	{ PCI_VDEVICE(INTEL, 0x4B41), (kernel_ulong_t)&ufs_intel_ehl_hba_vops },

	{ PCI_VDEVICE(INTEL, 0x4B43), (kernel_ulong_t)&ufs_intel_ehl_hba_vops },

	{ }	/* terminate list */

};

drivers/scsi/ufs/ufshcd.h

+8 −1
Original line number Diff line number Diff line
@@ -520,6 +520,12 @@ enum ufshcd_quirks { 
	 * OCS FATAL ERROR with device error through sense data

	 */

	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,

};



enum ufshcd_caps {
@@ -803,7 +809,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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE