Skip to content

Commit dd44b93

Browse files
popcornmixpelwell
authored andcommitted
dts: Set preferred numa options in bootargs
The default cmdline adjustment is now numa_policy=interleave for 2711 and 2712, and additionally system_heap.max_order=0 iommu_dma_numa_policy=interleave for just 2712 (due to its better iommu support). The key setting numa=fake=<n> is not set here, so we will boot with a single numa region and behaviour should be pretty much unchanged from before this PR. Signed-off-by: Dom Cobley <popcornmix@gmail.com>
1 parent aece592 commit dd44b93

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4s.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148

149149
/ {
150150
chosen {
151-
bootargs = "coherent_pool=1M snd_bcm2835.enable_headphones=0";
151+
bootargs = "coherent_pool=1M snd_bcm2835.enable_headphones=0 numa_policy=interleave";
152152
};
153153

154154
aliases {

arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/ {
55
chosen: chosen {
6-
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
6+
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0 numa_policy=interleave";
77
};
88

99
__overrides__ {

arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100
/ {
101101
chosen: chosen {
102-
bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe";
102+
bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe numa_policy=interleave iommu_dma_numa_policy=interleave system_heap.max_order=0";
103103
stdout-path = "serial10:115200n8";
104104
};
105105

0 commit comments

Comments
 (0)