Commit c8b5fd03 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: block: Factor out mmc_setup_queue() 



Factor out some common code that will also be used with blk-mq.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 93482b3d

drivers/mmc/core/queue.c

+24 −15
Original line number Diff line number Diff line
@@ -177,6 +177,29 @@ static void mmc_exit_request(struct request_queue *q, struct request *req) 
	mq_rq->sg = NULL;

}



static void mmc_setup_queue(struct mmc_queue *mq, struct mmc_card *card)

{

	struct mmc_host *host = card->host;

	u64 limit = BLK_BOUNCE_HIGH;



	if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)

		limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;



	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, mq->queue);

	queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, mq->queue);

	if (mmc_can_erase(card))

		mmc_queue_setup_discard(mq->queue, card);



	blk_queue_bounce_limit(mq->queue, limit);

	blk_queue_max_hw_sectors(mq->queue,

		min(host->max_blk_count, host->max_req_size / 512));

	blk_queue_max_segments(mq->queue, host->max_segs);

	blk_queue_max_segment_size(mq->queue, host->max_seg_size);



	/* Initialize thread_sem even if it is not used */

	sema_init(&mq->thread_sem, 1);

}



/**

 * mmc_init_queue - initialise a queue structure.

 * @mq: mmc queue
@@ -190,12 +213,8 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, 
		   spinlock_t *lock, const char *subname)

{

	struct mmc_host *host = card->host;

	u64 limit = BLK_BOUNCE_HIGH;

	int ret = -ENOMEM;



	if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)

		limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;



	mq->card = card;

	mq->queue = blk_alloc_queue(GFP_KERNEL);

	if (!mq->queue)
@@ -214,18 +233,8 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, 
	}



	blk_queue_prep_rq(mq->queue, mmc_prep_request);

	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, mq->queue);

	queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, mq->queue);

	if (mmc_can_erase(card))

		mmc_queue_setup_discard(mq->queue, card);



	blk_queue_bounce_limit(mq->queue, limit);

	blk_queue_max_hw_sectors(mq->queue,

		min(host->max_blk_count, host->max_req_size / 512));

	blk_queue_max_segments(mq->queue, host->max_segs);

	blk_queue_max_segment_size(mq->queue, host->max_seg_size);



	sema_init(&mq->thread_sem, 1);

	mmc_setup_queue(mq, card);



	mq->thread = kthread_run(mmc_queue_thread, mq, "mmcqd/%d%s",

		host->index, subname ? subname : "");