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

Commit fe032b0b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: cmdq_hci: verify the doorbell bit for DCMD before setting"

parents ea122dda 71efdc58

drivers/mmc/host/cmdq_hci.c

+4 −2
Original line number Diff line number Diff line
@@ -649,8 +649,6 @@ static int cmdq_request(struct mmc_host *mmc, struct mmc_request *mrq) 
		goto out;

	}



	BUG_ON(cmdq_readl(cq_host, CQTDBR) & (1 << tag));



	cq_host->mrq_slot[tag] = mrq;

	if (cq_host->ops->set_tranfer_params)

		cq_host->ops->set_tranfer_params(mmc);
@@ -661,6 +659,10 @@ static int cmdq_request(struct mmc_host *mmc, struct mmc_request *mrq) 
ring_doorbell:

	/* Ensure the task descriptor list is flushed before ringing doorbell */

	wmb();

	if (cmdq_readl(cq_host, CQTDBR) & (1 << tag)) {

		cmdq_dumpregs(cq_host);

		BUG_ON(1);

	}

	cmdq_writel(cq_host, 1 << tag, CQTDBR);

	/* Commit the doorbell write immediately */

	wmb();