Merge pull request #1034 from kernelkit/update-changelog

Update changelog for v25.04.0
2026-07-22 09:13:01 +02:00 · 2025-04-30 09:45:26 +02:00 · 2025-04-30 08:58:56 +02:00 · 2025-04-29 15:02:39 +02:00 · 2025-04-28 16:57:36 +02:00 · 2025-04-28 15:41:09 +02:00
209 changed files with 3122 additions and 3908 deletions
@@ -95,6 +95,11 @@ jobs:
          name: artifact-${{ matrix.target }}
          path: output/*.tar.gz

+      - uses: actions/upload-artifact@v4
+        with:
+          name: artifact-disk-image-${{ matrix.target }}
+          path: output/images/*.qcow2
+
  release:
    name: Release Infix ${{ github.ref_name }}
    needs: build
@@ -141,6 +146,11 @@ jobs:
          for file in *.tar.gz; do
              sha256sum $file > $file.sha256
          done
+          if ls *.qcow2 &>/dev/null; then
+            for file in *.qcow2; do
+              sha256sum "$file" > "$file.sha256"
+            done
+          fi

      - name: Extract ChangeLog entry ...
        run: |
@@ -155,7 +165,7 @@ jobs:
          makeLatest: ${{ steps.rel.outputs.latest }}
          discussionCategory: ${{ steps.rel.outputs.cat }}
          bodyFile:  release.md
-          artifacts: "*.tar.gz*"
+          artifacts: "*.tar.gz*,*.qcow2*"

      - name: Summary
        run: |
@@ -230,7 +230,6 @@ CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
-# CONFIG_ETHTOOL_NETLINK is not set
 CONFIG_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_IOV=y
@@ -481,7 +480,6 @@ CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_RK3X=y
 CONFIG_I2C_SLAVE=y
@@ -127,7 +127,7 @@ bootdata=
 diskimg=disk.img
 bootimg=
 bootpart=
-
+tmpimage=$(mktemp)
 while getopts "a:b:B:n:s:" opt; do
    case ${opt} in
 	a)
@@ -166,7 +166,7 @@ awk \
 	  -vimgsize=$imgsize \
 	  -vcfgsize=$cfgsize \
 	  -vvarsize=$varsize \
-	  -vdiskimg=$diskimg \
+	  -vdiskimg=$tmpimage \
 	  -vbootimg="$bootimg" -vbootpart="$bootpart" \
 	  '{
 		sub(/@TOTALSIZE@/, total);
@@ -211,5 +211,7 @@ genimage \
    --rootpath "$root" \
    --tmppath  "$tmp" \
    --inputpath "$BINARIES_DIR" \
-    --outputpath "$BINARIES_DIR" \
    --config "$root/genimage.cfg"
+
+qemu-img convert -c -O qcow2 "$tmpimage" "$BINARIES_DIR/$diskimg"
+rm "$tmpimage"
@@ -23,7 +23,7 @@ if [ -n "$IMAGE_ID" ]; then
 else
    NAME="$INFIX_ID"-$(echo "$BR2_ARCH" | tr _ - | sed 's/x86-64/x86_64/')
 fi
-diskimg=disk.img
+diskimg=disk.qcow2

 ver()
 {
@@ -48,7 +48,7 @@ fi
 load_cfg DISK_IMAGE
 if [ "$DISK_IMAGE" = "y" ]; then
    ixmsg "Creating Disk Image"
-    diskimg="${NAME}-disk$(ver).img"
+    diskimg="${NAME}-disk$(ver).qcow2"
    bootcfg=
    if [ "$DISK_IMAGE_BOOT_DATA" ]; then
 	bootcfg="-b $DISK_IMAGE_BOOT_DATA -B $DISK_IMAGE_BOOT_OFFSET"
@@ -90,7 +90,7 @@ if [ "$BR2_TARGET_ROOTFS_SQUASHFS" = "y" ]; then
    rel=$(ver)
    ln -sf rootfs.squashfs "$BINARIES_DIR/${NAME}${rel}.img"
    if [ -n "$rel" ]; then
-	ln -sf "$BINARIES_DIR/${NAME}${rel}.img" "$BINARIES_DIR/${NAME}.img"
+	ln -sf "${NAME}${rel}.img" "$BINARIES_DIR/${NAME}.img"
    fi
 fi

@@ -120,7 +120,7 @@ rootfs_args()
 	echo -n "-device sd-card,drive=mmc "
 	echo -n "-drive id=mmc,file=$CONFIG_QEMU_ROOTFS,if=none,format=raw "
    elif [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then
-	echo -n "-drive file=$CONFIG_QEMU_ROOTFS.qcow2,if=virtio,format=qcow2,bus=0,unit=0 "
+	echo -n "-drive file=qemu.qcow2,if=virtio,format=qcow2,bus=0,unit=0 "
    fi
 }

@@ -316,13 +316,13 @@ gdb_args()
 run_qemu()
 {
    if [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then
-	if ! qemu-img check "${CONFIG_QEMU_ROOTFS}.qcow2"; then
-	    rm -f "${CONFIG_QEMU_ROOTFS}.qcow2"
+	if ! qemu-img check "qemu.qcow2"; then
+	    rm -f "qemu.qcow2"
 	fi
-	if [ ! -f "${CONFIG_QEMU_ROOTFS}.qcow2" ]; then
+	if [ ! -f "qemu.qcow2" ]; then
 	    echo "Creating qcow2 disk image for Qemu ..."
 	    qemu-img create -f qcow2 -o backing_file="$CONFIG_QEMU_ROOTFS" \
-		     -F raw "${CONFIG_QEMU_ROOTFS}.qcow2" > /dev/null
+		     -F qcow2 "qemu.qcow2" > /dev/null
 	fi
    fi

@@ -0,0 +1,12 @@
+#!/bin/sh
+if [ $# -lt 2 ]; then
+        echo "usage: $0 <quirk-name> <ifname>"
+        exit 1
+fi
+quirk=$1
+ifname=$2
+if [ -f "/etc/product/interface-quirks.json" ]; then
+        echo "$(jq -r --arg iface "$ifname" --arg quirk "$quirk" '.[$iface][$quirk] // "false"' /etc/product/interface-quirks.json)"
+else
+        echo "false"
+fi
@@ -43,6 +43,7 @@ while [ "$1" ]; do
    txqs="$2"
    shift 2

+    [ $(/usr/libexec/infix/has-quirk "broken-mqprio" "$iface") = "true" ] && echo "Skipping $iface, does not support mqprio" && continue
    [ $txqs -lt 2 ] && continue
    [ $txqs -gt 8 ] && txqs=8

@@ -4,10 +4,14 @@
 # the migrate tool inserts old version in name before .cfg extension.
 CONFIG_FILE="/cfg/startup-config.cfg"
 BACKUP_FILE="/cfg/backup/startup-config.cfg"
-mkdir -p "$(dirname "$BACKUP_FILE")"
+BACKUP_DIR="$(dirname "$BACKUP_FILE")"
+
+mkdir -p         "$BACKUP_DIR"
+chown root:wheel "$BACKUP_DIR"
+chmod 0770       "$BACKUP_DIR"

 if [ ! -f "$CONFIG_FILE" ]; then
-    note "No $(basename "$CONFIG_FILE" .cfg) yet, likely factory reset."
+    logger -I $$ -k -p user.notice -t $(basename "$0")  "No $(basename "$CONFIG_FILE" .cfg) yet, likely factory reset."
    exit 0
 elif migrate -cq "$CONFIG_FILE"; then
    exit 0
@@ -27,13 +27,14 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.25"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_DBUS_CXX=y
@@ -139,6 +140,7 @@ BR2_PACKAGE_CURIOS_HTTPD=y
 BR2_PACKAGE_CURIOS_NFTABLES=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
 BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
@@ -164,6 +166,8 @@ BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_ROUSETTE=y
 BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
 BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_PACKAGE_GETENT=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
 DISK_IMAGE_BOOT_BIN=y
@@ -27,13 +27,14 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.25"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_DBUS_CXX=y
@@ -119,6 +120,7 @@ BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_CONFD_TEST_MODE=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
 BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
@@ -137,6 +139,8 @@ BR2_PACKAGE_MDNS_ALIAS=y
 BR2_PACKAGE_LIBINPUT=y
 BR2_PACKAGE_ROUSETTE=y
 BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_PACKAGE_GETENT=y
 DISK_IMAGE_BOOT_BIN=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
@@ -8,7 +8,6 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="${BR2_EXTERNAL_INFIX_PATH}/.ccache"
 BR2_ENABLE_DEBUG=y
 BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_INFIX_PATH}/patches"
-BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="infix"
 BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit"
 BR2_INIT_FINIT=y
@@ -30,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.25"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/r2s/linux_defconfig"
@@ -42,6 +41,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_INFIX_PATH)/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
@@ -74,7 +74,6 @@ BR2_PACKAGE_PYTHON_GUNICORN=y
 BR2_PACKAGE_LIBSSH_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_LIBSSH2_OPENSSL=y
-BR2_PACKAGE_LIBXCRYPT=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBINPUT=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -178,6 +177,7 @@ INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
 BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
 BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
@@ -201,8 +201,10 @@ BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER=y
 BR2_PACKAGE_PODMAN_DRIVER_VFS=y
 BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_ROUSETTE=y
-BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
 BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
+BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_PACKAGE_GETENT=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
 # GNS3_APPLIANCE is not set
@@ -39,6 +39,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_INFIX_PATH)/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
@@ -169,6 +170,7 @@ BR2_PACKAGE_CONFD=y
 # BR2_PACKAGE_CONFD_TEST_MODE is not set
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
 BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
@@ -194,6 +196,8 @@ BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_ROUSETTE=y
 BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
 BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_PACKAGE_GETENT=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
 # GNS3_APPLIANCE is not set
@@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.25"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -34,6 +34,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_DBUS_CXX=y
@@ -141,6 +142,7 @@ BR2_PACKAGE_CURIOS_HTTPD=y
 BR2_PACKAGE_CURIOS_NFTABLES=y
 BR2_PACKAGE_GENCERT=y
 BR2_PACKAGE_STATD=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_FACTORY=y
 BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y
 BR2_PACKAGE_FINIT_PLUGIN_HOOK_SCRIPTS=y
@@ -166,6 +168,8 @@ BR2_PACKAGE_TETRIS=y
 BR2_PACKAGE_ROUSETTE=y
 BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
 BR2_PACKAGE_HOST_PYTHON_YANGDOC=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+BR2_PACKAGE_GETENT=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
 GNS3_APPLIANCE_RAM=512
@@ -7,13 +7,14 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="${BR2_EXTERNAL_INFIX_PATH}/.ccache"
 BR2_ENABLE_DEBUG=y
 BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_INFIX_PATH}/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="ix"
 BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit"
 BR2_INIT_FINIT=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ${BR2_EXTERNAL_INFIX_PATH}/board/common/xattrs"
-# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
 BR2_ROOTFS_MERGED_USR=y
+# BR2_TARGET_ENABLE_ROOT_LOGIN is not set
 BR2_SYSTEM_BIN_SH_BASH=y
 BR2_TARGET_GENERIC_GETTY_PORT="@console"
 BR2_TARGET_GENERIC_GETTY_TERM="xterm"
@@ -26,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
 BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.21"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.25"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -34,6 +35,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig"
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_STRESS_NG=y
+BR2_PACKAGE_SYSREPO_GROUP="sys-cli"
 BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_DBUS_CXX=y
@@ -50,10 +52,7 @@ BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y
 BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
 BR2_PACKAGE_PYTHON3=y
-BR2_PACKAGE_LIBSSH_OPENSSL=y
 BR2_PACKAGE_LIBSSH2=y
-BR2_PACKAGE_LIBSSH2_OPENSSL=y
-BR2_PACKAGE_LIBXCRYPT=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBMNL=y
@@ -83,6 +82,7 @@ BR2_PACKAGE_TCPDUMP=y
 BR2_PACKAGE_WHOIS=y
 BR2_PACKAGE_BASH_COMPLETION=y
 BR2_PACKAGE_SUDO=y
+BR2_PACKAGE_GETENT=y
 BR2_PACKAGE_KMOD_TOOLS=y
 BR2_PACKAGE_PWGEN=y
 BR2_PACKAGE_RAUC=y
@@ -138,6 +138,7 @@ BR2_PACKAGE_KLISH_PLUGIN_INFIX=y
 BR2_PACKAGE_LOWDOWN=y
 BR2_PACKAGE_MCD=y
 BR2_PACKAGE_MDNS_ALIAS=y
+BR2_PACKAGE_SHOW=y
 BR2_PACKAGE_ROUSETTE=y
 BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y
 TRUSTED_KEYS=y
@@ -4,6 +4,23 @@ Change Log
 All notable changes to the project are documented in this file.


+[v25.04.0][] - 2025-04-30
+-------------------------
+
+### Changes
+ - Upgrade Linux kernel to 6.12.25 (LTS)
+ - Upgrade Buildroot to 2025.02.1 (LTS)
+ - Format for disk image (for QEMU) has changed to `qcow2`
+
+### Fixes
+ - Fix #1002: Broken symlink in release package
+ - Fix #1006: NanoPi R2S corrupt startup, regression in Infix v25.02.0
+   - Bump R2S kernel, now same as tier one boards
+ - Fix #1015: Not possible to save custom SSH settings in startup-config
+ - Fix group owner and permissions of `/cfg/backup` directory
+ - Fix extraction of old version for `/cfg/backup/` files
+ - Fix configuration migration issues when upgrading
+
 [v25.03.0][] - 2025-03-31
 -------------------------

@@ -1529,7 +1546,8 @@ 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/v25.03.0...HEAD
+[UNRELEASED]: https://github.com/kernelkit/infix/compare/v25.04.0...HEAD
+[v25.04.0]:   https://github.com/kernelkit/infix/compare/v25.03.0...v25.04.0
 [v25.03.0]:   https://github.com/kernelkit/infix/compare/v25.02.0...v25.03.0
 [v25.02.0]:   https://github.com/kernelkit/infix/compare/v25.01.0...v25.02.0
 [v25.01.0]:   https://github.com/kernelkit/infix/compare/v24.11.0...v25.01.0
@@ -131,6 +131,8 @@ This rebuilds (and installs) `foo` and `bar`, the `all` target calls
 on Buildroot to finalize the target filesystem and generate the images.
 The final `run` argument is explained below.

+
+
 ### `confd`

 The Infix `src/confd/` is the engine of the system.  Currently it is a
@@ -217,21 +219,24 @@ structure of an existing one. However, before making any changes, **always discu
 them with the Infix core team**. This helps avoid issues later in development and 
 makes pull request reviews smoother.

+
 Testing
 -------

 Manual testing can be done using Qemu by calling <kbd>make run</kbd>,
-see also [Infix in Virtual Environments](virtual.md).
+see also [Infix in Virtual Environments](virtual.md), or on a physical
+device by upgrading to the latest build or "[netbooting](netboot.md)"
+and running the image from RAM.  The latter is how most board porting
+work is done -- **much quicker** change-load-test cycles.

 The Infix automated test suite is built around Qemu and [Qeneth][2], see:

 * [Testing](testing.md)
 * [Docker Image](../test/docker/README.md)

-With any new feature added to Infix, it is essential to include a 
-relevant test case. See the 
-[Test Development](testing.md#test-development) section for guidance
-on adding test cases.
+With any new feature added to Infix, it is essential to include relevant
+test case(s).  See the [Test Development](testing.md#test-development)
+section for guidance on adding test cases.


 Reviewing
@@ -0,0 +1,130 @@
+Netboot HowTo
+=============
+
+This document describes how to set up network booting U-Boot devices on
+a LAN, e.g., when working with an evaluation board or other embedded
+system.  The most secure way to do this is with a local LAN between a PC
+and the device.
+
+Instead of setting up everything in U-Boot to download the Linux Image,
+device tree, and initramfs, we will let U-Boot download a script with
+instructions to run.  When you have multiple systems (boards) this
+quickly becomes a lot easier to manage.
+
+> [!NOTE]
+> Instructions in this HowTo assume a Debian based development system,
+> e.g., Ubuntu or Linux Mint.
+
+
+## Network Interface Setup
+
+For two dedicated network interfaces, here `eth2` and `eth3` (ymmv), we
+create an old-style interfaces config[^1] with the following content:
+
+```
+# /etc/network/interfaces.d/gimli
+auto eth2
+iface eth2 inet static
+        address 192.168.0.1
+        netmask 255.255.255.0
+
+auto eth3
+iface eth3 inet manual
+```
+
+> [!TIP]
+> Use configuration file names in `.d/` directories that make sense and
+> can easily be remembered.  Here we use the hostname of the PC.
+
+
+## DHCP/TFTP Server Setup
+
+The examples given here use `dnsmasq`, which provides both DHCP and TFTP
+server support.  The same can be achieved with other implementations.
+
+Similar to `interfaces.d`, dnsmasq has an `/etc/dnsmasq.d` directory so
+we can use "snippets" instead of modifying `/etc/dnsmasq.conf` directly.
+Add a file called `/etc/dnsmasq.d/gimli`.
+
+Initial content:
+
+```
+# Remember IP address handed out to BOOTP clients
+bootp-dynamic
+# Disable check-if-ip-address-is-already-used
+no-ping
+
+# Enable TFTP server, use /srv/ftp, same as any FTP server, useful
+# when using the same images for system upgrade as for netbooting.
+enable-tftp
+tftp-root=/srv/ftp
+```
+
+> [!CAUTION]
+> First of all, make sure you DO NOT accidentally set up dnsmasq so that
+> it starts acting as a DHCP server also on your office LAN!  Follow the
+> instructions below for more details.
+
+If you have many interfaces used for lab equipment and only one office
+LAN interface, then use something like this:
+
+```
+# Disable DHCP server on loopback and office LAN (eth0)
+except-interface=lo
+except-interface=eth0
+```
+
+To further lock this down, we only run the DHCP server on each of the
+interfaces used for lab equipment, with a dedicated IP range as well:
+
+```
+# Currently I have an imx8mp-evk on eth2, so on my system I have a
+# symlink bootfile-eth2 -> netboot.scr
+interface=eth2
+dhcp-range=192.168.0.100,192.168.0.199,1h
+dhcp-boot=tag:eth2,bootfile-eth2
+```
+
+## Bootfile netboot.scr
+
+The bootfile U-Boot retrieves from the TFTP server is a script that
+looks like this, `netboot.sh`:
+
+```sh
+setenv ramdisk_addr_r 0x58000000
+setenv fdt_addr_r     0x50400000
+
+setenv autoboot off
+tftp ${fdt_addr_r}     imx8mp-evk/imx8mp-evk.dtb
+tftp ${kernel_addr_r}  imx8mp-evk/Image
+tftp ${ramdisk_addr_r} imx8mp-evk/rootfs.squashfs
+
+setenv bootargs console=ttymxc1,115200 root=/dev/ram0 brd.rd_size=500000 rauc.slot=net
+booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}
+```
+
+U-Boot cannot read script files directly, so we need to wrap it with a
+FIT format header, this is done by first converting it on the PC:
+
+```
+$ mkimage -T script -d netboot.sh netboot.scr
+```
+
+The output is `netboot.scr` which we symlink to above in the dnsmasq
+setup step.
+
+
+## U-Boot Commands
+
+U-Boot is a maze of environment variables, some with values, some wrap
+commands, and most are undocumented.  We will use a prefix for our
+variables to ensure we do not overwrite anything you may want to use
+later.
+
+```sh
+==> setenv ixboot 'dhcp && source \${fileaddr}'
+==> saveenv
+```
+
+
+[^1]: To prevent NetworkManager from automatically managing the interfaces.
@@ -34,6 +34,7 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/python-libyang/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/python-statd/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/python-yangdoc/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/skeleton-init-finit/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/package/show/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/tetris/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/libyang-cpp/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/sysrepo-cpp/Config.in"
@@ -35,13 +35,30 @@ define CONFD_INSTALL_EXTRA
 	cp $(CONFD_PKGDIR)/avahi.service $(TARGET_DIR)/etc/avahi/services/netconf.service
 endef

+NETOPEER2_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/netopeer2/
+SYSREPO_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/sysrepo/
+LIBNETCONF2_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/libnetconf2/
+CONFD_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/confd/
+TEST_MODE_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/test-mode/
+ROUSETTE_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/rousette/
 COMMON_SYSREPO_ENV = \
 	SYSREPO_SHM_PREFIX=$(CONFD_SYSREPO_SHM_PREFIX) \
 	SYSREPOCTL_EXECUTABLE="$(HOST_DIR)/bin/sysrepoctl" \
 	SYSREPOCFG_EXECUTABLE="$(HOST_DIR)/bin/sysrepocfg" \
-	SEARCH_PATH="$(TARGET_DIR)/usr/share/yang/modules/confd/"
+	SEARCH_PATH="$(NETOPEER2_SEARCHPATH) $(SYSREPO_SEARCHPATH) $(LIBNETCONF2_SEARCHPATH) $(TEST_MODE_SEARCHPATH) $(CONFD_SEARCHPATH) $(ROUSETTE_SEARCHPATH)"
+

 define CONFD_INSTALL_YANG_MODULES
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/sysrepo.inc
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/libnetconf2.inc
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/netopeer2.inc
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/rousette.inc
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/test-mode.inc
 	$(COMMON_SYSREPO_ENV) \
 	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/confd.inc
 endef
@@ -54,14 +71,17 @@ endef
 endif

 define CONFD_PERMISSIONS
-	/etc/sysrepo/data/ r 660 root wheel - - - - -
-	/etc/sysrepo/data  d 770 root wheel - - - - -
+	/etc/sysrepo/data/ r 660 root sys-cli - - - - -
+	/etc/sysrepo/data  d 770 root sys-cli - - - - -
 endef

+define CONFD_EMPTY_SYSREPO
+	rm -rf $(TARGET_DIR)/etc/sysrepo/data/
+endef
 define CONFD_CLEANUP
 	rm -f /dev/shm/$(CONFD_SYSREPO_SHM_PREFIX)*
 endef
-
+CONFD_PRE_INSTALL_TARGET_HOOKS += CONFD_EMPTY_SYSREPO
 CONFD_PRE_INSTALL_TARGET_HOOKS += CONFD_CLEANUP
 CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA
 CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES
@@ -1,5 +1,5 @@
 # From https://github.com/troglobit/finit/releases/
-sha256  7e49a3df58c5aedfff9537b7ff34b9238fc28b523d4dbacc316d606c7af5e335  finit-4.11.tar.gz
+sha256  b6a0a2f98c860cf9fe5dfe7e3601d922957ad7880ae29919176ab960b7b96e70  finit-4.12.tar.gz

 # Locally calculated
 sha256  2fd62c0fe6ea6d1861669f4c87bda83a0b5ceca64f4baa4d16dd078fbd218c14  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-FINIT_VERSION = 4.11
+FINIT_VERSION = 4.12
 FINIT_SITE = https://github.com/troglobit/finit/releases/download/$(FINIT_VERSION)
 FINIT_LICENSE = MIT
 FINIT_LICENSE_FILES = LICENSE
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_SHOW
+	bool "show"
+	help
+	  Tool to retrieve and present operational data from sysrepo.
+
+	  https://github.com/kernelkit/infix
@@ -0,0 +1,19 @@
+################################################################################
+#
+# show
+#
+################################################################################
+
+SHOW_VERSION = 1.0
+SHOW_LICENSE = MIT
+SHOW_LICENSE_FILES = LICENSE
+SHOW_SITE_METHOD = local
+SHOW_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/show
+SHOW_REDISTRIBUTE = NO
+
+define SHOW_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" install
+endef
+
+$(eval $(generic-package))
@@ -1,236 +0,0 @@
-From c2251e09714b9715ee5ece18aa1096bc08cb8f6d Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Mon, 4 Mar 2024 16:47:28 +0100
-Subject: [PATCH 1/5] net: bridge: avoid classifying unknown multicast as
- mrouters_only
-Organization: Addiva Elektronik
-
-Unknown multicast, MAC/IPv4/IPv6, should always be flooded according to
-the per-port mcast_flood setting, as well as to detected and configured
-mcast_router ports.
-
-This patch drops the mrouters_only classifier of unknown IP multicast
-and moves the flow handling from br_multicast_flood() to br_flood().
-This in turn means br_flood() must know about multicast router ports.
-Because a multicast router should always receive both known and unknown
-multicast.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
- include/uapi/linux/if_bridge.h |  1 +
- net/bridge/br.c                |  5 +++++
- net/bridge/br_device.c         | 10 ++++++----
- net/bridge/br_forward.c        | 14 ++++++++++++--
- net/bridge/br_input.c          |  2 +-
- net/bridge/br_multicast.c      | 11 +++++++++--
- net/bridge/br_private.h        | 18 ++++++++++++++++--
- 7 files changed, 50 insertions(+), 11 deletions(-)
-
-diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
-index a5b743a2f775..3bffc39d7800 100644
--- a/include/uapi/linux/if_bridge.h
-+++ b/include/uapi/linux/if_bridge.h
-@@ -830,6 +830,7 @@ enum br_boolopt_id {
- 	BR_BOOLOPT_NO_LL_LEARN,
- 	BR_BOOLOPT_MCAST_VLAN_SNOOPING,
- 	BR_BOOLOPT_MST_ENABLE,
-+	BR_BOOLOPT_MCAST_FLOOD_ALWAYS,
- 	BR_BOOLOPT_MAX
- };
- 
-diff --git a/net/bridge/br.c b/net/bridge/br.c
-index 2cab878e0a39..006fb2e5eafb 100644
--- a/net/bridge/br.c
-+++ b/net/bridge/br.c
-@@ -277,6 +277,9 @@ int br_boolopt_toggle(struct net_bridge *br, enum br_boolopt_id opt, bool on,
- 	case BR_BOOLOPT_MST_ENABLE:
- 		err = br_mst_set_enabled(br, on, extack);
- 		break;
-+	case BR_BOOLOPT_MCAST_FLOOD_ALWAYS:
-+		br_opt_toggle(br, BROPT_MCAST_FLOOD_ALWAYS, on);
-+		break;
- 	default:
- 		/* shouldn't be called with unsupported options */
- 		WARN_ON(1);
-@@ -295,6 +298,8 @@ int br_boolopt_get(const struct net_bridge *br, enum br_boolopt_id opt)
- 		return br_opt_get(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED);
- 	case BR_BOOLOPT_MST_ENABLE:
- 		return br_opt_get(br, BROPT_MST_ENABLED);
-+	case BR_BOOLOPT_MCAST_FLOOD_ALWAYS:
-+		return br_opt_get(br, BROPT_MCAST_FLOOD_ALWAYS);
- 	default:
- 		/* 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 fb1115857e49..6aac21d86d37 100644
--- a/net/bridge/br_device.c
-+++ b/net/bridge/br_device.c
-@@ -87,10 +87,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
- 
- 	dest = eth_hdr(skb)->h_dest;
- 	if (is_broadcast_ether_addr(dest)) {
-		br_flood(br, skb, BR_PKT_BROADCAST, false, true, vid);
-+		br_flood(br, skb, NULL, BR_PKT_BROADCAST, false, true, vid);
- 	} else if (is_multicast_ether_addr(dest)) {
- 		if (unlikely(netpoll_tx_running(dev))) {
-			br_flood(br, skb, BR_PKT_MULTICAST, false, true, vid);
-+			br_flood(br, skb, brmctx, BR_PKT_MULTICAST, false, true, vid);
- 			goto out;
- 		}
- 		if (br_multicast_rcv(&brmctx, &pmctx_null, vlan, skb, vid)) {
-@@ -103,11 +103,11 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
- 		    br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst))
- 			br_multicast_flood(mdst, skb, brmctx, false, true);
- 		else
-			br_flood(br, skb, BR_PKT_MULTICAST, false, true, vid);
-+			br_flood(br, skb, brmctx, BR_PKT_MULTICAST, false, true, vid);
- 	} else if ((dst = br_fdb_find_rcu(br, dest, vid)) != NULL) {
- 		br_forward(dst->dst, skb, false, true);
- 	} else {
-		br_flood(br, skb, BR_PKT_UNICAST, false, true, vid);
-+		br_flood(br, skb, NULL, BR_PKT_UNICAST, false, true, vid);
- 	}
- out:
- 	rcu_read_unlock();
-@@ -524,6 +524,8 @@ void br_dev_setup(struct net_device *dev)
- 	br->bridge_ageing_time = br->ageing_time = BR_DEFAULT_AGEING_TIME;
- 	dev->max_mtu = ETH_MAX_MTU;
- 
-+	br_opt_toggle(br, BROPT_MCAST_FLOOD_ALWAYS, false);
-+
- 	br_netfilter_rtable_init(br);
- 	br_stp_timer_init(br);
- 	br_multicast_init(br);
-diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
-index e19b583ff2c6..1094364d96e0 100644
--- a/net/bridge/br_forward.c
-+++ b/net/bridge/br_forward.c
-@@ -198,14 +198,19 @@ static struct net_bridge_port *maybe_deliver(
- 
- /* called under rcu_read_lock */
- void br_flood(struct net_bridge *br, struct sk_buff *skb,
-	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig,
-	      u16 vid)
-+	      struct net_bridge_mcast *brmctx, enum br_pkt_type pkt_type,
-+	      bool local_rcv, bool local_orig, u16 vid)
- {
-+	struct net_bridge_port *rport = NULL;
- 	struct net_bridge_port *prev = NULL;
-+	struct hlist_node *rp = NULL;
- 	struct net_bridge_port *p;
- 
- 	br_tc_skb_miss_set(skb, pkt_type != BR_PKT_BROADCAST);
- 
-+	if (pkt_type == BR_PKT_MULTICAST)
-+		rp = br_multicast_get_first_rport_node(brmctx, skb);
-+
- 	list_for_each_entry_rcu(p, &br->port_list, list) {
- 		/* Do not flood unicast traffic to ports that turn it off, nor
- 		 * other traffic if flood off, except for traffic we originate
-@@ -216,6 +221,11 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb,
- 				continue;
- 			break;
- 		case BR_PKT_MULTICAST:
-+			rport = br_multicast_rport_from_node_skb(rp, skb);
-+			if (rport == p) {
-+				rp = rcu_dereference(hlist_next_rcu(rp));
-+				break;
-+			}
- 			if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
- 				continue;
- 			break;
-diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
-index ceaa5a89b947..e54d648db7de 100644
--- a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -212,7 +212,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
- 		br_forward(dst->dst, skb, local_rcv, false);
- 	} else {
- 		if (!mcast_hit)
-			br_flood(br, skb, pkt_type, local_rcv, false, vid);
-+			br_flood(br, skb, brmctx, pkt_type, local_rcv, false, vid);
- 		else
- 			br_multicast_flood(mdst, skb, brmctx, local_rcv, false);
- 	}
-diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
-index 9a1cb5079a7a..dc49df4f92a8 100644
--- a/net/bridge/br_multicast.c
-+++ b/net/bridge/br_multicast.c
-@@ -3776,6 +3776,11 @@ static void br_multicast_err_count(const struct net_bridge *br,
- 	u64_stats_update_end(&pstats->syncp);
- }
- 
-+static bool br_flood_mrouters(const struct net_bridge *br)
-+{
-+	return br_opt_get(br, BROPT_MCAST_FLOOD_ALWAYS) ? false : true;
-+}
-+
- static void br_multicast_pim(struct net_bridge_mcast *brmctx,
- 			     struct net_bridge_mcast_port *pmctx,
- 			     const struct sk_buff *skb)
-@@ -3822,7 +3827,8 @@ static int br_multicast_ipv4_rcv(struct net_bridge_mcast *brmctx,
- 
- 	if (err == -ENOMSG) {
- 		if (!ipv4_is_local_multicast(ip_hdr(skb)->daddr)) {
-			BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
-+			BR_INPUT_SKB_CB(skb)->mrouters_only =
-+				br_flood_mrouters(brmctx->br);
- 		} else if (pim_ipv4_all_pim_routers(ip_hdr(skb)->daddr)) {
- 			if (ip_hdr(skb)->protocol == IPPROTO_PIM)
- 				br_multicast_pim(brmctx, pmctx, skb);
-@@ -3891,7 +3897,8 @@ static int br_multicast_ipv6_rcv(struct net_bridge_mcast *brmctx,
- 
- 	if (err == -ENOMSG || err == -ENODATA) {
- 		if (!ipv6_addr_is_ll_all_nodes(&ipv6_hdr(skb)->daddr))
-			BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
-+			BR_INPUT_SKB_CB(skb)->mrouters_only =
-+				br_flood_mrouters(brmctx->br);
- 		if (err == -ENODATA &&
- 		    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 d4bedc87b1d8..dfd6e2cdd13e 100644
--- a/net/bridge/br_private.h
-+++ b/net/bridge/br_private.h
-@@ -483,6 +483,7 @@ enum net_bridge_opts {
- 	BROPT_VLAN_BRIDGE_BINDING,
- 	BROPT_MCAST_VLAN_SNOOPING_ENABLED,
- 	BROPT_MST_ENABLED,
-+	BROPT_MCAST_FLOOD_ALWAYS,
- };
- 
- struct net_bridge {
-@@ -886,8 +887,8 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,
- 		bool local_rcv, bool local_orig);
- int br_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
- void br_flood(struct net_bridge *br, struct sk_buff *skb,
-	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig,
-	      u16 vid);
-+	      struct net_bridge_mcast *brmctx, enum br_pkt_type pkt_type,
-+	      bool local_rcv, bool local_orig, u16 vid);
- 
- /* return true if both source port and dest port are isolated */
- static inline bool br_skb_isolated(const struct net_bridge_port *to,
-@@ -1408,6 +1409,19 @@ static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
- {
- }
- 
-+static inline struct hlist_node *
-+br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
-+				  struct sk_buff *skb)
-+{
-+	return NULL;
-+}
-+
-+static inline struct net_bridge_port *
-+br_multicast_rport_from_node_skb(struct hlist_node *rp, struct sk_buff *skb)
-+{
-+	return NULL;
-+}
-+
- static inline bool br_multicast_is_router(struct net_bridge_mcast *brmctx,
- 					  struct sk_buff *skb)
- {
-- 
-2.43.0
-
@@ -1,37 +0,0 @@
-From 75edfa9b690b65423aa3e63ed5870d565950d9bb Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Tue, 5 Mar 2024 06:44:41 +0100
-Subject: [PATCH 2/5] net: bridge: Ignore router ports when forwarding L2
- multicast
-Organization: Addiva Elektronik
-
-Multicast router ports are either statically configured or learned from
-control protocol traffic (IGMP/MLD/PIM).  These protocols regulate IP
-multicast -- MAC multicast should always be forwarded through flooding
-of unknown multicast or using permanent MDB entries.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
- net/bridge/br_private.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index dfd6e2cdd13e..7aabf8bd7da2 100644
--- a/net/bridge/br_private.h
-+++ b/net/bridge/br_private.h
-@@ -1086,7 +1086,10 @@ br_multicast_get_first_rport_node(struct net_bridge_mcast *brmctx,
- 	if (skb->protocol == htons(ETH_P_IPV6))
- 		return rcu_dereference(hlist_first_rcu(&brmctx->ip6_mc_router_list));
- #endif
-	return rcu_dereference(hlist_first_rcu(&brmctx->ip4_mc_router_list));
-+	if (skb->protocol == htons(ETH_P_IP))
-+		return rcu_dereference(hlist_first_rcu(&brmctx->ip4_mc_router_list));
-+
-+	return NULL;
- }
- 
- static inline struct net_bridge_port *
-- 
-2.43.0
-
@@ -1,190 +0,0 @@
-From 2d2ac57a7d9354c2c1fa796659e33496fc8e918d Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Thu, 4 Apr 2024 16:36:30 +0200
-Subject: [PATCH 3/5] net: bridge: drop delay for applying strict multicast
- filtering
-Organization: Addiva Elektronik
-
-This *local* patch drops the initial delay before applying strict multicast
-filtering, introduced in [1] and recently updated in [2].
-
-The main reason for this patch is RFC conformance and customer expectations.
-At power on we assume the querier role by default and are expected to stop
-unknown flooding as soon as we have a membership report in place, not after
-10 seconds.
-
-A proper fix for upstreaming could be to add a knob to disable the delay.
-
-[1]: https://lore.kernel.org/netdev/1375311980-25575-1-git-send-email-linus.luessing@web.de/
-[2]: https://lore.kernel.org/netdev/20240127175033.9640-1-linus.luessing@c0d3.blue/
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
- net/bridge/br_multicast.c | 42 +++++++--------------------------------
- net/bridge/br_private.h   |  4 +---
- 2 files changed, 8 insertions(+), 38 deletions(-)
-
-diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
-index dc49df4f92a8..47c0625c5553 100644
--- a/net/bridge/br_multicast.c
-+++ b/net/bridge/br_multicast.c
-@@ -1762,10 +1762,6 @@ static void br_ip6_multicast_querier_expired(struct timer_list *t)
- }
- #endif
- 
-static void br_multicast_query_delay_expired(struct timer_list *t)
-{
-}
-
- static void br_multicast_select_own_querier(struct net_bridge_mcast *brmctx,
- 					    struct br_ip *ip,
- 					    struct sk_buff *skb)
-@@ -3198,12 +3194,8 @@ int br_multicast_dump_querier_state(struct sk_buff *skb,
- 
- static void
- br_multicast_update_query_timer(struct net_bridge_mcast *brmctx,
-				struct bridge_mcast_other_query *query,
-				unsigned long max_delay)
-+				struct bridge_mcast_other_query *query)
- {
-	if (!timer_pending(&query->timer))
-		mod_timer(&query->delay_timer, jiffies + max_delay);
-
- 	mod_timer(&query->timer, jiffies + brmctx->multicast_querier_interval);
- }
- 
-@@ -3394,13 +3386,12 @@ static void
- br_ip4_multicast_query_received(struct net_bridge_mcast *brmctx,
- 				struct net_bridge_mcast_port *pmctx,
- 				struct bridge_mcast_other_query *query,
-				struct br_ip *saddr,
-				unsigned long max_delay)
-+				struct br_ip *saddr)
- {
- 	if (!br_multicast_select_querier(brmctx, pmctx, saddr))
- 		return;
- 
-	br_multicast_update_query_timer(brmctx, query, max_delay);
-+	br_multicast_update_query_timer(brmctx, query);
- 	br_ip4_multicast_mark_router(brmctx, pmctx);
- }
- 
-@@ -3409,13 +3400,12 @@ static void
- br_ip6_multicast_query_received(struct net_bridge_mcast *brmctx,
- 				struct net_bridge_mcast_port *pmctx,
- 				struct bridge_mcast_other_query *query,
-				struct br_ip *saddr,
-				unsigned long max_delay)
-+				struct br_ip *saddr)
- {
- 	if (!br_multicast_select_querier(brmctx, pmctx, saddr))
- 		return;
- 
-	br_multicast_update_query_timer(brmctx, query, max_delay);
-+	br_multicast_update_query_timer(brmctx, query);
- 	br_ip6_multicast_mark_router(brmctx, pmctx);
- }
- #endif
-@@ -3469,7 +3459,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
- 
- 		br_ip4_multicast_query_received(brmctx, pmctx,
- 						&brmctx->ip4_other_query,
-						&saddr, max_delay);
-+						&saddr);
- 		goto out;
- 	}
- 
-@@ -3557,7 +3547,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
- 
- 		br_ip6_multicast_query_received(brmctx, pmctx,
- 						&brmctx->ip6_other_query,
-						&saddr, max_delay);
-+						&saddr);
- 		goto out;
- 	} else if (!group) {
- 		goto out;
-@@ -4065,8 +4055,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
- 		    br_ip4_multicast_local_router_expired, 0);
- 	timer_setup(&brmctx->ip4_other_query.timer,
- 		    br_ip4_multicast_querier_expired, 0);
-	timer_setup(&brmctx->ip4_other_query.delay_timer,
-		    br_multicast_query_delay_expired, 0);
- 	timer_setup(&brmctx->ip4_own_query.timer,
- 		    br_ip4_multicast_query_expired, 0);
- #if IS_ENABLED(CONFIG_IPV6)
-@@ -4074,8 +4062,6 @@ void br_multicast_ctx_init(struct net_bridge *br,
- 		    br_ip6_multicast_local_router_expired, 0);
- 	timer_setup(&brmctx->ip6_other_query.timer,
- 		    br_ip6_multicast_querier_expired, 0);
-	timer_setup(&brmctx->ip6_other_query.delay_timer,
-		    br_multicast_query_delay_expired, 0);
- 	timer_setup(&brmctx->ip6_own_query.timer,
- 		    br_ip6_multicast_query_expired, 0);
- #endif
-@@ -4210,12 +4196,10 @@ static void __br_multicast_stop(struct net_bridge_mcast *brmctx)
- {
- 	del_timer_sync(&brmctx->ip4_mc_router_timer);
- 	del_timer_sync(&brmctx->ip4_other_query.timer);
-	del_timer_sync(&brmctx->ip4_other_query.delay_timer);
- 	del_timer_sync(&brmctx->ip4_own_query.timer);
- #if IS_ENABLED(CONFIG_IPV6)
- 	del_timer_sync(&brmctx->ip6_mc_router_timer);
- 	del_timer_sync(&brmctx->ip6_other_query.timer);
-	del_timer_sync(&brmctx->ip6_other_query.delay_timer);
- 	del_timer_sync(&brmctx->ip6_own_query.timer);
- #endif
- }
-@@ -4643,8 +4627,6 @@ EXPORT_SYMBOL_GPL(br_multicast_router);
- 
- int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
- {
-	unsigned long max_delay;
-
- 	val = !!val;
- 
- 	spin_lock_bh(&brmctx->br->multicast_lock);
-@@ -4655,19 +4637,9 @@ int br_multicast_set_querier(struct net_bridge_mcast *brmctx, unsigned long val)
- 	if (!val)
- 		goto unlock;
- 
-	max_delay = brmctx->multicast_query_response_interval;
-
-	if (!timer_pending(&brmctx->ip4_other_query.timer))
-		mod_timer(&brmctx->ip4_other_query.delay_timer,
-			  jiffies + max_delay);
-
- 	br_multicast_start_querier(brmctx, &brmctx->ip4_own_query);
- 
- #if IS_ENABLED(CONFIG_IPV6)
-	if (!timer_pending(&brmctx->ip6_other_query.timer))
-		mod_timer(&brmctx->ip6_other_query.delay_timer,
-			  jiffies + max_delay);
-
- 	br_multicast_start_querier(brmctx, &brmctx->ip6_own_query);
- #endif
- 
-diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index 7aabf8bd7da2..43fff09dfb71 100644
--- a/net/bridge/br_private.h
-+++ b/net/bridge/br_private.h
-@@ -78,7 +78,6 @@ struct bridge_mcast_own_query {
- /* other querier */
- struct bridge_mcast_other_query {
- 	struct timer_list		timer;
-	struct timer_list		delay_timer;
- };
- 
- /* selected querier */
-@@ -1164,8 +1163,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
- 		own_querier_enabled = false;
- 	}
- 
-	return !timer_pending(&querier->delay_timer) &&
-	       (own_querier_enabled || timer_pending(&querier->timer));
-+	return own_querier_enabled || timer_pending(&querier->timer);
- }
- 
- static inline bool br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
-- 
-2.43.0
-
@@ -1,49 +0,0 @@
-From c7818c4273ef1705d6e153f5e4eda683d68f59be Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Mon, 29 Apr 2024 15:14:51 +0200
-Subject: [PATCH 4/5] usb: core: adjust log level for unauthorized devices
-Organization: Addiva Elektronik
-
-The fact that a USB device currently is not authorized is not an error,
-so let's adjust the log level so these messages slip below radar for the
-commonly used 'quiet' log level.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
- drivers/usb/core/driver.c  | 4 ++--
- drivers/usb/core/generic.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
-index e02ba15f6e34..3fe4d15cd6db 100644
--- a/drivers/usb/core/driver.c
-+++ b/drivers/usb/core/driver.c
-@@ -335,10 +335,10 @@ static int usb_probe_interface(struct device *dev)
- 		return error;
- 
- 	if (udev->authorized == 0) {
-		dev_err(&intf->dev, "Device is not authorized for usage\n");
-+		dev_warn(&intf->dev, "Device is not authorized for usage\n");
- 		return error;
- 	} else if (intf->authorized == 0) {
-		dev_err(&intf->dev, "Interface %d is not authorized for usage\n",
-+		dev_warn(&intf->dev, "Interface %d is not authorized for usage\n",
- 				intf->altsetting->desc.bInterfaceNumber);
- 		return error;
- 	}
-diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
-index b134bff5c3fe..60575a01a810 100644
--- a/drivers/usb/core/generic.c
-+++ b/drivers/usb/core/generic.c
-@@ -247,7 +247,7 @@ int usb_generic_driver_probe(struct usb_device *udev)
- 	 * with the driver core and lets interface drivers bind to them.
- 	 */
- 	if (udev->authorized == 0)
-		dev_err(&udev->dev, "Device is not authorized for usage\n");
-+		dev_warn(&udev->dev, "Device is not authorized for usage\n");
- 	else {
- 		c = usb_choose_configuration(udev);
- 		if (c >= 0) {
-- 
-2.43.0
-
@@ -1,651 +0,0 @@
-From f33dc6fb8cd78eb3b1b2ea3de68b8a54efabdac2 Mon Sep 17 00:00:00 2001
-From: Tobias Waldekranz <tobias@waldekranz.com>
-Date: Tue, 18 Mar 2025 10:55:09 +0100
-Subject: [PATCH 27/27] net: mvpp2: Prevent parser TCAM memory corruption
-Organization: Wires
-
-Protect the parser TCAM/SRAM memory, and the cached (shadow) SRAM
-information, from concurrent modifications.
-
-Both the TCAM and SRAM tables are indirectly accessed by configuring
-an index register that selects the row to read or write to. This means
-that operations must be atomic in order to, e.g., avoid spreading
-writes across multiple rows. Since the shadow SRAM array is used to
-find free rows in the hardware table, it must also be protected in
-order to avoid TOCTOU errors where multiple cores allocate the same
-row.
-
-This issue was detected in a situation where `mvpp2_set_rx_mode()` ran
-concurrently on two CPUs. In this particular case the
-MVPP2_PE_MAC_UC_PROMISCUOUS entry was corrupted, causing the
-classifier unit to drop all incoming unicast - indicated by the
-`rx_classifier_drops` counter.
-
-Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit")
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
---
- drivers/net/ethernet/marvell/mvpp2/mvpp2.h    |   3 +
- .../net/ethernet/marvell/mvpp2/mvpp2_main.c   |   3 +-
- .../net/ethernet/marvell/mvpp2/mvpp2_prs.c    | 201 ++++++++++++------
- 3 files changed, 140 insertions(+), 67 deletions(-)
-
-diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
-index 9e02e4367bec..9bd3d76b5fe2 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
-@@ -1108,6 +1108,9 @@ struct mvpp2 {
- 
- 	/* Spinlocks for CM3 shared memory configuration */
- 	spinlock_t mss_spinlock;
-+
-+	/* Spinlock for shared PRS parser memory and shadow table */
-+	spinlock_t prs_spinlock;
- };
- 
- struct mvpp2_pcpu_stats {
-diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
-index 3880dcc0418b..66b5a80c9c28 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
-@@ -7640,8 +7640,9 @@ static int mvpp2_probe(struct platform_device *pdev)
- 	if (mvpp2_read(priv, MVPP2_VER_ID_REG) == MVPP2_VER_PP23)
- 		priv->hw_version = MVPP23;
- 
-	/* Init mss lock */
-+	/* Init locks for shared packet processor resources */
- 	spin_lock_init(&priv->mss_spinlock);
-+	spin_lock_init(&priv->prs_spinlock);
- 
- 	/* Initialize network controller */
- 	err = mvpp2_init(pdev, priv);
-diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
-index 9af22f497a40..a96edc7dc0de 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
-@@ -23,6 +23,8 @@ static int mvpp2_prs_hw_write(struct mvpp2 *priv, struct mvpp2_prs_entry *pe)
- {
- 	int i;
- 
-+	lockdep_assert_held(&priv->prs_spinlock);
-+
- 	if (pe->index > MVPP2_PRS_TCAM_SRAM_SIZE - 1)
- 		return -EINVAL;
- 
-@@ -43,11 +45,13 @@ static int mvpp2_prs_hw_write(struct mvpp2 *priv, struct mvpp2_prs_entry *pe)
- }
- 
- /* Initialize tcam entry from hw */
-int mvpp2_prs_init_from_hw(struct mvpp2 *priv, struct mvpp2_prs_entry *pe,
-			   int tid)
-+static int mvpp2_prs_init_from_hw_unlocked(struct mvpp2 *priv,
-+					   struct mvpp2_prs_entry *pe, int tid)
- {
- 	int i;
- 
-+	lockdep_assert_held(&priv->prs_spinlock);
-+
- 	if (tid > MVPP2_PRS_TCAM_SRAM_SIZE - 1)
- 		return -EINVAL;
- 
-@@ -73,6 +77,18 @@ int mvpp2_prs_init_from_hw(struct mvpp2 *priv, struct mvpp2_prs_entry *pe,
- 	return 0;
- }
- 
-+int mvpp2_prs_init_from_hw(struct mvpp2 *priv, struct mvpp2_prs_entry *pe,
-+			   int tid)
-+{
-+	int err;
-+
-+	spin_lock_bh(&priv->prs_spinlock);
-+	err = mvpp2_prs_init_from_hw_unlocked(priv, pe, tid);
-+	spin_unlock_bh(&priv->prs_spinlock);
-+
-+	return err;
-+}
-+
- /* Invalidate tcam hw entry */
- static void mvpp2_prs_hw_inv(struct mvpp2 *priv, int index)
- {
-@@ -374,7 +390,7 @@ static int mvpp2_prs_flow_find(struct mvpp2 *priv, int flow)
- 		    priv->prs_shadow[tid].lu != MVPP2_PRS_LU_FLOWS)
- 			continue;
- 
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 		bits = mvpp2_prs_sram_ai_get(&pe);
- 
- 		/* Sram store classification lookup ID in AI bits [5:0] */
-@@ -441,7 +457,7 @@ static void mvpp2_prs_mac_drop_all_set(struct mvpp2 *priv, int port, bool add)
- 
- 	if (priv->prs_shadow[MVPP2_PE_DROP_ALL].valid) {
- 		/* Entry exist - update port only */
-		mvpp2_prs_init_from_hw(priv, &pe, MVPP2_PE_DROP_ALL);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, MVPP2_PE_DROP_ALL);
- 	} else {
- 		/* Entry doesn't exist - create new */
- 		memset(&pe, 0, sizeof(pe));
-@@ -469,14 +485,17 @@ static void mvpp2_prs_mac_drop_all_set(struct mvpp2 *priv, int port, bool add)
- }
- 
- /* Set port to unicast or multicast promiscuous mode */
-void mvpp2_prs_mac_promisc_set(struct mvpp2 *priv, int port,
-			       enum mvpp2_prs_l2_cast l2_cast, bool add)
-+static void mvpp2_prs_mac_promisc_set_unlocked(struct mvpp2 *priv, int port,
-+					       enum mvpp2_prs_l2_cast l2_cast,
-+					       bool add)
- {
- 	struct mvpp2_prs_entry pe;
- 	unsigned char cast_match;
- 	unsigned int ri;
- 	int tid;
- 
-+	lockdep_assert_held(&priv->prs_spinlock);
-+
- 	if (l2_cast == MVPP2_PRS_L2_UNI_CAST) {
- 		cast_match = MVPP2_PRS_UCAST_VAL;
- 		tid = MVPP2_PE_MAC_UC_PROMISCUOUS;
-@@ -489,7 +508,7 @@ void mvpp2_prs_mac_promisc_set(struct mvpp2 *priv, int port,
- 
- 	/* promiscuous mode - Accept unknown unicast or multicast packets */
- 	if (priv->prs_shadow[tid].valid) {
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 	} else {
- 		memset(&pe, 0, sizeof(pe));
- 		mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_MAC);
-@@ -522,6 +541,14 @@ void mvpp2_prs_mac_promisc_set(struct mvpp2 *priv, int port,
- 	mvpp2_prs_hw_write(priv, &pe);
- }
- 
-+void mvpp2_prs_mac_promisc_set(struct mvpp2 *priv, int port,
-+			       enum mvpp2_prs_l2_cast l2_cast, bool add)
-+{
-+		spin_lock_bh(&priv->prs_spinlock);
-+		mvpp2_prs_mac_promisc_set_unlocked(priv, port, l2_cast, add);
-+		spin_unlock_bh(&priv->prs_spinlock);
-+}
-+
- /* Set entry for dsa packets */
- static void mvpp2_prs_dsa_tag_set(struct mvpp2 *priv, int port, bool add,
- 				  bool tagged, bool extend)
-@@ -539,7 +566,7 @@ static void mvpp2_prs_dsa_tag_set(struct mvpp2 *priv, int port, bool add,
- 
- 	if (priv->prs_shadow[tid].valid) {
- 		/* Entry exist - update port only */
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 	} else {
- 		/* Entry doesn't exist - create new */
- 		memset(&pe, 0, sizeof(pe));
-@@ -610,7 +637,7 @@ static void mvpp2_prs_dsa_tag_ethertype_set(struct mvpp2 *priv, int port,
- 
- 	if (priv->prs_shadow[tid].valid) {
- 		/* Entry exist - update port only */
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 	} else {
- 		/* Entry doesn't exist - create new */
- 		memset(&pe, 0, sizeof(pe));
-@@ -673,7 +700,7 @@ static int mvpp2_prs_vlan_find(struct mvpp2 *priv, unsigned short tpid, int ai)
- 		    priv->prs_shadow[tid].lu != MVPP2_PRS_LU_VLAN)
- 			continue;
- 
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 		match = mvpp2_prs_tcam_data_cmp(&pe, 0, tpid);
- 		if (!match)
- 			continue;
-@@ -726,7 +753,7 @@ static int mvpp2_prs_vlan_add(struct mvpp2 *priv, unsigned short tpid, int ai,
- 			    priv->prs_shadow[tid_aux].lu != MVPP2_PRS_LU_VLAN)
- 				continue;
- 
-			mvpp2_prs_init_from_hw(priv, &pe, tid_aux);
-+			mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid_aux);
- 			ri_bits = mvpp2_prs_sram_ri_get(&pe);
- 			if ((ri_bits & MVPP2_PRS_RI_VLAN_MASK) ==
- 			    MVPP2_PRS_RI_VLAN_DOUBLE)
-@@ -760,7 +787,7 @@ static int mvpp2_prs_vlan_add(struct mvpp2 *priv, unsigned short tpid, int ai,
- 
- 		mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_VLAN);
- 	} else {
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 	}
- 	/* Update ports' mask */
- 	mvpp2_prs_tcam_port_map_set(&pe, port_map);
-@@ -800,7 +827,7 @@ static int mvpp2_prs_double_vlan_find(struct mvpp2 *priv, unsigned short tpid1,
- 		    priv->prs_shadow[tid].lu != MVPP2_PRS_LU_VLAN)
- 			continue;
- 
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 
- 		match = mvpp2_prs_tcam_data_cmp(&pe, 0, tpid1) &&
- 			mvpp2_prs_tcam_data_cmp(&pe, 4, tpid2);
-@@ -849,7 +876,7 @@ static int mvpp2_prs_double_vlan_add(struct mvpp2 *priv, unsigned short tpid1,
- 			    priv->prs_shadow[tid_aux].lu != MVPP2_PRS_LU_VLAN)
- 				continue;
- 
-			mvpp2_prs_init_from_hw(priv, &pe, tid_aux);
-+			mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid_aux);
- 			ri_bits = mvpp2_prs_sram_ri_get(&pe);
- 			ri_bits &= MVPP2_PRS_RI_VLAN_MASK;
- 			if (ri_bits == MVPP2_PRS_RI_VLAN_SINGLE ||
-@@ -880,7 +907,7 @@ static int mvpp2_prs_double_vlan_add(struct mvpp2 *priv, unsigned short tpid1,
- 
- 		mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_VLAN);
- 	} else {
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 	}
- 
- 	/* Update ports' mask */
-@@ -1213,8 +1240,8 @@ static void mvpp2_prs_mac_init(struct mvpp2 *priv)
- 	/* Create dummy entries for drop all and promiscuous modes */
- 	mvpp2_prs_drop_fc(priv);
- 	mvpp2_prs_mac_drop_all_set(priv, 0, false);
-	mvpp2_prs_mac_promisc_set(priv, 0, MVPP2_PRS_L2_UNI_CAST, false);
-	mvpp2_prs_mac_promisc_set(priv, 0, MVPP2_PRS_L2_MULTI_CAST, false);
-+	mvpp2_prs_mac_promisc_set_unlocked(priv, 0, MVPP2_PRS_L2_UNI_CAST, false);
-+	mvpp2_prs_mac_promisc_set_unlocked(priv, 0, MVPP2_PRS_L2_MULTI_CAST, false);
- }
- 
- /* Set default entries for various types of dsa packets */
-@@ -1533,12 +1560,6 @@ static int mvpp2_prs_vlan_init(struct platform_device *pdev, struct mvpp2 *priv)
- 	struct mvpp2_prs_entry pe;
- 	int err;
- 
-	priv->prs_double_vlans = devm_kcalloc(&pdev->dev, sizeof(bool),
-					      MVPP2_PRS_DBL_VLANS_MAX,
-					      GFP_KERNEL);
-	if (!priv->prs_double_vlans)
-		return -ENOMEM;
-
- 	/* Double VLAN: 0x88A8, 0x8100 */
- 	err = mvpp2_prs_double_vlan_add(priv, ETH_P_8021AD, ETH_P_8021Q,
- 					MVPP2_PRS_PORT_MASK);
-@@ -1941,7 +1962,7 @@ static int mvpp2_prs_vid_range_find(struct mvpp2_port *port, u16 vid, u16 mask)
- 		    port->priv->prs_shadow[tid].lu != MVPP2_PRS_LU_VID)
- 			continue;
- 
-		mvpp2_prs_init_from_hw(port->priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(port->priv, &pe, tid);
- 
- 		mvpp2_prs_tcam_data_byte_get(&pe, 2, &byte[0], &enable[0]);
- 		mvpp2_prs_tcam_data_byte_get(&pe, 3, &byte[1], &enable[1]);
-@@ -1970,6 +1991,8 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
- 
- 	memset(&pe, 0, sizeof(pe));
- 
-+	spin_lock_bh(&priv->prs_spinlock);
-+
- 	/* Scan TCAM and see if entry with this <vid,port> already exist */
- 	tid = mvpp2_prs_vid_range_find(port, vid, mask);
- 
-@@ -1988,8 +2011,10 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
- 						MVPP2_PRS_VLAN_FILT_MAX_ENTRY);
- 
- 		/* There isn't room for a new VID filter */
-		if (tid < 0)
-+		if (tid < 0) {
-+			spin_unlock_bh(&priv->prs_spinlock);
- 			return tid;
-+		}
- 
- 		mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_VID);
- 		pe.index = tid;
-@@ -1997,7 +2022,7 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
- 		/* Mask all ports */
- 		mvpp2_prs_tcam_port_map_set(&pe, 0);
- 	} else {
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 	}
- 
- 	/* Enable the current port */
-@@ -2019,6 +2044,7 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
- 	mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_VID);
- 	mvpp2_prs_hw_write(priv, &pe);
- 
-+	spin_unlock_bh(&priv->prs_spinlock);
- 	return 0;
- }
- 
-@@ -2028,15 +2054,16 @@ void mvpp2_prs_vid_entry_remove(struct mvpp2_port *port, u16 vid)
- 	struct mvpp2 *priv = port->priv;
- 	int tid;
- 
-	/* Scan TCAM and see if entry with this <vid,port> already exist */
-	tid = mvpp2_prs_vid_range_find(port, vid, 0xfff);
-+	spin_lock_bh(&priv->prs_spinlock);
- 
-	/* No such entry */
-	if (tid < 0)
-		return;
-+	/* Invalidate TCAM entry with this <vid,port>, if it exists */
-+	tid = mvpp2_prs_vid_range_find(port, vid, 0xfff);
-+	if (tid >= 0) {
-+		mvpp2_prs_hw_inv(priv, tid);
-+		priv->prs_shadow[tid].valid = false;
-+	}
- 
-	mvpp2_prs_hw_inv(priv, tid);
-	priv->prs_shadow[tid].valid = false;
-+	spin_unlock_bh(&priv->prs_spinlock);
- }
- 
- /* Remove all existing VID filters on this port */
-@@ -2045,6 +2072,8 @@ void mvpp2_prs_vid_remove_all(struct mvpp2_port *port)
- 	struct mvpp2 *priv = port->priv;
- 	int tid;
- 
-+	spin_lock_bh(&priv->prs_spinlock);
-+
- 	for (tid = MVPP2_PRS_VID_PORT_FIRST(port->id);
- 	     tid <= MVPP2_PRS_VID_PORT_LAST(port->id); tid++) {
- 		if (priv->prs_shadow[tid].valid) {
-@@ -2052,6 +2081,8 @@ void mvpp2_prs_vid_remove_all(struct mvpp2_port *port)
- 			priv->prs_shadow[tid].valid = false;
- 		}
- 	}
-+
-+	spin_unlock_bh(&priv->prs_spinlock);
- }
- 
- /* Remove VID filering entry for this port */
-@@ -2060,10 +2091,14 @@ void mvpp2_prs_vid_disable_filtering(struct mvpp2_port *port)
- 	unsigned int tid = MVPP2_PRS_VID_PORT_DFLT(port->id);
- 	struct mvpp2 *priv = port->priv;
- 
-+	spin_lock_bh(&priv->prs_spinlock);
-+
- 	/* Invalidate the guard entry */
- 	mvpp2_prs_hw_inv(priv, tid);
- 
- 	priv->prs_shadow[tid].valid = false;
-+
-+	spin_unlock_bh(&priv->prs_spinlock);
- }
- 
- /* Add guard entry that drops packets when no VID is matched on this port */
-@@ -2079,6 +2114,8 @@ void mvpp2_prs_vid_enable_filtering(struct mvpp2_port *port)
- 
- 	memset(&pe, 0, sizeof(pe));
- 
-+	spin_lock_bh(&priv->prs_spinlock);
-+
- 	pe.index = tid;
- 
- 	reg_val = mvpp2_read(priv, MVPP2_MH_REG(port->id));
-@@ -2111,6 +2148,8 @@ void mvpp2_prs_vid_enable_filtering(struct mvpp2_port *port)
- 	/* Update shadow table */
- 	mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_VID);
- 	mvpp2_prs_hw_write(priv, &pe);
-+
-+	spin_unlock_bh(&priv->prs_spinlock);
- }
- 
- /* Parser default initialization */
-@@ -2118,6 +2157,20 @@ int mvpp2_prs_default_init(struct platform_device *pdev, struct mvpp2 *priv)
- {
- 	int err, index, i;
- 
-+	priv->prs_shadow = devm_kcalloc(&pdev->dev, MVPP2_PRS_TCAM_SRAM_SIZE,
-+					sizeof(*priv->prs_shadow),
-+					GFP_KERNEL);
-+	if (!priv->prs_shadow)
-+		return -ENOMEM;
-+
-+	priv->prs_double_vlans = devm_kcalloc(&pdev->dev, sizeof(bool),
-+					      MVPP2_PRS_DBL_VLANS_MAX,
-+					      GFP_KERNEL);
-+	if (!priv->prs_double_vlans)
-+		return -ENOMEM;
-+
-+	spin_lock_bh(&priv->prs_spinlock);
-+
- 	/* Enable tcam table */
- 	mvpp2_write(priv, MVPP2_PRS_TCAM_CTRL_REG, MVPP2_PRS_TCAM_EN_MASK);
- 
-@@ -2136,12 +2189,6 @@ int mvpp2_prs_default_init(struct platform_device *pdev, struct mvpp2 *priv)
- 	for (index = 0; index < MVPP2_PRS_TCAM_SRAM_SIZE; index++)
- 		mvpp2_prs_hw_inv(priv, index);
- 
-	priv->prs_shadow = devm_kcalloc(&pdev->dev, MVPP2_PRS_TCAM_SRAM_SIZE,
-					sizeof(*priv->prs_shadow),
-					GFP_KERNEL);
-	if (!priv->prs_shadow)
-		return -ENOMEM;
-
- 	/* Always start from lookup = 0 */
- 	for (index = 0; index < MVPP2_MAX_PORTS; index++)
- 		mvpp2_prs_hw_port_init(priv, index, MVPP2_PRS_LU_MH,
-@@ -2158,26 +2205,13 @@ int mvpp2_prs_default_init(struct platform_device *pdev, struct mvpp2 *priv)
- 	mvpp2_prs_vid_init(priv);
- 
- 	err = mvpp2_prs_etype_init(priv);
-	if (err)
-		return err;
-
-	err = mvpp2_prs_vlan_init(pdev, priv);
-	if (err)
-		return err;
-
-	err = mvpp2_prs_pppoe_init(priv);
-	if (err)
-		return err;
-
-	err = mvpp2_prs_ip6_init(priv);
-	if (err)
-		return err;
-
-	err = mvpp2_prs_ip4_init(priv);
-	if (err)
-		return err;
-+	err = err ? : mvpp2_prs_vlan_init(pdev, priv);
-+	err = err ? : mvpp2_prs_pppoe_init(priv);
-+	err = err ? : mvpp2_prs_ip6_init(priv);
-+	err = err ? : mvpp2_prs_ip4_init(priv);
- 
-	return 0;
-+	spin_unlock_bh(&priv->prs_spinlock);
-+	return err;
- }
- 
- /* Compare MAC DA with tcam entry data */
-@@ -2217,7 +2251,7 @@ mvpp2_prs_mac_da_range_find(struct mvpp2 *priv, int pmap, const u8 *da,
- 		    (priv->prs_shadow[tid].udf != udf_type))
- 			continue;
- 
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 		entry_pmap = mvpp2_prs_tcam_port_map_get(&pe);
- 
- 		if (mvpp2_prs_mac_range_equals(&pe, da, mask) &&
-@@ -2229,7 +2263,8 @@ mvpp2_prs_mac_da_range_find(struct mvpp2 *priv, int pmap, const u8 *da,
- }
- 
- /* Update parser's mac da entry */
-int mvpp2_prs_mac_da_accept(struct mvpp2_port *port, const u8 *da, bool add)
-+static int mvpp2_prs_mac_da_accept_unlocked(struct mvpp2_port *port,
-+					    const u8 *da, bool add)
- {
- 	unsigned char mask[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
- 	struct mvpp2 *priv = port->priv;
-@@ -2261,7 +2296,7 @@ int mvpp2_prs_mac_da_accept(struct mvpp2_port *port, const u8 *da, bool add)
- 		/* Mask all ports */
- 		mvpp2_prs_tcam_port_map_set(&pe, 0);
- 	} else {
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 	}
- 
- 	mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_MAC);
-@@ -2317,6 +2352,17 @@ int mvpp2_prs_mac_da_accept(struct mvpp2_port *port, const u8 *da, bool add)
- 	return 0;
- }
- 
-+int mvpp2_prs_mac_da_accept(struct mvpp2_port *port, const u8 *da, bool add)
-+{
-+	int err;
-+
-+	spin_lock_bh(&port->priv->prs_spinlock);
-+	err = mvpp2_prs_mac_da_accept_unlocked(port, da, add);
-+	spin_unlock_bh(&port->priv->prs_spinlock);
-+
-+	return err;
-+}
-+
- int mvpp2_prs_update_mac_da(struct net_device *dev, const u8 *da)
- {
- 	struct mvpp2_port *port = netdev_priv(dev);
-@@ -2345,6 +2391,8 @@ void mvpp2_prs_mac_del_all(struct mvpp2_port *port)
- 	unsigned long pmap;
- 	int index, tid;
- 
-+	spin_lock_bh(&priv->prs_spinlock);
-+
- 	for (tid = MVPP2_PE_MAC_RANGE_START;
- 	     tid <= MVPP2_PE_MAC_RANGE_END; tid++) {
- 		unsigned char da[ETH_ALEN], da_mask[ETH_ALEN];
-@@ -2354,7 +2402,7 @@ void mvpp2_prs_mac_del_all(struct mvpp2_port *port)
- 		    (priv->prs_shadow[tid].udf != MVPP2_PRS_UDF_MAC_DEF))
- 			continue;
- 
-		mvpp2_prs_init_from_hw(priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(priv, &pe, tid);
- 
- 		pmap = mvpp2_prs_tcam_port_map_get(&pe);
- 
-@@ -2375,14 +2423,17 @@ void mvpp2_prs_mac_del_all(struct mvpp2_port *port)
- 			continue;
- 
- 		/* Remove entry from TCAM */
-		mvpp2_prs_mac_da_accept(port, da, false);
-+		mvpp2_prs_mac_da_accept_unlocked(port, da, false);
- 	}
-+
-+	spin_unlock_bh(&priv->prs_spinlock);
- }
- 
- int mvpp2_prs_tag_mode_set(struct mvpp2 *priv, int port, int type)
- {
- 	switch (type) {
- 	case MVPP2_TAG_TYPE_EDSA:
-+		spin_lock_bh(&priv->prs_spinlock);
- 		/* Add port to EDSA entries */
- 		mvpp2_prs_dsa_tag_set(priv, port, true,
- 				      MVPP2_PRS_TAGGED, MVPP2_PRS_EDSA);
-@@ -2393,9 +2444,11 @@ int mvpp2_prs_tag_mode_set(struct mvpp2 *priv, int port, int type)
- 				      MVPP2_PRS_TAGGED, MVPP2_PRS_DSA);
- 		mvpp2_prs_dsa_tag_set(priv, port, false,
- 				      MVPP2_PRS_UNTAGGED, MVPP2_PRS_DSA);
-+		spin_unlock_bh(&priv->prs_spinlock);
- 		break;
- 
- 	case MVPP2_TAG_TYPE_DSA:
-+		spin_lock_bh(&priv->prs_spinlock);
- 		/* Add port to DSA entries */
- 		mvpp2_prs_dsa_tag_set(priv, port, true,
- 				      MVPP2_PRS_TAGGED, MVPP2_PRS_DSA);
-@@ -2406,10 +2459,12 @@ int mvpp2_prs_tag_mode_set(struct mvpp2 *priv, int port, int type)
- 				      MVPP2_PRS_TAGGED, MVPP2_PRS_EDSA);
- 		mvpp2_prs_dsa_tag_set(priv, port, false,
- 				      MVPP2_PRS_UNTAGGED, MVPP2_PRS_EDSA);
-+		spin_unlock_bh(&priv->prs_spinlock);
- 		break;
- 
- 	case MVPP2_TAG_TYPE_MH:
- 	case MVPP2_TAG_TYPE_NONE:
-+		spin_lock_bh(&priv->prs_spinlock);
- 		/* Remove port form EDSA and DSA entries */
- 		mvpp2_prs_dsa_tag_set(priv, port, false,
- 				      MVPP2_PRS_TAGGED, MVPP2_PRS_DSA);
-@@ -2419,6 +2474,7 @@ int mvpp2_prs_tag_mode_set(struct mvpp2 *priv, int port, int type)
- 				      MVPP2_PRS_TAGGED, MVPP2_PRS_EDSA);
- 		mvpp2_prs_dsa_tag_set(priv, port, false,
- 				      MVPP2_PRS_UNTAGGED, MVPP2_PRS_EDSA);
-+		spin_unlock_bh(&priv->prs_spinlock);
- 		break;
- 
- 	default:
-@@ -2437,11 +2493,15 @@ int mvpp2_prs_add_flow(struct mvpp2 *priv, int flow, u32 ri, u32 ri_mask)
- 
- 	memset(&pe, 0, sizeof(pe));
- 
-+	spin_lock_bh(&priv->prs_spinlock);
-+
- 	tid = mvpp2_prs_tcam_first_free(priv,
- 					MVPP2_PE_LAST_FREE_TID,
- 					MVPP2_PE_FIRST_FREE_TID);
-	if (tid < 0)
-+	if (tid < 0) {
-+		spin_unlock_bh(&priv->prs_spinlock);
- 		return tid;
-+	}
- 
- 	pe.index = tid;
- 
-@@ -2461,6 +2521,7 @@ int mvpp2_prs_add_flow(struct mvpp2 *priv, int flow, u32 ri, u32 ri_mask)
- 	mvpp2_prs_tcam_port_map_set(&pe, MVPP2_PRS_PORT_MASK);
- 	mvpp2_prs_hw_write(priv, &pe);
- 
-+	spin_unlock_bh(&priv->prs_spinlock);
- 	return 0;
- }
- 
-@@ -2472,6 +2533,8 @@ int mvpp2_prs_def_flow(struct mvpp2_port *port)
- 
- 	memset(&pe, 0, sizeof(pe));
- 
-+	spin_lock_bh(&port->priv->prs_spinlock);
-+
- 	tid = mvpp2_prs_flow_find(port->priv, port->id);
- 
- 	/* Such entry not exist */
-@@ -2480,8 +2543,10 @@ int mvpp2_prs_def_flow(struct mvpp2_port *port)
- 		tid = mvpp2_prs_tcam_first_free(port->priv,
- 						MVPP2_PE_LAST_FREE_TID,
- 					       MVPP2_PE_FIRST_FREE_TID);
-		if (tid < 0)
-+		if (tid < 0) {
-+			spin_unlock_bh(&port->priv->prs_spinlock);
- 			return tid;
-+		}
- 
- 		pe.index = tid;
- 
-@@ -2492,13 +2557,14 @@ int mvpp2_prs_def_flow(struct mvpp2_port *port)
- 		/* Update shadow table */
- 		mvpp2_prs_shadow_set(port->priv, pe.index, MVPP2_PRS_LU_FLOWS);
- 	} else {
-		mvpp2_prs_init_from_hw(port->priv, &pe, tid);
-+		mvpp2_prs_init_from_hw_unlocked(port->priv, &pe, tid);
- 	}
- 
- 	mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_FLOWS);
- 	mvpp2_prs_tcam_port_map_set(&pe, (1 << port->id));
- 	mvpp2_prs_hw_write(port->priv, &pe);
- 
-+	spin_unlock_bh(&port->priv->prs_spinlock);
- 	return 0;
- }
- 
-@@ -2509,11 +2575,14 @@ int mvpp2_prs_hits(struct mvpp2 *priv, int index)
- 	if (index > MVPP2_PRS_TCAM_SRAM_SIZE)
- 		return -EINVAL;
- 
-+	spin_lock_bh(&priv->prs_spinlock);
-+
- 	mvpp2_write(priv, MVPP2_PRS_TCAM_HIT_IDX_REG, index);
- 
- 	val = mvpp2_read(priv, MVPP2_PRS_TCAM_HIT_CNT_REG);
- 
- 	val &= MVPP2_PRS_TCAM_HIT_CNT_MASK;
- 
-+	spin_unlock_bh(&priv->prs_spinlock);
- 	return val;
- }
-- 
-2.43.0
-
@@ -1,21 +1,19 @@
-From 774cf1d3f5b9cfac247c3efcf4eed39d06c675dc Mon Sep 17 00:00:00 2001
+From 74f8ab9d77486305e12a075ad94d87f404429f66 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
-Subject: [PATCH 01/27] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
+Subject: [PATCH 01/35] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
 PPU on 6393X
 Organization: Wires

 In a multi-chip setup, delays of up to 750ms are observed before the
 device (6393X) signals completion of PPU initialization (Global 1,
 register 0, bit 15). Therefore, increase the timeout threshold to 1s.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index 5aeecfab9630..2565277582c5 100644
