From: Mateusz Nowak <mateusz.nowak@xxxxxxxxx> max_dev_sectors is the upper limit for supported block size by the block device. Since it is used for limiting up max_hw_sectors value (and, as consequence maximum block size for request), lower level driver may need to set it to non-default value. This patch implements function allowing to do so. Fixes: ca369d51b3e1 ("block/sd: Fix device-imposed transfer length limits") Cc: linux-mmc@xxxxxxxxxxxxxxx Signed-off-by: Mateusz Nowak <mateusz.nowak@xxxxxxxxx> --- block/blk-settings.c | 24 ++++++++++++++++++++++++ include/linux/blkdev.h | 1 + 2 files changed, 25 insertions(+) diff --git a/block/blk-settings.c b/block/blk-settings.c index c7bb666aafd1..276920dfacd0 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -253,6 +253,30 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto EXPORT_SYMBOL(blk_queue_max_hw_sectors); /** + * blk_queue_max_dev_sectors - set max sectors supported by a device for + * this queue. + * @q: the request queue for the device + * @max_dev_sectors: max device sectors in the usual 512b unit + * + * Description: + * Enables a low level driver to set a device supported upper limit, + * max_dev_sectors, on the size of request. max_dev_sectors is set by + * the device driver based upon the capabilities of the device. + * + * max_dev_sectors is upper limit for max_hw_sectors value, thus + * it should be set before changing the latter value. + **/ +void blk_queue_max_dev_sectors(struct request_queue *q, + unsigned int max_dev_sectors) +{ + struct queue_limits *limits = &q->limits; + + limits->max_dev_sectors = min_t(unsigned int, max_dev_sectors, + BLK_DEF_MAX_SECTORS); +} +EXPORT_SYMBOL(blk_queue_max_dev_sectors); + +/** * blk_queue_chunk_sectors - set size of the chunk for this queue * @q: the request queue for the device * @chunk_sectors: chunk sectors in the usual 512b unit diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 4571ef1a12a9..2752d3afcf1c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -967,6 +967,7 @@ extern void blk_cleanup_queue(struct request_queue *); extern void blk_queue_make_request(struct request_queue *, make_request_fn *); extern void blk_queue_bounce_limit(struct request_queue *, u64); extern void blk_queue_max_hw_sectors(struct request_queue *, unsigned int); +extern void blk_queue_max_dev_sectors(struct request_queue *, unsigned int); extern void blk_queue_chunk_sectors(struct request_queue *, unsigned int); extern void blk_queue_max_segments(struct request_queue *, unsigned short); extern void blk_queue_max_segment_size(struct request_queue *, unsigned int); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html