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

Commit 38eebefa authored by Stanley Chu's avatar Stanley Chu Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: scsi: ufs: Export ufs_fixup_device_setup() function 

Export ufs_fixup_device_setup() to allow vendors to re-use it for fixing
device quriks on specified UFS hosts.

Link: https://lore.kernel.org/r/20200508080115.24233-4-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 8db269a5102eabfb05f4207f90e0a022caf7b804)
Change-Id: Ia29cf3947d1722944bdc023544169208e023c85f
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent dcda3bd5

drivers/scsi/ufs/ufshcd.c

+7 −3
Original line number Diff line number Diff line
@@ -7021,12 +7021,15 @@ static void ufshcd_wb_probe(struct ufs_hba *hba, u8 *desc_buf) 
	hba->caps &= ~UFSHCD_CAP_WB_EN;

}



static void ufshcd_fixup_dev_quirks(struct ufs_hba *hba)

void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_fix *fixups)

{

	struct ufs_dev_fix *f;

	struct ufs_dev_info *dev_info = &hba->dev_info;



	for (f = ufs_fixups; f->quirk; f++) {

	if (!fixups)

		return;



	for (f = fixups; f->quirk; f++) {

		if ((f->wmanufacturerid == dev_info->wmanufacturerid ||

		     f->wmanufacturerid == UFS_ANY_VENDOR) &&

		     ((dev_info->model &&
@@ -7035,11 +7038,12 @@ static void ufshcd_fixup_dev_quirks(struct ufs_hba *hba) 
			hba->dev_quirks |= f->quirk;

	}

}

EXPORT_SYMBOL_GPL(ufshcd_fixup_dev_quirks);



static void ufs_fixup_device_setup(struct ufs_hba *hba)

{

	/* fix by general quirk table */

	ufshcd_fixup_dev_quirks(hba);

	ufshcd_fixup_dev_quirks(hba, ufs_fixups);



	/* allow vendors to fix quirks */

	ufshcd_vops_fixup_dev_quirks(hba);

drivers/scsi/ufs/ufshcd.h

+1 −0
Original line number Diff line number Diff line
@@ -1055,6 +1055,7 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode, 


void ufshcd_auto_hibern8_enable(struct ufs_hba *hba);

void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit);

void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_fix *fixups);

#define SD_ASCII_STD true

#define SD_RAW false

int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,