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

Commit a18ab197 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: trigger get queue status after dcmd"

parents e0539445 46a190b8
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ static void cmdq_dumpregs(struct cmdq_host *cq_host)
	pr_err(DRV_NAME ": Resp idx 0x%08x	  | Resp arg:  0x%08x\n",
		cmdq_readl(cq_host, CQCRI),
		cmdq_readl(cq_host, CQCRA));
	pr_err(DRV_NAME": Vendor cfg 0x%08x\n",
	       cmdq_readl(cq_host, CQ_VENDOR_CFG));
	pr_err(DRV_NAME ": ===========================================\n");

	cmdq_dump_debug_ram(cq_host);
@@ -639,6 +641,9 @@ static void cmdq_finish_data(struct mmc_host *mmc, unsigned int tag)
	if (tag == cq_host->dcmd_slot)
		mrq->cmd->resp[0] = cmdq_readl(cq_host, CQCRDCT);

	if (mrq->cmdq_req->cmdq_req_flags & DCMD)
		cmdq_writel(cq_host, cmdq_readl(cq_host, CQ_VENDOR_CFG) |
			    CMDQ_SEND_STATUS_TRIGGER, CQCTL);
	mrq->done(mrq);
}

+3 −0
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@
#define DAT_ADDR_LO(x)	((x & 0xFFFFFFFF) << 32)
#define DAT_ADDR_HI(x)	((x & 0xFFFFFFFF) << 0)

#define CQ_VENDOR_CFG	0x100
#define CMDQ_SEND_STATUS_TRIGGER (1 << 31)

struct cmdq_host {
	const struct cmdq_host_ops *ops;
	void __iomem *mmio;