Skip to content

Commit 583c284

Browse files
altsergpopcornmix
authored andcommitted
Revert "nvme-pci: Disable Host Memory Buffer usage"
This reverts commit 4263812.
1 parent 5f7c056 commit 583c284

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

drivers/nvme/host/pci.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2091,7 +2091,6 @@ static void nvme_free_host_mem(struct nvme_dev *dev)
20912091
dev->nr_host_mem_descs = 0;
20922092
}
20932093

2094-
#if 0
20952094
static int nvme_alloc_host_mem_single(struct nvme_dev *dev, u64 size)
20962095
{
20972096
dev->hmb_sgt = dma_alloc_noncontiguous(dev->dev, size,
@@ -2178,11 +2177,9 @@ static int nvme_alloc_host_mem_multi(struct nvme_dev *dev, u64 preferred,
21782177
dev->host_mem_descs = NULL;
21792178
return -ENOMEM;
21802179
}
2181-
#endif
21822180

21832181
static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)
21842182
{
2185-
#if 0
21862183
unsigned long dma_merge_boundary = dma_get_merge_boundary(dev->dev);
21872184
u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);
21882185
u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);
@@ -2205,7 +2202,6 @@ static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)
22052202
nvme_free_host_mem(dev);
22062203
}
22072204
}
2208-
#endif
22092205

22102206
return -ENOMEM;
22112207
}

0 commit comments

Comments
 (0)