Merge pull request #1468 from kernelkit/fix-rpi-display

linux: Fix stability of Raspberry pi display 1

Author: troglobit

board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-4-b.dts

@@ -2,29 +2,18 @@
 #include "infix.dtsi"
 
 / {
-	/* Dynamic GPU reservation */
-	gpu-reserved {
-		size = <0x0 0x10000000>; /* 256MB */
-		alignment = <0x0 0x1000000>; /* 16MB aligned */
-		alloc-ranges = <0x0 0x10000000 0x1 0x00000000>; /* Allow anywhere in RAM */
-		no-map;
-	};
-
-	/* CMA pool */
-	cma-reserved {
-		compatible = "shared-dma-pool";
-		size = <0x0 0x10000000>; /* 256MB */
-		alignment = <0x0 0x1000000>; /* 16MB aligned */
-		linux,cma-default;
-		reusable;
-	};
-
 	chosen {
 		/* 8250 auxiliary UART instead of pl011 */
 		stdout-path = "serial1:115200n8";
 	};
 };
 
+/* Override upstream 64MB CMA with 256MB for vc4 GPU */
+&rmem {
+	cma: linux,cma {
+		size = <0x10000000>; /* 256MB */
+	};
+};
 
 &vc4 {
 	status = "okay";

doc/ChangeLog.md

@@ -3,6 +3,16 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+[v26.04.0][UNRELEASED] -
+-------------------------
+
+### Changes
+
+- Upgrade Linux kernel to 6.18.21 (LTS)
+
+### Fixes
+
+
 [v26.03.0][] - 2026-03-31
 -------------------------
 
@@ -2025,7 +2035,7 @@ Supported YANG models in addition to those used by sysrepo and netopeer:
  - N/A
 
 [buildroot]:  https://buildroot.org/
-[UNRELEASED]: https://github.com/kernelkit/infix/compare/v26.02.0...HEAD
+[UNRELEASED]: https://github.com/kernelkit/infix/compare/v26.03.0...HEAD
 [v26.03.0]:   https://github.com/kernelkit/infix/compare/v26.02.0...v26.03.0
 [v26.02.0]:   https://github.com/kernelkit/infix/compare/v26.01.0...v26.02.0
 [v26.01.0]:   https://github.com/kernelkit/infix/compare/v25.11.0...v26.01.0

patches/linux/6.18.21/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch

@@ -1,8 +1,9 @@
 From 657a79b59e67bac4af66f63bcf740238af399aba Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
-Subject: [PATCH 01/33] net: phy: marvell10g: Support firmware loading on
+Subject: [PATCH 01/41] net: phy: marvell10g: Support firmware loading on
  88X3310
+Organization: Wires
 
 When probing, if a device is waiting for firmware to be loaded into
 its RAM, ask userspace for the binary and load it over XMDIO.
@@ -15,7 +16,7 @@ fall back.
  1 file changed, 161 insertions(+)
 
 diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
-index 8fd42131cdbf..44294519231e 100644
+index 8fd42131cdbf9..44294519231ed 100644
 --- a/drivers/net/phy/marvell10g.c
 +++ b/drivers/net/phy/marvell10g.c
 @@ -25,6 +25,7 @@

patches/linux/6.18.21/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch

@@ -1,8 +1,9 @@
 From 6684303b2262468f91f4aab0755a35f8dc2ee141 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
-Subject: [PATCH 02/33] net: phy: marvell10g: Fix power-up when strapped to
+Subject: [PATCH 02/41] net: phy: marvell10g: Fix power-up when strapped to
  start powered down
+Organization: Wires
 
 On devices which are hardware strapped to start powered down (PDSTATE
 == 1), make sure that we clear the power-down bit on all units
@@ -12,7 +13,7 @@ affected by this setting.
  1 file changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
-index 44294519231e..40439db49601 100644
+index 44294519231ed..40439db49601d 100644
 --- a/drivers/net/phy/marvell10g.c
 +++ b/drivers/net/phy/marvell10g.c
 @@ -322,11 +322,23 @@ static int mv3310_power_down(struct phy_device *phydev)

patches/linux/6.18.21/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch

@@ -1,7 +1,8 @@
 From ee1464a4becdb06df87ae167fb56d9ac1530512f Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
-Subject: [PATCH 03/33] net: phy: marvell10g: Add LED support for 88X3310
+Subject: [PATCH 03/41] net: phy: marvell10g: Add LED support for 88X3310
+Organization: Wires
 
 Pickup the LEDs from the state in which the hardware reset or
 bootloader left them, but also support further configuration via
@@ -21,7 +22,7 @@ Trigger support:
  1 file changed, 422 insertions(+)
 
 diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
-index 40439db49601..7ae4744f147b 100644
+index 40439db49601d..7ae4744f147bb 100644
 --- a/drivers/net/phy/marvell10g.c
 +++ b/drivers/net/phy/marvell10g.c
 @@ -28,6 +28,7 @@

patches/linux/6.18.21/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch

@@ -1,8 +1,9 @@
 From cfe0f07454be8ab659b33fafd83a57b2d44f2fdf Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
-Subject: [PATCH 04/33] net: phy: marvell10g: Support LEDs tied to a single
+Subject: [PATCH 04/41] net: phy: marvell10g: Support LEDs tied to a single
  media side
+Organization: Wires
 
 In a combo-port setup, i.e. where both the copper and fiber interface
 are available to the user, the LEDs may be physically located either
@@ -18,7 +19,7 @@ versa for the SFP cage.
  1 file changed, 22 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
-index 7ae4744f147b..5e48355ffcef 100644
+index 7ae4744f147bb..5e48355ffcef4 100644
 --- a/drivers/net/phy/marvell10g.c
 +++ b/drivers/net/phy/marvell10g.c
 @@ -192,6 +192,9 @@ struct mv3310_chip {

patches/linux/6.18.21/0005-net-phy-Do-not-resume-PHY-when-attaching.patch

@@ -1,7 +1,8 @@
 From e0d9221901b235ffb4c0ea58748e8e5263eb0d9f Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
-Subject: [PATCH 05/33] net: phy: Do not resume PHY when attaching
+Subject: [PATCH 05/41] net: phy: Do not resume PHY when attaching
+Organization: Wires
 
 The PHY should not start negotiating with its link-partner until
 explicitly instructed to do so.
@@ -19,7 +20,7 @@ administratively down.
  1 file changed, 1 deletion(-)
 
 diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
-index 2353d6eced68..9b0983453393 100644
+index 2353d6eced68d..9b09834533933 100644
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
 @@ -1750,7 +1750,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,

patches/linux/6.18.21/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch

@@ -1,8 +1,9 @@
 From 86cdec8b0959cf957b2811a23ddf77648161a402 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
-Subject: [PATCH 06/33] net: bridge: avoid classifying unknown multicast as
+Subject: [PATCH 06/41] net: bridge: avoid classifying unknown multicast as
  mrouters_only
+Organization: Wires
 
 Unknown multicast, MAC/IPv4/IPv6, should always be flooded according to
 the per-port mcast_flood setting, as well as to detected and configured
@@ -26,7 +27,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
  7 files changed, 57 insertions(+), 14 deletions(-)
 
 diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
-index e52f8207ab27..306fa8a94c81 100644
+index e52f8207ab278..306fa8a94c819 100644
 --- a/include/uapi/linux/if_bridge.h
 +++ b/include/uapi/linux/if_bridge.h
 @@ -835,6 +835,7 @@ enum br_boolopt_id {
@@ -38,7 +39,7 @@ index e52f8207ab27..306fa8a94c81 100644
  };
 
 diff --git a/net/bridge/br.c b/net/bridge/br.c
-index c37e52e2f29a..0759bc37d6f0 100644
+index c37e52e2f29ad..0759bc37d6f0f 100644
 --- a/net/bridge/br.c
 +++ b/net/bridge/br.c
 @@ -312,6 +312,9 @@ int br_boolopt_toggle(struct net_bridge *br, enum br_boolopt_id opt, bool on,
@@ -61,7 +62,7 @@ index c37e52e2f29a..0759bc37d6f0 100644
  		/* shouldn't be called with unsupported options */
  		WARN_ON(1);
 diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
-index 525d4eccd194..6278dfc9612f 100644
+index 525d4eccd194a..6278dfc9612f5 100644
 --- a/net/bridge/br_device.c
 +++ b/net/bridge/br_device.c
 @@ -89,10 +89,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -101,7 +102,7 @@ index 525d4eccd194..6278dfc9612f 100644
  	br_stp_timer_init(br);
  	br_multicast_init(br);
 diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
-index dea09096ad0f..f0a613238e0d 100644
+index dea09096ad0fb..f0a613238e0d5 100644
 --- a/net/bridge/br_forward.c
 +++ b/net/bridge/br_forward.c
 @@ -199,15 +199,20 @@ static struct net_bridge_port *maybe_deliver(
@@ -140,7 +141,7 @@ index dea09096ad0f..f0a613238e0d 100644
  				continue;
  			break;
 diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
-index 2cbae0f9ae1f..0c539bf4bebe 100644
+index 2cbae0f9ae1f0..0c539bf4bebec 100644
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
 @@ -186,9 +186,13 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
@@ -170,7 +171,7 @@ index 2cbae0f9ae1f..0c539bf4bebe 100644
  			br_multicast_flood(mdst, skb, brmctx, local_rcv, false);
  	}
 diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
-index 5855eb050208..06641afb99a8 100644
+index 5855eb0502085..06641afb99a8b 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
 @@ -3836,6 +3836,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
@@ -206,7 +207,7 @@ index 5855eb050208..06641afb99a8 100644
  		    ipv6_addr_is_all_snoopers(&ipv6_hdr(skb)->daddr))
  			br_ip6_multicast_mrd_rcv(brmctx, pmctx, skb);
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index b9b2981c4841..ccbaaa96f7c7 100644
+index b9b2981c48414..ccbaaa96f7c70 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -489,6 +489,7 @@ enum net_bridge_opts {

patches/linux/6.18.21/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch

@@ -1,8 +1,9 @@
 From 31794e03e7f1d66f7fdff708cdaa40453e591204 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
-Subject: [PATCH 07/33] net: bridge: Ignore router ports when forwarding L2
+Subject: [PATCH 07/41] net: bridge: Ignore router ports when forwarding L2
  multicast
+Organization: Wires
 
 Multicast router ports are either statically configured or learned from
 control protocol traffic (IGMP/MLD/PIM).  These protocols regulate IP
@@ -16,7 +17,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index ccbaaa96f7c7..d7187bead496 100644
+index ccbaaa96f7c70..d7187bead4968 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -1097,7 +1097,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,

patches/linux/6.18.21/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch

@@ -1,8 +1,9 @@
 From 984d59e5f06c3741e1c76daf4bed6883eb339e97 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
-Subject: [PATCH 08/33] net: bridge: drop delay for applying strict multicast
+Subject: [PATCH 08/41] net: bridge: drop delay for applying strict multicast
  filtering
+Organization: Wires
 
 This *local* patch drops the initial delay before applying strict multicast
 filtering, introduced in [1] and recently updated in [2].
@@ -24,7 +25,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
  2 files changed, 8 insertions(+), 38 deletions(-)
 
 diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
-index 06641afb99a8..bacff6c2e968 100644
+index 06641afb99a8b..bacff6c2e9684 100644
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
 @@ -1760,10 +1760,6 @@ static void br_ip6_multicast_querier_expired(struct timer_list *t)
@@ -163,7 +164,7 @@ index 06641afb99a8..bacff6c2e968 100644
  #endif
 
 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index d7187bead496..83dc15fdcefd 100644
+index d7187bead4968..83dc15fdcefdc 100644
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
 @@ -80,7 +80,6 @@ struct bridge_mcast_own_query {