nvme-rdma: initialize max_hw_sectors earlier

Initialize max_fr_pages and the values depending on it a little earlier
so that nvme_alloc_admin_tag_set can rely on it to set the initial
queue limits.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 20fdd40b1879f5796ab768acade2096eefde9e93..04a69f7bd48f46dcf3150272757fb34ca285ed45 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -797,6 +797,12 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
 
        ctrl->max_fr_pages = nvme_rdma_get_max_fr_pages(ctrl->device->dev,
                                                        pi_capable);
+       ctrl->ctrl.max_segments = ctrl->max_fr_pages;
+       ctrl->ctrl.max_hw_sectors = ctrl->max_fr_pages << (ilog2(SZ_4K) - 9);
+       if (pi_capable)
+               ctrl->ctrl.max_integrity_segments = ctrl->max_fr_pages;
+       else
+               ctrl->ctrl.max_integrity_segments = 0;
 
        /*
         * Bind the async event SQE DMA mapping to the admin queue lifetime.
@@ -826,13 +832,6 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
        if (error)
                goto out_stop_queue;
 
-       ctrl->ctrl.max_segments = ctrl->max_fr_pages;
-       ctrl->ctrl.max_hw_sectors = ctrl->max_fr_pages << (ilog2(SZ_4K) - 9);
-       if (pi_capable)
-               ctrl->ctrl.max_integrity_segments = ctrl->max_fr_pages;
-       else
-               ctrl->ctrl.max_integrity_segments = 0;
-
        nvme_unquiesce_admin_queue(&ctrl->ctrl);
 
        error = nvme_init_ctrl_finish(&ctrl->ctrl, false);