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

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

Merge "mmc: core: kick block queue after unhalting cmdq"

parents 0c2178fd 3ff14d83

drivers/mmc/card/queue.c

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, 
		} else {

			sema_init(&mq->thread_sem, 1);

			mq->queue->queuedata = mq;

			card->host->cmdq_ctx.q = mq->queue;

			mq->thread = kthread_run(mmc_cmdq_thread, mq,

						 "mmc-cmdqd/%d%s",

						 host->index,

drivers/mmc/core/core.c

+5 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/of.h>

#include <linux/pm.h>

#include <linux/jiffies.h>

#include <linux/blkdev.h>



#include <trace/events/mmc.h>
@@ -1434,8 +1435,11 @@ int mmc_cmdq_halt(struct mmc_host *host, bool halt) 
			host->ops->notify_halt(host, halt);

		if (!err && halt)

			mmc_host_set_halt(host);

		else if (!err && !halt)

		else if (!err && !halt) {

			mmc_host_clr_halt(host);

			if (host->cmdq_ctx.q)

				blk_run_queue(host->cmdq_ctx.q);

		}

	} else {

		err = -ENOSYS;

	}

include/linux/mmc/host.h

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ struct mmc_cmdq_context_info { 
	/* no free tag available */

	unsigned long	req_starved;

	wait_queue_head_t	queue_empty_wq;

	struct request_queue *q;

};



/**