Commit 14f4ca7e authored by Linus Walleij's avatar Linus Walleij Committed by Ulf Hansson
Browse files

mmc: block: Delete mmc_access_rpmb() 



This function is used by the block layer queue to bail out of
requests if the current request is towards an RPMB
"block device".

This was done to avoid boot time scanning of this "block
device" which was never really a block device, thus duct-taping
over the fact that it was badly engineered.

This problem is now gone as we removed the offending RPMB block
device in another patch and replaced it with a character
device.

Cc: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 97548575

drivers/mmc/core/block.c

+0 −12
Original line number Diff line number Diff line
@@ -1203,18 +1203,6 @@ static inline void mmc_blk_reset_success(struct mmc_blk_data *md, int type) 
	md->reset_done &= ~type;

}



int mmc_access_rpmb(struct mmc_queue *mq)

{

	struct mmc_blk_data *md = mq->blkdata;

	/*

	 * If this is a RPMB partition access, return ture

	 */

	if (md && md->part_type == EXT_CSD_PART_CONFIG_ACC_RPMB)

		return true;



	return false;

}



/*

 * The non-block commands come back from the block layer after it queued it and

 * processed it with all other requests and then they get issued in this

drivers/mmc/core/queue.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int mmc_prep_request(struct request_queue *q, struct request *req) 
{

	struct mmc_queue *mq = q->queuedata;



	if (mq && (mmc_card_removed(mq->card) || mmc_access_rpmb(mq)))

	if (mq && mmc_card_removed(mq->card))

		return BLKPREP_KILL;



	req->rq_flags |= RQF_DONTPREP;

drivers/mmc/core/queue.h

+0 −2
Original line number Diff line number Diff line
@@ -83,6 +83,4 @@ extern void mmc_queue_resume(struct mmc_queue *); 
extern unsigned int mmc_queue_map_sg(struct mmc_queue *,

				     struct mmc_queue_req *);



extern int mmc_access_rpmb(struct mmc_queue *);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE