mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-25 06:26:15 +00:00
538a1d740c
The patches were generated from the RPi repo with the following command: git format-patch v6.6.58..rpi-6.6.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From dd44b93200c412c4c043392243c417f2d70082b3 Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Thu, 18 Jul 2024 20:22:18 +0100
|
|
Subject: [PATCH 1345/1350] 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>
|
|
---
|
|
arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4s.dts | 2 +-
|
|
arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi | 2 +-
|
|
arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4s.dts
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4s.dts
|
|
@@ -148,7 +148,7 @@
|
|
|
|
/ {
|
|
chosen {
|
|
- bootargs = "coherent_pool=1M snd_bcm2835.enable_headphones=0";
|
|
+ bootargs = "coherent_pool=1M snd_bcm2835.enable_headphones=0 numa_policy=interleave";
|
|
};
|
|
|
|
aliases {
|
|
--- 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: chosen {
|
|
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
|
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0 numa_policy=interleave";
|
|
};
|
|
|
|
__overrides__ {
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
|
|
@@ -99,7 +99,7 @@
|
|
|
|
/ {
|
|
chosen: chosen {
|
|
- bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe";
|
|
+ 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";
|
|
stdout-path = "serial10:115200n8";
|
|
};
|
|
|