Merge "mmc: sdhci-msm: fix tracepoint for pm debugging" (64562b71) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mmc/card/queue.c

+16 −10

Original line number	Diff line number	Diff line
		@@ -59,16 +59,22 @@ static inline bool mmc_cmdq_should_pull_reqs(struct mmc_host *host,
		struct request *req)

		{
		if (((req->cmd_flags & (REQ_FLUSH \| REQ_DISCARD)) &&
		test_bit(CMDQ_STATE_DCMD_ACTIVE, &ctx->curr_state)) \|\|
		(!host->card->part_curr && mmc_host_halt(host)) \|\|
		test_bit(CMDQ_STATE_ERR, &ctx->curr_state)) {
		pr_debug("%s: %s: skip pulling reqs: state: %lu\n",
		mmc_hostname(host), __func__, ctx->curr_state);
		return false;
		} else {
		return true;
		}
		bool ret = true;

		if ((req->cmd_flags & (REQ_FLUSH \| REQ_DISCARD)) &&
		test_bit(CMDQ_STATE_DCMD_ACTIVE, &ctx->curr_state))
		ret = false;
		else if (!host->card->part_curr &&
		mmc_host_halt(host) && !mmc_card_suspended(host->card))
		ret = false;
		else if (test_bit(CMDQ_STATE_ERR, &ctx->curr_state))
		ret = false;

		if (!ret)
		pr_debug("%s: %s: skip pulling reqs: state: %lu, cmd_flags: 0x%x\n",
		mmc_hostname(host), __func__,
		ctx->curr_state, (unsigned int)req->cmd_flags);
		return ret;
		}

		static int mmc_cmdq_thread(void *d)

+2 −2

Original line number	Diff line number	Diff line
		@@ -3396,8 +3396,6 @@ static int sdhci_msm_runtime_suspend(struct device *dev)
		if (msm_host->msm_bus_vote.client_handle)
		sdhci_msm_bus_cancel_work_and_set_vote(host, 0);
		}
		trace_sdhci_msm_runtime_suspend(mmc_hostname(host->mmc), 0,
		ktime_to_us(ktime_sub(ktime_get(), start)));

		if (host->is_crypto_en) {
		ret = sdhci_msm_ice_suspend(host);
		@@ -3405,6 +3403,8 @@ static int sdhci_msm_runtime_suspend(struct device *dev)
		pr_err("%s: failed to suspend crypto engine %d\n",
		mmc_hostname(host->mmc), ret);
		}
		trace_sdhci_msm_runtime_suspend(mmc_hostname(host->mmc), 0,
		ktime_to_us(ktime_sub(ktime_get(), start)));
		return 0;
		}