Commit facc239c authored by Bean Huo's avatar Bean Huo Committed by Martin K. Petersen
Browse files

scsi: ufs: ufshpb: Merge ufshpb_reset() and ufshpb_reset_host() 

There is no functional change in this patch, just merge ufshpb_reset() and
ufshpb_reset_host() into one function ufshpb_toggle_state().

Link: https://lore.kernel.org/r/20220505134707.35929-2-huobean@gmail.com


Reviewed-by: default avatarKeoseong Park <keosung.park@samsung.com>
Signed-off-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6f21d927

drivers/scsi/ufs/ufshcd.c

+2 −2
Original line number Diff line number Diff line
@@ -7226,7 +7226,7 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba) 
	 * Stop the host controller and complete the requests

	 * cleared by h/w

	 */

	ufshpb_reset_host(hba);

	ufshpb_toggle_state(hba, HPB_PRESENT, HPB_RESET);

	ufshcd_hba_stop(hba);

	hba->silence_err_logs = true;

	ufshcd_complete_requests(hba);
@@ -8193,7 +8193,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params) 
	/* Enable Auto-Hibernate if configured */

	ufshcd_auto_hibern8_enable(hba);



	ufshpb_reset(hba);

	ufshpb_toggle_state(hba, HPB_RESET, HPB_PRESENT);

out:

	spin_lock_irqsave(hba->host->host_lock, flags);

	if (ret)

drivers/scsi/ufs/ufshpb.c

+13 −23
Original line number Diff line number Diff line
@@ -2272,40 +2272,30 @@ static bool ufshpb_check_hpb_reset_query(struct ufs_hba *hba) 
	return flag_res;

}



void ufshpb_reset(struct ufs_hba *hba)

/**

 * ufshpb_toggle_state - switch HPB state of all LUs

 * @hba: per-adapter instance

 * @src: expected current HPB state

 * @dest: target HPB state to switch to

 */

void ufshpb_toggle_state(struct ufs_hba *hba, enum UFSHPB_STATE src, enum UFSHPB_STATE dest)

{

	struct ufshpb_lu *hpb;

	struct scsi_device *sdev;



	shost_for_each_device(sdev, hba->host) {

		hpb = ufshpb_get_hpb_data(sdev);

		if (!hpb)

			continue;



		if (ufshpb_get_state(hpb) != HPB_RESET)

		if (!hpb || ufshpb_get_state(hpb) != src)

			continue;

		ufshpb_set_state(hpb, dest);



		ufshpb_set_state(hpb, HPB_PRESENT);

	}

}



void ufshpb_reset_host(struct ufs_hba *hba)

{

	struct ufshpb_lu *hpb;

	struct scsi_device *sdev;



	shost_for_each_device(sdev, hba->host) {

		hpb = ufshpb_get_hpb_data(sdev);

		if (!hpb)

			continue;



		if (ufshpb_get_state(hpb) != HPB_PRESENT)

			continue;

		ufshpb_set_state(hpb, HPB_RESET);

		if (dest == HPB_RESET) {

			ufshpb_cancel_jobs(hpb);

			ufshpb_discard_rsp_lists(hpb);

		}

	}

}



void ufshpb_suspend(struct ufs_hba *hba)

{

drivers/scsi/ufs/ufshpb.h

+2 −4
Original line number Diff line number Diff line
@@ -288,8 +288,7 @@ static int ufshpb_prep(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) { return 0; 
static void ufshpb_rsp_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) {}

static void ufshpb_resume(struct ufs_hba *hba) {}

static void ufshpb_suspend(struct ufs_hba *hba) {}

static void ufshpb_reset(struct ufs_hba *hba) {}

static void ufshpb_reset_host(struct ufs_hba *hba) {}

static void ufshpb_toggle_state(struct ufs_hba *hba, enum UFSHPB_STATE src, enum UFSHPB_STATE dest) {}

static void ufshpb_init(struct ufs_hba *hba) {}

static void ufshpb_init_hpb_lu(struct ufs_hba *hba, struct scsi_device *sdev) {}

static void ufshpb_destroy_lu(struct ufs_hba *hba, struct scsi_device *sdev) {}
@@ -303,8 +302,7 @@ int ufshpb_prep(struct ufs_hba *hba, struct ufshcd_lrb *lrbp); 
void ufshpb_rsp_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp);

void ufshpb_resume(struct ufs_hba *hba);

void ufshpb_suspend(struct ufs_hba *hba);

void ufshpb_reset(struct ufs_hba *hba);

void ufshpb_reset_host(struct ufs_hba *hba);

void ufshpb_toggle_state(struct ufs_hba *hba, enum UFSHPB_STATE src, enum UFSHPB_STATE dest);

void ufshpb_init(struct ufs_hba *hba);

void ufshpb_init_hpb_lu(struct ufs_hba *hba, struct scsi_device *sdev);

void ufshpb_destroy_lu(struct ufs_hba *hba, struct scsi_device *sdev);