Commit 152694c8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Keith Busch
Browse files

nvme: set max_hw_sectors unconditionally 



All transports set a max_hw_sectors value in the nvme_ctrl, so make
the code using it unconditional and clean it up using a little helper.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 49995681

drivers/nvme/host/core.c

+8 −8
Original line number Diff line number Diff line
@@ -1944,19 +1944,19 @@ static int nvme_configure_metadata(struct nvme_ctrl *ctrl, 
	return 0;

}



static u32 nvme_max_drv_segments(struct nvme_ctrl *ctrl)

{

	return ctrl->max_hw_sectors / (NVME_CTRL_PAGE_SIZE >> SECTOR_SHIFT) + 1;

}



static void nvme_set_queue_limits(struct nvme_ctrl *ctrl,

		struct request_queue *q)

{

	bool vwc = ctrl->vwc & NVME_CTRL_VWC_PRESENT;



	if (ctrl->max_hw_sectors) {

		u32 max_segments =

			(ctrl->max_hw_sectors / (NVME_CTRL_PAGE_SIZE >> 9)) + 1;



		max_segments = min_not_zero(max_segments, ctrl->max_segments);

	blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors);

		blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX));

	}

	blk_queue_max_segments(q, min_t(u32, USHRT_MAX,

		min_not_zero(nvme_max_drv_segments(ctrl), ctrl->max_segments)));

	blk_queue_virt_boundary(q, NVME_CTRL_PAGE_SIZE - 1);

	blk_queue_dma_alignment(q, 3);

	blk_queue_write_cache(q, vwc, vwc);