Skip to content

Commit bed8a80

Browse files
altsergpopcornmix
authored andcommitted
Revert "nvme-pci: Disable Host Memory Buffer usage"
This reverts commit 4263812.
1 parent 4817030 commit bed8a80

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
@@ -2096,7 +2096,6 @@ static void nvme_free_host_mem(struct nvme_dev *dev)
20962096
dev->nr_host_mem_descs = 0;
20972097
}
20982098

2099-
#if 0
21002099
static int nvme_alloc_host_mem_single(struct nvme_dev *dev, u64 size)
21012100
{
21022101
dev->hmb_sgt = dma_alloc_noncontiguous(dev->dev, size,
@@ -2183,11 +2182,9 @@ static int nvme_alloc_host_mem_multi(struct nvme_dev *dev, u64 preferred,
21832182
dev->host_mem_descs = NULL;
21842183
return -ENOMEM;
21852184
}
2186-
#endif
21872185

21882186
static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)
21892187
{
2190-
#if 0
21912188
unsigned long dma_merge_boundary = dma_get_merge_boundary(dev->dev);
21922189
u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);
21932190
u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);
@@ -2210,7 +2207,6 @@ static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)
22102207
nvme_free_host_mem(dev);
22112208
}
22122209
}
2213-
#endif
22142210

22152211
return -ENOMEM;
22162212
}

0 commit comments

Comments
 (0)