Commit 249159c5 authored Dec 14, 2017 by Keith Busch Committed by Christoph Hellwig Dec 15, 2017

nvme: check hw sectors before setting chunk sectors



Some devices with IDs matching the "stripe" quirk don't actually have
this quirk, and don't have an MDTS value. When MDTS is not set, the
driver sets the max sectors to UINT_MAX, which is not a power of 2,
hitting a BUG_ON from blk_queue_chunk_sectors. This patch skips setting
chunk sectors for such devices.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent bd9f5d65

drivers/nvme/host/core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1705,7 +1705,8 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl,
		blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors);
		blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX));
		}
		if (ctrl->quirks & NVME_QUIRK_STRIPE_SIZE)
		if ((ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) &&
		is_power_of_2(ctrl->max_hw_sectors))
		blk_queue_chunk_sectors(q, ctrl->max_hw_sectors);
		blk_queue_virt_boundary(q, ctrl->page_size - 1);
		if (ctrl->vwc & NVME_CTRL_VWC_PRESENT)

Admin message