Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (0c045111) · Commits · 戴 / test

drivers/scsi/ufs/ufshcd.c

+29 −5

Original line number	Diff line number	Diff line
		@@ -1627,12 +1627,12 @@ start:
		*/
		fallthrough;
		case CLKS_OFF:
		ufshcd_scsi_block_requests(hba);
		hba->clk_gating.state = REQ_CLKS_ON;
		trace_ufshcd_clk_gating(dev_name(hba->dev),
		hba->clk_gating.state);
		queue_work(hba->clk_gating.clk_gating_workq,
		&hba->clk_gating.ungate_work);
		if (queue_work(hba->clk_gating.clk_gating_workq,
		&hba->clk_gating.ungate_work))
		ufshcd_scsi_block_requests(hba);
		/*
		* fall through to check if we should wait for this
		* work to be done or not.
		@@ -2115,10 +2115,20 @@ ufshcd_wait_for_uic_cmd(struct ufs_hba hba, struct uic_command uic_cmd)
		unsigned long flags;

		if (wait_for_completion_timeout(&uic_cmd->done,
		msecs_to_jiffies(UIC_CMD_TIMEOUT)))
		msecs_to_jiffies(UIC_CMD_TIMEOUT))) {
		ret = uic_cmd->argument2 & MASK_UIC_COMMAND_RESULT;
		else
		} else {
		ret = -ETIMEDOUT;
		dev_err(hba->dev,
		"uic cmd 0x%x with arg3 0x%x completion timeout\n",
		uic_cmd->command, uic_cmd->argument3);

		if (!uic_cmd->cmd_active) {
		dev_err(hba->dev, "%s: UIC cmd has been completed, return the result\n",
		__func__);
		ret = uic_cmd->argument2 & MASK_UIC_COMMAND_RESULT;
		}
		}

		spin_lock_irqsave(hba->host->host_lock, flags);
		hba->active_uic_cmd = NULL;
		@@ -2150,6 +2160,7 @@ __ufshcd_send_uic_cmd(struct ufs_hba hba, struct uic_command uic_cmd,
		if (completion)
		init_completion(&uic_cmd->done);

		uic_cmd->cmd_active = 1;
		ufshcd_dispatch_uic_cmd(hba, uic_cmd);

		return 0;
		@@ -3807,10 +3818,18 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba hba, struct uic_command cmd)
		dev_err(hba->dev,
		"pwr ctrl cmd 0x%x with mode 0x%x completion timeout\n",
		cmd->command, cmd->argument3);

		if (!cmd->cmd_active) {
		dev_err(hba->dev, "%s: Power Mode Change operation has been completed, go check UPMCRS\n",
		__func__);
		goto check_upmcrs;
		}

		ret = -ETIMEDOUT;
		goto out;
		}

		check_upmcrs:
		status = ufshcd_get_upmcrs(hba);
		if (status != PWR_LOCAL) {
		dev_err(hba->dev,
		@@ -4902,11 +4921,14 @@ static irqreturn_t ufshcd_uic_cmd_compl(struct ufs_hba *hba, u32 intr_status)
		ufshcd_get_uic_cmd_result(hba);
		hba->active_uic_cmd->argument3 =
		ufshcd_get_dme_attr_val(hba);
		if (!hba->uic_async_done)
		hba->active_uic_cmd->cmd_active = 0;
		complete(&hba->active_uic_cmd->done);
		retval = IRQ_HANDLED;
		}

		if ((intr_status & UFSHCD_UIC_PWR_MASK) && hba->uic_async_done) {
		hba->active_uic_cmd->cmd_active = 0;
		complete(hba->uic_async_done);
		retval = IRQ_HANDLED;
		}
		@@ -8906,6 +8928,7 @@ void ufshcd_remove(struct ufs_hba *hba)
		blk_mq_free_tag_set(&hba->tmf_tag_set);
		blk_cleanup_queue(hba->cmd_queue);
		scsi_remove_host(hba->host);
		destroy_workqueue(hba->eh_wq);
		/* disable interrupts */
		ufshcd_disable_intr(hba, hba->intr_mask);
		ufshcd_hba_stop(hba);
		@@ -9206,6 +9229,7 @@ out_remove_scsi_host:
		exit_gating:
		ufshcd_exit_clk_scaling(hba);
		ufshcd_exit_clk_gating(hba);
		destroy_workqueue(hba->eh_wq);
		out_disable:
		hba->is_irq_enabled = false;
		ufshcd_hba_exit(hba);

drivers/scsi/ufs/ufshcd.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ enum dev_cmd_type {
		* @argument1: UIC command argument 1
		* @argument2: UIC command argument 2
		* @argument3: UIC command argument 3
		* @cmd_active: Indicate if UIC command is outstanding
		* @done: UIC command completion
		*/
		struct uic_command {
		@@ -71,6 +72,7 @@ struct uic_command {
		u32 argument1;
		u32 argument2;
		u32 argument3;
		int cmd_active;
		struct completion done;
		};

Admin message