+index df1df6015412..54c99357540d 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -86,7 +86,7 @@ int mv88e6xxx_write(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val)
@@ -27,6 +25,3 @@ index 5aeecfab9630..2565277582c5 100644
 	u16 data;
 	int err;
 	int i;
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 6bd6c3c49c438e35d61669879b64b6c4a00d1a19 Mon Sep 17 00:00:00 2001
+From bf88305dd98a52f698c6f866b76645a48728d628 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
-Subject: [PATCH 02/27] net: dsa: mv88e6xxx: Improve indirect register access
+Subject: [PATCH 02/35] net: dsa: mv88e6xxx: Improve indirect register access
 perf on 6393
 Organization: Wires

@@ -13,8 +13,6 @@ previous families).
 Therefore, add a new set of SMI operations which remaps accesses to
 such registers to the corresponding directly addressable register. All
 other accesses use the regular indirect interface.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c    |  7 +++
 drivers/net/dsa/mv88e6xxx/global1.h |  3 ++
@@ -24,10 +22,10 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 5 files changed, 119 insertions(+)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index 2565277582c5..7ba492ee5c86 100644
+index 54c99357540d..f6611496dc0f 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -6502,6 +6502,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip)
+@@ -6532,6 +6532,13 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip)
 	/* Update the compatible info with the probed one */
 	chip->info = info;
 
