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

Commit 4c93e63f authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: Fix UFS's NOC error, command tracing"

parents bb45dcb2 dc34cc80

drivers/scsi/ufs/ufshcd.c

+0 −4
Original line number Diff line number Diff line
@@ -753,9 +753,6 @@ static inline void ufshcd_cond_add_cmd_trace(struct ufs_hba *hba, 
	sector_t lba = 0;

	int transfer_len = 0;



	if (!trace_ufshcd_command_enabled())

		return;



	lrbp = &hba->lrb[tag];



	if (lrbp->cmd) { /* data phase exists */
@@ -3703,7 +3700,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) 
	if (err) {

		err = SCSI_MLQUEUE_HOST_BUSY;

		clear_bit_unlock(tag, &hba->lrb_in_use);

		ufshcd_release_all(hba);

		goto out;

	}

	if (ufshcd_is_clkgating_allowed(hba))

drivers/scsi/ufs/ufshcd.h

+2 −2
Original line number Diff line number Diff line
@@ -892,10 +892,10 @@ struct ufs_hba { 


	#define UFSHCD_BROKEN_LCC_PROCESSING_ON_HOST		UFS_BIT(13)



	#define UFSHCD_QUIRK_DME_PEER_GET_FAST_MODE		UFS_BIT(8)

	#define UFSHCD_QUIRK_DME_PEER_GET_FAST_MODE		UFS_BIT(14)



	/* Auto hibern8 support is broken */

	#define UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8		UFS_BIT(9)

	#define UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8		UFS_BIT(15)



	unsigned int quirks;	/* Deviations from standard UFSHCI spec. */