Merge "mmc: sdhci-msm: dump cmdq debug ram only for command queue host" (93bc1979) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mmc/host/sdhci-msm.c

+12 −7

Original line number	Diff line number	Diff line
		@@ -2986,6 +2986,7 @@ void sdhci_msm_dump_vendor_regs(struct sdhci_host *host)
		u32 sts = 0;

		pr_info("----------- VENDOR REGISTER DUMP -----------\n");
		if (host->cq_host)
		sdhci_msm_cmdq_dump_debug_ram(msm_host);

		pr_info("Data cnt: 0x%08x \| Fifo cnt: 0x%08x \| Int sts: 0x%08x\n",
		@@ -3217,11 +3218,13 @@ void sdhci_msm_pm_qos_irq_unvote(struct sdhci_host *host, bool async)
		if (!msm_host->pm_qos_irq.enabled)
		return;

		if (atomic_read(&msm_host->pm_qos_irq.counter)) {
		counter = atomic_dec_return(&msm_host->pm_qos_irq.counter);
		if (counter < 0) {
		pr_err("%s: counter=%d\n", __func__, counter);
		BUG();
		} else {
		WARN(1, "attempt to decrement pm_qos_irq.counter when it's 0");
		return;
		}

		if (counter)
		return;

		@@ -3742,12 +3745,14 @@ static void sdhci_msm_cmdq_init(struct sdhci_host *host,
		struct sdhci_msm_host *msm_host = pltfm_host->priv;

		host->cq_host = cmdq_pltfm_init(pdev);
		if (IS_ERR(host->cq_host))
		if (IS_ERR(host->cq_host)) {
		dev_dbg(&pdev->dev, "cmdq-pltfm init: failed: %ld\n",
		PTR_ERR(host->cq_host));
		else
		host->cq_host = NULL;
		} else {
		msm_host->mmc->caps2 \|= MMC_CAP2_CMD_QUEUE;
		}
		}
		#else
		static void sdhci_msm_cmdq_init(struct sdhci_host *host,
		struct platform_device *pdev)