From b0e1f022e52005d83f64eedff4f628cf19339f2d Mon Sep 17 00:00:00 2001 From: Serge Date: Thu, 8 May 2025 20:57:16 +0200 Subject: [PATCH 1/3] Revert "nvme-pci: Disable Host Memory Buffer usage" This reverts commit 4263812f0e010a193c6654f75eda49220066bd57. --- drivers/nvme/host/pci.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 75ec73bb5b28d0..e70618e8d35eb4 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -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) { @@ -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; @@ -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; } From 0860bce28b4d1807426962a22d60fe94ceb27985 Mon Sep 17 00:00:00 2001 From: Serge Date: Thu, 8 May 2025 19:20:36 +0200 Subject: [PATCH 2/3] Set default NVME HMB size to 0 on RPi 5 --- arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi index 5cb04f345200cb..3276bc297c5c42 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi @@ -97,7 +97,7 @@ pio: &rp1_pio { / { 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"; stdout-path = "serial10:115200n8"; }; From c8ff33f7c18ae2484c2b22d06ac4b1cc880b5425 Mon Sep 17 00:00:00 2001 From: Serge Date: Thu, 8 May 2025 19:50:46 +0200 Subject: [PATCH 3/3] Set default NVME HMB size to 0 on RPi 4 --- arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi index 63f01c49b3b940..4773b7bd267430 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi @@ -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"; }; __overrides__ {