@@ -211,6 +209,3 @@ index c6c71d5757f5..788cf68b7b33 100644
 int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip,
 		       struct mii_bus *bus, int sw_addr);
 
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 02bb753cee9b24a3a1bcbcd15c3729144200eafc Mon Sep 17 00:00:00 2001
+From be5cc28a5bac1bc968a2d6b9892cc64d41aad9ac Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
-Subject: [PATCH 03/27] net: dsa: mv88e6xxx: Honor ports being managed via
+Subject: [PATCH 03/35] net: dsa: mv88e6xxx: Honor ports being managed via
 in-band-status
 Organization: Wires

@@ -13,14 +13,12 @@ USXGMII autoneg)
 This state is the default set up by mv88e6xxx_port_setup_mac(), so all
 we have to do is to make the phylink MAC callbacks no-ops in cases
 when in-band-status is being used.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++
 1 file changed, 6 insertions(+)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index 7ba492ee5c86..cdf48fae0623 100644
+index f6611496dc0f..216fbcfcd476 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -964,6 +964,9 @@ static void mv88e6xxx_mac_link_down(struct phylink_config *config,
@@ -43,6 +41,3 @@ index 7ba492ee5c86..cdf48fae0623 100644
 	ops = chip->info->ops;
 
 	mv88e6xxx_reg_lock(chip);
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 6cbb6a0a54d81ff5b117b023ac7e251ab1e9c556 Mon Sep 17 00:00:00 2001
+From 0e7940b52ab43e1e97d523d8900927f2b82a54fe Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
-Subject: [PATCH 04/27] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
+Subject: [PATCH 04/35] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
 ports on 6393X
 Organization: Wires

@@ -29,8 +29,6 @@ Before this change, due to rsvd2cpu being enabled on the CPU port, the
 switch would try to trap it back to the CPU. Given that the CPU is
 trusted, instead assume that it indeed meant for the packet to be
 forwarded like any other.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/port.c | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)
@@ -98,6 +96,3 @@ index 04053fdc6489..f25fb3214acb 100644
 	if (err)
 		return err;
 
-- 
-2.43.0
-
@@ -1,13 +1,11 @@
-From 86b1608084c6e9676db0641f31203d8067893470 Mon Sep 17 00:00:00 2001
+From 6a7421879866a712d127e6588744019668b4d1bc Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 19:44:32 +0100
-Subject: [PATCH 05/27] net: dsa: mv88e6xxx: Add LED infrastructure
+Subject: [PATCH 05/35] net: dsa: mv88e6xxx: Add LED infrastructure
 Organization: Wires

 Parse DT for LEDs and register them for devices that support it,
 though no actual implementations exist yet.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/Makefile |   1 +
 drivers/net/dsa/mv88e6xxx/chip.c   |   5 +-
@@ -31,7 +29,7 @@ index a9a9651187db..6720d9303914 100644
 mv88e6xxx-objs += pcs-6352.o
 mv88e6xxx-objs += pcs-639x.o
 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index cdf48fae0623..0a7858280903 100644
+index 216fbcfcd476..8d386766d1ec 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -37,6 +37,7 @@
@@ -42,7 +40,7 @@ index cdf48fae0623..0a7858280903 100644
 #include "phy.h"
 #include "port.h"
 #include "ptp.h"
-@@ -4145,7 +4146,9 @@ static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port)
+@@ -4171,7 +4172,9 @@ static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port)
 			return err;
 	}
 
@@ -311,6 +309,3 @@ index 000000000000..8afa2a0c0527
 +int mv88e6xxx_port_setup_leds(struct dsa_switch *ds, int port);
 +
 +#endif /* _MV88E6XXX_LEDS_H */
-- 
-2.43.0
-
@@ -1,15 +1,13 @@
-From 5496a27ee644f72b721eba0e8c057efb65ee445f Mon Sep 17 00:00:00 2001
+From 2190bebac9c7205a4a513eabed45dc9cb3dee2bd Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 21:59:35 +0100
-Subject: [PATCH 06/27] net: dsa: mv88e6xxx: Add LED support for 6393X
+Subject: [PATCH 06/35] net: dsa: mv88e6xxx: Add LED support for 6393X
 Organization: Wires

 Trigger support:
 - "none"
 - "timer"
 - "netdev"
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c |   1 +
 drivers/net/dsa/mv88e6xxx/leds.c | 229 +++++++++++++++++++++++++++++++
