Skip to content

Commit fc25e98

Browse files
altsergpelwell
authored andcommitted
Revert "nvme-pci: Disable Host Memory Buffer usage"
This reverts commit 4263812.
1 parent 356b9ca commit fc25e98

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/nvme/host/pci.c

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

2097-
#if 0
20982097
static int nvme_alloc_host_mem_single(struct nvme_dev *dev, u64 size)
20992098
{
21002099
dev->hmb_sgt = dma_alloc_noncontiguous(dev->dev, size,
@@ -2181,11 +2180,9 @@ static int nvme_alloc_host_mem_multi(struct nvme_dev *dev, u64 preferred,
21812180
dev->host_mem_descs = NULL;
21822181
return -ENOMEM;
21832182
}
2184-
#endif
21852183

21862184
static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)
21872185
{
2188-
#if 0
21892186
unsigned long dma_merge_boundary = dma_get_merge_boundary(dev->dev);
21902187
u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);
21912188
u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);
@@ -2208,7 +2205,6 @@ static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)
22082205
nvme_free_host_mem(dev);
22092206
}
22102207
}
2211-
#endif
22122208

22132209
return -ENOMEM;
22142210
}

0 commit comments

Comments
 (0)