nvme: set max_hw_sectors unconditionally

[linux-2.6-microblaze.git] / drivers / nvme / host / core.c

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index cb13f7c..6ae9aed 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -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_hw_sectors(q, ctrl->max_hw_sectors);
+       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);