@@ -19,10 +17,10 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 5 files changed, 272 insertions(+)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index 0a7858280903..cd746bea31be 100644
+index 8d386766d1ec..3cc41fea6d41 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -5657,6 +5657,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = {
+@@ -5685,6 +5685,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = {
 	.gpio_ops = &mv88e6352_gpio_ops,
 	.avb_ops = &mv88e6390_avb_ops,
 	.ptp_ops = &mv88e6352_ptp_ops,
@@ -359,6 +357,3 @@ index ddadeb9bfdae..7157864dc20f 100644
 int mv88e6393x_set_egress_port(struct mv88e6xxx_chip *chip,
 			       enum mv88e6xxx_egress_direction direction,
 			       int port);
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From a0e2ebe61422d5e0e330022a2a38a31c049a4407 Mon Sep 17 00:00:00 2001
+From c587f8b5fa584efc53e09f110bfbd9e09f0deff5 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
-Subject: [PATCH 07/27] net: dsa: tag_dsa: Use tag priority as initial
+Subject: [PATCH 07/35] net: dsa: tag_dsa: Use tag priority as initial
 skb->priority
 Organization: Wires

@@ -19,8 +19,6 @@ Ideally we could then map this priority to an internal one, like we
 can do with an "ingress-qos-map" on VLAN interfaces. Until that is
 implemented, support the setup that is likely to be the most common; a
 1:1 mapping from FPri to skb->priority.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 net/dsa/tag_dsa.c | 7 +++++++
 1 file changed, 7 insertions(+)
@@ -43,6 +41,3 @@ index 2a2c4fb61a65..a00ae6bf2971 100644
 	return skb;
 }
 
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From a88679c946d5163eb0e30718109c18ddbbd8cfc6 Mon Sep 17 00:00:00 2001
+From a0797da07ca347ed3a8092124fef77963a52cdcb Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
-Subject: [PATCH 08/27] net: dsa: Support MDB memberships whose L2 addresses
+Subject: [PATCH 08/35] net: dsa: Support MDB memberships whose L2 addresses
 overlap
 Organization: Wires

@@ -29,8 +29,6 @@ as long as the count is positive. Fortunately, all the infrastructure
 needed to do this is already in place, since it is also needed on CPU
 and DSA ports. Thus, "implement" this by simply removing the guards
 which previously skipped reference countung on user ports.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 net/dsa/switch.c | 16 ----------------
 1 file changed, 16 deletions(-)
@@ -69,6 +67,3 @@ index 3d2feeea897b..628e8a884dde 100644
 	mutex_lock(&dp->addr_lists_lock);
 
 	a = dsa_mac_addr_find(&dp->mdbs, mdb->addr, mdb->vid, db);
-- 
-2.43.0
-
@@ -1,10 +1,9 @@
-From c6528f18fbafef721c18e546aa0b60c1b1d772c6 Mon Sep 17 00:00:00 2001
+From e548e14cc271efa568a39afcb8f71bd5a48cf446 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
-Subject: [PATCH 09/27] net: dsa: Support EtherType based priority overrides
+Subject: [PATCH 09/35] net: dsa: Support EtherType based priority overrides
 Organization: Wires

-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 include/net/dsa.h |  4 ++++
 net/dsa/user.c    | 56 +++++++++++++++++++++++++++++++++++++++++++++--
@@ -113,6 +112,3 @@ index 64f660d2334b..e13fb22e2c2b 100644
 		}
 		break;
 	case IEEE_8021QAZ_APP_SEL_DSCP:
-- 
-2.43.0
-
@@ -1,11 +1,10 @@
-From bc41b93b365694ac36a19565270b8deda3b8cb79 Mon Sep 17 00:00:00 2001
+From 63e47b33b09221310e2f6f33478a1b07c4706f00 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
-Subject: [PATCH 10/27] net: dsa: mv88e6xxx: Support EtherType based priority
+Subject: [PATCH 10/35] net: dsa: mv88e6xxx: Support EtherType based priority
 overrides
 Organization: Wires

-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c    | 64 +++++++++++++++++++++++++++++
 drivers/net/dsa/mv88e6xxx/chip.h    | 21 ++++++++++
@@ -16,7 +15,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 6 files changed, 207 insertions(+), 4 deletions(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index cd746bea31be..e05caeabdc85 100644
+index 3cc41fea6d41..182d3a0e75c8 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1715,6 +1715,11 @@ static int mv88e6xxx_rmu_setup(struct mv88e6xxx_chip *chip)
@@ -31,7 +30,7 @@ index cd746bea31be..e05caeabdc85 100644
 	if (chip->info->ops->pot_clear)
 		return chip->info->ops->pot_clear(chip);
 
-@@ -3416,6 +3421,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
+@@ -3427,6 +3432,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
 
 	chip->ports[port].chip = chip;
 	chip->ports[port].port = port;
@@ -39,7 +38,7 @@ index cd746bea31be..e05caeabdc85 100644
 
 	err = mv88e6xxx_port_setup_mac(chip, port, LINK_UNFORCED,
 				       SPEED_UNFORCED, DUPLEX_UNFORCED,
-@@ -6562,6 +6568,7 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev)
+@@ -6592,6 +6598,7 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev)
 	chip->dev = dev;
 
 	mutex_init(&chip->reg_lock);
@@ -47,7 +46,7 @@ index cd746bea31be..e05caeabdc85 100644
 	INIT_LIST_HEAD(&chip->mdios);
 	idr_init(&chip->policies);
 	INIT_LIST_HEAD(&chip->msts);
-@@ -7101,6 +7108,61 @@ static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index,
+@@ -7131,6 +7138,61 @@ static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index,
 	return err_sync ? : err_pvt;
 }
 
@@ -109,7 +108,7 @@ index cd746bea31be..e05caeabdc85 100644
 static const struct phylink_mac_ops mv88e6xxx_phylink_mac_ops = {
 	.mac_select_pcs		= mv88e6xxx_mac_select_pcs,
 	.mac_prepare		= mv88e6xxx_mac_prepare,
-@@ -7170,6 +7232,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
+@@ -7200,6 +7262,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
 	.crosschip_lag_change	= mv88e6xxx_crosschip_lag_change,
 	.crosschip_lag_join	= mv88e6xxx_crosschip_lag_join,
 	.crosschip_lag_leave	= mv88e6xxx_crosschip_lag_leave,
@@ -371,6 +370,3 @@ index 7157864dc20f..7edb04c41ac8 100644
 int mv88e6xxx_port_set_message_port(struct mv88e6xxx_chip *chip, int port,
 				    bool message_port);
 int mv88e6xxx_port_set_trunk(struct mv88e6xxx_chip *chip, int port,
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 70c1d59448db0ec88c07fa4ff5748b0df740a8d2 Mon Sep 17 00:00:00 2001
+From d6d9d65123b6559194254079b39654883f984f13 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
-Subject: [PATCH 11/27] net: dsa: mv88e6xxx: Add mqprio qdisc support
+Subject: [PATCH 11/35] net: dsa: mv88e6xxx: Add mqprio qdisc support
 Organization: Wires

 Add support for attaching mqprio qdisc's to mv88e6xxx ports and use
@@ -24,15 +24,13 @@ are effectively only specifying the QPri.
 Since FPri is always a 3-bit field, even on older chips with only 4
 physical queues, always report 8 queues and let the chip's policy
 handle the mapping down to the "real" number.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 70 ++++++++++++++++++++++++++++++++
 net/dsa/tag_dsa.c                |  4 +-
 2 files changed, 73 insertions(+), 1 deletion(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index e05caeabdc85..ad997818047e 100644
+index 182d3a0e75c8..e73a4c2f0392 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -31,6 +31,7 @@
@@ -43,7 +41,7 @@ index e05caeabdc85..ad997818047e 100644
 
 #include "chip.h"
 #include "devlink.h"
-@@ -7163,6 +7164,68 @@ static int mv88e6xxx_port_del_etype_prio(struct dsa_switch *ds, int port,
+@@ -7193,6 +7194,68 @@ static int mv88e6xxx_port_del_etype_prio(struct dsa_switch *ds, int port,
 	return err;
 }
 
@@ -112,7 +110,7 @@ index e05caeabdc85..ad997818047e 100644
 static const struct phylink_mac_ops mv88e6xxx_phylink_mac_ops = {
 	.mac_select_pcs		= mv88e6xxx_mac_select_pcs,
 	.mac_prepare		= mv88e6xxx_mac_prepare,
-@@ -7234,6 +7297,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
+@@ -7264,6 +7327,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
 	.crosschip_lag_leave	= mv88e6xxx_crosschip_lag_leave,
 	.port_add_etype_prio	= mv88e6xxx_port_add_etype_prio,
 	.port_del_etype_prio	= mv88e6xxx_port_del_etype_prio,
@@ -120,7 +118,7 @@ index e05caeabdc85..ad997818047e 100644
 };
 
 static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)
-@@ -7260,6 +7324,12 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)
+@@ -7290,6 +7354,12 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)
 	 */
 	ds->num_lag_ids = mv88e6xxx_has_lag(chip) ? 16 : 0;
 
@@ -157,6 +155,3 @@ index a00ae6bf2971..55c296e0b5b0 100644
 		dsa_header[3] = vid & 0xff;
 	}
 
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From c3721cb1cccf3c8fe18bea05c9ad20e7082291bd Mon Sep 17 00:00:00 2001
+From 0873cb85051b8c483d11570cb2b3ad3da6b7ca4c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
-Subject: [PATCH 12/27] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
+Subject: [PATCH 12/35] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
 are available
 Organization: Wires

@@ -22,17 +22,15 @@ main reasons for choosing the new default:
   packet's priority. As the packet then moves through the network
   core over trusted VLAN trunks, the packet should keep its original
   priority, independent of what inner protocol fields may indicate.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index ad997818047e..40e8d2018fee 100644
+index e73a4c2f0392..9988fc3983d1 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3432,9 +3432,13 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
+@@ -3443,9 +3443,13 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
 
 	/* Port Control: disable Drop-on-Unlock, disable Drop-on-Lock,
 	 * disable Header mode, enable IGMP/MLD snooping, disable VLAN
@@ -49,7 +47,7 @@ index ad997818047e..40e8d2018fee 100644
 	 *
 	 * If this is the CPU link, use DSA or EDSA tagging depending
 	 * on which tagging mode was configured.
-@@ -3445,6 +3449,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
+@@ -3456,6 +3460,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
 	 * forwarding of unknown unicasts and multicasts.
 	 */
 	reg = MV88E6185_PORT_CTL0_USE_TAG | MV88E6185_PORT_CTL0_USE_IP |
