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

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

Merge "mmc: core: Resume clk scaling after hw reset"

parents ce6f1bab fa782a06

drivers/mmc/core/mmc.c

+2 −2
Original line number Diff line number Diff line
@@ -2942,9 +2942,9 @@ static int _mmc_hw_reset(struct mmc_host *host) 
		return ret;

	}



	ret = mmc_suspend_clk_scaling(host);

	ret = mmc_resume_clk_scaling(host);

	if (ret) {

		pr_err("%s: %s: fail to suspend clock scaling (%d)\n",

		pr_err("%s: %s: fail to resume clock scaling (%d)\n",

				mmc_hostname(host), __func__, ret);

	}

	return ret;

drivers/mmc/host/cqhci.c

+9 −2
Original line number Diff line number Diff line
@@ -901,14 +901,21 @@ irqreturn_t cqhci_irq(struct mmc_host *mmc, u32 intmask, int cmd_error, 
	struct cqhci_host *cq_host = mmc->cqe_private;



	status = cqhci_readl(cq_host, CQHCI_IS);

	cqhci_writel(cq_host, status, CQHCI_IS);



	pr_debug("%s: cqhci: IRQ status: 0x%08x\n", mmc_hostname(mmc), status);

	mmc_log_string(mmc, "CQIS: 0x%x cmd_error : %d data_err: %d\n",

		status, cmd_error, data_error);



	if ((status & CQHCI_IS_RED) || cmd_error || data_error)

	if ((status & CQHCI_IS_RED) || cmd_error || data_error) {

		pr_err("%s: cqhci: error IRQ status: 0x%08x cmd error %d data error %d\n",

			mmc_hostname(mmc), status, cmd_error, data_error);

		cqhci_dumpregs(cq_host);

		cqhci_writel(cq_host, status, CQHCI_IS);

		cqhci_error_irq(mmc, status, cmd_error, data_error);

	} else {

		/* Clear interrupt */

		cqhci_writel(cq_host, status, CQHCI_IS);

	}



	if (status & CQHCI_IS_TCC) {

		/* read TCN and complete the request */