webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 19:00:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

kernel: update to 6.6.2

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2023-11-24 15:45:00 +01:00
committed by Michael Tremer
parent e36e826ad9
commit 95f9d9350d
19 changed files with 5185 additions and 1735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/patches/linux/aarch64/0001-rockchip-dt-nanopi-r2s-change-button-from-restart-to.patch Normal file
View File

@@ -0,0 +1,32 @@
From 937057185cce0a05eea29f307aa3ef498e49138e Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 9 Nov 2021 08:52:11 +0100
Subject: [PATCH 1/8] rockchip: dt: nanopi-r2s: change button from restart to
power
this is to proper shutdown via acpi with this button.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
index 1445b879ac7a..35b76d7e8ab4 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -35,9 +35,9 @@ keys {
pinctrl-names = "default";
key-reset {
- label = "reset";
+ label = "power";
gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
+ linux,code = <KEY_POWER>;
debounce-interval = <50>;
};
};
--
2.34.1

26
src/patches/linux/aarch64/0002-rockchip-dt-nanopi-r2s-change-sysled-trigger-to-hear.patch Normal file
View File

@@ -0,0 +1,26 @@
From ebdbd87a1e1b67755a8e04e93b2bba6a56b2019c Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 9 Nov 2021 08:55:06 +0100
Subject: [PATCH 2/8] rockchip: dt: nanopi-r2s: change sysled trigger to
heartbeat
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
index 35b76d7e8ab4..16caf1e32259 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
@@ -56,6 +56,7 @@ sys_led: led-1 {
gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
label = "nanopi-r2s:red:sys";
default-state = "on";
+ linux,default-trigger = "heartbeat";
};
wan_led: led-2 {
--
2.34.1

51
src/patches/linux/aarch64/0003-rockchip-dt-nanopi-r4s-fix-led-names-and-button.patch Normal file
View File

@@ -0,0 +1,51 @@
From 38b042cba08034365a6b152202e943883ee12c95 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 25 Jan 2022 18:04:28 +0100
Subject: [PATCH 3/8] rockchip: dt: nanopi-r4s: fix led names and button
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
index fe5b52610010..9125f013438d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -28,18 +28,19 @@ gpio-leds {
lan_led: led-lan {
gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_HIGH>;
- label = "green:lan";
+ label = "nanopi-r4s:green:lan";
};
sys_led: led-sys {
gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
- label = "red:power";
+ label = "nanopi-r4s:green:sys";
default-state = "on";
+ linux,default-trigger = "heartbeat";
};
wan_led: led-wan {
gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
- label = "green:wan";
+ label = "nanopi-r4s:green:wan";
};
};
@@ -51,8 +52,8 @@ gpio-keys {
key-reset {
debounce-interval = <50>;
gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
- label = "reset";
- linux,code = <KEY_RESTART>;
+ label = "power";
+ linux,code = <KEY_POWER>;
};
};
--
2.34.1

46
src/patches/linux/aarch64/0004-rockchip-dt-nanopi-r4s-add-realtek-pci-devicenode.patch Normal file
View File

@@ -0,0 +1,46 @@
From 6039099142af6cba233ab72b49f70605b611d1c6 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 28 Jan 2022 17:20:56 +0100
Subject: [PATCH 4/8] rockchip: dt: nanopi-r4s: add realtek pci devicenode
this is needed to set the mac address via u-boot
---
.../arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
index 9125f013438d..5a60460bd974 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
@@ -19,6 +19,10 @@ / {
model = "FriendlyElec NanoPi R4S";
compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399";
+ aliases {
+ ethernet1 = &r8169;
+ };
+
/delete-node/ display-subsystem;
gpio-leds {
@@ -77,6 +81,17 @@ &pcie0 {
max-link-speed = <1>;
num-lanes = <1>;
vpcie3v3-supply = <&vcc3v3_sys>;
+
+ pcie@0 {
+ reg = <0x00000000 0 0 0 0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+
+ r8169: pcie@0,0 {
+ reg = <0x000000 0 0 0 0>;
+ local-mac-address = [ 00 00 00 00 00 00 ];
+ };
+ };
};
&pinctrl {
--
2.34.1

46
src/patches/linux/aarch64/0005-mmc-core-set-initial-signal-voltage-on-power-off.patch Normal file
View File

@@ -0,0 +1,46 @@
From dfacc132a5be8eb643495f8ca693fd59368cc262 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 17 Feb 2019 22:14:38 +0000
Subject: [PATCH 5/8] mmc: core: set initial signal voltage on power off
Some boards have SD card connectors where the power rail cannot be switched
off by the driver. If the card has not been power cycled, it may still be
using 1.8V signaling after a warm re-boot. Bootroms expecting 3.3V signaling
will fail to boot from a UHS card that continue to use 1.8V signaling.
Set initial signal voltage in mmc_power_off() to allow re-boot to function.
This fixes re-boot with UHS cards on Asus Tinker Board (Rockchip RK3288),
same issue have been seen on some Rockchip RK3399 boards.
I am sending this as a RFC because I have no insights into SD/MMC subsystem,
this change fix a re-boot issue on my boards and does not break emmc/sdio.
Is this an acceptable workaround? Any advice is appreciated.
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
drivers/mmc/core/core.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 3d3e0ca52614..33cb13b7bf88 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1363,6 +1363,14 @@ void mmc_power_off(struct mmc_host *host)
if (host->ios.power_mode == MMC_POWER_OFF)
return;
+ mmc_set_initial_signal_voltage(host);
+
+ /*
+ * This delay should be sufficient to allow the power supply
+ * to reach the minimum voltage.
+ */
+ mmc_delay(host->ios.power_delay_ms);
+
mmc_pwrseq_power_off(host);
host->ios.clock = 0;
--
2.34.1

39
src/patches/linux/aarch64/0006-pcie-rockchip-host-try-again-if-training-fail.patch Normal file
View File

@@ -0,0 +1,39 @@
From 828dc7d5beca4c10db50330d1858cd70588bff5d Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 5 Feb 2022 15:35:57 +0000
Subject: [PATCH 6/8] pcie-rockchip-host: try again if training fail.
on NanoPi R4S the training of the pcie often fails at first try
so this try again some times.
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
drivers/pci/controller/pcie-rockchip-host.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
index afbbdccd195d..5d75189e64e5 100644
--- a/drivers/pci/controller/pcie-rockchip-host.c
+++ b/drivers/pci/controller/pcie-rockchip-host.c
@@ -959,8 +959,16 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
}
err = rockchip_pcie_host_init_port(rockchip);
- if (err)
- goto err_vpcie;
+ if (err) {
+ dev_err(dev, "failed to init port, try again...\n");
+ err = rockchip_pcie_host_init_port(rockchip);
+ if (err) {
+ dev_err(dev, "failed to init port, last try in 500ms.\n");
+ mdelay(500);
+ err = rockchip_pcie_host_init_port(rockchip);
+ if (err) goto err_vpcie;
+ }
+ }
err = rockchip_pcie_init_irq_domain(rockchip);
if (err < 0)
--
2.34.1

60
src/patches/linux/aarch64/0007-rockchip-dt-add-overclocked-NanoPi-R4S.patch Normal file
View File

@@ -0,0 +1,60 @@
From a7489da29122b1aa890c1186e63d1ad4ba610bb9 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 11 Feb 2022 09:34:40 +0000
Subject: [PATCH 7/8] rockchip: dt: add overclocked NanoPi R4S
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../dts/rockchip/rk3399-nanopi-r4s-oc.dts | 27 +++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s-oc.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index e7728007fd1b..f32fe64a84ed 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -49,6 +49,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4b.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s-oc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s-enterprise.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s-oc.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s-oc.dts
new file mode 100644
index 000000000000..7268d2209f52
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s-oc.dts
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * FriendlyElec NanoPC-R4S OC
+ *
+ * Overclock NanoPi R4S to 2Ghz/1.5Ghz
+ */
+
+/dts-v1/;
+#include "rk3399-nanopi-r4s.dts"
+
+/ {
+ model = "FriendlyElec NanoPi R4S OC";
+
+ cluster0_opp: opp-table-0 {
+ opp06 {
+ opp-hz = /bits/ 64 <1512000000>;
+ opp-microvolt = <1150000 1150000 1250000>;
+ };
+ };
+
+ cluster1_opp: opp-table-1 {
+ opp08 {
+ opp-hz = /bits/ 64 <20160000000>;
+ opp-microvolt = <1250000 1250000 1250000>;
+ };
+ };
+};
--
2.34.1

201
src/patches/linux/aarch64/0008-rockchip-dt-add-some-overclocked-rk3328-boards.patch Normal file
View File

@@ -0,0 +1,201 @@
From 5d1a97bca7efef833d4a9577c8a4951933f01303 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 19 Nov 2023 13:27:36 +0000
Subject: [PATCH 8/8] rockchip: dt: add some overclocked rk3328 boards
nanopi-r2c, nanopi-r2c-plus-oc, nanopi-r2s-oc,
orangepi-r1-plus-lts-oc, orangepi-r1-plus-oc
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
arch/arm64/boot/dts/rockchip/Makefile | 5 ++++
.../dts/rockchip/rk3328-nanopi-r2c-oc.dts | 25 +++++++++++++++++++
.../rockchip/rk3328-nanopi-r2c-plus-oc.dts | 25 +++++++++++++++++++
.../dts/rockchip/rk3328-nanopi-r2s-oc.dts | 25 +++++++++++++++++++
.../rk3328-orangepi-r1-plus-lts-oc.dts | 25 +++++++++++++++++++
.../rockchip/rk3328-orangepi-r1-plus-oc.dts | 25 +++++++++++++++++++
6 files changed, 130 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-oc.dts
create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus-oc.dts
create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-oc.dts
create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts-oc.dts
create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-oc.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index f32fe64a84ed..4d1cb2b32572 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -15,10 +15,15 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go3.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c-oc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c-plus.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2c-plus-oc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s-oc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-oc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts-oc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-oc.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-oc.dts
new file mode 100644
index 000000000000..617bcefb2122
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-oc.dts
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * overclock Nanopi R2C to 1.5 Ghz
+ */
+
+/dts-v1/;
+
+#include "rk3328-nanopi-r2c.dts"
+
+/ {
+ model = "FriendlyElec NanoPi R2C OC";
+
+ cpu0_opp_table: opp-table-0 {
+ opp-1392000000 {
+ opp-hz = /bits/ 64 <1392000000>;
+ opp-microvolt = <1350000>;
+ clock-latency-ns = <40000>;
+ };
+ opp-1512000000 {
+ opp-hz = /bits/ 64 <1512000000>;
+ opp-microvolt = <1400000>;
+ clock-latency-ns = <40000>;
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus-oc.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus-oc.dts
new file mode 100644
index 000000000000..5324afec9271
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c-plus-oc.dts
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * overclock Nanopi R2C to 1.5 Ghz
+ */
+
+/dts-v1/;
+
+#include "rk3328-nanopi-r2c-plus.dts"
+
+/ {
+ model = "FriendlyElec NanoPi R2C Plus OC";
+
+ cpu0_opp_table: opp-table-0 {
+ opp-1392000000 {
+ opp-hz = /bits/ 64 <1392000000>;
+ opp-microvolt = <1350000>;
+ clock-latency-ns = <40000>;
+ };
+ opp-1512000000 {
+ opp-hz = /bits/ 64 <1512000000>;
+ opp-microvolt = <1400000>;
+ clock-latency-ns = <40000>;
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-oc.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-oc.dts
new file mode 100644
index 000000000000..b94dc24d44e5
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-oc.dts
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * overclock Nanopi R2S to 1.5 Ghz
+ */
+
+/dts-v1/;
+
+#include "rk3328-nanopi-r2s.dts"
+
+/ {
+ model = "FriendlyElec NanoPi R2S OC";
+
+ cpu0_opp_table: opp-table-0 {
+ opp-1392000000 {
+ opp-hz = /bits/ 64 <1392000000>;
+ opp-microvolt = <1350000>;
+ clock-latency-ns = <40000>;
+ };
+ opp-1512000000 {
+ opp-hz = /bits/ 64 <1512000000>;
+ opp-microvolt = <1400000>;
+ clock-latency-ns = <40000>;
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts-oc.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts-oc.dts
new file mode 100644
index 000000000000..1cc615a5d8e0
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts-oc.dts
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * overclock OrangePi R1 Plus LTS to 1.5 Ghz
+ */
+
+/dts-v1/;
+
+#include "rk3328-orangepi-r1-plus-lts.dts"
+
+/ {
+ model = "Xunlong Orange Pi R1 Plus LTS OC";
+
+ cpu0_opp_table: opp-table-0 {
+ opp-1392000000 {
+ opp-hz = /bits/ 64 <1392000000>;
+ opp-microvolt = <1350000>;
+ clock-latency-ns = <40000>;
+ };
+ opp-1512000000 {
+ opp-hz = /bits/ 64 <1512000000>;
+ opp-microvolt = <1400000>;
+ clock-latency-ns = <40000>;
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-oc.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-oc.dts
new file mode 100644
index 000000000000..1a420d214f12
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-oc.dts
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * overclock OrangePi R1 Plus to 1.5 Ghz
+ */
+
+/dts-v1/;
+
+#include "rk3328-nanopi-r2s.dts"
+
+/ {
+ model = "Xunlong Orange Pi R1 Plus OC";
+
+ cpu0_opp_table: opp-table-0 {
+ opp-1392000000 {
+ opp-hz = /bits/ 64 <1392000000>;
+ opp-microvolt = <1350000>;
+ clock-latency-ns = <40000>;
+ };
+ opp-1512000000 {
+ opp-hz = /bits/ 64 <1512000000>;
+ opp-microvolt = <1400000>;
+ clock-latency-ns = <40000>;
+ };
+ };
+};
--
2.34.1

108
src/patches/linux/linux-6.1.56-layer7.patch → src/patches/linux/linux-6.6-layer7.patch
View File

@@ -1,20 +1,22 @@
diff -Naur linux-6.1.56.org/include/linux/skbuff.h linux-6.1.56/include/linux/skbuff.h
--- linux-6.1.56.org/include/linux/skbuff.h 2023-10-06 14:57:07.000000000 +0200
+++ linux-6.1.56/include/linux/skbuff.h 2023-10-07 14:14:11.094115796 +0200
@@ -901,6 +901,9 @@
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 97bfef071255..b41174c29ca0 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -890,6 +890,9 @@ struct sk_buff {
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
unsigned long _nfct;
#endif
+#endif
+#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
+ char layer7_flags[1];
+#endif
#endif
unsigned int len,
data_len;
__u16 mac_len,
diff -Naur linux-6.1.56.org/include/net/netfilter/nf_conntrack.h linux-6.1.56/include/net/netfilter/nf_conntrack.h
--- linux-6.1.56.org/include/net/netfilter/nf_conntrack.h 2023-10-06 14:57:07.000000000 +0200
+++ linux-6.1.56/include/net/netfilter/nf_conntrack.h 2023-10-07 14:14:11.094115796 +0200
@@ -121,6 +121,23 @@
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 4085765c3370..1e3be388684d 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -121,6 +121,23 @@ struct nf_conn {
/* Extensions */
struct nf_ct_ext *ext;
@@ -38,9 +40,11 @@ diff -Naur linux-6.1.56.org/include/net/netfilter/nf_conntrack.h linux-6.1.56/in
/* Storage reserved for other modules, must be the last member */
union nf_conntrack_proto proto;
};
diff -Naur linux-6.1.56.org/include/uapi/linux/netfilter/xt_layer7.h linux-6.1.56/include/uapi/linux/netfilter/xt_layer7.h
--- linux-6.1.56.org/include/uapi/linux/netfilter/xt_layer7.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-6.1.56/include/uapi/linux/netfilter/xt_layer7.h 2023-10-07 14:14:11.094115796 +0200
diff --git a/include/uapi/linux/netfilter/xt_layer7.h b/include/uapi/linux/netfilter/xt_layer7.h
new file mode 100644
index 000000000000..147cd6477858
--- /dev/null
+++ b/include/uapi/linux/netfilter/xt_layer7.h
@@ -0,0 +1,13 @@
+#ifndef _XT_LAYER7_H
+#define _XT_LAYER7_H
@@ -55,10 +59,11 @@ diff -Naur linux-6.1.56.org/include/uapi/linux/netfilter/xt_layer7.h linux-6.1.5
+};
+
+#endif /* _XT_LAYER7_H */
diff -Naur linux-6.1.56.org/net/netfilter/Kconfig linux-6.1.56/net/netfilter/Kconfig
--- linux-6.1.56.org/net/netfilter/Kconfig 2023-10-06 14:57:07.000000000 +0200
+++ linux-6.1.56/net/netfilter/Kconfig 2023-10-07 14:14:11.094115796 +0200
@@ -1401,6 +1401,26 @@
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 441d1f134110..504362b18a79 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -1403,6 +1403,26 @@ config NETFILTER_XT_MATCH_L2TP
To compile it as a module, choose M here. If unsure, say N.
@@ -85,10 +90,11 @@ diff -Naur linux-6.1.56.org/net/netfilter/Kconfig linux-6.1.56/net/netfilter/Kco
config NETFILTER_XT_MATCH_LENGTH
tristate '"length" match support'
depends on NETFILTER_ADVANCED
diff -Naur linux-6.1.56.org/net/netfilter/Makefile linux-6.1.56/net/netfilter/Makefile
--- linux-6.1.56.org/net/netfilter/Makefile 2023-10-06 14:57:07.000000000 +0200
+++ linux-6.1.56/net/netfilter/Makefile 2023-10-07 14:14:11.094115796 +0200
@@ -212,6 +212,7 @@
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index d4958e7e7631..eea1eb1206fa 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -221,6 +221,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) += xt_recent.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
@@ -96,10 +102,11 @@ diff -Naur linux-6.1.56.org/net/netfilter/Makefile linux-6.1.56/net/netfilter/Ma
obj-$(CONFIG_NETFILTER_XT_MATCH_STATISTIC) += xt_statistic.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
diff -Naur linux-6.1.56.org/net/netfilter/nf_conntrack_core.c linux-6.1.56/net/netfilter/nf_conntrack_core.c
--- linux-6.1.56.org/net/netfilter/nf_conntrack_core.c 2023-10-06 14:57:07.000000000 +0200
+++ linux-6.1.56/net/netfilter/nf_conntrack_core.c 2023-10-07 14:14:11.098115909 +0200
@@ -604,6 +604,11 @@
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 9f6f2e643575..ea2fb2889155 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -592,6 +592,11 @@ void nf_ct_destroy(struct nf_conntrack *nfct)
*/
nf_ct_remove_expectations(ct);
@@ -111,10 +118,11 @@ diff -Naur linux-6.1.56.org/net/netfilter/nf_conntrack_core.c linux-6.1.56/net/n
if (ct->master)
nf_ct_put(ct->master);
diff -Naur linux-6.1.56.org/net/netfilter/nf_conntrack_standalone.c linux-6.1.56/net/netfilter/nf_conntrack_standalone.c
--- linux-6.1.56.org/net/netfilter/nf_conntrack_standalone.c 2023-10-06 14:57:07.000000000 +0200
+++ linux-6.1.56/net/netfilter/nf_conntrack_standalone.c 2023-10-07 14:14:11.098115909 +0200
@@ -373,6 +373,11 @@
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 0ee98ce5b816..a065e0635463 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -369,6 +369,11 @@ static int ct_seq_show(struct seq_file *s, void *v)
ct_show_zone(s, ct, NF_CT_DEFAULT_ZONE_DIR);
ct_show_delta_time(s, ct);
@@ -126,9 +134,11 @@ diff -Naur linux-6.1.56.org/net/netfilter/nf_conntrack_standalone.c linux-6.1.56
seq_printf(s, "use=%u\n", refcount_read(&ct->ct_general.use));
if (seq_has_overflowed(s))
diff -Naur linux-6.1.56.org/net/netfilter/regexp/regexp.c linux-6.1.56/net/netfilter/regexp/regexp.c
--- linux-6.1.56.org/net/netfilter/regexp/regexp.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-6.1.56/net/netfilter/regexp/regexp.c 2023-10-07 14:14:11.098115909 +0200
diff --git a/net/netfilter/regexp/regexp.c b/net/netfilter/regexp/regexp.c
new file mode 100644
index 000000000000..900698886531
--- /dev/null
+++ b/net/netfilter/regexp/regexp.c
@@ -0,0 +1,1197 @@
+/*
+ * regcomp and regexec -- regsub and regerror are elsewhere
@@ -1327,9 +1337,11 @@ diff -Naur linux-6.1.56.org/net/netfilter/regexp/regexp.c linux-6.1.56/net/netfi
+#endif
+
+
diff -Naur linux-6.1.56.org/net/netfilter/regexp/regexp.h linux-6.1.56/net/netfilter/regexp/regexp.h
--- linux-6.1.56.org/net/netfilter/regexp/regexp.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-6.1.56/net/netfilter/regexp/regexp.h 2023-10-07 14:14:11.098115909 +0200
diff --git a/net/netfilter/regexp/regexp.h b/net/netfilter/regexp/regexp.h
new file mode 100644
index 000000000000..a72eba71fb61
--- /dev/null
+++ b/net/netfilter/regexp/regexp.h
@@ -0,0 +1,41 @@
+/*
+ * Definitions etc. for regexp(3) routines.
@@ -1372,18 +1384,22 @@ diff -Naur linux-6.1.56.org/net/netfilter/regexp/regexp.h linux-6.1.56/net/netfi
+void regerror(char *s);
+
+#endif
diff -Naur linux-6.1.56.org/net/netfilter/regexp/regmagic.h linux-6.1.56/net/netfilter/regexp/regmagic.h
--- linux-6.1.56.org/net/netfilter/regexp/regmagic.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-6.1.56/net/netfilter/regexp/regmagic.h 2023-10-07 14:14:11.098115909 +0200
diff --git a/net/netfilter/regexp/regmagic.h b/net/netfilter/regexp/regmagic.h
new file mode 100644
index 000000000000..5acf4478ff71
--- /dev/null
+++ b/net/netfilter/regexp/regmagic.h
@@ -0,0 +1,5 @@
+/*
+ * The first byte of the regexp internal "program" is actually this magic
+ * number; the start node begins in the second byte.
+ */
+#define MAGIC 0234
diff -Naur linux-6.1.56.org/net/netfilter/regexp/regsub.c linux-6.1.56/net/netfilter/regexp/regsub.c
--- linux-6.1.56.org/net/netfilter/regexp/regsub.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-6.1.56/net/netfilter/regexp/regsub.c 2023-10-07 14:14:11.098115909 +0200
diff --git a/net/netfilter/regexp/regsub.c b/net/netfilter/regexp/regsub.c
new file mode 100644
index 000000000000..339631f06f00
--- /dev/null
+++ b/net/netfilter/regexp/regsub.c
@@ -0,0 +1,95 @@
+/*
+ * regsub
@@ -1480,9 +1496,11 @@ diff -Naur linux-6.1.56.org/net/netfilter/regexp/regsub.c linux-6.1.56/net/netfi
+ }
+ *dst++ = '\0';
+}
diff -Naur linux-6.1.56.org/net/netfilter/xt_layer7.c linux-6.1.56/net/netfilter/xt_layer7.c
--- linux-6.1.56.org/net/netfilter/xt_layer7.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-6.1.56/net/netfilter/xt_layer7.c 2023-10-07 14:14:11.098115909 +0200
diff --git a/net/netfilter/xt_layer7.c b/net/netfilter/xt_layer7.c
new file mode 100644
index 000000000000..a7eb760123bf
--- /dev/null
+++ b/net/netfilter/xt_layer7.c
@@ -0,0 +1,666 @@
+/*
+ Kernel module to match application layer (OSI layer 7) data in connections.