@@ -57,6 +55,3 @@ index ad997818047e..40e8d2018fee 100644
 		MV88E6XXX_PORT_CTL0_STATE_FORWARDING;
 	/* Forward any IPv4 IGMP or IPv6 MLD frames received
 	 * by a USER port to the CPU port to allow snooping.
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 373d60426de6d19fd668e1e0b599ca430f351a18 Mon Sep 17 00:00:00 2001
+From 6976a38c8392241021a7bc5053a1f4c4d6447956 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 26 Nov 2024 19:45:59 +0100
-Subject: [PATCH 13/27] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
+Subject: [PATCH 13/35] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
 VLANs
 Organization: Wires

@@ -24,8 +24,6 @@ a VLAN upper interface, rather than to offload bridge VLANs, are
 marked as policy entries. As the VTU policy of user ports is already
 set to TRAP (to ensure proper standalone port operation), this will
 cause all packets assigned to these VLANs to properly terminated.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 33 ++++++++++++++++++--------------
 include/net/switchdev.h          |  4 ++++
@@ -33,10 +31,10 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 3 files changed, 27 insertions(+), 14 deletions(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index 40e8d2018fee..30f8a5388733 100644
+index 9988fc3983d1..74fca098b11a 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2654,7 +2654,7 @@ static int mv88e6xxx_port_broadcast_sync(struct mv88e6xxx_chip *chip, int port,
+@@ -2665,7 +2665,7 @@ static int mv88e6xxx_port_broadcast_sync(struct mv88e6xxx_chip *chip, int port,
 }
 
 static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port,
@@ -45,7 +43,7 @@ index 40e8d2018fee..30f8a5388733 100644
 {
 	const u8 non_member = MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER;
 	struct mv88e6xxx_vtu_entry vlan;
-@@ -2666,9 +2666,7 @@ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port,
+@@ -2677,9 +2677,7 @@ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port,
 
 	if (!vlan.valid) {
 		memset(&vlan, 0, sizeof(vlan));
@@ -56,7 +54,7 @@ index 40e8d2018fee..30f8a5388733 100644
 
 		err = mv88e6xxx_atu_new(chip, &vlan.fid);
 		if (err)
-@@ -2691,6 +2689,9 @@ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port,
+@@ -2702,6 +2700,9 @@ static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port,
 		if (err)
 			return err;
 	} else if (vlan.member[port] != member) {
@@ -66,7 +64,7 @@ index 40e8d2018fee..30f8a5388733 100644
 		vlan.member[port] = member;
 
 		err = mv88e6xxx_vtu_loadpurge(chip, &vlan);
-@@ -2737,7 +2738,8 @@ static int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port,
+@@ -2748,7 +2749,8 @@ static int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port,
 
 	mv88e6xxx_reg_lock(chip);
 
@@ -76,7 +74,7 @@ index 40e8d2018fee..30f8a5388733 100644
 	if (err) {
 		dev_err(ds->dev, "p%d: failed to add VLAN %d%c\n", port,
 			vlan->vid, untagged ? 'u' : 't');
-@@ -3484,14 +3486,17 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
+@@ -3495,14 +3497,17 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
 	if (err)
 		return err;
 
@@ -101,7 +99,7 @@ index 40e8d2018fee..30f8a5388733 100644
 	    chip->info->ops->port_set_policy) {
 		err = chip->info->ops->port_set_policy(chip, port,
 						MV88E6XXX_POLICY_MAPPING_VTU,
-@@ -3521,7 +3526,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
+@@ -3532,7 +3537,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
 	 */
 	err = mv88e6xxx_port_vlan_join(chip, port, MV88E6XXX_VID_STANDALONE,
 				       MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED,
@@ -110,7 +108,7 @@ index 40e8d2018fee..30f8a5388733 100644
 	if (err)
 		return err;
 
-@@ -3535,7 +3540,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
+@@ -3546,7 +3551,7 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
 	 */
 	err = mv88e6xxx_port_vlan_join(chip, port, MV88E6XXX_VID_BRIDGED,
 				       MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED,
@@ -156,6 +154,3 @@ index e13fb22e2c2b..f45e313f1dd0 100644
 	};
 	struct dsa_switch *ds = dp->ds;
 	struct netdev_hw_addr *ha;
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From a6368c60ac6ae2e0d97ac571b6506aa09becbb71 Mon Sep 17 00:00:00 2001
+From 8eb1da2d6b87c0b997a1a9de6d0b964ff8a3134e Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
-Subject: [PATCH 14/27] net: phy: marvell10g: Support firmware loading on
+Subject: [PATCH 14/35] net: phy: marvell10g: Support firmware loading on
 88X3310
 Organization: Wires

@@ -11,8 +11,6 @@ its RAM, ask userspace for the binary and load it over XMDIO.
 We have no choice but to bail out of the probe if firmware is not
 available, as the device does not have any built-in image on which to
 fall back.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/phy/marvell10g.c | 161 +++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
@@ -236,6 +234,3 @@ index 6642eb642d4b..79d9483419c0 100644
 MODULE_DESCRIPTION("Marvell Alaska X/M multi-gigabit Ethernet PHY driver");
 +MODULE_FIRMWARE("mrvl/x3310fw.hdr");
 MODULE_LICENSE("GPL");
-- 
-2.43.0
-
@@ -1,15 +1,13 @@
-From 550dd1b443cf9d054f2a523088fbe22b215e07cb Mon Sep 17 00:00:00 2001
+From c33528ebee1cd9f876b41a85f5435d6b37f1b511 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
-Subject: [PATCH 15/27] net: phy: marvell10g: Fix power-up when strapped to
+Subject: [PATCH 15/35] 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
 affected by this setting.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/phy/marvell10g.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
@@ -45,6 +43,3 @@ index 79d9483419c0..268484092776 100644
 
 	/* Sometimes, the power down bit doesn't clear immediately, and
 	 * a read of this register causes the bit not to clear. Delay
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 9ca4c28ccf7857a36db8dd3c37dcd005222bdb78 Mon Sep 17 00:00:00 2001
+From b825b8b6490df0893c6172971db4a4ec45164ee9 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
-Subject: [PATCH 16/27] net: phy: marvell10g: Add LED support for 88X3310
+Subject: [PATCH 16/35] net: phy: marvell10g: Add LED support for 88X3310
 Organization: Wires

 Pickup the LEDs from the state in which the hardware reset or
@@ -17,8 +17,6 @@ Trigger support:
 	   software blinking
 - "netdev": Offload link or duplex information to the solid behavior;
  	    tx and/or rx activity to blink behavior.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/phy/marvell10g.c | 422 +++++++++++++++++++++++++++++++++++
 1 file changed, 422 insertions(+)
@@ -512,6 +510,3 @@ index 268484092776..9f8475b67ef7 100644
 	},
 	{
 		.phy_id		= MARVELL_PHY_ID_88X3310,
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 69f9bda6cab34556e67a096c282eee7337f97f26 Mon Sep 17 00:00:00 2001
+From a9248de91e771540c92774998111166732eba59a Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
-Subject: [PATCH 17/27] net: phy: marvell10g: Support LEDs tied to a single
+Subject: [PATCH 17/35] net: phy: marvell10g: Support LEDs tied to a single
 media side
 Organization: Wires

@@ -14,8 +14,6 @@ tied to a particular media side, and use that information to refine
 the offloading of the "netdev" trigger, such that LEDs attached to the
 RJ45 jack only lights up when a copper link is established, and vice
 versa for the SFP cage.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/phy/marvell10g.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)
@@ -75,6 +73,3 @@ index 9f8475b67ef7..82b2e9b55b67 100644
 	/* mv3310_led_polarity_set() will not be called unless the
 	 * device tree specifies a mode that of_phy_led() considers to
 	 * be a non-default configuration. I.e., something other than
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From f70be42f0ee50cda8c1cde14442ea8285c01834b Mon Sep 17 00:00:00 2001
+From 9ca2c21e070baa0b3c7aca376f6bb9aaa0c801ea Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
-Subject: [PATCH 18/27] net: phy: Do not resume PHY when attaching
+Subject: [PATCH 18/35] net: phy: Do not resume PHY when attaching
 Organization: Wires

 The PHY should not start negotiating with its link-partner until
@@ -15,17 +15,15 @@ Otherwise, drivers that attached to their PHYs during
 probing (e.g. DSA) would end up with a physical link being
 established, even though the corresponding interface was still
 administratively down.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/phy/phy_device.c | 1 -
 1 file changed, 1 deletion(-)

 diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
-index 119dfa2d6643..7c7cc6edf314 100644
+index 8af44224480f..a2e386e9fafc 100644
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1634,7 +1634,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
+@@ -1661,7 +1661,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
 	if (err)
 		goto error;
 
@@ -33,6 +31,3 @@ index 119dfa2d6643..7c7cc6edf314 100644
 	if (!phydev->is_on_sfp_module)
 		phy_led_triggers_register(phydev);
 
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 17d6f3f6a7429ae635d0359b39da2e173c403fdf Mon Sep 17 00:00:00 2001
+From 4a731f968cb458ea29e9fa0b710b87607d01c18b Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
-Subject: [PATCH 19/27] net: bridge: avoid classifying unknown multicast as
+Subject: [PATCH 19/35] net: bridge: avoid classifying unknown multicast as
 mrouters_only
 Organization: Wires

@@ -16,7 +16,6 @@ Because a multicast router should always receive both known and unknown
 multicast.

 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 include/uapi/linux/if_bridge.h |  1 +
 net/bridge/br.c                |  5 +++++
@@ -232,6 +231,3 @@ index 041f6e571a20..40651b07df94 100644
 static inline bool br_multicast_is_router(struct net_bridge_mcast *brmctx,
 					  struct sk_buff *skb)
 {
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 27ca82c96a6bcd560e908eed17fc24126e8051a6 Mon Sep 17 00:00:00 2001
+From e2cfbf7c107e5ab73bd16d1ffecd30bdcb8c8a63 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
-Subject: [PATCH 20/27] net: bridge: Ignore router ports when forwarding L2
+Subject: [PATCH 20/35] net: bridge: Ignore router ports when forwarding L2
 multicast
 Organization: Wires

@@ -32,6 +32,3 @@ index 40651b07df94..e90b4f5cab76 100644
 }
 
 static inline struct net_bridge_port *
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From bbbb4f7460efeaf057d37d837cae79a565a6d406 Mon Sep 17 00:00:00 2001
+From 1f19092b74eaaef88314e97e9b89012328bd857d Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
-Subject: [PATCH 21/27] net: bridge: drop delay for applying strict multicast
+Subject: [PATCH 21/35] net: bridge: drop delay for applying strict multicast
 filtering
 Organization: Wires

@@ -19,7 +19,6 @@ A proper fix for upstreaming could be to add a knob to disable the delay.
 [2]: https://lore.kernel.org/netdev/20240127175033.9640-1-linus.luessing@c0d3.blue/

 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 net/bridge/br_multicast.c | 42 +++++++--------------------------------
 net/bridge/br_private.h   |  4 +---
@@ -186,6 +185,3 @@ index e90b4f5cab76..73b78c594564 100644
 }
 
 static inline bool br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 7c751c24428060c3e87f164eb2a054db410f4b0d Mon Sep 17 00:00:00 2001
+From 63019c809c938f5233386d39cf53543ed2144850 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
-Subject: [PATCH 22/27] net: bridge: Differentiate MDB additions from
+Subject: [PATCH 22/35] net: bridge: Differentiate MDB additions from
 modifications
 Organization: Wires

@@ -21,8 +21,6 @@ generated.

 Therefore, discriminate new groups from changes to existing groups by
 introducing a RTM_SETMDB events to be used in the latter scenario.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 include/uapi/linux/rtnetlink.h | 2 ++
 net/bridge/br_mdb.c            | 4 ++--
@@ -104,6 +102,3 @@ index 34be07a1fd00..9c8bf38e0079 100644
 unlock_continue:
 		spin_unlock(&brmctx->br->multicast_lock);
 	}
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From db0d727f6cc90ccea2378d876329c151db1670dc Mon Sep 17 00:00:00 2001
+From 2673b004d9a30833428a799245e3c57fd9acb330 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
-Subject: [PATCH 23/27] nvmem: layouts: onie-tlv: Let device probe even when
+Subject: [PATCH 23/35] nvmem: layouts: onie-tlv: Let device probe even when
 TLV is invalid
 Organization: Wires

@@ -13,8 +13,6 @@ be successfully probed.

 Therefore, settle for reporting data corruption issues in the log, and
 simply refrain from registering any cells in those cases.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/nvmem/layouts/onie-tlv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
@@ -50,6 +48,3 @@ index 0967a32319a2..48547d5bb502 100644
 
 	data = table + hdr_len;
 	ret = onie_tlv_add_cells(dev, nvmem, data_len, data);
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From ed58f4b6e7344bdefceb7ac31d1c769a6d127827 Mon Sep 17 00:00:00 2001
+From d7519317b32dcd332a359d42a447b2c74eeacd01 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 29 Apr 2024 15:14:51 +0200
-Subject: [PATCH 24/27] usb: core: adjust log level for unauthorized devices
+Subject: [PATCH 24/35] usb: core: adjust log level for unauthorized devices
 Organization: Wires

 The fact that a USB device currently is not authorized is not an error,
@@ -9,7 +9,6 @@ so let's adjust the log level so these messages slip below radar for the
 commonly used 'quiet' log level.

 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/usb/core/driver.c  | 4 ++--
 drivers/usb/core/generic.c | 2 +-
@@ -45,6 +44,3 @@ index b134bff5c3fe..60575a01a810 100644
 	else {
 		c = usb_choose_configuration(udev);
 		if (c >= 0) {
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From e7f7ae788680b4ec73af736453ec4afeb34d9842 Mon Sep 17 00:00:00 2001
+From 67dfe75bf1517162845725e0fac83dafa37c701d Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 16 Jan 2025 12:35:12 +0100
-Subject: [PATCH 25/27] net: dsa: mv88e6xxx: collapse disabled state into
+Subject: [PATCH 25/35] net: dsa: mv88e6xxx: collapse disabled state into
 blocking
 Organization: Wires

@@ -18,7 +18,6 @@ each member port, preventing LACPDUs from passing through to qualify the
 link and become active.

 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/port.c | 2 --
 1 file changed, 2 deletions(-)
@@ -36,6 +35,3 @@ index 84900814c456..91e58297594c 100644
 	case BR_STATE_BLOCKING:
 	case BR_STATE_LISTENING:
 		state = MV88E6XXX_PORT_CTL0_STATE_BLOCKING;
-- 
-2.43.0
-
@@ -1,7 +1,7 @@
-From 823687aa03d866f3b76b5e40e35fa56c7f6f4492 Mon Sep 17 00:00:00 2001
+From 2b29bd6a4b0851dfe2beff03e4c8a59a9d6c201b Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 12 Feb 2025 22:03:14 +0100
-Subject: [PATCH 26/27] net: dsa: mv88e6xxx: Only activate LAG offloading when
+Subject: [PATCH 26/35] net: dsa: mv88e6xxx: Only activate LAG offloading when
 bridged
 Organization: Wires

@@ -46,17 +46,15 @@ existing port isolation to work as intended.
 Before joining a bridge, the offload does not offer any performance
 benefit anyway. All ingressing packet will always have to go to the
 CPU; egress traffic always relies on software hashing.
-
-Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 42 +++++++++++++++-----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

 diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
-index 30f8a5388733..c1f8adaa008a 100644
+index 74fca098b11a..df7ea44da912 100644
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3095,6 +3095,7 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,
+@@ -3106,6 +3106,7 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,
 				      struct netlink_ext_ack *extack)
 {
 	struct mv88e6xxx_chip *chip = ds->priv;
@@ -64,7 +62,7 @@ index 30f8a5388733..c1f8adaa008a 100644
 	int err;
 
 	mv88e6xxx_reg_lock(chip);
-@@ -3103,6 +3104,13 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,
+@@ -3114,6 +3115,13 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,
 	if (err)
 		goto unlock;
 
@@ -78,7 +76,7 @@ index 30f8a5388733..c1f8adaa008a 100644
 	err = mv88e6xxx_port_set_map_da(chip, port, true);
 	if (err)
 		goto unlock;
-@@ -3147,6 +3155,14 @@ static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port,
+@@ -3158,6 +3166,14 @@ static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port,
 			"port %d failed to restore map-DA: %pe\n",
 			port, ERR_PTR(err));
 
@@ -93,7 +91,7 @@ index 30f8a5388733..c1f8adaa008a 100644
 	err = mv88e6xxx_port_commit_pvid(chip, port);
 	if (err)
 		dev_err(ds->dev,
-@@ -7029,30 +7045,13 @@ static int mv88e6xxx_port_lag_join(struct dsa_switch *ds, int port,
+@@ -7059,30 +7075,13 @@ static int mv88e6xxx_port_lag_join(struct dsa_switch *ds, int port,
 				   struct netlink_ext_ack *extack)
 {
 	struct mv88e6xxx_chip *chip = ds->priv;
@@ -125,7 +123,7 @@ index 30f8a5388733..c1f8adaa008a 100644
 	mv88e6xxx_reg_unlock(chip);
 	return err;
 }
-@@ -7061,13 +7060,12 @@ static int mv88e6xxx_port_lag_leave(struct dsa_switch *ds, int port,
+@@ -7091,13 +7090,12 @@ static int mv88e6xxx_port_lag_leave(struct dsa_switch *ds, int port,
 				    struct dsa_lag lag)
 {
 	struct mv88e6xxx_chip *chip = ds->priv;
@@ -142,6 +140,3 @@ index 30f8a5388733..c1f8adaa008a 100644
 }
 
 static int mv88e6xxx_crosschip_lag_change(struct dsa_switch *ds, int sw_index,
-- 
-2.43.0
-
@@ -1,9 +1,9 @@
-From daba70e7782b704224396f0d86dcd91b4713e064 Mon Sep 17 00:00:00 2001
+From b459641eb229d46a2dabcc29f060c7eaed27fb32 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 11 Aug 2024 11:27:35 +0200
-Subject: [PATCH 5/5] net: usb: r8152: add r8153b support for link/activity
+Subject: [PATCH 27/35] net: usb: r8152: add r8153b support for link/activity
 LEDs
-Organization: Addiva Elektronik
+Organization: Wires

 This patch adds support for the link/activity LEDs on the NanoPi R2S
 and OrangePi R1 Plus.
@@ -19,7 +19,7 @@ Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 1 file changed, 8 insertions(+)

 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
-index 19df1cd9f072..810477991810 100644
+index 96fa3857d8e2..cddb025aa56b 100644
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
@@ -41,6 +41,11 @@
@@ -34,7 +34,7 @@ index 19df1cd9f072..810477991810 100644
 #define R8152_PHY_ID		32
 
 #define PLA_IDR			0xc000
-@@ -7296,6 +7301,9 @@ static void r8153b_init(struct r8152 *tp)
+@@ -7307,6 +7312,9 @@ static void r8153b_init(struct r8152 *tp)
 	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
 	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
 
@@ -44,6 +44,3 @@ index 19df1cd9f072..810477991810 100644
 	rtl_tally_reset(tp);
 
 	tp->coalesce = 15000;	/* 15 us */
-- 
-2.43.0
-
@@ -0,0 +1,46 @@
+From 5059085e17b7967a8ed10f10c0cfbe1413a6955c Mon Sep 17 00:00:00 2001
+From: Liu Ying <victor.liu@nxp.com>
+Date: Mon, 4 Nov 2024 11:27:58 +0800
+Subject: [PATCH 28/35] drm: of: Get MEDIA_BUS_FMT_RGB101010_1X7X5_{JEIDA,
+ SPWG} LVDS data mappings
+Organization: Wires
+
+Add MEDIA_BUS_FMT_RGB101010_1X7X5_{JEIDA,SPWG} support in
+drm_of_lvds_get_data_mapping() function implementation so that function
+callers may get the two LVDS data mappings.
+
+Signed-off-by: Liu Ying <victor.liu@nxp.com>
+Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20241104032806.611890-6-victor.liu@nxp.com
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ drivers/gpu/drm/drm_of.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
+index 177b600895d3..89863a35c731 100644
+--- a/drivers/gpu/drm/drm_of.c
+++ b/drivers/gpu/drm/drm_of.c
+@@ -410,7 +410,9 @@ EXPORT_SYMBOL_GPL(drm_of_lvds_get_dual_link_pixel_order);
+  * Return:
+  * * MEDIA_BUS_FMT_RGB666_1X7X3_SPWG - data-mapping is "jeida-18"
+  * * MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA - data-mapping is "jeida-24"
+ * * MEDIA_BUS_FMT_RGB101010_1X7X5_JEIDA - data-mapping is "jeida-30"
+  * * MEDIA_BUS_FMT_RGB888_1X7X4_SPWG - data-mapping is "vesa-24"
+ * * MEDIA_BUS_FMT_RGB101010_1X7X5_SPWG - data-mapping is "vesa-30"
+  * * -EINVAL - the "data-mapping" property is unsupported
+  * * -ENODEV - the "data-mapping" property is missing
+  */
+@@ -427,8 +429,12 @@ int drm_of_lvds_get_data_mapping(const struct device_node *port)
+ 		return MEDIA_BUS_FMT_RGB666_1X7X3_SPWG;
+ 	if (!strcmp(mapping, "jeida-24"))
+ 		return MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA;
+	if (!strcmp(mapping, "jeida-30"))
+		return MEDIA_BUS_FMT_RGB101010_1X7X5_JEIDA;
+ 	if (!strcmp(mapping, "vesa-24"))
+ 		return MEDIA_BUS_FMT_RGB888_1X7X4_SPWG;
+	if (!strcmp(mapping, "vesa-30"))
+		return MEDIA_BUS_FMT_RGB101010_1X7X5_SPWG;
+ 
+ 	return -EINVAL;
+ }
@@ -0,0 +1,147 @@
+From 0f483d196dab387a4ad31342ab1ad5d4c75d5bf8 Mon Sep 17 00:00:00 2001
+From: Liu Ying <victor.liu@nxp.com>
+Date: Mon, 4 Nov 2024 11:27:59 +0800
+Subject: [PATCH 29/35] drm: of: Add
+ drm_of_lvds_get_dual_link_pixel_order_sink()
+Organization: Wires
+
+drm_of_lvds_get_dual_link_pixel_order() gets LVDS dual-link source pixel
+order.  Similar to it, add it's counterpart function
+drm_of_lvds_get_dual_link_pixel_order_sink() to get LVDS dual-link sink
+pixel order.
+
+Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Signed-off-by: Liu Ying <victor.liu@nxp.com>
+Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20241104032806.611890-7-victor.liu@nxp.com
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ drivers/gpu/drm/drm_of.c | 76 ++++++++++++++++++++++++++++++++++------
+ include/drm/drm_of.h     |  9 +++++
+ 2 files changed, 74 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
+index 89863a35c731..5c2abc9eca9c 100644
+--- a/drivers/gpu/drm/drm_of.c
+++ b/drivers/gpu/drm/drm_of.c
+@@ -341,8 +341,23 @@ static int drm_of_lvds_get_remote_pixels_type(
+ 	return pixels_type;
+ }
+ 
+static int __drm_of_lvds_get_dual_link_pixel_order(int p1_pt, int p2_pt)
+{
+	/*
+	 * A valid dual-lVDS bus is found when one port is marked with
+	 * "dual-lvds-even-pixels", and the other port is marked with
+	 * "dual-lvds-odd-pixels", bail out if the markers are not right.
+	 */
+	if (p1_pt + p2_pt != DRM_OF_LVDS_EVEN + DRM_OF_LVDS_ODD)
+		return -EINVAL;
+
+	return p1_pt == DRM_OF_LVDS_EVEN ?
+		DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS :
+		DRM_LVDS_DUAL_LINK_ODD_EVEN_PIXELS;
+}
+
+ /**
+- * drm_of_lvds_get_dual_link_pixel_order - Get LVDS dual-link pixel order
+ * drm_of_lvds_get_dual_link_pixel_order - Get LVDS dual-link source pixel order
+  * @port1: First DT port node of the Dual-link LVDS source
+  * @port2: Second DT port node of the Dual-link LVDS source
+  *
+@@ -387,19 +402,58 @@ int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
+ 	if (remote_p2_pt < 0)
+ 		return remote_p2_pt;
+ 
+-	/*
+-	 * A valid dual-lVDS bus is found when one remote port is marked with
+-	 * "dual-lvds-even-pixels", and the other remote port is marked with
+-	 * "dual-lvds-odd-pixels", bail out if the markers are not right.
+-	 */
+-	if (remote_p1_pt + remote_p2_pt != DRM_OF_LVDS_EVEN + DRM_OF_LVDS_ODD)
+	return __drm_of_lvds_get_dual_link_pixel_order(remote_p1_pt, remote_p2_pt);
+}
+EXPORT_SYMBOL_GPL(drm_of_lvds_get_dual_link_pixel_order);
+
+/**
+ * drm_of_lvds_get_dual_link_pixel_order_sink - Get LVDS dual-link sink pixel order
+ * @port1: First DT port node of the Dual-link LVDS sink
+ * @port2: Second DT port node of the Dual-link LVDS sink
+ *
+ * An LVDS dual-link connection is made of two links, with even pixels
+ * transitting on one link, and odd pixels on the other link. This function
+ * returns, for two ports of an LVDS dual-link sink, which port shall transmit
+ * the even and odd pixels, based on the requirements of the sink.
+ *
+ * The pixel order is determined from the dual-lvds-even-pixels and
+ * dual-lvds-odd-pixels properties in the sink's DT port nodes. If those
+ * properties are not present, or if their usage is not valid, this function
+ * returns -EINVAL.
+ *
+ * If either port is not connected, this function returns -EPIPE.
+ *
+ * @port1 and @port2 are typically DT sibling nodes, but may have different
+ * parents when, for instance, two separate LVDS decoders receive the even and
+ * odd pixels.
+ *
+ * Return:
+ * * DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS - @port1 receives even pixels and @port2
+ *   receives odd pixels
+ * * DRM_LVDS_DUAL_LINK_ODD_EVEN_PIXELS - @port1 receives odd pixels and @port2
+ *   receives even pixels
+ * * -EINVAL - @port1 or @port2 are NULL
+ * * -EPIPE - when @port1 or @port2 are not connected
+ */
+int drm_of_lvds_get_dual_link_pixel_order_sink(struct device_node *port1,
+					       struct device_node *port2)
+{
+	int sink_p1_pt, sink_p2_pt;
+
+	if (!port1 || !port2)
+ 		return -EINVAL;
+ 
+-	return remote_p1_pt == DRM_OF_LVDS_EVEN ?
+-		DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS :
+-		DRM_LVDS_DUAL_LINK_ODD_EVEN_PIXELS;
+	sink_p1_pt = drm_of_lvds_get_port_pixels_type(port1);
+	if (!sink_p1_pt)
+		return -EPIPE;
+
+	sink_p2_pt = drm_of_lvds_get_port_pixels_type(port2);
+	if (!sink_p2_pt)
+		return -EPIPE;
+
+	return __drm_of_lvds_get_dual_link_pixel_order(sink_p1_pt, sink_p2_pt);
+ }
+-EXPORT_SYMBOL_GPL(drm_of_lvds_get_dual_link_pixel_order);
+EXPORT_SYMBOL_GPL(drm_of_lvds_get_dual_link_pixel_order_sink);
+ 
+ /**
+  * drm_of_lvds_get_data_mapping - Get LVDS data mapping
+diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h
+index 02d1cdd7f798..7f0256dae3f1 100644
+--- a/include/drm/drm_of.h
+++ b/include/drm/drm_of.h
+@@ -52,6 +52,8 @@ int drm_of_find_panel_or_bridge(const struct device_node *np,
+ 				struct drm_bridge **bridge);
+ int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
+ 					  const struct device_node *port2);
+int drm_of_lvds_get_dual_link_pixel_order_sink(struct device_node *port1,
+					       struct device_node *port2);
+ int drm_of_lvds_get_data_mapping(const struct device_node *port);
+ int drm_of_get_data_lanes_count(const struct device_node *endpoint,
+ 				const unsigned int min, const unsigned int max);
+@@ -109,6 +111,13 @@ drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
+ 	return -EINVAL;
+ }
+ 
+static inline int
+drm_of_lvds_get_dual_link_pixel_order_sink(struct device_node *port1,
+					   struct device_node *port2)
+{
+	return -EINVAL;
+}
+
+ static inline int
+ drm_of_lvds_get_data_mapping(const struct device_node *port)
+ {
@@ -0,0 +1,80 @@
+From 901dd3cc12ff3e8ac7f361892ee04cfb44a4df76 Mon Sep 17 00:00:00 2001
+From: Liu Ying <victor.liu@nxp.com>
+Date: Mon, 4 Nov 2024 11:28:00 +0800
+Subject: [PATCH 30/35] dt-bindings: display: lvds-data-mapping: Add 30-bit RGB
+ pixel data mappings
+Organization: Wires
+
+Add "jeida-30" and "vesa-30" data mappings that are compatible with JEIDA
+and VESA respectively.
+
+Signed-off-by: Liu Ying <victor.liu@nxp.com>
+Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20241104032806.611890-8-victor.liu@nxp.com
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ .../bindings/display/lvds-data-mapping.yaml   | 31 +++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/display/lvds-data-mapping.yaml b/Documentation/devicetree/bindings/display/lvds-data-mapping.yaml
+index d68982fe2e9b..ab842594feb9 100644
+--- a/Documentation/devicetree/bindings/display/lvds-data-mapping.yaml
+++ b/Documentation/devicetree/bindings/display/lvds-data-mapping.yaml
+@@ -26,12 +26,17 @@ description: |
+   Device compatible with those specifications have been marketed under the
+   FPD-Link and FlatLink brands.
+ 
+  This bindings also supports 30-bit data mapping compatible with JEIDA and
+  VESA.
+
+ properties:
+   data-mapping:
+     enum:
+       - jeida-18
+       - jeida-24
+      - jeida-30
+       - vesa-24
+      - vesa-30
+     description: |
+       The color signals mapping order.
+ 
+@@ -60,6 +65,19 @@ properties:
+       DATA2     ><_CTL2_><_CTL1_><_CTL0_><__B7__><__B6__><__B5__><__B4__><
+       DATA3     ><_CTL3_><__B1__><__B0__><__G1__><__G0__><__R1__><__R0__><
+ 
+      - "jeida-30" - 30-bit data mapping compatible with JEIDA and VESA. Data
+        are transferred as follows on 5 LVDS lanes.
+
+      Slot          0       1       2       3       4       5       6
+                ________________                         _________________
+      Clock                     \_______________________/
+                  ______  ______  ______  ______  ______  ______  ______
+      DATA0     ><__G4__><__R9__><__R8__><__R7__><__R6__><__R5__><__R4__><
+      DATA1     ><__B5__><__B4__><__G9__><__G8__><__G7__><__G6__><__G5__><
+      DATA2     ><_CTL2_><_CTL1_><_CTL0_><__B9__><__B8__><__B7__><__B6__><
+      DATA3     ><_CTL3_><__B3__><__B2__><__G3__><__G2__><__R3__><__R2__><
+      DATA4     ><_CTL3_><__B1__><__B0__><__G1__><__G0__><__R1__><__R0__><
+
+       - "vesa-24" - 24-bit data mapping compatible with the [VESA] specification.
+         Data are transferred as follows on 4 LVDS lanes.
+ 
+@@ -72,6 +90,19 @@ properties:
+       DATA2     ><_CTL2_><_CTL1_><_CTL0_><__B5__><__B4__><__B3__><__B2__><
+       DATA3     ><_CTL3_><__B7__><__B6__><__G7__><__G6__><__R7__><__R6__><
+ 
+      - "vesa-30" - 30-bit data mapping compatible with VESA. Data are
+        transferred as follows on 5 LVDS lanes.
+
+      Slot          0       1       2       3       4       5       6
+                ________________                         _________________
+      Clock                     \_______________________/
+                  ______  ______  ______  ______  ______  ______  ______
+      DATA0     ><__G0__><__R5__><__R4__><__R3__><__R2__><__R1__><__R0__><
+      DATA1     ><__B1__><__B0__><__G5__><__G4__><__G3__><__G2__><__G1__><
+      DATA2     ><_CTL2_><_CTL1_><_CTL0_><__B5__><__B4__><__B3__><__B2__><
+      DATA3     ><_CTL3_><__B7__><__B6__><__G7__><__G6__><__R7__><__R6__><
+      DATA4     ><_CTL3_><__B9__><__B8__><__G9__><__G8__><__R9__><__R8__><
+
+       Control signals are mapped as follows.
+ 
+       CTL0: HSync
@@ -0,0 +1,187 @@
+From 34bc3735912c7af9b7c1f600bac60482d1879c3f Mon Sep 17 00:00:00 2001
+From: Liu Ying <victor.liu@nxp.com>
+Date: Mon, 4 Nov 2024 11:28:01 +0800
+Subject: [PATCH 31/35] dt-bindings: display: Document dual-link LVDS display
+ common properties
+Organization: Wires
+
+Dual-link LVDS displays receive odd pixels and even pixels separately from
+dual LVDS links.  One link receives odd pixels and the other receives even
+pixels.  Some of those displays may also use only one LVDS link to receive
+all pixels, being odd and even agnostic.  Document common properties for
+those displays by extending LVDS display common properties defined in
+lvds.yaml.
+
+Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Signed-off-by: Liu Ying <victor.liu@nxp.com>
+Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20241104032806.611890-9-victor.liu@nxp.com
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ .../bindings/display/lvds-dual-ports.yaml     | 63 +++++++++++++++++++
+ .../display/panel/advantech,idk-2121wr.yaml   | 14 +----
+ .../panel/panel-simple-lvds-dual-ports.yaml   | 20 +-----
+ 3 files changed, 65 insertions(+), 32 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/lvds-dual-ports.yaml
+
+diff --git a/Documentation/devicetree/bindings/display/lvds-dual-ports.yaml b/Documentation/devicetree/bindings/display/lvds-dual-ports.yaml
+new file mode 100644
+index 000000000000..785701fe1590
+--- /dev/null
+++ b/Documentation/devicetree/bindings/display/lvds-dual-ports.yaml
+@@ -0,0 +1,63 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/lvds-dual-ports.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Dual-link LVDS Display Common Properties
+
+maintainers:
+  - Liu Ying <victor.liu@nxp.com>
+
+description: |
+  Common properties for LVDS displays with dual LVDS links. Extend LVDS display
+  common properties defined in lvds.yaml.
+
+  Dual-link LVDS displays receive odd pixels and even pixels separately from
+  the dual LVDS links. One link receives odd pixels and the other receives
+  even pixels. Some of those displays may also use only one LVDS link to
+  receive all pixels, being odd and even agnostic.
+
+allOf:
+  - $ref: lvds.yaml#
+
+properties:
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+
+    patternProperties:
+      '^port@[01]$':
+        $ref: /schemas/graph.yaml#/$defs/port-base
+        unevaluatedProperties: false
+        description: |
+          port@0 represents the first LVDS input link.
+          port@1 represents the second LVDS input link.
+
+        properties:
+          dual-lvds-odd-pixels:
+            type: boolean
+            description: LVDS input link for odd pixels
+
+          dual-lvds-even-pixels:
+            type: boolean
+            description: LVDS input link for even pixels
+
+        oneOf:
+          - required: [dual-lvds-odd-pixels]
+          - required: [dual-lvds-even-pixels]
+          - properties:
+              dual-lvds-odd-pixels: false
+              dual-lvds-even-pixels: false
+
+    anyOf:
+      - required:
+          - port@0
+      - required:
+          - port@1
+
+required:
+  - ports
+
+additionalProperties: true
+
+...
+diff --git a/Documentation/devicetree/bindings/display/panel/advantech,idk-2121wr.yaml b/Documentation/devicetree/bindings/display/panel/advantech,idk-2121wr.yaml
+index 2e8dbdb5a3d5..05ca3b2385f8 100644
+--- a/Documentation/devicetree/bindings/display/panel/advantech,idk-2121wr.yaml
+++ b/Documentation/devicetree/bindings/display/panel/advantech,idk-2121wr.yaml
+@@ -20,6 +20,7 @@ description: |
+   dual-lvds-odd-pixels or dual-lvds-even-pixels).
+ 
+ allOf:
+  - $ref: /schemas/display/lvds-dual-ports.yaml#
+   - $ref: panel-common.yaml#
+ 
+ properties:
+@@ -44,22 +45,10 @@ properties:
+ 
+     properties:
+       port@0:
+-        $ref: /schemas/graph.yaml#/$defs/port-base
+-        unevaluatedProperties: false
+-        description: The sink for odd pixels.
+-        properties:
+-          dual-lvds-odd-pixels: true
+-
+         required:
+           - dual-lvds-odd-pixels
+ 
+       port@1:
+-        $ref: /schemas/graph.yaml#/$defs/port-base
+-        unevaluatedProperties: false
+-        description: The sink for even pixels.
+-        properties:
+-          dual-lvds-even-pixels: true
+-
+         required:
+           - dual-lvds-even-pixels
+ 
+@@ -75,7 +64,6 @@ required:
+   - height-mm
+   - data-mapping
+   - panel-timing
+-  - ports
+ 
+ examples:
+   - |+
+diff --git a/Documentation/devicetree/bindings/display/panel/panel-simple-lvds-dual-ports.yaml b/Documentation/devicetree/bindings/display/panel/panel-simple-lvds-dual-ports.yaml
+index 10ed4b57232b..e80fc7006984 100644
+--- a/Documentation/devicetree/bindings/display/panel/panel-simple-lvds-dual-ports.yaml
+++ b/Documentation/devicetree/bindings/display/panel/panel-simple-lvds-dual-ports.yaml
+@@ -22,6 +22,7 @@ description: |
+   If the panel is more advanced a dedicated binding file is required.
+ 
+ allOf:
+  - $ref: /schemas/display/lvds-dual-ports.yaml#
+   - $ref: panel-common.yaml#
+ 
+ properties:
+@@ -55,28 +56,10 @@ properties:
+ 
+     properties:
+       port@0:
+-        $ref: /schemas/graph.yaml#/$defs/port-base
+-        unevaluatedProperties: false
+-        description: The first sink port.
+-
+-        properties:
+-          dual-lvds-odd-pixels:
+-            type: boolean
+-            description: The first sink port for odd pixels.
+-
+         required:
+           - dual-lvds-odd-pixels
+ 
+       port@1:
+-        $ref: /schemas/graph.yaml#/$defs/port-base
+-        unevaluatedProperties: false
+-        description: The second sink port.
+-
+-        properties:
+-          dual-lvds-even-pixels:
+-            type: boolean
+-            description: The second sink port for even pixels.
+-
+         required:
+           - dual-lvds-even-pixels
+ 
+@@ -88,7 +71,6 @@ unevaluatedProperties: false
+ 
+ required:
+   - compatible
+-  - ports
+   - power-supply
+ 
+ examples:
@@ -0,0 +1,278 @@
+From 40d2762755d7f6b404edb1e2baa28ef62e8b4973 Mon Sep 17 00:00:00 2001
+From: Liu Ying <victor.liu@nxp.com>
+Date: Mon, 4 Nov 2024 11:28:02 +0800
+Subject: [PATCH 32/35] dt-bindings: display: bridge: Add ITE IT6263 LVDS to
+ HDMI converter
+Organization: Wires
+
+Document ITE IT6263 LVDS to HDMI converter.
+
+Product link:
+https://www.ite.com.tw/en/product/cate1/IT6263
+
+Signed-off-by: Liu Ying <victor.liu@nxp.com>
+Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
+Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20241104032806.611890-10-victor.liu@nxp.com
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ .../bindings/display/bridge/ite,it6263.yaml   | 250 ++++++++++++++++++
+ 1 file changed, 250 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/display/bridge/ite,it6263.yaml
+
+diff --git a/Documentation/devicetree/bindings/display/bridge/ite,it6263.yaml b/Documentation/devicetree/bindings/display/bridge/ite,it6263.yaml
+new file mode 100644
+index 000000000000..0a10e10d80ff
+--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/ite,it6263.yaml
+@@ -0,0 +1,250 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/bridge/ite,it6263.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: ITE IT6263 LVDS to HDMI converter
+
+maintainers:
+  - Liu Ying <victor.liu@nxp.com>
+
+description: |
+  The IT6263 is a high-performance single-chip De-SSC(De-Spread Spectrum) LVDS
+  to HDMI converter.  Combined with LVDS receiver and HDMI 1.4a transmitter,
+  the IT6263 supports LVDS input and HDMI 1.4 output by conversion function.
+  The built-in LVDS receiver can support single-link and dual-link LVDS inputs,
+  and the built-in HDMI transmitter is fully compliant with HDMI 1.4a/3D, HDCP
+  1.2 and backward compatible with DVI 1.0 specification.
+
+  The IT6263 also encodes and transmits up to 8 channels of I2S digital audio,
+  with sampling rate up to 192KHz and sample size up to 24 bits. In addition,
+  an S/PDIF input port takes in compressed audio of up to 192KHz frame rate.
+
+  The newly supported High-Bit Rate(HBR) audio by HDMI specifications v1.3 is
+  provided by the IT6263 in two interfaces: the four I2S input ports or the
+  S/PDIF input port.  With both interfaces the highest possible HBR frame rate
+  is supported at up to 768KHz.
+
+allOf:
+  - $ref: /schemas/display/lvds-dual-ports.yaml#
+
+properties:
+  compatible:
+    const: ite,it6263
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+    description: audio master clock
+
+  clock-names:
+    const: mclk
+
+  data-mapping:
+    enum:
+      - jeida-18
+      - jeida-24
+      - jeida-30
+      - vesa-24
+      - vesa-30
+
+  reset-gpios:
+    maxItems: 1
+
+  ivdd-supply:
+    description: 1.8V digital logic power
+
+  ovdd-supply:
+    description: 3.3V I/O pin power
+
+  txavcc18-supply:
+    description: 1.8V HDMI analog frontend power
+
+  txavcc33-supply:
+    description: 3.3V HDMI analog frontend power
+
+  pvcc1-supply:
+    description: 1.8V HDMI frontend core PLL power
+
+  pvcc2-supply:
+    description: 1.8V HDMI frontend filter PLL power
+
+  avcc-supply:
+    description: 3.3V LVDS frontend power
+
+  anvdd-supply:
+    description: 1.8V LVDS frontend analog power
+
+  apvdd-supply:
+    description: 1.8V LVDS frontend PLL power
+
+  "#sound-dai-cells":
+    const: 0
+
+  ite,i2s-audio-fifo-sources:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 1
+    maxItems: 4
+    items:
+      enum: [0, 1, 2, 3]
+    description:
+      Each array element indicates the pin number of an I2S serial data input
+      line which is connected to an audio FIFO, from audio FIFO0 to FIFO3.
+
+  ite,rl-channel-swap-audio-sources:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 1
+    maxItems: 4
+    uniqueItems: true
+    items:
+      enum: [0, 1, 2, 3]
+    description:
+      Each array element indicates an audio source whose right channel and left
+      channel are swapped by this converter. For I2S, the element is the pin
+      number of an I2S serial data input line. For S/PDIF, the element is always
+      0.
+
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+
+    properties:
+      port@0: true
+
+      port@1:
+        oneOf:
+          - required: [dual-lvds-odd-pixels]
+          - required: [dual-lvds-even-pixels]
+
+      port@2:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: video port for the HDMI output
+
+      port@3:
+        $ref: /schemas/graph.yaml#/properties/port
+        description: sound input port
+
+    required:
+      - port@0
+      - port@2
+
+required:
+  - compatible
+  - reg
+  - data-mapping
+  - ivdd-supply
+  - ovdd-supply
+  - txavcc18-supply
+  - txavcc33-supply
+  - pvcc1-supply
+  - pvcc2-supply
+  - avcc-supply
+  - anvdd-supply
+  - apvdd-supply
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    /* single-link LVDS input */
+    #include <dt-bindings/gpio/gpio.h>
+
+    i2c {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        hdmi@4c {
+            compatible = "ite,it6263";
+            reg = <0x4c>;
+            data-mapping = "jeida-24";
+            reset-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+            ivdd-supply = <&reg_buck5>;
+            ovdd-supply = <&reg_vext_3v3>;
+            txavcc18-supply = <&reg_buck5>;
+            txavcc33-supply = <&reg_vext_3v3>;
+            pvcc1-supply = <&reg_buck5>;
+            pvcc2-supply = <&reg_buck5>;
+            avcc-supply = <&reg_vext_3v3>;
+            anvdd-supply = <&reg_buck5>;
+            apvdd-supply = <&reg_buck5>;
+
+            ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                    reg = <0>;
+
+                    it6263_lvds_link1: endpoint {
+                        remote-endpoint = <&ldb_lvds_ch0>;
+                    };
+                };
+
+                port@2 {
+                    reg = <2>;
+
+                    it6263_out: endpoint {
+                        remote-endpoint = <&hdmi_in>;
+                    };
+                };
+            };
+        };
+    };
+
+  - |
+    /* dual-link LVDS input */
+    #include <dt-bindings/gpio/gpio.h>
+
+    i2c {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        hdmi@4c {
+            compatible = "ite,it6263";
+            reg = <0x4c>;
+            data-mapping = "jeida-24";
+            reset-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+            ivdd-supply = <&reg_buck5>;
+            ovdd-supply = <&reg_vext_3v3>;
+            txavcc18-supply = <&reg_buck5>;
+            txavcc33-supply = <&reg_vext_3v3>;
+            pvcc1-supply = <&reg_buck5>;
+            pvcc2-supply = <&reg_buck5>;
+            avcc-supply = <&reg_vext_3v3>;
+            anvdd-supply = <&reg_buck5>;
+            apvdd-supply = <&reg_buck5>;
+
+            ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                    reg = <0>;
+                    dual-lvds-odd-pixels;
+
+                    it6263_lvds_link1_dual: endpoint {
+                        remote-endpoint = <&ldb_lvds_ch0>;
+                    };
+                };
+
+                port@1 {
+                    reg = <1>;
+                    dual-lvds-even-pixels;
+
+                    it6263_lvds_link2_dual: endpoint {
+                        remote-endpoint = <&ldb_lvds_ch1>;
+                    };
+                };
+
+                port@2 {
+                    reg = <2>;
+
+                    it6263_out_dual: endpoint {
+                        remote-endpoint = <&hdmi_in>;
+                    };
+                };
+            };
+        };
+    };
@@ -0,0 +1,966 @@
+From aa3f6b62a24979e579323e77c8900064e7c725f1 Mon Sep 17 00:00:00 2001
+From: Liu Ying <victor.liu@nxp.com>
+Date: Mon, 4 Nov 2024 11:28:03 +0800
+Subject: [PATCH 33/35] drm/bridge: Add ITE IT6263 LVDS to HDMI converter
+Organization: Wires
+
+Add basic HDMI video output support. Currently, only RGB888 output
+pixel format is supported.  At the LVDS input side, the driver
+supports single LVDS link and dual LVDS links with "jeida-24" LVDS
+mapping.
+
+Product link:
+https://www.ite.com.tw/en/product/cate1/IT6263
+
+Signed-off-by: Liu Ying <victor.liu@nxp.com>
+Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
+Acked-by: Maxime Ripard <mripard@kernel.org>
+Tested-by: Biju Das <biju.das.jz@bp.renesas.com>
+Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20241104032806.611890-11-victor.liu@nxp.com
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ drivers/gpu/drm/bridge/Kconfig      |  11 +
+ drivers/gpu/drm/bridge/Makefile     |   1 +
+ drivers/gpu/drm/bridge/ite-it6263.c | 898 ++++++++++++++++++++++++++++
+ 3 files changed, 910 insertions(+)
+ create mode 100644 drivers/gpu/drm/bridge/ite-it6263.c
+
+diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
+index 3eb955333c80..676286542706 100644
+--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
+@@ -90,6 +90,17 @@ config DRM_FSL_LDB
+ 	help
+ 	  Support for i.MX8MP DPI-to-LVDS on-SoC encoder.
+ 
+config DRM_ITE_IT6263
+	tristate "ITE IT6263 LVDS/HDMI bridge"
+	depends on OF
+	select DRM_DISPLAY_HDMI_STATE_HELPER
+	select DRM_DISPLAY_HELPER
+	select DRM_BRIDGE_CONNECTOR
+	select DRM_KMS_HELPER
+	select REGMAP_I2C
+	help
+	  ITE IT6263 LVDS to HDMI bridge chip driver.
+
+ config DRM_ITE_IT6505
+ 	tristate "ITE IT6505 DisplayPort bridge"
+ 	depends on OF
+diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
+index 7df87b582dca..f3776dd473fd 100644
+--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
+@@ -6,6 +6,7 @@ obj-$(CONFIG_DRM_CHRONTEL_CH7033) += chrontel-ch7033.o
+ obj-$(CONFIG_DRM_CROS_EC_ANX7688) += cros-ec-anx7688.o
+ obj-$(CONFIG_DRM_DISPLAY_CONNECTOR) += display-connector.o
+ obj-$(CONFIG_DRM_FSL_LDB) += fsl-ldb.o
+obj-$(CONFIG_DRM_ITE_IT6263) += ite-it6263.o
+ obj-$(CONFIG_DRM_ITE_IT6505) += ite-it6505.o
+ obj-$(CONFIG_DRM_LONTIUM_LT8912B) += lontium-lt8912b.o
+ obj-$(CONFIG_DRM_LONTIUM_LT9211) += lontium-lt9211.o
+diff --git a/drivers/gpu/drm/bridge/ite-it6263.c b/drivers/gpu/drm/bridge/ite-it6263.c
+new file mode 100644
+index 000000000000..cbabd4e20d3e
+--- /dev/null
+++ b/drivers/gpu/drm/bridge/ite-it6263.c
+@@ -0,0 +1,898 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright 2024 NXP
+ */
+
+#include <linux/bitfield.h>
+#include <linux/bits.h>
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/hdmi.h>
+#include <linux/i2c.h>
+#include <linux/media-bus-format.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
+#include <drm/display/drm_hdmi_helper.h>
+#include <drm/display/drm_hdmi_state_helper.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_atomic_state_helper.h>
+#include <drm/drm_bridge.h>
+#include <drm/drm_bridge_connector.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_edid.h>
+#include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
+
+/* -----------------------------------------------------------------------------
+ * LVDS registers
+ */
+
+/* LVDS software reset registers */
+#define LVDS_REG_05			0x05
+#define  REG_SOFT_P_RST			BIT(1)
+
+/* LVDS system configuration registers */
+/* 0x0b */
+#define LVDS_REG_0B			0x0b
+#define  REG_SSC_PCLK_RF		BIT(0)
+#define  REG_LVDS_IN_SWAP		BIT(1)
+
+/* LVDS test pattern gen control registers */
+/* 0x2c */
+#define LVDS_REG_2C			0x2c
+#define  REG_COL_DEP			GENMASK(1, 0)
+#define  BIT8				FIELD_PREP(REG_COL_DEP, 1)
+#define  OUT_MAP			BIT(4)
+#define  JEIDA				0
+#define  REG_DESSC_ENB			BIT(6)
+#define  DMODE				BIT(7)
+#define  DISO				BIT(7)
+#define  SISO				0
+
+#define LVDS_REG_3C			0x3c
+#define LVDS_REG_3F			0x3f
+#define LVDS_REG_47			0x47
+#define LVDS_REG_48			0x48
+#define LVDS_REG_4F			0x4f
+#define LVDS_REG_52			0x52
+
+/* -----------------------------------------------------------------------------
+ * HDMI registers are separated into three banks:
+ * 1) HDMI register common bank: 0x00 ~ 0x2f
+ */
+
+/* HDMI genernal registers */
+#define HDMI_REG_SW_RST			0x04
+#define  SOFTREF_RST			BIT(5)
+#define  SOFTA_RST			BIT(4)
+#define  SOFTV_RST			BIT(3)
+#define  AUD_RST			BIT(2)
+#define  HDCP_RST			BIT(0)
+#define  HDMI_RST_ALL			(SOFTREF_RST | SOFTA_RST | SOFTV_RST | \
+					 AUD_RST | HDCP_RST)
+
+#define HDMI_REG_SYS_STATUS		0x0e
+#define  HPDETECT			BIT(6)
+#define  TXVIDSTABLE			BIT(4)
+
+#define HDMI_REG_BANK_CTRL		0x0f
+#define  REG_BANK_SEL			BIT(0)
+
+/* HDMI System DDC control registers */
+#define HDMI_REG_DDC_MASTER_CTRL	0x10
+#define  MASTER_SEL_HOST		BIT(0)
+
+#define HDMI_REG_DDC_HEADER		0x11
+
+#define HDMI_REG_DDC_REQOFF		0x12
+#define HDMI_REG_DDC_REQCOUNT		0x13
+#define HDMI_REG_DDC_EDIDSEG		0x14
+
+#define HDMI_REG_DDC_CMD		0x15
+#define  DDC_CMD_EDID_READ		0x3
+#define  DDC_CMD_FIFO_CLR		0x9
+
+#define HDMI_REG_DDC_STATUS		0x16
+#define  DDC_DONE			BIT(7)
+#define  DDC_NOACK			BIT(5)
+#define  DDC_WAITBUS			BIT(4)
+#define  DDC_ARBILOSE			BIT(3)
+#define  DDC_ERROR			(DDC_NOACK | DDC_WAITBUS | DDC_ARBILOSE)
+
+#define HDMI_DDC_FIFO_BYTES		32
+#define HDMI_REG_DDC_READFIFO		0x17
+#define HDMI_REG_LVDS_PORT		0x1d /* LVDS input control I2C addr */
+#define HDMI_REG_LVDS_PORT_EN		0x1e
+#define LVDS_INPUT_CTRL_I2C_ADDR	0x33
+
+/* -----------------------------------------------------------------------------
+ * 2) HDMI register bank0: 0x30 ~ 0xff
+ */
+
+/* HDMI AFE registers */
+#define HDMI_REG_AFE_DRV_CTRL		0x61
+#define  AFE_DRV_PWD			BIT(5)
+#define  AFE_DRV_RST			BIT(4)
+
+#define HDMI_REG_AFE_XP_CTRL		0x62
+#define  AFE_XP_GAINBIT			BIT(7)
+#define  AFE_XP_ER0			BIT(4)
+#define  AFE_XP_RESETB			BIT(3)
+
+#define HDMI_REG_AFE_ISW_CTRL		0x63
+
+#define HDMI_REG_AFE_IP_CTRL		0x64
+#define  AFE_IP_GAINBIT			BIT(7)
+#define  AFE_IP_ER0			BIT(3)
+#define  AFE_IP_RESETB			BIT(2)
+
+/* HDMI input data format registers */
+#define HDMI_REG_INPUT_MODE		0x70
+#define  IN_RGB				0x00
+
+/* HDMI general control registers */
+#define HDMI_REG_HDMI_MODE		0xc0
+#define  TX_HDMI_MODE			BIT(0)
+
+#define HDMI_REG_GCP			0xc1
+#define  AVMUTE				BIT(0)
+#define  HDMI_COLOR_DEPTH		GENMASK(6, 4)
+#define  HDMI_COLOR_DEPTH_24		FIELD_PREP(HDMI_COLOR_DEPTH, 4)
+
+#define HDMI_REG_PKT_GENERAL_CTRL	0xc6
+#define HDMI_REG_AVI_INFOFRM_CTRL	0xcd
+#define  ENABLE_PKT			BIT(0)
+#define  REPEAT_PKT			BIT(1)
+
+/* -----------------------------------------------------------------------------
+ * 3) HDMI register bank1: 0x130 ~ 0x1ff (HDMI packet registers)
+ */
+
+/* AVI packet registers */
+#define HDMI_REG_AVI_DB1		0x158
+#define HDMI_REG_AVI_DB2		0x159
+#define HDMI_REG_AVI_DB3		0x15a
+#define HDMI_REG_AVI_DB4		0x15b
+#define HDMI_REG_AVI_DB5		0x15c
+#define HDMI_REG_AVI_CSUM		0x15d
+#define HDMI_REG_AVI_DB6		0x15e
+#define HDMI_REG_AVI_DB7		0x15f
+#define HDMI_REG_AVI_DB8		0x160
+#define HDMI_REG_AVI_DB9		0x161
+#define HDMI_REG_AVI_DB10		0x162
+#define HDMI_REG_AVI_DB11		0x163
+#define HDMI_REG_AVI_DB12		0x164
+#define HDMI_REG_AVI_DB13		0x165
+
+#define HDMI_AVI_DB_CHUNK1_SIZE		(HDMI_REG_AVI_DB5 - HDMI_REG_AVI_DB1 + 1)
+#define HDMI_AVI_DB_CHUNK2_SIZE		(HDMI_REG_AVI_DB13 - HDMI_REG_AVI_DB6 + 1)
+
+/* IT6263 data sheet Rev0.8: LVDS RX supports input clock rate up to 150MHz. */
+#define MAX_PIXEL_CLOCK_KHZ		150000
+
+/* IT6263 programming guide Ver0.90: PCLK_HIGH for TMDS clock over 80MHz. */
+#define HIGH_PIXEL_CLOCK_KHZ		80000
+
+/*
+ * IT6263 data sheet Rev0.8: HDMI TX supports link speeds of up to 2.25Gbps
+ * (link clock rate of 225MHz).
+ */
+#define MAX_HDMI_TMDS_CHAR_RATE_HZ	225000000
+
+struct it6263 {
+	struct device *dev;
+	struct i2c_client *hdmi_i2c;
+	struct i2c_client *lvds_i2c;
+	struct regmap *hdmi_regmap;
+	struct regmap *lvds_regmap;
+	struct drm_bridge bridge;
+	struct drm_bridge *next_bridge;
+	int lvds_data_mapping;
+	bool lvds_dual_link;
+	bool lvds_link12_swap;
+};
+
+static inline struct it6263 *bridge_to_it6263(struct drm_bridge *bridge)
+{
+	return container_of(bridge, struct it6263, bridge);
+}
+
+static bool it6263_hdmi_writeable_reg(struct device *dev, unsigned int reg)
+{
+	switch (reg) {
+	case HDMI_REG_SW_RST:
+	case HDMI_REG_BANK_CTRL:
+	case HDMI_REG_DDC_MASTER_CTRL:
+	case HDMI_REG_DDC_HEADER:
+	case HDMI_REG_DDC_REQOFF:
+	case HDMI_REG_DDC_REQCOUNT:
+	case HDMI_REG_DDC_EDIDSEG:
+	case HDMI_REG_DDC_CMD:
+	case HDMI_REG_LVDS_PORT:
+	case HDMI_REG_LVDS_PORT_EN:
+	case HDMI_REG_AFE_DRV_CTRL:
+	case HDMI_REG_AFE_XP_CTRL:
+	case HDMI_REG_AFE_ISW_CTRL:
+	case HDMI_REG_AFE_IP_CTRL:
+	case HDMI_REG_INPUT_MODE:
+	case HDMI_REG_HDMI_MODE:
+	case HDMI_REG_GCP:
+	case HDMI_REG_PKT_GENERAL_CTRL:
+	case HDMI_REG_AVI_INFOFRM_CTRL:
+	case HDMI_REG_AVI_DB1:
+	case HDMI_REG_AVI_DB2:
+	case HDMI_REG_AVI_DB3:
+	case HDMI_REG_AVI_DB4:
+	case HDMI_REG_AVI_DB5:
+	case HDMI_REG_AVI_CSUM:
+	case HDMI_REG_AVI_DB6:
+	case HDMI_REG_AVI_DB7:
+	case HDMI_REG_AVI_DB8:
+	case HDMI_REG_AVI_DB9:
+	case HDMI_REG_AVI_DB10:
+	case HDMI_REG_AVI_DB11:
+	case HDMI_REG_AVI_DB12:
+	case HDMI_REG_AVI_DB13:
+		return true;
+	default:
+		return false;
+	}
+}
+
+static bool it6263_hdmi_readable_reg(struct device *dev, unsigned int reg)
+{
+	if (it6263_hdmi_writeable_reg(dev, reg))
+		return true;
+
+	switch (reg) {
+	case HDMI_REG_SYS_STATUS:
+	case HDMI_REG_DDC_STATUS:
+	case HDMI_REG_DDC_READFIFO:
+		return true;
+	default:
+		return false;
+	}
+}
+
+static bool it6263_hdmi_volatile_reg(struct device *dev, unsigned int reg)
+{
+	switch (reg) {
+	case HDMI_REG_SW_RST:
+	case HDMI_REG_SYS_STATUS:
+	case HDMI_REG_DDC_STATUS:
+	case HDMI_REG_DDC_READFIFO:
+		return true;
+	default:
+		return false;
+	}
+}
+
+static const struct regmap_range_cfg it6263_hdmi_range_cfg = {
+	.range_min = 0x00,
+	.range_max = HDMI_REG_AVI_DB13,
+	.selector_reg = HDMI_REG_BANK_CTRL,
+	.selector_mask = REG_BANK_SEL,
+	.selector_shift = 0,
+	.window_start = 0x00,
+	.window_len = 0x100,
+};
+
+static const struct regmap_config it6263_hdmi_regmap_config = {
+	.name = "it6263-hdmi",
+	.reg_bits = 8,
+	.val_bits = 8,
+	.writeable_reg = it6263_hdmi_writeable_reg,
+	.readable_reg = it6263_hdmi_readable_reg,
+	.volatile_reg = it6263_hdmi_volatile_reg,
+	.max_register = HDMI_REG_AVI_DB13,
+	.ranges = &it6263_hdmi_range_cfg,
+	.num_ranges = 1,
+	.cache_type = REGCACHE_MAPLE,
+};
+
+static bool it6263_lvds_writeable_reg(struct device *dev, unsigned int reg)
+{
+	switch (reg) {
+	case LVDS_REG_05:
+	case LVDS_REG_0B:
+	case LVDS_REG_2C:
+	case LVDS_REG_3C:
+	case LVDS_REG_3F:
+	case LVDS_REG_47:
+	case LVDS_REG_48:
+	case LVDS_REG_4F:
+	case LVDS_REG_52:
+		return true;
+	default:
+		return false;
+	}
+}
+
+static bool it6263_lvds_readable_reg(struct device *dev, unsigned int reg)
+{
+	return it6263_lvds_writeable_reg(dev, reg);
+}
+
+static bool it6263_lvds_volatile_reg(struct device *dev, unsigned int reg)
+{
+	return reg == LVDS_REG_05;
+}
+
+static const struct regmap_config it6263_lvds_regmap_config = {
+	.name = "it6263-lvds",
+	.reg_bits = 8,
+	.val_bits = 8,
+	.writeable_reg = it6263_lvds_writeable_reg,
+	.readable_reg = it6263_lvds_readable_reg,
+	.volatile_reg = it6263_lvds_volatile_reg,
+	.max_register = LVDS_REG_52,
+	.cache_type = REGCACHE_MAPLE,
+};
+
+static const char * const it6263_supplies[] = {
+	"ivdd", "ovdd", "txavcc18", "txavcc33", "pvcc1", "pvcc2",
+	"avcc", "anvdd", "apvdd"
+};
+
+static int it6263_parse_dt(struct it6263 *it)
+{
+	struct device *dev = it->dev;
+	struct device_node *port0, *port1;
+	int ret = 0;
+
+	it->lvds_data_mapping = drm_of_lvds_get_data_mapping(dev->of_node);
+	if (it->lvds_data_mapping < 0) {
+		dev_err(dev, "%pOF: invalid or missing %s DT property: %d\n",
+			dev->of_node, "data-mapping", it->lvds_data_mapping);
+		return it->lvds_data_mapping;
+	}
+
+	it->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 2, 0);
+	if (IS_ERR(it->next_bridge))
+		return dev_err_probe(dev, PTR_ERR(it->next_bridge),
+				     "failed to get next bridge\n");
+
+	port0 = of_graph_get_port_by_id(dev->of_node, 0);
+	port1 = of_graph_get_port_by_id(dev->of_node, 1);
+	if (port0 && port1) {
+		int order;
+
+		it->lvds_dual_link = true;
+		order = drm_of_lvds_get_dual_link_pixel_order_sink(port0, port1);
+		if (order < 0) {
+			dev_err(dev,
+				"failed to get dual link pixel order: %d\n",
+				order);
+			ret = order;
+		} else if (order == DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS) {
+			it->lvds_link12_swap = true;
+		}
+	} else if (port1) {
+		ret = -EINVAL;
+		dev_err(dev, "single input LVDS port1 is not supported\n");
+	} else if (!port0) {
+		ret = -EINVAL;
+		dev_err(dev, "no input LVDS port\n");
+	}
+
+	of_node_put(port0);
+	of_node_put(port1);
+
+	return ret;
+}
+
+static inline void it6263_hw_reset(struct gpio_desc *reset_gpio)
+{
+	if (!reset_gpio)
+		return;
+
+	gpiod_set_value_cansleep(reset_gpio, 0);
+	fsleep(1000);
+	gpiod_set_value_cansleep(reset_gpio, 1);
+	/* The chip maker says the low pulse should be at least 40ms. */
+	fsleep(40000);
+	gpiod_set_value_cansleep(reset_gpio, 0);
+	/* addtional time to wait the high voltage to be stable */
+	fsleep(5000);
+}
+
+static inline int it6263_lvds_set_i2c_addr(struct it6263 *it)
+{
+	int ret;
+
+	ret = regmap_write(it->hdmi_regmap, HDMI_REG_LVDS_PORT,
+			   LVDS_INPUT_CTRL_I2C_ADDR << 1);
+	if (ret)
+		return ret;
+
+	return regmap_write(it->hdmi_regmap, HDMI_REG_LVDS_PORT_EN, BIT(0));
+}
+
+static inline void it6263_lvds_reset(struct it6263 *it)
+{
+	/* AFE PLL reset */
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_3C, BIT(0), 0x0);
+	fsleep(1000);
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_3C, BIT(0), BIT(0));
+
+	/* software pixel clock domain reset */
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_05, REG_SOFT_P_RST,
+			  REG_SOFT_P_RST);
+	fsleep(1000);
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_05, REG_SOFT_P_RST, 0x0);
+	fsleep(10000);
+}
+
+static inline void it6263_lvds_set_interface(struct it6263 *it)
+{
+	/* color depth */
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_2C, REG_COL_DEP, BIT8);
+	/* output mapping */
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_2C, OUT_MAP, JEIDA);
+
+	if (it->lvds_dual_link) {
+		regmap_write_bits(it->lvds_regmap, LVDS_REG_2C, DMODE, DISO);
+		regmap_write_bits(it->lvds_regmap, LVDS_REG_52, BIT(1), BIT(1));
+	} else {
+		regmap_write_bits(it->lvds_regmap, LVDS_REG_2C, DMODE, SISO);
+		regmap_write_bits(it->lvds_regmap, LVDS_REG_52, BIT(1), 0);
+	}
+}
+
+static inline void it6263_lvds_set_afe(struct it6263 *it)
+{
+	regmap_write(it->lvds_regmap, LVDS_REG_3C, 0xaa);
+	regmap_write(it->lvds_regmap, LVDS_REG_3F, 0x02);
+	regmap_write(it->lvds_regmap, LVDS_REG_47, 0xaa);
+	regmap_write(it->lvds_regmap, LVDS_REG_48, 0x02);
+	regmap_write(it->lvds_regmap, LVDS_REG_4F, 0x11);
+
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_0B, REG_SSC_PCLK_RF,
+			  REG_SSC_PCLK_RF);
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_3C, 0x07, 0);
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_2C, REG_DESSC_ENB,
+			  REG_DESSC_ENB);
+}
+
+static inline void it6263_lvds_sys_cfg(struct it6263 *it)
+{
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_0B, REG_LVDS_IN_SWAP,
+			  it->lvds_link12_swap ? REG_LVDS_IN_SWAP : 0);
+}
+
+static inline void it6263_lvds_config(struct it6263 *it)
+{
+	it6263_lvds_reset(it);
+	it6263_lvds_set_interface(it);
+	it6263_lvds_set_afe(it);
+	it6263_lvds_sys_cfg(it);
+}
+
+static inline void it6263_hdmi_config(struct it6263 *it)
+{
+	regmap_write(it->hdmi_regmap, HDMI_REG_SW_RST, HDMI_RST_ALL);
+	regmap_write(it->hdmi_regmap, HDMI_REG_INPUT_MODE, IN_RGB);
+	regmap_write_bits(it->hdmi_regmap, HDMI_REG_GCP, HDMI_COLOR_DEPTH,
+			  HDMI_COLOR_DEPTH_24);
+}
+
+static enum drm_connector_status it6263_detect(struct it6263 *it)
+{
+	unsigned int val;
+
+	regmap_read(it->hdmi_regmap, HDMI_REG_SYS_STATUS, &val);
+	if (val & HPDETECT)
+		return connector_status_connected;
+	else
+		return connector_status_disconnected;
+}
+
+static int it6263_read_edid(void *data, u8 *buf, unsigned int block, size_t len)
+{
+	struct it6263 *it = data;
+	struct regmap *regmap = it->hdmi_regmap;
+	unsigned int start = (block % 2) * EDID_LENGTH;
+	unsigned int segment = block >> 1;
+	unsigned int count, val;
+	int ret;
+
+	regmap_write(regmap, HDMI_REG_DDC_MASTER_CTRL, MASTER_SEL_HOST);
+	regmap_write(regmap, HDMI_REG_DDC_HEADER, DDC_ADDR << 1);
+	regmap_write(regmap, HDMI_REG_DDC_EDIDSEG, segment);
+
+	while (len) {
+		/* clear DDC FIFO */
+		regmap_write(regmap, HDMI_REG_DDC_CMD, DDC_CMD_FIFO_CLR);
+
+		ret = regmap_read_poll_timeout(regmap, HDMI_REG_DDC_STATUS,
+					       val, val & DDC_DONE,
+					       2000, 10000);
+		if (ret) {
+			dev_err(it->dev, "failed to clear DDC FIFO:%d\n", ret);
+			return ret;
+		}
+
+		count = len > HDMI_DDC_FIFO_BYTES ? HDMI_DDC_FIFO_BYTES : len;
+
+		/* fire the read command */
+		regmap_write(regmap, HDMI_REG_DDC_REQOFF, start);
+		regmap_write(regmap, HDMI_REG_DDC_REQCOUNT, count);
+		regmap_write(regmap, HDMI_REG_DDC_CMD, DDC_CMD_EDID_READ);
+
+		start += count;
+		len -= count;
+
+		ret = regmap_read_poll_timeout(regmap, HDMI_REG_DDC_STATUS, val,
+					       val & (DDC_DONE | DDC_ERROR),
+					       20000, 250000);
+		if (ret && !(val & DDC_ERROR)) {
+			dev_err(it->dev, "failed to read EDID:%d\n", ret);
+			return ret;
+		}
+
+		if (val & DDC_ERROR) {
+			dev_err(it->dev, "DDC error\n");
+			return -EIO;
+		}
+
+		/* cache to buffer */
+		for (; count > 0; count--) {
+			regmap_read(regmap, HDMI_REG_DDC_READFIFO, &val);
+			*(buf++) = val;
+		}
+	}
+
+	return 0;
+}
+
+static int it6263_bridge_atomic_check(struct drm_bridge *bridge,
+				      struct drm_bridge_state *bridge_state,
+				      struct drm_crtc_state *crtc_state,
+				      struct drm_connector_state *conn_state)
+{
+	return drm_atomic_helper_connector_hdmi_check(conn_state->connector,
+						      conn_state->state);
+}
+
+static void
+it6263_bridge_atomic_disable(struct drm_bridge *bridge,
+			     struct drm_bridge_state *old_bridge_state)
+{
+	struct it6263 *it = bridge_to_it6263(bridge);
+
+	regmap_write_bits(it->hdmi_regmap, HDMI_REG_GCP, AVMUTE, AVMUTE);
+	regmap_write(it->hdmi_regmap, HDMI_REG_PKT_GENERAL_CTRL, 0);
+	regmap_write(it->hdmi_regmap, HDMI_REG_AFE_DRV_CTRL,
+		     AFE_DRV_RST | AFE_DRV_PWD);
+}
+
+static void
+it6263_bridge_atomic_enable(struct drm_bridge *bridge,
+			    struct drm_bridge_state *old_bridge_state)
+{
+	struct drm_atomic_state *state = old_bridge_state->base.state;
+	struct it6263 *it = bridge_to_it6263(bridge);
+	const struct drm_crtc_state *crtc_state;
+	struct regmap *regmap = it->hdmi_regmap;
+	const struct drm_display_mode *mode;
+	struct drm_connector *connector;
+	bool is_stable = false;
+	struct drm_crtc *crtc;
+	unsigned int val;
+	bool pclk_high;
+	int i, ret;
+
+	connector = drm_atomic_get_new_connector_for_encoder(state,
+							     bridge->encoder);
+	crtc = drm_atomic_get_new_connector_state(state, connector)->crtc;
+	crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
+	mode = &crtc_state->adjusted_mode;
+
+	regmap_write(regmap, HDMI_REG_HDMI_MODE, TX_HDMI_MODE);
+
+	drm_atomic_helper_connector_hdmi_update_infoframes(connector, state);
+
+	/* HDMI AFE setup */
+	pclk_high = mode->clock > HIGH_PIXEL_CLOCK_KHZ;
+	regmap_write(regmap, HDMI_REG_AFE_DRV_CTRL, AFE_DRV_RST);
+	if (pclk_high)
+		regmap_write(regmap, HDMI_REG_AFE_XP_CTRL,
+			     AFE_XP_GAINBIT | AFE_XP_RESETB);
+	else
+		regmap_write(regmap, HDMI_REG_AFE_XP_CTRL,
+			     AFE_XP_ER0 | AFE_XP_RESETB);
+	regmap_write(regmap, HDMI_REG_AFE_ISW_CTRL, 0x10);
+	if (pclk_high)
+		regmap_write(regmap, HDMI_REG_AFE_IP_CTRL,
+			     AFE_IP_GAINBIT | AFE_IP_RESETB);
+	else
+		regmap_write(regmap, HDMI_REG_AFE_IP_CTRL,
+			     AFE_IP_ER0 | AFE_IP_RESETB);
+
+	/* HDMI software video reset */
+	regmap_write_bits(regmap, HDMI_REG_SW_RST, SOFTV_RST, SOFTV_RST);
+	fsleep(1000);
+	regmap_write_bits(regmap, HDMI_REG_SW_RST, SOFTV_RST, 0);
+
+	/* reconfigure LVDS and retry several times in case video is instable */
+	for (i = 0; i < 3; i++) {
+		ret = regmap_read_poll_timeout(regmap, HDMI_REG_SYS_STATUS, val,
+					       val & TXVIDSTABLE,
+					       20000, 500000);
+		if (!ret) {
+			is_stable = true;
+			break;
+		}
+
+		it6263_lvds_config(it);
+	}
+
+	if (!is_stable)
+		dev_warn(it->dev, "failed to wait for video stable\n");
+
+	/* HDMI AFE reset release and power up */
+	regmap_write(regmap, HDMI_REG_AFE_DRV_CTRL, 0);
+
+	regmap_write_bits(regmap, HDMI_REG_GCP, AVMUTE, 0);
+
+	regmap_write(regmap, HDMI_REG_PKT_GENERAL_CTRL, ENABLE_PKT | REPEAT_PKT);
+}
+
+static enum drm_mode_status
+it6263_bridge_mode_valid(struct drm_bridge *bridge,
+			 const struct drm_display_info *info,
+			 const struct drm_display_mode *mode)
+{
+	unsigned long long rate;
+
+	rate = drm_hdmi_compute_mode_clock(mode, 8, HDMI_COLORSPACE_RGB);
+	if (rate == 0)
+		return MODE_NOCLOCK;
+
+	return bridge->funcs->hdmi_tmds_char_rate_valid(bridge, mode, rate);
+}
+
+static int it6263_bridge_attach(struct drm_bridge *bridge,
+				enum drm_bridge_attach_flags flags)
+{
+	struct it6263 *it = bridge_to_it6263(bridge);
+	struct drm_connector *connector;
+	int ret;
+
+	ret = drm_bridge_attach(bridge->encoder, it->next_bridge, bridge,
+				flags | DRM_BRIDGE_ATTACH_NO_CONNECTOR);
+	if (ret < 0)
+		return ret;
+
+	if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)
+		return 0;
+
+	connector = drm_bridge_connector_init(bridge->dev, bridge->encoder);
+	if (IS_ERR(connector)) {
+		ret = PTR_ERR(connector);
+		dev_err(it->dev, "failed to initialize bridge connector: %d\n",
+			ret);
+		return ret;
+	}
+
+	drm_connector_attach_encoder(connector, bridge->encoder);
+
+	return 0;
+}
+
+static enum drm_connector_status it6263_bridge_detect(struct drm_bridge *bridge)
+{
+	struct it6263 *it = bridge_to_it6263(bridge);
+
+	return it6263_detect(it);
+}
+
+static const struct drm_edid *
+it6263_bridge_edid_read(struct drm_bridge *bridge,
+			struct drm_connector *connector)
+{
+	struct it6263 *it = bridge_to_it6263(bridge);
+
+	return drm_edid_read_custom(connector, it6263_read_edid, it);
+}
+
+static u32 *
+it6263_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
+					struct drm_bridge_state *bridge_state,
+					struct drm_crtc_state *crtc_state,
+					struct drm_connector_state *conn_state,
+					u32 output_fmt,
+					unsigned int *num_input_fmts)
+{
+	struct it6263 *it = bridge_to_it6263(bridge);
+	u32 *input_fmts;
+
+	*num_input_fmts = 0;
+
+	if (it->lvds_data_mapping != MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA)
+		return NULL;
+
+	input_fmts = kmalloc(sizeof(*input_fmts), GFP_KERNEL);
+	if (!input_fmts)
+		return NULL;
+
+	input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA;
+	*num_input_fmts = 1;
+
+	return input_fmts;
+}
+
+static enum drm_mode_status
+it6263_hdmi_tmds_char_rate_valid(const struct drm_bridge *bridge,
+				 const struct drm_display_mode *mode,
+				 unsigned long long tmds_rate)
+{
+	if (mode->clock > MAX_PIXEL_CLOCK_KHZ)
+		return MODE_CLOCK_HIGH;
+
+	if (tmds_rate > MAX_HDMI_TMDS_CHAR_RATE_HZ)
+		return MODE_CLOCK_HIGH;
+
+	return MODE_OK;
+}
+
+static int it6263_hdmi_clear_infoframe(struct drm_bridge *bridge,
+				       enum hdmi_infoframe_type type)
+{
+	struct it6263 *it = bridge_to_it6263(bridge);
+
+	if (type == HDMI_INFOFRAME_TYPE_AVI)
+		regmap_write(it->hdmi_regmap, HDMI_REG_AVI_INFOFRM_CTRL, 0);
+	else
+		dev_dbg(it->dev, "unsupported HDMI infoframe 0x%x\n", type);
+
+	return 0;
+}
+
+static int it6263_hdmi_write_infoframe(struct drm_bridge *bridge,
+				       enum hdmi_infoframe_type type,
+				       const u8 *buffer, size_t len)
+{
+	struct it6263 *it = bridge_to_it6263(bridge);
+	struct regmap *regmap = it->hdmi_regmap;
+
+	if (type != HDMI_INFOFRAME_TYPE_AVI) {
+		dev_dbg(it->dev, "unsupported HDMI infoframe 0x%x\n", type);
+		return 0;
+	}
+
+	/* write the first AVI infoframe data byte chunk(DB1-DB5) */
+	regmap_bulk_write(regmap, HDMI_REG_AVI_DB1,
+			  &buffer[HDMI_INFOFRAME_HEADER_SIZE],
+			  HDMI_AVI_DB_CHUNK1_SIZE);
+
+	/* write the second AVI infoframe data byte chunk(DB6-DB13) */
+	regmap_bulk_write(regmap, HDMI_REG_AVI_DB6,
+			  &buffer[HDMI_INFOFRAME_HEADER_SIZE +
+				  HDMI_AVI_DB_CHUNK1_SIZE],
+			  HDMI_AVI_DB_CHUNK2_SIZE);
+
+	/* write checksum */
+	regmap_write(regmap, HDMI_REG_AVI_CSUM, buffer[3]);
+
+	regmap_write(regmap, HDMI_REG_AVI_INFOFRM_CTRL, ENABLE_PKT | REPEAT_PKT);
+
+	return 0;
+}
+
+static const struct drm_bridge_funcs it6263_bridge_funcs = {
+	.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
+	.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
+	.atomic_reset = drm_atomic_helper_bridge_reset,
+	.attach = it6263_bridge_attach,
+	.mode_valid = it6263_bridge_mode_valid,
+	.atomic_disable = it6263_bridge_atomic_disable,
+	.atomic_enable = it6263_bridge_atomic_enable,
+	.atomic_check = it6263_bridge_atomic_check,
+	.detect = it6263_bridge_detect,
+	.edid_read = it6263_bridge_edid_read,
+	.atomic_get_input_bus_fmts = it6263_bridge_atomic_get_input_bus_fmts,
+	.hdmi_tmds_char_rate_valid = it6263_hdmi_tmds_char_rate_valid,
+	.hdmi_clear_infoframe = it6263_hdmi_clear_infoframe,
+	.hdmi_write_infoframe = it6263_hdmi_write_infoframe,
+};
+
+static int it6263_probe(struct i2c_client *client)
+{
+	struct device *dev = &client->dev;
+	struct gpio_desc *reset_gpio;
+	struct it6263 *it;
+	int ret;
+
+	it = devm_kzalloc(dev, sizeof(*it), GFP_KERNEL);
+	if (!it)
+		return -ENOMEM;
+
+	it->dev = dev;
+	it->hdmi_i2c = client;
+
+	it->hdmi_regmap = devm_regmap_init_i2c(client,
+					       &it6263_hdmi_regmap_config);
+	if (IS_ERR(it->hdmi_regmap))
+		return dev_err_probe(dev, PTR_ERR(it->hdmi_regmap),
+				     "failed to init I2C regmap for HDMI\n");
+
+	reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
+	if (IS_ERR(reset_gpio))
+		return dev_err_probe(dev, PTR_ERR(reset_gpio),
+				     "failed to get reset gpio\n");
+
+	ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(it6263_supplies),
+					     it6263_supplies);
+	if (ret)
+		return dev_err_probe(dev, ret, "failed to get power supplies\n");
+
+	ret = it6263_parse_dt(it);
+	if (ret)
+		return ret;
+
+	it6263_hw_reset(reset_gpio);
+
+	ret = it6263_lvds_set_i2c_addr(it);
+	if (ret)
+		return dev_err_probe(dev, ret, "failed to set I2C addr\n");
+
+	it->lvds_i2c = devm_i2c_new_dummy_device(dev, client->adapter,
+						 LVDS_INPUT_CTRL_I2C_ADDR);
+	if (IS_ERR(it->lvds_i2c))
+		dev_err_probe(it->dev, PTR_ERR(it->lvds_i2c),
+			      "failed to allocate I2C device for LVDS\n");
+
+	it->lvds_regmap = devm_regmap_init_i2c(it->lvds_i2c,
+					       &it6263_lvds_regmap_config);
+	if (IS_ERR(it->lvds_regmap))
+		return dev_err_probe(dev, PTR_ERR(it->lvds_regmap),
+				     "failed to init I2C regmap for LVDS\n");
+
+	it6263_lvds_config(it);
+	it6263_hdmi_config(it);
+
+	i2c_set_clientdata(client, it);
+
+	it->bridge.funcs = &it6263_bridge_funcs;
+	it->bridge.of_node = dev->of_node;
+	/* IT6263 chip doesn't support HPD interrupt. */
+	it->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID |
+			 DRM_BRIDGE_OP_HDMI;
+	it->bridge.type = DRM_MODE_CONNECTOR_HDMIA;
+	it->bridge.vendor = "ITE";
+	it->bridge.product = "IT6263";
+
+	return devm_drm_bridge_add(dev, &it->bridge);
+}
+
+static const struct of_device_id it6263_of_match[] = {
+	{ .compatible = "ite,it6263", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, it6263_of_match);
+
+static const struct i2c_device_id it6263_i2c_ids[] = {
+	{ "it6263", 0 },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, it6263_i2c_ids);
+
+static struct i2c_driver it6263_driver = {
+	.probe = it6263_probe,
+	.driver = {
+		.name = "it6263",
+		.of_match_table = it6263_of_match,
+	},
+	.id_table = it6263_i2c_ids,
+};
+module_i2c_driver(it6263_driver);
+
+MODULE_DESCRIPTION("ITE Tech. Inc. IT6263 LVDS/HDMI bridge");
+MODULE_AUTHOR("Liu Ying <victor.liu@nxp.com>");
+MODULE_LICENSE("GPL");
@@ -0,0 +1,82 @@
+From 40dbdab340dfc6c4392479d726999db6b4ed2713 Mon Sep 17 00:00:00 2001
+From: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
+Date: Thu, 5 Dec 2024 09:02:10 +0100
+Subject: [PATCH 34/35] drm/bridge: ite-it6263: Support VESA-24 input format
+Organization: Wires
+
+Introduce it6263_is_input_bus_fmt_valid() and refactor the
+it6263_bridge_atomic_get_input_bus_fmts() function to support VESA-24
+format by selecting the LVDS input format based on the LVDS data mapping
+and thereby support both JEIDA-24 and VESA-24 input formats.
+
+Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Signed-off-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
+Reviewed-by: Liu Ying <victor.liu@nxp.com>
+Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20241205080210.1285385-1-tommaso.merciai.xr@bp.renesas.com
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+---
+ drivers/gpu/drm/bridge/ite-it6263.c | 25 ++++++++++++++++++++++---
+ 1 file changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/bridge/ite-it6263.c b/drivers/gpu/drm/bridge/ite-it6263.c
+index cbabd4e20d3e..3fc5c6795487 100644
+--- a/drivers/gpu/drm/bridge/ite-it6263.c
+++ b/drivers/gpu/drm/bridge/ite-it6263.c
+@@ -48,6 +48,7 @@
+ #define  REG_COL_DEP			GENMASK(1, 0)
+ #define  BIT8				FIELD_PREP(REG_COL_DEP, 1)
+ #define  OUT_MAP			BIT(4)
+#define  VESA				BIT(4)
+ #define  JEIDA				0
+ #define  REG_DESSC_ENB			BIT(6)
+ #define  DMODE				BIT(7)
+@@ -428,12 +429,30 @@ static inline void it6263_lvds_reset(struct it6263 *it)
+ 	fsleep(10000);
+ }
+ 
+static inline bool it6263_is_input_bus_fmt_valid(int input_fmt)
+{
+	switch (input_fmt) {
+	case MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA:
+	case MEDIA_BUS_FMT_RGB888_1X7X4_SPWG:
+		return true;
+	}
+	return false;
+}
+
+ static inline void it6263_lvds_set_interface(struct it6263 *it)
+ {
+	u8 fmt;
+
+ 	/* color depth */
+ 	regmap_write_bits(it->lvds_regmap, LVDS_REG_2C, REG_COL_DEP, BIT8);
+
+	if (it->lvds_data_mapping == MEDIA_BUS_FMT_RGB888_1X7X4_SPWG)
+		fmt = VESA;
+	else
+		fmt = JEIDA;
+
+ 	/* output mapping */
+-	regmap_write_bits(it->lvds_regmap, LVDS_REG_2C, OUT_MAP, JEIDA);
+	regmap_write_bits(it->lvds_regmap, LVDS_REG_2C, OUT_MAP, fmt);
+ 
+ 	if (it->lvds_dual_link) {
+ 		regmap_write_bits(it->lvds_regmap, LVDS_REG_2C, DMODE, DISO);
+@@ -714,14 +733,14 @@ it6263_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
+ 
+ 	*num_input_fmts = 0;
+ 
+-	if (it->lvds_data_mapping != MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA)
+	if (!it6263_is_input_bus_fmt_valid(it->lvds_data_mapping))
+ 		return NULL;
+ 
+ 	input_fmts = kmalloc(sizeof(*input_fmts), GFP_KERNEL);
+ 	if (!input_fmts)
+ 		return NULL;
+ 
+-	input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA;
+	input_fmts[0] = it->lvds_data_mapping;
+ 	*num_input_fmts = 1;
+ 
+ 	return input_fmts;
@@ -0,0 +1,36 @@
+From ee2b394cbd2efd3a38151bfb5b244012ab0f05b8 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@linaro.org>
+Date: Tue, 12 Nov 2024 13:23:03 +0300
+Subject: [PATCH 35/35] drm/bridge: ite-it6263: Prevent error pointer
+ dereference in probe()
+Organization: Wires
+
+If devm_i2c_new_dummy_device() fails then we were supposed to return an
+error code, but instead the function continues and will crash on the next
+line.  Add the missing return statement.
+
+Fixes: 049723628716 ("drm/bridge: Add ITE IT6263 LVDS to HDMI converter")
+Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
+Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
+Reviewed-by: Liu Ying <victor.liu@nxp.com>
+Signed-off-by: Liu Ying <victor.liu@nxp.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/804a758b-f2e7-4116-b72d-29bc8905beed@stanley.mountain
+---
+ drivers/gpu/drm/bridge/ite-it6263.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/bridge/ite-it6263.c b/drivers/gpu/drm/bridge/ite-it6263.c
+index 3fc5c6795487..9608e83ca894 100644
+--- a/drivers/gpu/drm/bridge/ite-it6263.c
+++ b/drivers/gpu/drm/bridge/ite-it6263.c
+@@ -864,8 +864,8 @@ static int it6263_probe(struct i2c_client *client)
+ 	it->lvds_i2c = devm_i2c_new_dummy_device(dev, client->adapter,
+ 						 LVDS_INPUT_CTRL_I2C_ADDR);
+ 	if (IS_ERR(it->lvds_i2c))
+-		dev_err_probe(it->dev, PTR_ERR(it->lvds_i2c),
+-			      "failed to allocate I2C device for LVDS\n");
+		return dev_err_probe(it->dev, PTR_ERR(it->lvds_i2c),
+				     "failed to allocate I2C device for LVDS\n");
+ 
+ 	it->lvds_regmap = devm_regmap_init_i2c(it->lvds_i2c,
+ 					       &it6263_lvds_regmap_config);
@@ -1,3 +1,2 @@
-# Locally calculated
-sha256  9ac322d85bcf98a04667d929f5c2666b15bd58c6c2d68dd512c72acbced07d04  linux-6.8.2.tar.xz
-sha256  fa5f22fd67dd05812d39dca579320c493048e26c4a556048a12385e7ae6fc698  linux-6.10.3.tar.xz
+# Calculated with ../utils/kernel-refresh.sh
+sha256   c8af780f6f613ca24622116e4c512a764335ab66e75c6643003c16e49a8e3b90  linux-6.12.25.tar.xz
@@ -1,5 +1,8 @@
 {
    "eth0": {
 	"phy-detached-when-down": true
+    },
+    "eth1": {
+	"broken-mqprio": true
    }
 }
@@ -82,9 +82,6 @@ else
    fi
 fi

-# Ensure users in admin group can access all datastores
-chgrp wheel /dev/shm/*
-
 if [ ! -f "$fn" ]; then
    case "$config" in
 	startup-config)
@@ -9,10 +9,12 @@ usage()
    echo
    echo "options:"
    echo "  -b FILE  Create backup FILE, appends detected version before .ext"
+    echo "  -e       Print all messages on stderr instead of syslog"
    echo "  -c       Check only, returns false when migration is not needed"
    echo "  -h       This help text"
    echo "  -i       Edit file in-place instead of sending to stdout, like sed"
    echo "  -q       Quiet, skip normal log messages, only errors are logged"
+    echo "  -s PATH  Specify custom script path"
    echo
    echo "By default, this script reads a .cfg file on stdin, or as the first"
    echo "non-option argument, then migrates it to a new syntax on stdout."
@@ -27,14 +29,23 @@ cleanup()
 note()
 {
    if [ -n "$quiet" ]; then
-       return
+        return
+    fi
+
+    if [ -n "$nolog" ]; then
+        echo "$1" >&2
+    else
+        logger -I $$ -k -p user.notice -t "$ident" "$1"
    fi
-    logger -I $$ -k -p user.notice -t "$ident" "$1"
 }

 err()
 {
-    logger -I $$ -k -p user.err -t "$ident" "$1"
+    if [ -n "$nolog" ]; then
+        echo "Error: $1" >&2
+    else
+        logger -I $$ -k -p user.err -t "$ident" "$1"
+    fi
 }

 # Convert human-readable version to integer level
@@ -46,11 +57,11 @@ atoi()
 file_version()
 {
    jq -r '
-        if .["infix-meta:meta"] | has("infix-meta:version") then
-            .["infix-meta:meta"]["infix-meta:version"]
-        else
-            "0.0"
-        end
+    if .["infix-meta:meta"] | has("version") then
+        .["infix-meta:meta"]["version"]
+    else
+        "0.0"
+    end
    ' "$1"
 }

@@ -58,16 +69,16 @@ file_version()
 confd_version()
 {
    find "$scripts" -mindepth 1 -maxdepth 1 -type d \
-	| sort -V | tail -n1 | xargs -n1 basename
-}
+        | sort -V | tail -n1 | xargs -n1 basename
+    }

 # Update meta data with the latest version
 meta_version()
 {
-    if jq --arg version "$sys_version" '.["infix-meta:meta"] = {"infix-meta:version": $version}' "$2" \
-       > "${2}.tmp" && mv "${2}.tmp" "$2"; then
-	note "$1: configuration updated to version $sys_version."
-	return 0
+    if jq --arg version "$sys_version" '.["infix-meta:meta"] = {"version": $version}' "$2" \
+        > "${2}.tmp" && mv "${2}.tmp" "$2"; then
+            note "$1: configuration updated to version $sys_version."
+            return 0
    fi

    err "$1: failed updating configuration to version $sys_version!"
@@ -80,23 +91,23 @@ migrate()
    note "$1: migrating from version $cfg_version"

    for version_dir in $(find "$scripts" -mindepth 1 -maxdepth 1 -type d | sort -V); do
-	dir=$(basename "$version_dir")
-	version=$(atoi "$dir")
+        dir=$(basename "$version_dir")
+        version=$(atoi "$dir")

-	# Step by step upgrade file to latest version
-	if [ "$cfg_level" -lt "$version" ]; then
-	    note "Applying migrations for version $dir ..."
+    # Step by step upgrade file to latest version
+    if [ "$cfg_level" -lt "$version" ]; then
+        note "Applying migrations for version $dir ..."

-	    # Apply all scripts in the version directory in order
-	    for script in $(find "$version_dir" -type f -name '*.sh' | sort -V); do
-		note "$1: calling $script ..."
-		sh "$script" "$2"
-	    done
+        # Apply all scripts in the version directory in order
+        for script in $(find "$version_dir" -type f -name '*.sh' | sort -V); do
+            note "$1: calling $script ..."
+            sh "$script" "$2"
+        done

-	    # File now at $version ...
-	    cfg_level="$version"
-	fi
-    done
+        # File now at $version ...
+        cfg_level="$version"
+    fi
+done
 }

 # Try migrating a copy, then diff the files, for factory-config check
@@ -121,36 +132,43 @@ chmod 600 "$tmp"

 trap cleanup INT HUP TERM EXIT

-OPTS=$(getopt -o b:chiq -- "$@")
+OPTS=$(getopt -o b:echiqs: -- "$@")
 eval set -- "$OPTS"

 while [ -n "$1" ]; do
    case $1 in
-	-b)
-	    bak=$2
-	    shift
-	    ;;
-	-c)
-	    check=1
-	    ;;
-	-h)
-	    usage
-	    exit 0
-	    ;;
-	-i)
-	    inplace=1
-	    ;;
-	-q)
-	    quiet=1
-	    ;;
-	--)
-	    shift
-	    break
-	    ;;
-	*)
-	    # Likely file argument
-	    break
-	    ;;
+        -b)
+            bak=$2
+            shift
+            ;;
+        -e)
+            nolog=1
+            ;;
+        -c)
+            check=1
+            ;;
+        -h)
+            usage
+            exit 0
+            ;;
+        -i)
+            inplace=1
+            ;;
+        -q)
+            quiet=1
+            ;;
+        -s)
+            scripts=$2
+            shift
+            ;;
+        --)
+            shift
+            break
+            ;;
+        *)
+            # Likely file argument
+            break
+            ;;
    esac
    shift
 done
@@ -190,22 +208,22 @@ if [ "$cfg_level" -eq "$sys_level" ]; then
    exit 0
 else
    if [ -n "$check" ]; then
-	# We may be called to check a file without meta:version (factory)
-	if [ "$cfg_version" = "0.0" ]; then
-	    if diff "$tmp"; then
-		# File is OK, despite lacking meta:version
-		exit 0
-	    fi
-	    msg="$orig: has syntax error, requires migrating."
-	else
-	    msg="$orig: version $cfg_version, requires migrating."
-	fi
-	if [ -t 0 ]; then
-	    echo "$msg"
-	else
-	    note "$msg"
-	fi
-	exit 1
+        # We may be called to check a file without meta:version (factory)
+        if [ "$cfg_version" = "0.0" ]; then
+            if diff "$tmp"; then
+                # File is OK, despite lacking meta:version
+                exit 0
+            fi
+            msg="$orig: has syntax error, requires migrating."
+        else
+            msg="$orig: version $cfg_version, requires migrating."
+        fi
+        if [ -t 0 ]; then
+            echo "$msg"
+        else
+            note "$msg"
+        fi
+        exit 1
    fi
 fi

@@ -214,10 +232,10 @@ if [ -n "$bak" ]; then
    ext="${bak##*.}"
    bak="${fil}-${cfg_version}.${ext}"
    if cp -p "$tmp" "$bak" 2>/dev/null; then
-	note "$orig: backup created: $bak"
+        note "$orig: backup created: $bak"
    else
-	err "$orig: failed creating backup: $bak"
-	exit 1
+        err "$orig: failed creating backup: $bak"
+        exit 1
    fi
 fi

@@ -19,8 +19,11 @@ AC_CONFIG_FILES([
 	share/migrate/1.3/Makefile
 	share/migrate/1.4/Makefile
 	share/migrate/1.5/Makefile
-	src/Makefile
 	yang/Makefile
+	yang/confd/Makefile
+	yang/test-mode/Makefile
+	yang/rousette/Makefile
+	src/Makefile
 ])

 AC_PROG_CC
@@ -83,7 +86,7 @@ DATAROOTDIR=`eval echo $datarootdir`
 DATAROOTDIR=`eval echo $DATAROOTDIR`
 AC_SUBST(DATAROOTDIR)

-YANGDIR=`eval echo $datarootdir/yang/modules/confd`
+YANGDIR=`eval echo $datarootdir/yang/modules`
 AC_SUBST(YANGDIR)

 LIBDIR=`eval echo $libdir`
@@ -3,14 +3,17 @@

 file=$1
 temp=${file}.tmp
-
-jq '.["infix-services:ssh"] = {
-      "enabled": true,
-      "hostkey": ["genkey"],
-      "listen": [
-        {"name": "ipv4", "address": "0.0.0.0", "port": 22},
-        {"name": "ipv6", "address": "::", "port": 22}
-      ]
-    }' "$file" > "$temp"
-
-mv "$temp" "$file"
+jq '
+if has("infix-services:ssh") then
+  .
+else
+  .["infix-services:ssh"] = {
+    "enabled": true,
+    "hostkey": ["genkey"],
+    "listen": [
+      {"name": "ipv4", "address": "0.0.0.0", "port": 22},
+      {"name": "ipv6", "address": "::", "port": 22}
+    ]
+  }
+end' $file > temp.json
+mv temp.json $file
@@ -38,10 +38,6 @@ struct sr_change {
 	sr_val_t *new;
 };

-static char   *ver = NULL;
-static char   *rel = NULL;
-static char   *sys = NULL;
-static char   *os  = NULL;
 static char   *nm  = NULL;
 static char   *id  = NULL;

@@ -90,17 +86,9 @@ static void setvar(const char *line, const char *key, char **var)

 static void os_init(void)
 {
-	struct utsname uts;
 	char line[80];
 	FILE *fp;

-	if (!uname(&uts)) {
-		os  = strdup(uts.sysname);
-		ver = strdup(uts.release);
-		rel = strdup(uts.release);
-		sys = strdup(uts.machine);
-	}
-
 	fp = fopen("/etc/os-release", "r");
 	if (!fp) {
 		fp = fopen("/usr/lib/os-release", "r");
@@ -110,36 +98,12 @@ static void os_init(void)

 	while (fgets(line, sizeof(line), fp)) {
 		line[strlen(line) - 1] = 0; /* drop \n */
-		setvar(line, "NAME", &os);
-		setvar(line, "VERSION_ID", &ver);
-		setvar(line, "BUILD_ID", &rel);
-		setvar(line, "ARCHITECTURE", &sys);
 		setvar(line, "DEFAULT_HOSTNAME", &nm);
 		setvar(line, "ID", &id);
 	}
 	fclose(fp);
 }

