WIP: linux-iot2050: Update mainline recipe to work with current 6.x

Open issues:
 - framebuffer does not work
 - icssg-prueth PG1 support is missing

kas/opt/upstream.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) Siemens AG, 2020
+# Copyright (c) Siemens AG, 2020-2023
 #
 # This file is subject to the terms and conditions of the MIT License.  See
 # COPYING.MIT file in the top-level directory.
@@ -10,6 +10,4 @@ header:
 
 local_conf_header:
   upstream-versions: |
-    PREFERRED_VERSION_linux-iot2050 = "5.x-upstream"
-  extra-args: |
-    EXTRA_KERNEL_PARAMS = "fw_devlink=permissive"
+    PREFERRED_VERSION_linux-iot2050 = "6.x-upstream"

recipes-kernel/linux/files/iot2050_defconfig_base

@@ -28,6 +28,7 @@ CONFIG_USER_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
@@ -643,6 +644,7 @@ CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
 CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=m

recipes-kernel/linux/files/patches-upstream/0001-net-ti-icssg-prueth-Add-phys_port_name-support.patch

@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jan Kiszka <[email protected]>
+Date: Sun, 22 Oct 2023 09:59:08 +0200
+Subject: [PATCH] net: ti: icssg-prueth: Add phys_port_name support
+
+Helps identifying the ports in udev rules e.g.
+
+Signed-off-by: Jan Kiszka <[email protected]>
+---
+ drivers/net/ethernet/ti/icssg/icssg_prueth.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
+index 4914d0ef58e9..ffae89a6ccc5 100644
+--- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c
++++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
+@@ -1653,6 +1653,19 @@ static void emac_ndo_get_stats64(struct net_device *ndev,
+ 	stats->tx_dropped = ndev->stats.tx_dropped;
+ }
+
++static int emac_ndo_get_phys_port_name(struct net_device *ndev, char *name,
++				       size_t len)
++{
++	struct prueth_emac *emac = netdev_priv(ndev);
++	int ret;
++
++	ret = snprintf(name, len, "p%d", emac->port_id);
++	if (ret >= len)
++		return -EINVAL;
++
++	return 0;
++}
++
+ static const struct net_device_ops emac_netdev_ops = {
+ 	.ndo_open = emac_ndo_open,
+ 	.ndo_stop = emac_ndo_stop,
+@@ -1663,6 +1676,7 @@ static const struct net_device_ops emac_netdev_ops = {
+ 	.ndo_set_rx_mode = emac_ndo_set_rx_mode,
+ 	.ndo_eth_ioctl = emac_ndo_ioctl,
+ 	.ndo_get_stats64 = emac_ndo_get_stats64,
++	.ndo_get_phys_port_name = emac_ndo_get_phys_port_name,
+ };
+
+ /* get emac_port corresponding to eth_node name */

recipes-kernel/linux/files/patches-upstream/0002-arm64-dts-ti-k3-am65-main-Add-ICSSG-IEP-nodes.patch

@@ -0,0 +1,78 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MD Danish Anwar <[email protected]>
+Date: Fri, 13 Oct 2023 16:31:48 +0530
+Subject: [PATCH] arm64: dts: ti: k3-am65-main: Add ICSSG IEP nodes
+
+The ICSSG IP on AM65x SoCs have two Industrial Ethernet Peripherals (IEPs)
+to manage/generate Industrial Ethernet functions such as time stamping.
+Each IEP sub-module is sourced from an internal clock mux that can be
+sourced from either of the IP instance's ICSSG_IEP_GCLK or ICSSG_ICLK.
+Add the IEP nodes for all the ICSSG instances.
+
+Signed-off-by: MD Danish Anwar <[email protected]>
+[Taken from https://lore.kernel.org/all/[email protected]/]
+---
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 36 ++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+index bc460033a37a..fdb042d04ad9 100644
+--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
++++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+@@ -1151,6 +1151,18 @@ icssg0_iepclk_mux: iepclk-mux@30 {
+ 			};
+ 		};
+
++		icssg0_iep0: iep@2e000 {
++			compatible = "ti,am654-icss-iep";
++			reg = <0x2e000 0x1000>;
++			clocks = <&icssg0_iepclk_mux>;
++		};
++
++		icssg0_iep1: iep@2f000 {
++			compatible = "ti,am654-icss-iep";
++			reg = <0x2f000 0x1000>;
++			clocks = <&icssg0_iepclk_mux>;
++		};
++
+ 		icssg0_mii_rt: mii-rt@32000 {
+ 			compatible = "ti,pruss-mii", "syscon";
+ 			reg = <0x32000 0x100>;
+@@ -1293,6 +1305,18 @@ icssg1_iepclk_mux: iepclk-mux@30 {
+ 			};
+ 		};
+
++		icssg1_iep0: iep@2e000 {
++			compatible = "ti,am654-icss-iep";
++			reg = <0x2e000 0x1000>;
++			clocks = <&icssg1_iepclk_mux>;
++		};
++
++		icssg1_iep1: iep@2f000 {
++			compatible = "ti,am654-icss-iep";
++			reg = <0x2f000 0x1000>;
++			clocks = <&icssg1_iepclk_mux>;
++		};
++
+ 		icssg1_mii_rt: mii-rt@32000 {
+ 			compatible = "ti,pruss-mii", "syscon";
+ 			reg = <0x32000 0x100>;
+@@ -1435,6 +1459,18 @@ icssg2_iepclk_mux: iepclk-mux@30 {
+ 			};
+ 		};
+
++		icssg2_iep0: iep@2e000 {
++			compatible = "ti,am654-icss-iep";
++			reg = <0x2e000 0x1000>;
++			clocks = <&icssg2_iepclk_mux>;
++		};
++
++		icssg2_iep1: iep@2f000 {
++			compatible = "ti,am654-icss-iep";
++			reg = <0x2f000 0x1000>;
++			clocks = <&icssg2_iepclk_mux>;
++		};
++
+ 		icssg2_mii_rt: mii-rt@32000 {
+ 			compatible = "ti,pruss-mii", "syscon";
+ 			reg = <0x32000 0x100>;

recipes-kernel/linux/files/patches-upstream/0003-arm64-dts-ti-iot2050-Re-add-aliases.patch

@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jan Kiszka <[email protected]>
+Date: Sat, 21 Oct 2023 14:14:32 +0200
+Subject: [PATCH] arm64: dts: ti: iot2050: Re-add aliases
+
+Lost while dropping them from the common dtsi.
+
+Fixes: ffc449e016e2 ("arm64: dts: ti: k3-am65: Drop aliases")
+Signed-off-by: Jan Kiszka <[email protected]>
+---
+ arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+index ba1c14a54acf..b849648d51f9 100644
+--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
++++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+@@ -14,6 +14,16 @@
+
+ / {
+ 	aliases {
++		serial0 = &wkup_uart0;
++		serial1 = &mcu_uart0;
++		serial2 = &main_uart0;
++		serial3 = &main_uart1;
++		i2c0 = &wkup_i2c0;
++		i2c1 = &mcu_i2c0;
++		i2c2 = &main_i2c0;
++		i2c3 = &main_i2c1;
++		i2c4 = &main_i2c2;
++		i2c5 = &main_i2c3;
+ 		spi0 = &mcu_spi0;
+ 		mmc0 = &sdhci1;
+ 		mmc1 = &sdhci0;

recipes-kernel/linux/files/patches-upstream/0004-arm64-dts-ti-iot2050-Drop-unused-ecap0-PWM.patch

@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jan Kiszka <[email protected]>
+Date: Mon, 23 Oct 2023 07:09:44 +0200
+Subject: [PATCH] arm64: dts: ti: iot2050: Drop unused ecap0 PWM
+
+In fact, this was never used by the final device, only dates back to
+first prototypes.
+
+Signed-off-by: Jan Kiszka <[email protected]>
+---
+ arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+index b849648d51f9..fc39ae0f9587 100644
+--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
++++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+@@ -355,12 +355,6 @@ AM65X_IOPAD(0x0008, PIN_INPUT,  0)  /* (B21) I2C1_SCL */
+ 			AM65X_IOPAD(0x000c, PIN_INPUT,  0)  /* (E21) I2C1_SDA */
+ 		>;
+ 	};
+-
+-	ecap0_pins_default: ecap0-default-pins {
+-		pinctrl-single,pins = <
+-			AM65X_IOPAD(0x0010, PIN_INPUT,  0)  /* (D21) ECAP0_IN_APWM_OUT */
+-		>;
+-	};
+ };
+
+ &wkup_uart0 {
+@@ -557,12 +551,6 @@ &mcu_cpsw {
+ 	status = "disabled";
+ };
+
+-&ecap0 {
+-	status = "okay";
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&ecap0_pins_default>;
+-};
+-
+ &sdhci1 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&main_mmc1_pins_default>;