nvme-pci: move the HMPRE check into nvme_setup_host_mem

Check that a HMB is wanted into the allocation helper instead of the
caller.  This makes life simpler for an upcoming second caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 4da3396..57fb883 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2102,6 +2102,9 @@ static int nvme_setup_host_mem(struct nvme_dev *dev)
        u32 enable_bits = NVME_HOST_MEM_ENABLE;
        int ret;
 
+       if (!dev->ctrl.hmpre)
+               return 0;
+
        preferred = min(preferred, max);
        if (min > max) {
                dev_warn(dev->ctrl.device,
@@ -2862,11 +2865,9 @@ static void nvme_reset_work(struct work_struct *work)
 
        nvme_dbbuf_dma_alloc(dev);
 
-       if (dev->ctrl.hmpre) {
-               result = nvme_setup_host_mem(dev);
-               if (result < 0)
-                       goto out;
-       }
+       result = nvme_setup_host_mem(dev);
+       if (result < 0)
+               goto out;
 
        result = nvme_setup_io_queues(dev);
        if (result)