-static char *fmtime(time_t t, char *buf, size_t len)
-{
-        const char *isofmt = "%FT%T%z";
-        struct tm tm;
-        size_t i, n;
-
-	tzset();
-        localtime_r(&t, &tm);
-        n = strftime(buf, len, isofmt, &tm);
-        i = n - 5;
-        if (buf[i] == '+' || buf[i] == '-') {
-                buf[i + 6] = buf[i + 5];
-                buf[i + 5] = buf[i + 4];
-                buf[i + 4] = buf[i + 3];
-                buf[i + 3] = ':';
-        }
-
-        return buf;
-}
-
 static sr_error_t _sr_change_iter(sr_session_ctx_t *session, struct confd *confd, char *xpath,
 				  sr_error_t cb(sr_session_ctx_t *, struct confd *, struct sr_change *))
 {
@@ -165,71 +129,6 @@ static sr_error_t _sr_change_iter(sr_session_ctx_t *session, struct confd *confd
 	return SR_ERR_OK;
 }

-static int clock_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
-		    const char *path, const char *request_path, uint32_t request_id,
-		    struct lyd_node **parent, void *priv)
-{
-	static char boottime[64] = { 0 };
-	const struct ly_ctx *ctx;
-	char curtime[64];
-	time_t now, boot;
-	int rc;
-
-	ctx = sr_acquire_context(sr_session_get_connection(session));
-
-	now = time(NULL);
-	if (!boottime[0]) {
-		struct sysinfo si;
-
-		sysinfo(&si);
-		boot = now - si.uptime;
-		fmtime(boot, boottime, sizeof(boottime));
-	}
-	fmtime(now, curtime, sizeof(curtime));
-
-	if ((rc = lydx_new_path(ctx, parent, CLOCK_PATH_, "boot-datetime", "%s", boottime)))
-		goto fail;
-	if ((rc = lydx_new_path(ctx, parent, CLOCK_PATH_, "current-datetime", "%s", curtime)))
-		goto fail;
-
-	if (rc) {
-	fail:
-		ERROR("Failed building data tree, libyang error %d", rc);
-		rc = SR_ERR_INTERNAL;
-	}
-
-	sr_release_context(sr_session_get_connection(session));
-	return rc;
-}
-
-static int platform_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
-		       const char *path, const char *request_path, uint32_t request_id,
-		       struct lyd_node **parent, void *priv)
-{
-	const struct ly_ctx *ctx;
-	int rc;
-
-	ctx = sr_acquire_context(sr_session_get_connection(session));
-
-	if ((rc = lydx_new_path(ctx, parent, PLATFORM_PATH_, "os-name", "%s", os)))
-		goto fail;
-	if ((rc = lydx_new_path(ctx, parent, PLATFORM_PATH_, "os-release", "%s", rel)))
-		goto fail;
-	if ((rc = lydx_new_path(ctx, parent, PLATFORM_PATH_, "os-version", "%s", ver)))
-		goto fail;
-	if ((rc = lydx_new_path(ctx, parent, PLATFORM_PATH_, "machine", "%s", sys)))
-		goto fail;
-
-	if (rc) {
-	fail:
-		ERROR("Failed building data tree, libyang error %d", rc);
-		rc = SR_ERR_INTERNAL;
-	}
-
-	sr_release_context(sr_session_get_connection(session));
-	return rc;
-}
-
 static int rpc_exec(sr_session_ctx_t *session, uint32_t sub_id, const char *path,
 		    const sr_val_t *input, const size_t input_cnt,
 		    sr_event_t event, unsigned request_id,
@@ -1408,30 +1307,6 @@ static int change_auth(sr_session_ctx_t *session, uint32_t sub_id, const char *m
 	return SR_ERR_OK;
 }

-static int auth_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
-		    const char *path, const char *request_path, uint32_t request_id,
-		    struct lyd_node **parent, void *priv)
-{
-	const char *fmt = "/ietf-system:system/authentication/user[name='%s']/password";
-	struct spwd *spwd;
-
-	setspent();
-	while ((spwd = getspent())) {
-		char xpath[256];
-
-		/* Skip any records that do not pass YANG validation */
-		if (!spwd->sp_pwdp || spwd->sp_pwdp[0] == '0' ||
-		     spwd->sp_pwdp[0] == '*' || spwd->sp_pwdp[0] == '!')
-			continue;
-
-		snprintf(xpath, sizeof(xpath), fmt, spwd->sp_namp);
-		lyd_new_path(*parent, NULL, xpath, spwd->sp_pwdp, 0, 0);
-	}
-	endspent();
-
-	return SR_ERR_OK;
-}
-
 static int change_nacm(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
 		       const char *_, sr_event_t event, unsigned request_id, void *priv)
 {
@@ -1773,23 +1648,6 @@ err:
 	return SR_ERR_OK;
 }

