Merge "scsi: ufs: reduce printout for aborted requests" (b56f87a4) · Commits · e / devices / android_kernel_sony_msm8994

drivers/scsi/ufs/ufshcd.c

+29 −14

Original line number	Diff line number	Diff line
		@@ -452,6 +452,7 @@ static
		void ufshcd_print_trs(struct ufs_hba *hba, unsigned long bitmap, bool pr_prdt)
		{
		struct ufshcd_lrb *lrbp;
		int prdt_length;
		int tag;

		for_each_set_bit(tag, &bitmap, hba->nutrs) {
		@@ -472,18 +473,13 @@ void ufshcd_print_trs(struct ufs_hba *hba, unsigned long bitmap, bool pr_prdt)
		(u64)lrbp->ucd_rsp_dma_addr);
		ufshcd_hex_dump("UPIU RSP: ", lrbp->ucd_rsp_ptr,
		sizeof(struct utp_upiu_rsp));
		if (pr_prdt) {
		int prdt_length = le16_to_cpu(
		lrbp->utr_descriptor_ptr->prd_table_length);

		dev_err(hba->dev,
		"UPIU[%d] - PRDT - %d entries phys@0x%llx",
		tag, prdt_length,
		(u64)lrbp->ucd_prdt_dma_addr);
		prdt_length =
		le16_to_cpu(lrbp->utr_descriptor_ptr->prd_table_length);
		dev_err(hba->dev, "UPIU[%d] - PRDT - %d entries phys@0x%llx",
		tag, prdt_length, (u64)lrbp->ucd_prdt_dma_addr);
		if (pr_prdt)
		ufshcd_hex_dump("UPIU PRDT: ", lrbp->ucd_prdt_ptr,
		sizeof(struct ufshcd_sg_entry) *
		prdt_length);
		}
		sizeof(struct ufshcd_sg_entry) * prdt_length);
		}
		}

		@@ -2374,6 +2370,8 @@ static int ufshcd_queuecommand(struct Scsi_Host host, struct scsi_cmnd cmd)
		}
		spin_unlock_irqrestore(hba->host->host_lock, flags);

		hba->req_abort_count = 0;

		/* acquire the tag to make sure device cmds don't use it */
		if (test_and_set_bit_lock(tag, &hba->lrb_in_use)) {
		/*
		@@ -5638,7 +5636,9 @@ static int ufshcd_eh_device_reset_handler(struct scsi_cmnd *cmd)
		spin_lock_irqsave(host->host_lock, flags);
		ufshcd_transfer_req_compl(hba);
		spin_unlock_irqrestore(host->host_lock, flags);

		out:
		hba->req_abort_count = 0;
		if (!err) {
		err = SUCCESS;
		} else {
		@@ -5718,10 +5718,23 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)

		/* Print Transfer Request of aborted task */
		dev_err(hba->dev, "%s: Device abort task at tag %d", __func__, tag);

		/*
		* Print detailed info about aborted request.
		* As more than one request might get aborted at the same time,
		* print full information only for the first aborted request in order
		* to reduce repeated printouts. For other aborted requests only print
		* basic details.
		*/
		scsi_print_command(cmd);
		if (!hba->req_abort_count) {
		ufshcd_print_host_regs(hba);
		ufshcd_print_pwr_info(hba);
		ufshcd_print_trs(hba, 1 << tag, true);
		} else {
		ufshcd_print_trs(hba, 1 << tag, false);
		}
		hba->req_abort_count++;


		/* Skip task abort in case previous aborts failed and report failure */
		@@ -6176,6 +6189,8 @@ static void ufshcd_clear_dbg_ufs_stats(struct ufs_hba *hba)
		memset(&hba->ufs_stats.nl_err, 0, err_reg_hist_size);
		memset(&hba->ufs_stats.tl_err, 0, err_reg_hist_size);
		memset(&hba->ufs_stats.dme_err, 0, err_reg_hist_size);

		hba->req_abort_count = 0;
		}

		static void ufshcd_apply_pm_quirks(struct ufs_hba *hba)

include/linux/scsi/ufs/ufshcd.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -746,6 +746,9 @@ struct ufs_hba {

		/* PM Quality-of-Service (QoS) data */
		struct ufshcd_pm_qos pm_qos;

		/* Number of requests aborts */
		int req_abort_count;
		};

		/* Returns true if clocks can be gated. Otherwise false */