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

Commit 5698f58e authored by Stanley Chu's avatar Stanley Chu Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: scsi: ufs-mediatek: Add fixup_dev_quirks vops 

Add fixup_dev_quirk vops in MediaTek UFS platforms and provide an initial
vendor-specific device quirk table.

Link: https://lore.kernel.org/r/20200508080115.24233-5-stanley.chu@mediatek.com


Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>

Bug: 151050916
(cherry picked from commit 62c2f503b54cd17bc4ad7b929354923012375f73)
Change-Id: I5451ab84d736f0e990547b5872a4ac10ebc939e2
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 38eebefa

drivers/scsi/ufs/ufs-mediatek.c

+19 −3
Original line number Diff line number Diff line
@@ -30,6 +30,12 @@ 
#define ufs_mtk_device_reset_ctrl(high, res) \

	ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res)



static struct ufs_dev_fix ufs_mtk_dev_fixups[] = {

	UFS_FIX(UFS_VENDOR_SKHYNIX, "H9HQ21AFAMZDAR",

		UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES),

	END_FIX

};



static void ufs_mtk_cfg_unipro_cg(struct ufs_hba *hba, bool enable)

{

	u32 tmp;
@@ -555,10 +561,8 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba) 
	struct ufs_dev_info *dev_info = &hba->dev_info;

	u16 mid = dev_info->wmanufacturerid;



	if (mid == UFS_VENDOR_SAMSUNG) {

		hba->dev_quirks &= ~UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE;

	if (mid == UFS_VENDOR_SAMSUNG)

		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TACTIVATE), 6);

	}



	/*

	 * Decide waiting time before gating reference clock and
@@ -575,6 +579,17 @@ static int ufs_mtk_apply_dev_quirks(struct ufs_hba *hba) 
	return 0;

}



void ufs_mtk_fixup_dev_quirks(struct ufs_hba *hba)

{

	struct ufs_dev_info *dev_info = &hba->dev_info;

	u16 mid = dev_info->wmanufacturerid;



	ufshcd_fixup_dev_quirks(hba, ufs_mtk_dev_fixups);



	if (mid == UFS_VENDOR_SAMSUNG)

		hba->dev_quirks &= ~UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE;

}



/**

 * struct ufs_hba_mtk_vops - UFS MTK specific variant operations

 *
@@ -589,6 +604,7 @@ static struct ufs_hba_variant_ops ufs_hba_mtk_vops = { 
	.link_startup_notify = ufs_mtk_link_startup_notify,

	.pwr_change_notify   = ufs_mtk_pwr_change_notify,

	.apply_dev_quirks    = ufs_mtk_apply_dev_quirks,

	.fixup_dev_quirks    = ufs_mtk_fixup_dev_quirks,

	.suspend             = ufs_mtk_suspend,

	.resume              = ufs_mtk_resume,

	.dbg_register_dump   = ufs_mtk_dbg_register_dump,