-static int hostname_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *module,
-		       const char *path, const char *request_path, uint32_t request_id,
-		       struct lyd_node **parent, void *priv)
-{
-	char hostname[128];
-	int rc;
-
-	gethostname(hostname, sizeof(hostname));
-	rc = lyd_new_path(*parent, NULL, path, hostname, 0, NULL);
-	if (rc) {
-		ERROR("Failed building data tree, libyang error %d", rc);
-		rc = SR_ERR_INTERNAL;
-	}
-
-	return rc;
-}
-
 int ietf_system_init(struct confd *confd)
 {
 	int rc;
@@ -1797,12 +1655,10 @@ int ietf_system_init(struct confd *confd)
 	os_init();

 	REGISTER_CHANGE(confd->session, "ietf-system", XPATH_AUTH_, 0, change_auth, confd, &confd->sub);
-	REGISTER_OPER(confd->session, "ietf-system", PASSWORD_PATH, auth_cb, confd, 0, &confd->sub);
 	REGISTER_MONITOR(confd->session, "ietf-netconf-acm", "/ietf-netconf-acm:nacm//.",
 			 0, change_nacm, confd, &confd->sub);

 	REGISTER_CHANGE(confd->session, "ietf-system", XPATH_BASE_"/hostname", 0, change_hostname, confd, &confd->sub);
-	REGISTER_OPER(confd->session, "ietf-system", XPATH_BASE_"/hostname", hostname_cb, confd, 0, &confd->sub);
 	REGISTER_CHANGE(confd->session, "ietf-system", XPATH_BASE_"/infix-system:motd", 0, change_motd, confd, &confd->sub);
 	REGISTER_CHANGE(confd->session, "ietf-system", XPATH_BASE_"/infix-system:motd-banner", 0, change_motd_banner, confd, &confd->sub);
 	REGISTER_CHANGE(confd->session, "ietf-system", XPATH_BASE_"/infix-system:text-editor", 0, change_editor, confd, &confd->sub);
@@ -1810,9 +1666,6 @@ int ietf_system_init(struct confd *confd)
 	REGISTER_CHANGE(confd->session, "ietf-system", XPATH_BASE_"/ntp", 0, change_ntp, confd, &confd->sub);
 	REGISTER_CHANGE(confd->session, "ietf-system", XPATH_BASE_"/dns-resolver", 0, change_dns, confd, &confd->sub);

-	REGISTER_OPER(confd->session, "ietf-system", CLOCK_PATH_, clock_cb, NULL, 0, &confd->sub);
-	REGISTER_OPER(confd->session, "ietf-system", PLATFORM_PATH_, platform_cb, NULL, 0, &confd->sub);
-
 	REGISTER_RPC(confd->session, "/ietf-system:system-restart",  rpc_exec, "reboot", &confd->sub);
 	REGISTER_RPC(confd->session, "/ietf-system:system-shutdown", rpc_exec, "poweroff", &confd->sub);
 	REGISTER_RPC(confd->session, "/ietf-system:set-current-datetime", rpc_set_datetime, NULL, &confd->sub);
@@ -1,2 +1 @@
-yangdir   = $(YANGDIR)
-yang_DATA = $(wildcard *@*.yang) ieee802-types.yang ieee802-dot1ab-types.yang
+SUBDIRS             = confd test-mode rousette
@@ -1,25 +1,20 @@
 # -*- sh -*-
 # REMEMBER TO UPDATE infix-interfaces ALSO IN containers.inc
-#FORCE_UPDATE="infix-interfaces"
+
 MODULES=(
 	"ietf-system@2014-08-06.yang -e authentication -e local-users -e ntp -e ntp-udp-port -e timezone-name"
 	"iana-timezones@2013-11-19.yang"
-	"notifications@2008-07-14.yang"
-	"ietf-tcp-common@2023-12-28.yang -e keepalives-supported"
 	"ietf-interfaces@2018-02-20.yang -e if-mib"
 	"ietf-ip@2018-02-22.yang -e ipv6-privacy-autoconf"
 	"ietf-network-instance@2019-01-21.yang"
 	"ietf-netconf-monitoring@2010-10-04.yang"
-	"ietf-netconf-nmda@2019-01-07.yang -e origin -e with-defaults"
-	"ietf-subscribed-notifications@2019-09-09.yang -e encode-xml -e replay -e subtree -e xpath"
-	"ietf-yang-push@2019-09-09.yang -e on-change"
 	"ietf-routing@2018-03-13.yang"
 	"ietf-ipv6-unicast-routing@2018-03-13.yang"
 	"ietf-ipv4-unicast-routing@2018-03-13.yang"
 	"ietf-ospf@2022-10-19.yang -e bfd -e explicit-router-id"
 	"iana-if-type@2023-01-26.yang"
-	# NOTE: ietf-tls-client must be version matched with ietf-tls-server, used by netopeer2!
-	"ietf-tls-client@2023-12-28.yang" # used by ietf-syslog (remote)
+        # NOTE: ietf-tls-client must be version matched with ietf-tls-server, used by netopeer2!
+	"ietf-tls-client@2023-12-28.yang"
 	"ietf-syslog@2024-03-21.yang -e file-action -e file-limit-size -e remote-action"
 	"infix-syslog@2024-07-19.yang"
 	"iana-hardware@2018-03-13.yang"
@@ -43,22 +38,4 @@ MODULES=(
 	"infix-interfaces@2025-01-09.yang -e vlan-filtering"
 	"infix-crypto-types@2025-02-04.yang"
 	"infix-keystore@2025-02-04.yang"
-
-	# from rousette
-	"ietf-restconf@2017-01-26.yang"
-	"ietf-yang-patch@2017-02-22.yang"
-	"ietf-restconf-monitoring@2017-01-26.yang"
-
-	# from sysrepo
-	"sysrepo-plugind@2022-08-26.yang"
-	# from netopeer
-	"nc-notifications@2008-07-14.yang"
-	"ietf-crypto-types@2023-12-28.yang -e encrypted-private-keys"
-	"ietf-netconf-server@2023-12-28.yang -e ssh-listen -e tls-listen -e ssh-call-home -e tls-call-home"
-	"ietf-netconf-acm@2018-02-14.yang"
-	"ietf-netconf@2013-09-29.yang -e writable-running -e candidate -e rollback-on-error -e validate -e startup -e url -e xpath -e confirmed-commit"
-	"ietf-truststore@2023-12-28.yang -e central-truststore-supported -e certificates"
-	"ietf-keystore@2023-12-28.yang -e central-keystore-supported -e asymmetric-keys -e symmetric-keys"
-	"ietf-tls-server@2023-12-28.yang -e server-ident-raw-public-key -e server-ident-x509-cert"
-
 )
@@ -0,0 +1,2 @@
+yangdir   = $(YANGDIR)/confd
+yang_DATA = $(wildcard *@*.yang) ieee802-types.yang ieee802-dot1ab-types.yang
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mattias WalströmandGitHub	3f0a0e3df0	Merge pull request #1034 from kernelkit/update-changelog Update changelog for v25.04.0	2025-04-30 09:45:26 +02:00
Mattias Walström	3b261b331d	Update changelog for v25.04.0	2025-04-30 08:58:56 +02:00
Richard AlpeandGitHub	066ec71736	Merge pull request #1030 from kernelkit/allow-user-sysrepo-access Allow user sysrepo access	2025-04-29 15:02:39 +02:00
Tobias WaldekranzandGitHub	71295e0e37	Merge pull request #1027 from kernelkit/add-mqprio-quirk imx8mp-evk: Disable mqprio for eth1	2025-04-28 16:57:36 +02:00
Richard Alpe	ac89f94580	sysrepo: allow non-wheel users access to sysrepo data Non-privileged users in the sys-cli group can now access sysrepo data. The data is now solely protected by the NCAM rules and not Unix file permissions. Any stray user that's not part of the (default) sys-cli group still can't access syrepo, like users added from the shell. Fixes #932 Signed-off-by: Richard Alpe <richard@bit42.se>	2025-04-28 15:41:09 +02:00
Richard Alpe	399984082f	Bump buildroot (still 2025.02.1) Use new buildroot branching strategy where all our commits are placed on top of a buildroot release on a branch named BR_RELEASE-kkit. Signed-off-by: Richard Alpe <richard@bit42.se>	2025-04-28 15:32:10 +02:00
Mattias Walström	3375555911	imx8mp-evk: Disable mqprio for eth1 The kernel just hang, adding a quirk for it.	2025-04-28 13:44:19 +02:00
Tobias WaldekranzandGitHub	794872ca0c	Merge pull request #1028 from kernelkit/bump-finit Bump Finit to v4.12	2025-04-28 08:09:52 +02:00
Joachim Wiberg	b7f110dbdc	package/finit: bump to v4.12 - Improve notify:s6 readiness compatibility - Update `runparts` usage text - Fix variable overloading in urandom plugin - Fix buffer overwrite in urandom plugin, reported by Aaron Andersen Signed-off-by: Joachim Wiberg <troglobit@gmail.com>	2025-04-28 00:50:30 +02:00
Mattias WalströmandGitHub	af20325cc4	Merge pull request #1026 from kernelkit/upgrade-kernel	2025-04-25 18:09:49 +02:00
Mattias Walström	7a5c9d0324	Upgrade kernel to 6.12.25 (LTS) Also backport some fixes for freescale-imx8mp-evk	2025-04-25 13:04:37 +02:00
Mattias WalströmandGitHub	a2533aa9c4	Merge pull request #1025 from kernelkit/upgrade-buildroot	2025-04-25 12:10:52 +02:00
Mattias Walström	4d650bad7f	Upgrade buildroot to 2025.02.1 (LTS) 2025.02.1, released April 22nd, 2025 Changes with potentially large impact: - gstreamer1 and related packages: updated from 1.22.x to 1.24.x. 1.22.x was already EOL when Buildroot 2025.02 was released, so GStreamer should really already have been udpated to 1.24.x. This update was needed to fix a lot of vulnerabilities. - frr: updated from 9.1.3 to 10.3. Version 9 is no longer maintained upstream, and not in any distro either. This update was needed to fix a vulernability. Important / security related fixes: - libmodsecurity: CVE-2025-27110. - tinyxml2: CVE-2024-50615. - xserver_xorg-server & xwayland: CVE-2024-9632, CVE-2025-26594, CVE-2025-26595, CVE-2025-26596, CVE-2025-26597, CVE-2025-26598, CVE-2025-26599, CVE-2025-26600, CVE-2025-26601. - exim: CVE-2025-30232. - mbedtls: CVE-2025-27809, CVE-2025-27810. - libfreeglut: CVE-2024-24258, CVE-2024-24259. - libopenh264: CVE-2025-27091. - gstreamer1: CVE-2024-47834, CVE-2024-47835, CVE-2024-47778, CVE-2024-47777 CVE-2024-47776, CVE-2024-47775, CVE-2024-47774, CVE-2024-47615, CVE-2024-47613, CVE-2024-47607, CVE-2024-47606, CVE-2024-47603, CVE-2024-47602, CVE-2024-47601, CVE-2024-47600, CVE-2024-47599, CVE-2024-47598, CVE-2024-47597, CVE-2024-47596, CVE-2024-47546, CVE-2024-47545, CVE-2024-47544, CVE-2024-47543, CVE-2024-47542, CVE-2024-47541, CVE-2024-47540, CVE-2024-47539, CVE-2024-47538, CVE-2024-47537. - augeas: CVE-2025-2588. - libndp: CVE-2024-5564. - python-jinja2: CVE-2025-27516. - python-django: CVE-2025-26699. - libarchive: CVE-2024-57970, CVE-2025-1632. - frr: CVE-2024-55553. Updated / fixed packages: libmodsecurity, intel-mediadriver, intel-vpl-gpu-rt, python-aerich, python-aiohttp, python-maturin, python-tortoise-orm, python-sqlalchemy, kodi-pvr-waipu, tor, mc, tinyxml2, libgeos, intel-vpl-gpu-rt, intel-mediadriver, ruby, ncftp, xserver_xorg-server, exim, mbedtls, gdb, freerdp, uclibc, libsoup3, cairo, zabbix, armadillo, spdlog, go, linux, linux-tools, gstreamer, linux-header, ethtool, apr, mali-driver, libcoap, libcap python-fastapi, python-twisted. Test Improvements: - linux-tools: selftests: Add path containing BPF binary. - testing: make time setting portable. - testing: set date in emulated machine. - testing: add git runtime test. - test_gstreamer1: fix test by using bootlin toolchain. Infrastructure updates/fixes: - kconfig: Handle backspace (^H) key. - xilinx-embeddedsw: fix menuconfig visualization. - DEVELOPERS: change arnout's address. - support/download/svn: use 'svn info' whith LC_ALL=C - glibc: disable on RISC-V ilp32f and lp64f, not supported. - dillo: Fix an issue related to _SITE url for make show-info. - pkg-stats: add -v/--verbose option Build issues/problems solved for packages: dillo, freerdp, freeswitch, gdb, glibc, linux-tools, mesa3d-demos, ncftp, tesseract-ocr, v4l2loopback, zabbix	2025-04-24 20:12:43 +02:00
Tobias WaldekranzandGitHub	ff5b71b825	Merge pull request #1019 from kernelkit/move-operational statd: Move operational from confd to statd (yanger)	2025-04-23 16:18:42 +02:00
Mattias Walström	2b5cf29bb9	statd: Add new README to describe statd Whats required from your system and what to expect when you run it outside Infix.	2025-04-23 13:45:50 +02:00
Mattias Walström	513c03a764	statd: Add script to install yang-tools locally (under /home) This to be able to run statd locally on your computer.	2025-04-23 13:45:50 +02:00
Mattias Walström	5a982ab9ff	statd: Allow to specify yanger path	2025-04-23 13:45:50 +02:00
Mattias Walström	4ea451362f	yanger: DHCP: Fix bug when search exist but no nameserver When running a DHCP test `resolvconf -l` looked like this: admin@client:~$ resolvconf -l search example.com # e5 admin@client:~$ This resulted in broken result when reading operational data from system-state (which used resolvonf -l)	2025-04-23 13:45:49 +02:00
Mattias Walström	44be4e57f0	test: statd: Update unit testfiles	2025-04-23 13:45:49 +02:00
Mattias Walström	dc0871a093	yanger: Do not fail if rauc or /run/system.json exist This allowes to run statd on your computer.	2025-04-23 13:45:48 +02:00
Mattias Walström	c6b44db18a	statd: Move operational from confd to statd (yanger)	2025-04-23 13:45:48 +02:00
Mattias WalströmandGitHub	a4def1379c	Merge pull request #1018 from kernelkit/clean-srload	2025-04-14 07:40:45 +02:00
Mattias Walström	028ab7c1f9	srload: Cleanup when running outside buildtree The original syntax did not work and the initial intention, that root is always required is also false.	2025-04-11 20:31:43 +02:00
Mattias WalströmandGitHub	cc03a59725	Merge pull request #1013 from kernelkit/move-yang-models-to-confd Move yang models to confd	2025-04-11 13:45:26 +02:00
Mattias Walström	092964a10b	confd: Install all YANG modules from confd Sysrepo, netopeer etc are still responsible to install the modules in target directory, this will make that we will discover quickly if something is updated. Also this enables rm -rf output/target/etc/sysrepo/data/* && make confd-rebuild This will reinstall all modules again.	2025-04-11 08:21:51 +02:00
Mattias Walström	d0277de958	srload: Add support for multiple search directories	2025-04-11 08:21:50 +02:00
Mattias WalströmandGitHub	2df84e20af	Merge pull request #1016 from kernelkit/fix-ssh-migrate Fix migration when SSH server settings exist	2025-04-11 08:20:34 +02:00
Mattias WalströmandGitHub	9de4633c13	Merge pull request #1017 from kernelkit/update-kernel Upgrade linux kernel to 6.12.23 (LTS)	2025-04-10 19:50:39 +02:00
Mattias Walström	50f955c242	Upgrade linux kernel to 6.12.23 (LTS)	2025-04-10 15:21:36 +02:00
Mattias Walström	f2f539b492	Fix migration when SSH server settings exist This fix #1015	2025-04-10 14:29:56 +02:00
Joachim WibergandGitHub	2b439298fb	Merge pull request #1014 from kernelkit/fix-migrate-version	2025-04-09 17:04:06 +02:00
Richard Alpe	2ef759a9d8	confd: remove prefix from version leaf in migrate Signed-off-by: Richard Alpe <richard@bit42.se>	2025-04-09 15:51:11 +02:00
Mattias WalströmandGitHub	6fe4db8431	Merge pull request #1011 from kernelkit/update-kernel Update kernel to 6.12.22 (LTS)	2025-04-07 18:44:55 +02:00
Mattias Walström	b2525e29e1	Upgrade linux kernel to 6.12.22 (LTS)	2025-04-07 18:26:07 +02:00
Joachim WibergandGitHub	7ef5223fca	Merge pull request #1010 from kernelkit/netboot-doc Netboot HowTo Signed-off-by: Joachim Wiberg <troglobit@gmail.com>	2025-04-07 17:57:56 +02:00
Joachim Wiberg	323bfc9d66	doc: add netboot howto, for developers [skip ci] Signed-off-by: Joachim Wiberg <troglobit@gmail.com>	2025-04-07 17:56:59 +02:00
Mattias WalströmandGitHub	d6be23fa6b	Merge pull request #1012 from kernelkit/run-migrate-script-locally Run migrate script locally	2025-04-07 17:07:21 +02:00
Mattias Walström	c7c2998e33	Require a valid sha256 checksum for all package downloaded	2025-04-07 16:57:17 +02:00
Mattias Walström	184ed470d7	kernel-refresh.sh: Update linux hash on update	2025-04-07 16:57:17 +02:00
Richard Alpe	75352a9f77	confd: add no log option (-e) to migrate script Write logs to stderr instead of syslog. Useful when running on a non-target system. Signed-off-by: Richard Alpe <richard@bit42.se>	2025-04-07 15:20:54 +02:00
Richard Alpe	e3c601f2fd	confd: add script path option (-s) to migrate script This allows a user to run in on any system which has the Infix source code that contains the modification scripts. Signed-off-by: Richard Alpe <richard@bit42.se>	2025-04-07 15:09:36 +02:00
Richard Alpe	0ab9e2a36a	confd: fix indentation of bin/migrate Don't mix tabs and spaces. Signed-off-by: Richard Alpe <richard@bit42.se>	2025-04-07 14:57:17 +02:00
Joachim WibergandGitHub	7b20665cf9	Merge pull request #1004 from kernelkit/new-show-command Add new show command Signed-off-by: Joachim Wiberg <troglobit@gmail.com>	2025-04-07 14:34:35 +02:00
Mattias WalströmandGitHub	3d86ecd2ee	Merge pull request #1005 from kernelkit/fix-images Change type of disk image	2025-04-07 09:41:01 +02:00
Richard Alpe	403b79d370	test: update unit test data (cli/show-software) The software list from sysrepo is no longer reversed, the reverse now happens in cli-pretty. This commit reflects that. Signed-off-by: Richard Alpe <richard@bit42.se>	2025-04-07 09:06:29 +02:00
Richard Alpe	740ecbcc43	cli: integrate (use) new show command in cli	2025-04-07 09:06:28 +02:00
Richard Alpe	42af6eec30	show: add bash tab-completions Signed-off-by: Richard Alpe <richard@bit42.se>	2025-04-07 09:06:27 +02:00
Richard Alpe	c584af356b	show: add new show tool written in python3 The reason for this is: 1) We want to use the same fetch tool for all operational data, to avoid having duplicated xpaths scattered across the repo. 2) We want to call this directly from the CLI, which means it need to be escape safe. A unprivileged user shall be able to use it but not escape into a shell or do other malicious stuff. Signed-off-by: Richard Alpe <richard@bit42.se>	2025-04-07 09:06:26 +02:00
Richard Alpe	827dc098e4	board/common: deprecate existing show command There's several reasons for this. The main reason is that it was developed as an intermediate way of getting system information when the operational datastore was almost empty. There's not a lot of data available in the operational datastore and we shall rely on that data primarily. This command isn't safe to run from a jailed CLI as i doesn't validate input and run commands directly in the shell, making it hard to protect against a CLI jail break. In upcoming patches we will introduce a new show tool that relies solely on operational data and which sanitize the user input. Signed-off-by: Richard Alpe <richard@bit42.se>	2025-04-07 09:06:25 +02:00
Richard Alpe	bc5dd949d7	cli: fix indentation of infix.xml	2025-04-07 09:06:20 +02:00
Mattias Walström	4a932dec11	Update changelog for 2025.04	2025-04-07 08:20:21 +02:00
Mattias Walström	d5c5e38604	CI: Store qcow2 disk images as release artififacts This to make it easier to use GNS3 appliance file from GNS3 marketplace.	2025-04-07 08:16:34 +02:00
Mattias Walström	02080bfb6c	qeneth: Move Infix test templates from qeneth to Infix	2025-04-07 08:16:33 +02:00
Mattias Walström	d3fa51e4fa	Use qcow2 for disk image instead of raw image This make the release bundle much smaller, the disk image size change from 512M to 2xsizeof(squashimage)	2025-04-07 08:16:33 +02:00
Mattias Walström	6cfe5f8c58	Fix symlink in release packages Fix #1002	2025-04-07 08:16:33 +02:00
Mattias Walström	b4f3e4eab8	migrate: Fix typo resulting in not logging correctly	2025-04-07 08:16:32 +02:00
Joachim WibergandGitHub	b188e781ee	Merge pull request #1007 from kernelkit/r2s-fixes Fix NanoPi R2S Regression Signed-off-by: Joachim Wiberg <troglobit@gmail.com>	2025-04-07 08:16:09 +02:00
Joachim Wiberg	8156179f1b	doc: update ChangeLog for v25.04 release cycle Signed-off-by: Joachim Wiberg <troglobit@gmail.com>	2025-04-07 06:22:19 +02:00
Joachim Wiberg	55632eebaa	utils: update usage text with example, add -f - Update usage text for readability, add example - Reindent getopts case and add -h - Allow 'git rm -f' to remove already staged patches Signed-off-by: Joachim Wiberg <troglobit@gmail.com>	2025-04-07 06:06:42 +02:00
Joachim Wiberg	71b11026bb	configs/r2s_defconfig: bump kernel to 6.12.21 (LTS) - Bump kernel to 6.12.21, same as other tier one boards - Fix #1006 byt enabling netlink for ethtool (now works!) - Sync defconfigs: - LIBXCRYPT now in an rdep of another package - Disable FORCE check hashes for now - Drop patches for 6.10 tree (r2s kernel) - Port RTL8153b patch for R2S LAN LED support Fixes #1006 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>	2025-04-07 05:54:54 +02:00
Joachim Wiberg	2b28733fda	confd: set correct file version of migrated files in backup Signed-off-by: Joachim Wiberg <troglobit@gmail.com>	2025-04-07 05:32:05 +02:00
Joachim Wiberg	8c115e17c4	board/common: set wheel group on /cfg/backup dir Signed-off-by: Joachim Wiberg <troglobit@gmail.com>	2025-04-07 05:32:05 +02:00