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

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

Merge "mmc: card: Set INLINECRYPT queue flag based on host capability"

parents 00e5bd25 495ff45e

drivers/mmc/card/queue.c

+5 −0
Original line number Diff line number Diff line
@@ -314,6 +314,8 @@ void mmc_cmdq_setup_queue(struct mmc_queue *mq, struct mmc_card *card) 
						host->max_req_size / 512));

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

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

	if (host->inlinecrypt_support)

		queue_flag_set_unlocked(QUEUE_FLAG_INLINECRYPT, mq->queue);

}



/**
@@ -483,6 +485,9 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, 
success:

	sema_init(&mq->thread_sem, 1);



	if (host->inlinecrypt_support)

		queue_flag_set_unlocked(QUEUE_FLAG_INLINECRYPT, mq->queue);



	/* hook for pm qos legacy init */

	if (card->host->ops->init)

		card->host->ops->init(card->host);

include/linux/mmc/host.h

+2 −0
Original line number Diff line number Diff line
@@ -652,6 +652,8 @@ struct mmc_host { 
	void *cmdq_private;

	struct mmc_request	*err_mrq;



	bool inlinecrypt_support;  /* Inline encryption support */



	atomic_t rpmb_req_pending;

	struct mutex		rpmb_req_mutex;

	unsigned long		private[0] ____cacheline_aligned;