Skip to content

nvme-pci: Re-enable NVME Host Memory Block (HMB) support #6844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
altserg wants to merge 3 commits into from
Closed

nvme-pci: Re-enable NVME Host Memory Block (HMB) support #6844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0e1f02
Revert "nvme-pci: Disable Host Memory Buffer usage"
altserg May 8, 2025
0860bce
Set default NVME HMB size to 0 on RPi 5
altserg May 8, 2025
c8ff33f
Set default NVME HMB size to 0 on RPi 4
altserg May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

/ {
chosen {
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0 cgroup_disable=memory numa_policy=interleave";
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0 cgroup_disable=memory numa_policy=interleave nvme.max_host_mem_size_mb=0";

Check failure on line 6 in arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 167 exceeds 100 columns
};

__overrides__ {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

/ {
chosen: chosen {
bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe cgroup_disable=memory numa_policy=interleave";
bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe cgroup_disable=memory numa_policy=interleave nvme.max_host_mem_size_mb=0";

Check failure on line 100 in arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 162 exceeds 100 columns
stdout-path = "serial10:115200n8";
};

Expand Down
4 changes: 0 additions & 4 deletions drivers/nvme/host/pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2081,7 +2081,6 @@ static void nvme_free_host_mem(struct nvme_dev *dev)
dev->nr_host_mem_descs = 0;
}

#if 0
static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,
u32 chunk_size)
{
Expand Down Expand Up @@ -2150,11 +2149,9 @@ static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,
dev->host_mem_descs = NULL;
return -ENOMEM;
}
#endif

static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)
{
#if 0
u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);
u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);
u64 chunk_size;
Expand All @@ -2167,7 +2164,6 @@ static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)
nvme_free_host_mem(dev);
}
}
#endif

return -ENOMEM;
}
Expand Down
Loading